From 757384546bbc83356a07149592a54c725ab272f2 Mon Sep 17 00:00:00 2001
From: Ankita Kinger <ankita@appsmith.com>
Date: Sun, 29 Oct 2023 03:25:06 +0530
Subject: [PATCH] chore: Updating validateLicense function call in cypress
 (#28448)

## Description

Updating validateLicense function call in cypress

#### PR fixes following issue(s)
Fixes # (issue number)

#### Type of change
- Chore (housekeeping or task changes that don't impact user perception)

## Testing

#### How Has This Been Tested?
- [x] Manual
- [ ] JUnit
- [ ] Jest
- [x] Cypress

## Checklist:
#### Dev activity
- [x] My code follows the style guidelines of this project
- [x] I have performed a self-review of my own code
- [x] I have commented my code, particularly in hard-to-understand areas
- [ ] I have made corresponding changes to the documentation
- [x] My changes generate no new warnings
- [ ] I have added tests that prove my fix is effective or that my
feature works
- [x] New and existing unit tests pass locally with my changes
- [ ] PR is being merged under a feature flag


#### QA activity:
- [ ] [Speedbreak
features](https://github.com/appsmithorg/TestSmith/wiki/Guidelines-for-test-plans#speedbreakers-)
have been covered
- [ ] Test plan covers all impacted features and [areas of
interest](https://github.com/appsmithorg/TestSmith/wiki/Guidelines-for-test-plans#areas-of-interest-)
- [ ] Test plan has been peer reviewed by project stakeholders and other
QA members
- [ ] Manually tested functionality on DP
- [ ] We had an implementation alignment call with stakeholders post QA
Round 2
- [ ] Cypress test cases have been added and approved by SDET/manual QA
- [ ] Added `Test Plan Approved` label after Cypress tests were reviewed
- [ ] Added `Test Plan Approved` label after JUnit tests were reviewed
---
 app/client/cypress/support/e2e.js               | 17 +++++++++--------
 app/client/src/ce/pages/workspace/Members.tsx   |  1 -
 .../pages/Editor/Explorer/Common/components.tsx |  3 +--
 3 files changed, 10 insertions(+), 11 deletions(-)

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