diff --git a/app/client/cypress/support/e2e.js b/app/client/cypress/support/e2e.js index 9fc7c64986..5631f3ac0c 100644 --- a/app/client/cypress/support/e2e.js +++ b/app/client/cypress/support/e2e.js @@ -119,18 +119,19 @@ before(function () { } else if (url.indexOf("user/login") > -1) { //Cypress.Cookies.preserveOnce("SESSION", "remember_token"); cy.LoginFromAPI(username, password); - if (CURRENT_REPO === REPO.EE) { - cy.wait(2000); - cy.url().then((url) => { - if (url.indexOf("/license") > -1) { - cy.validateLicense(); - } - }); - } cy.wait(3000); } }); + if (CURRENT_REPO === REPO.EE) { + cy.wait(2000); + cy.url().then((url) => { + if (url.indexOf("/license") > -1) { + cy.validateLicense(); + } + }); + } + if (!Cypress.currentTest.titlePath[0].includes(WALKTHROUGH_TEST_PAGE)) { // Adding key FEATURE_WALKTHROUGH (which is used to check if the walkthrough is already shown to the user or not) for non walkthrough cypress tests (to not show walkthrough) addIndexedDBKey(FEATURE_WALKTHROUGH_INDEX_KEY, { diff --git a/app/client/src/ce/pages/workspace/Members.tsx b/app/client/src/ce/pages/workspace/Members.tsx index 4af0e0f4bb..843f53dc4f 100644 --- a/app/client/src/ce/pages/workspace/Members.tsx +++ b/app/client/src/ce/pages/workspace/Members.tsx @@ -57,7 +57,6 @@ export const MembersWrapper = styled.div<{ table-layout: fixed; thead { - z-index: 1; tr { border-bottom: 1px solid var(--ads-v2-color-border); th { diff --git a/app/client/src/pages/Editor/Explorer/Common/components.tsx b/app/client/src/pages/Editor/Explorer/Common/components.tsx index 4e3c9fa099..07eb8d01d9 100644 --- a/app/client/src/pages/Editor/Explorer/Common/components.tsx +++ b/app/client/src/pages/Editor/Explorer/Common/components.tsx @@ -9,8 +9,7 @@ export const RelativeContainer = styled.div` `; export const StyledEntity = styled(Entity)<{ entitySize?: number }>` - &.pages > div:not(.t--entity-item) > div > div, - &.query-modules > div:not(.t--entity-item) > div > div { + &.pages > div:not(.t--entity-item) > div > div { max-height: 40vh; min-height: ${({ entitySize }) => entitySize && entitySize > MIN_PAGES_HEIGHT