Merge pull request #9493 from ToolJet/community/platformv1.0

Release: Platform Community (v2.38.0)
ToolJet · Apr 29, 2024 · 4fd5666 · 4fd5666
2 parents 0fae5a0 + 06369d9
commit 4fd5666
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 9 deletions.
diff --git a/.version b/.version
@@ -1 +1 @@
-2.37.1
+2.38.0
diff --git a/cypress-tests/cypress/e2e/happyPath/platform/commonTestcases/workspace/userPermissions.cy.js b/cypress-tests/cypress/e2e/happyPath/platform/commonTestcases/workspace/userPermissions.cy.js
@@ -210,7 +210,7 @@ describe("User permissions", () => {
  );
  cy.get(
  '[data-cy="go-to-workspace-constants-option-button"]'
- ).verifyVisibleElement("have.text", "Go to workspace constants");
+ ).verifyVisibleElement("have.text", "Go to Workspace constants");
  cy.logoutApi();
  });
 });
diff --git a/frontend/.version b/frontend/.version
@@ -1 +1 @@
-2.37.1
+2.38.0
diff --git a/frontend/src/HomePage/HomePage.jsx b/frontend/src/HomePage/HomePage.jsx
@@ -886,7 +886,7 @@ class HomePageComponent extends React.Component {
  </span>
  </div>
  )}
- {meta.total_count > 0 && (
+ {(isLoading || meta.total_count > 0) && (
  <AppList
  apps={apps}
  canCreateApp={this.canCreateApp}

diff --git a/frontend/src/ManageOrgVars/ManageOrgVars.jsx b/frontend/src/ManageOrgVars/ManageOrgVars.jsx
@@ -314,7 +314,7 @@ class RawManageOrgVarsComponent extends React.Component {
  >
  <Button.Content
  iconSrc="assets/images/icons/arrow-right.svg"
- title={'Go to workspace constants'}
+ title={'Go to Workspace constants'}
  direction="right"
  />
  </Button>

diff --git a/frontend/src/_components/AppModal.jsx b/frontend/src/_components/AppModal.jsx
@@ -124,7 +124,13 @@ export function AppModal({
  title={title}
  footerContent={
  <>
- <ButtonSolid variant="tertiary" onClick={closeModal} data-cy="cancel-button" className="modal-footer-divider">
+ <ButtonSolid
+ variant="tertiary"
+ onClick={closeModal}
+ data-cy="cancel-button"
+ className="modal-footer-divider"
+ disabled={isLoading}
+ >
  Cancel
  </ButtonSolid>
  <ButtonSolid
@@ -157,6 +163,7 @@ export function AppModal({
  style={{
  borderColor: errorText ? '#DB4324 !important' : 'initial',
  }}
+ disabled={isLoading}
  />
  {errorText ? (
  <small

diff --git a/frontend/src/_components/SearchBox.jsx b/frontend/src/_components/SearchBox.jsx
@@ -75,7 +75,7 @@ export const SearchBox = forwardRef(
  autoFocus={autoFocus}
  ref={ref}
  />
- {searchText.length > 0 ? (
+ {searchText.length >= 0 ? (
  <span className="input-icon-addon end" onMouseDown={clearSearchText}>
  <div className="d-flex tj-common-search-input-clear-icon" title="clear">
  <SolidIcon name="remove" />

diff --git a/frontend/src/_styles/theme.scss b/frontend/src/_styles/theme.scss
@@ -3322,6 +3322,10 @@ input:focus-visible {
  #4c5b79 80%);
  }
 
+ .app-icon-skeleton {
+ background-color: #3A4251 !important;
+ }
+
  .folder-icon-skeleton::after {
  background-image: linear-gradient(to right,
  #566177 0,
@@ -6242,6 +6246,7 @@ a.step-item-disabled {
 
 .notification-center {
  max-height: 500px;
+ min-width: 420px;
  overflow: auto;
  margin-left: 11px !important;
 
@@ -7942,7 +7947,6 @@ tbody {
  padding-bottom: 24px;
  border-right: 1px solid var(--slate5);
 
- &[data-name="Workspace constants"],
  &[data-name="Profile settings"] {
  border-right: none;
  border-bottom: 1px solid var(--slate5);
@@ -8402,6 +8406,9 @@ tbody {
  background-color: #2F3C4C !important;
  background-image: linear-gradient(90deg, #2F3C4C, #2F3C4C, #2F3C4C) !important;
  }
+ .react-loading-skeleton::after {
+ background-image: linear-gradient(90deg, #2F3C4C, #3A4251, #2F3C4C) !important;
+ }
 }
 
 @keyframes up-and-down {

diff --git a/server/.version b/server/.version
@@ -1 +1 @@
-2.37.1
+2.38.0