From 06744989a52c043543dd8b51a3157afa026910a0 Mon Sep 17 00:00:00 2001
From: Midhun Kumar E <midhun752@gmail.com>
Date: Tue, 5 Mar 2024 12:51:59 +0530
Subject: [PATCH 1/4] Restructured cypress specs: Organized test cases for
 enhanced clarity and maintenance (#8957)

* Move specs to specified locations

* Modify cypress config
---
 cypress-tests/cypress-app-builder.config.js       | 10 ++--------
 cypress-tests/cypress-marketplace.config.js       |  6 ++----
 cypress-tests/cypress-run.config.js               | 15 ++-------------
 cypress-tests/cypress-workspace.config.js         |  7 ++-----
 .../commonTestcases/components}/appTitle.cy.js    |  0
 .../components}/buttonHappyPath.cy.js             |  0
 .../componentDuplicationHappypath.cy.js           |  0
 .../components}/componentsBasicHappypath.cy.js    |  0
 .../commonTestcases/components}/csa.cy.js         |  0
 .../components}/datePickerHappyPath.cy.js         |  0
 .../components}/listViewHappyPath.cy.js           |  0
 .../components}/modalHappyPath.cy.js              |  0
 .../components}/multiselectHappyPath.cy.js        |  0
 .../components}/numberInputHappyPath.cy.js        |  0
 .../components}/passwordInputHappyPath.cy.js      |  0
 .../components}/tableRegression.cy.js             |  0
 .../components}/textHappyPath.cy.js               |  0
 .../components}/textInputHappyPath.cy.js          |  0
 .../commonTestcases}/globalSetingsHappyPath.cy.js |  0
 .../commonTestcases}/inspectorHappypath.cy.js     |  0
 .../multipage/multipageHappypath.cy.js            |  0
 .../queries/chainingOfQueries.cy.js               |  0
 .../queryPanel/queryEditorRegression.cy.js        |  0
 .../queryPanel/queryManagerRegression.cy.js       |  0
 .../commonTestcases}/queries/runjsHappyPath.cy.js |  0
 .../commonTestcases}/queries/runpyHappyPath.cy.js |  0
 .../data-source/azureBlobStorageHappyPath.cy.js   |  0
 .../data-source/bigqueryHappyPath.cy.js           |  0
 .../data-source/clickHouseHappyPath.cy.js         |  0
 .../data-source/cosmosDbHappyPath.cy.js           |  0
 .../data-source/couchDbHappyPath.cy.js            |  0
 .../data-source/dynamoDbHappyPath.cy.js           |  0
 .../data-source/elasticsearchHappyPath.cy.js      |  0
 .../data-source/fireStoreHappyPath.cy.js          |  0
 .../data-source/influxDbHappyPath.cy.js           |  0
 .../data-source/mariaDbHappyPath.cy.skip.js       |  0
 .../data-source/mongoDbHappyPath.cy.js            |  0
 .../data-source/mysqlHappyPath.cy.js              |  0
 .../data-source/oracleDbHappyPath.cy.skip.js      |  0
 .../data-source/postgresHappyPath.cy.js           |  0
 .../data-source/redisHappyPath.cy.js              |  0
 .../data-source/rethinkDbHappyPath.cy.skip.js     |  0
 .../data-source/s3HappyPath.cy.js                 |  0
 .../data-source/sapHanaHappyPath.cy.skip.js       |  0
 .../data-source/smtpHappyPath.cy.js               |  0
 .../data-source/snowflakeHappyPath.cy.js          |  0
 .../data-source/sqlServerHappyPath.cy.js          |  0
 .../data-source/typeSenseHappyPath.cy.skip.js     |  0
 .../commonTestcases}/database/database.cy.skip.js |  0
 .../commonTestcases}/exportImport/export.cy.js    |  0
 .../commonTestcases}/exportImport/import.cy.js    |  0
 .../ceTestcases}/app-version/version.cy.js        |  0
 .../platform/ceTestcases}/appSlug.cy.js           |  0
 .../globalDataSourcePermissions.cy.js             |  0
 .../platform/ceTestcases}/groupDuplication.cy.js  |  0
 .../ceTestcases}/privateAndPublicApp.cy.js        |  0
 .../ceTestcases}/selfHost/selfHostSignUp.cy.js    |  0
 .../ceTestcases}/workspaceConstants.cy.js         |  0
 .../authentication/forgotPassword.cy.js           |  0
 .../commonTestcases}/authentication/login.cy.js   |  0
 .../commonTestcases}/authentication/signUp.cy.js  |  0
 .../commonTestcases}/workspace/appCreate.cy.js    |  0
 .../workspace/bulkUserUpload.cy.js                |  0
 .../commonTestcases}/workspace/dashboard.cy.js    |  0
 .../commonTestcases}/workspace/errorPage.cy.js    |  0
 .../commonTestcases}/workspace/manageGroups.cy.js |  0
 .../commonTestcases}/workspace/manageSSO.cy.js    |  0
 .../commonTestcases}/workspace/manageUsers.cy.js  |  0
 .../commonTestcases}/workspace/profile.cy.js      |  0
 .../workspace/userPermissions.cy.js               |  0
 .../commonTestcases}/workspace/workspace.cy.js    |  0
 71 files changed, 8 insertions(+), 30 deletions(-)
 rename cypress-tests/cypress/e2e/{editor/widget => happyPath/appbuilder/commonTestcases/components}/appTitle.cy.js (100%)
 rename cypress-tests/cypress/e2e/{editor/widget => happyPath/appbuilder/commonTestcases/components}/buttonHappyPath.cy.js (100%)
 rename cypress-tests/cypress/e2e/{editor/widget => happyPath/appbuilder/commonTestcases/components}/componentDuplicationHappypath.cy.js (100%)
 rename cypress-tests/cypress/e2e/{editor/widget => happyPath/appbuilder/commonTestcases/components}/componentsBasicHappypath.cy.js (100%)
 rename cypress-tests/cypress/e2e/{editor/widget => happyPath/appbuilder/commonTestcases/components}/csa.cy.js (100%)
 rename cypress-tests/cypress/e2e/{editor/widget => happyPath/appbuilder/commonTestcases/components}/datePickerHappyPath.cy.js (100%)
 rename cypress-tests/cypress/e2e/{editor/widget => happyPath/appbuilder/commonTestcases/components}/listViewHappyPath.cy.js (100%)
 rename cypress-tests/cypress/e2e/{editor/widget => happyPath/appbuilder/commonTestcases/components}/modalHappyPath.cy.js (100%)
 rename cypress-tests/cypress/e2e/{editor/widget => happyPath/appbuilder/commonTestcases/components}/multiselectHappyPath.cy.js (100%)
 rename cypress-tests/cypress/e2e/{editor/widget => happyPath/appbuilder/commonTestcases/components}/numberInputHappyPath.cy.js (100%)
 rename cypress-tests/cypress/e2e/{editor/widget => happyPath/appbuilder/commonTestcases/components}/passwordInputHappyPath.cy.js (100%)
 rename cypress-tests/cypress/e2e/{editor/widget => happyPath/appbuilder/commonTestcases/components}/tableRegression.cy.js (100%)
 rename cypress-tests/cypress/e2e/{editor/widget => happyPath/appbuilder/commonTestcases/components}/textHappyPath.cy.js (100%)
 rename cypress-tests/cypress/e2e/{editor/widget => happyPath/appbuilder/commonTestcases/components}/textInputHappyPath.cy.js (100%)
 rename cypress-tests/cypress/e2e/{editor => happyPath/appbuilder/commonTestcases}/globalSetingsHappyPath.cy.js (100%)
 rename cypress-tests/cypress/e2e/{editor => happyPath/appbuilder/commonTestcases}/inspectorHappypath.cy.js (100%)
 rename cypress-tests/cypress/e2e/{editor => happyPath/appbuilder/commonTestcases}/multipage/multipageHappypath.cy.js (100%)
 rename cypress-tests/cypress/e2e/{editor => happyPath/appbuilder/commonTestcases}/queries/chainingOfQueries.cy.js (100%)
 rename cypress-tests/cypress/e2e/{regressionSuite/appBuilder => happyPath/appbuilder/commonTestcases/queries}/queryPanel/queryEditorRegression.cy.js (100%)
 rename cypress-tests/cypress/e2e/{regressionSuite/appBuilder => happyPath/appbuilder/commonTestcases/queries}/queryPanel/queryManagerRegression.cy.js (100%)
 rename cypress-tests/cypress/e2e/{editor => happyPath/appbuilder/commonTestcases}/queries/runjsHappyPath.cy.js (100%)
 rename cypress-tests/cypress/e2e/{editor => happyPath/appbuilder/commonTestcases}/queries/runpyHappyPath.cy.js (100%)
 rename cypress-tests/cypress/e2e/{editor => happyPath/marketplace/commonTestcases}/data-source/azureBlobStorageHappyPath.cy.js (100%)
 rename cypress-tests/cypress/e2e/{editor => happyPath/marketplace/commonTestcases}/data-source/bigqueryHappyPath.cy.js (100%)
 rename cypress-tests/cypress/e2e/{editor => happyPath/marketplace/commonTestcases}/data-source/clickHouseHappyPath.cy.js (100%)
 rename cypress-tests/cypress/e2e/{editor => happyPath/marketplace/commonTestcases}/data-source/cosmosDbHappyPath.cy.js (100%)
 rename cypress-tests/cypress/e2e/{editor => happyPath/marketplace/commonTestcases}/data-source/couchDbHappyPath.cy.js (100%)
 rename cypress-tests/cypress/e2e/{editor => happyPath/marketplace/commonTestcases}/data-source/dynamoDbHappyPath.cy.js (100%)
 rename cypress-tests/cypress/e2e/{editor => happyPath/marketplace/commonTestcases}/data-source/elasticsearchHappyPath.cy.js (100%)
 rename cypress-tests/cypress/e2e/{editor => happyPath/marketplace/commonTestcases}/data-source/fireStoreHappyPath.cy.js (100%)
 rename cypress-tests/cypress/e2e/{editor => happyPath/marketplace/commonTestcases}/data-source/influxDbHappyPath.cy.js (100%)
 rename cypress-tests/cypress/e2e/{editor => happyPath/marketplace/commonTestcases}/data-source/mariaDbHappyPath.cy.skip.js (100%)
 rename cypress-tests/cypress/e2e/{editor => happyPath/marketplace/commonTestcases}/data-source/mongoDbHappyPath.cy.js (100%)
 rename cypress-tests/cypress/e2e/{editor => happyPath/marketplace/commonTestcases}/data-source/mysqlHappyPath.cy.js (100%)
 rename cypress-tests/cypress/e2e/{editor => happyPath/marketplace/commonTestcases}/data-source/oracleDbHappyPath.cy.skip.js (100%)
 rename cypress-tests/cypress/e2e/{editor => happyPath/marketplace/commonTestcases}/data-source/postgresHappyPath.cy.js (100%)
 rename cypress-tests/cypress/e2e/{editor => happyPath/marketplace/commonTestcases}/data-source/redisHappyPath.cy.js (100%)
 rename cypress-tests/cypress/e2e/{editor => happyPath/marketplace/commonTestcases}/data-source/rethinkDbHappyPath.cy.skip.js (100%)
 rename cypress-tests/cypress/e2e/{editor => happyPath/marketplace/commonTestcases}/data-source/s3HappyPath.cy.js (100%)
 rename cypress-tests/cypress/e2e/{editor => happyPath/marketplace/commonTestcases}/data-source/sapHanaHappyPath.cy.skip.js (100%)
 rename cypress-tests/cypress/e2e/{editor => happyPath/marketplace/commonTestcases}/data-source/smtpHappyPath.cy.js (100%)
 rename cypress-tests/cypress/e2e/{editor => happyPath/marketplace/commonTestcases}/data-source/snowflakeHappyPath.cy.js (100%)
 rename cypress-tests/cypress/e2e/{editor => happyPath/marketplace/commonTestcases}/data-source/sqlServerHappyPath.cy.js (100%)
 rename cypress-tests/cypress/e2e/{editor => happyPath/marketplace/commonTestcases}/data-source/typeSenseHappyPath.cy.skip.js (100%)
 rename cypress-tests/cypress/e2e/{ => happyPath/marketplace/commonTestcases}/database/database.cy.skip.js (100%)
 rename cypress-tests/cypress/e2e/{ => happyPath/marketplace/commonTestcases}/exportImport/export.cy.js (100%)
 rename cypress-tests/cypress/e2e/{ => happyPath/marketplace/commonTestcases}/exportImport/import.cy.js (100%)
 rename cypress-tests/cypress/e2e/{editor => happyPath/platform/ceTestcases}/app-version/version.cy.js (100%)
 rename cypress-tests/cypress/e2e/{ce => happyPath/platform/ceTestcases}/appSlug.cy.js (100%)
 rename cypress-tests/cypress/e2e/{ce => happyPath/platform/ceTestcases}/globalDataSources/globalDataSourcePermissions.cy.js (100%)
 rename cypress-tests/cypress/e2e/{ce => happyPath/platform/ceTestcases}/groupDuplication.cy.js (100%)
 rename cypress-tests/cypress/e2e/{ce => happyPath/platform/ceTestcases}/privateAndPublicApp.cy.js (100%)
 rename cypress-tests/cypress/e2e/{ => happyPath/platform/ceTestcases}/selfHost/selfHostSignUp.cy.js (100%)
 rename cypress-tests/cypress/e2e/{ce => happyPath/platform/ceTestcases}/workspaceConstants.cy.js (100%)
 rename cypress-tests/cypress/e2e/{ => happyPath/platform/commonTestcases}/authentication/forgotPassword.cy.js (100%)
 rename cypress-tests/cypress/e2e/{ => happyPath/platform/commonTestcases}/authentication/login.cy.js (100%)
 rename cypress-tests/cypress/e2e/{ => happyPath/platform/commonTestcases}/authentication/signUp.cy.js (100%)
 rename cypress-tests/cypress/e2e/{ => happyPath/platform/commonTestcases}/workspace/appCreate.cy.js (100%)
 rename cypress-tests/cypress/e2e/{ => happyPath/platform/commonTestcases}/workspace/bulkUserUpload.cy.js (100%)
 rename cypress-tests/cypress/e2e/{ => happyPath/platform/commonTestcases}/workspace/dashboard.cy.js (100%)
 rename cypress-tests/cypress/e2e/{ => happyPath/platform/commonTestcases}/workspace/errorPage.cy.js (100%)
 rename cypress-tests/cypress/e2e/{ => happyPath/platform/commonTestcases}/workspace/manageGroups.cy.js (100%)
 rename cypress-tests/cypress/e2e/{ => happyPath/platform/commonTestcases}/workspace/manageSSO.cy.js (100%)
 rename cypress-tests/cypress/e2e/{ => happyPath/platform/commonTestcases}/workspace/manageUsers.cy.js (100%)
 rename cypress-tests/cypress/e2e/{ => happyPath/platform/commonTestcases}/workspace/profile.cy.js (100%)
 rename cypress-tests/cypress/e2e/{ => happyPath/platform/commonTestcases}/workspace/userPermissions.cy.js (100%)
 rename cypress-tests/cypress/e2e/{ => happyPath/platform/commonTestcases}/workspace/workspace.cy.js (100%)

diff --git a/cypress-tests/cypress-app-builder.config.js b/cypress-tests/cypress-app-builder.config.js
index fef61c5efe..756ef58abe 100644
--- a/cypress-tests/cypress-app-builder.config.js
+++ b/cypress-tests/cypress-app-builder.config.js
@@ -76,14 +76,8 @@ module.exports = defineConfig({
     experimentalRunAllSpecs: true,
     baseUrl: "http://localhost:8082",
     specPattern: [
-      "cypress/e2e/editor/widget/*.cy.js",
-      "cypress/e2e/editor/multipage/*.cy.js",
-      "cypress/e2e/editor/globalSetingsHappyPath.cy.js",
-      "cypress/e2e/editor/inspectorHappypath.cy.js",
-      "cypress/e2e/editor/queries/runpyHappyPath.cy.js",
-      "cypress/e2e/editor/queries/runjsHappyPath.cy.js",
-      "cypress/e2e/editor/multipage/multipageHappypath.cy.js",
-      "cypress/e2e/editor/queries/chainingOfQueries.cy.js",
+      "cypress/e2e/happypath/appbuilder/commonTestcases/**/*.cy.js",
+      "cypress/e2e/happypath/appbuilder/ceTestcases/**/*.cy.js"
     ],
     numTestsKeptInMemory: 1,
     redirectionLimit: 7,
diff --git a/cypress-tests/cypress-marketplace.config.js b/cypress-tests/cypress-marketplace.config.js
index c8fc5f4409..f5e8661b1d 100644
--- a/cypress-tests/cypress-marketplace.config.js
+++ b/cypress-tests/cypress-marketplace.config.js
@@ -76,10 +76,8 @@ module.exports = defineConfig({
     experimentalRunAllSpecs: true,
     baseUrl: "http://localhost:8082",
     specPattern: [
-      "cypress/e2e/exportImport/export.cy.js",
-      "cypress/e2e/exportImport/import.cy.js",
-      "cypress/e2e/database/database.cy.js",
-      "cypress/e2e/editor/data-source/*.cy.js",
+      "cypress/e2e/happypath/marketplace/commonTestcases/**/*.cy.js",
+      "cypress/e2e/happypath/marketplace/ceTestcases/**/*.cy.js"
     ],
     numTestsKeptInMemory: 1,
     redirectionLimit: 7,
diff --git a/cypress-tests/cypress-run.config.js b/cypress-tests/cypress-run.config.js
index 8bc0752bc4..7a09e7218a 100644
--- a/cypress-tests/cypress-run.config.js
+++ b/cypress-tests/cypress-run.config.js
@@ -75,19 +75,8 @@ module.exports = defineConfig({
     experimentalModfyObstructiveThirdPartyCode: true,
     experimentalRunAllSpecs: true,
     baseUrl: "http://localhost:8082",
-    specPattern: [
-      // "cypress/e2e/selfHost/*.cy.js",
-      // "cypress/e2e/authentication/*.cy.js",
-      // "cypress/e2e/workspace/*.cy.js",
-      // "cypress/e2e/editor/data-source/*.cy.js",
-      "cypress/e2e/editor/app-version/version.cy.js",
-      "cypress/e2e/exportImport/export.cy.js",
-      "cypress/e2e/exportImport/import.cy.js",
-      "cypress/e2e/database/database.cy.js",
-      "cypress/e2e/editor/widget/*.cy.js",
-      "cypress/e2e/editor/multipage/*.cy.js",
-    ],
-    numTestsKeptInMemory: 1,
+    specPattern: "cypress/e2e/**/*.cy.js",
+    numTestsKeptInMemory: 0,
     redirectionLimit: 7,
     experimentalRunAllSpecs: true,
     experimentalMemoryManagement: true,
diff --git a/cypress-tests/cypress-workspace.config.js b/cypress-tests/cypress-workspace.config.js
index 16144f4e07..0508e9910f 100644
--- a/cypress-tests/cypress-workspace.config.js
+++ b/cypress-tests/cypress-workspace.config.js
@@ -76,11 +76,8 @@ module.exports = defineConfig({
     experimentalRunAllSpecs: true,
     baseUrl: "http://localhost:8082",
     specPattern: [
-      "cypress/e2e/ce/**/*.cy.js",
-      "cypress/e2e/editor/app-version/version.cy.js",
-      "cypress/e2e/workspace/*.cy.js",
-      "cypress/e2e/authentication/*.cy.js",
-      "cypress/e2e/selfHost/*.cy.js",
+      "cypress/e2e/happypath/platform/commonTestcases/**/*.cy.js",
+      "cypress/e2e/happypath/platform/ceTestcases/**/*.cy.js"
     ],
     numTestsKeptInMemory: 1,
     redirectionLimit: 15,
diff --git a/cypress-tests/cypress/e2e/editor/widget/appTitle.cy.js b/cypress-tests/cypress/e2e/happyPath/appbuilder/commonTestcases/components/appTitle.cy.js
similarity index 100%
rename from cypress-tests/cypress/e2e/editor/widget/appTitle.cy.js
rename to cypress-tests/cypress/e2e/happyPath/appbuilder/commonTestcases/components/appTitle.cy.js
diff --git a/cypress-tests/cypress/e2e/editor/widget/buttonHappyPath.cy.js b/cypress-tests/cypress/e2e/happyPath/appbuilder/commonTestcases/components/buttonHappyPath.cy.js
similarity index 100%
rename from cypress-tests/cypress/e2e/editor/widget/buttonHappyPath.cy.js
rename to cypress-tests/cypress/e2e/happyPath/appbuilder/commonTestcases/components/buttonHappyPath.cy.js
diff --git a/cypress-tests/cypress/e2e/editor/widget/componentDuplicationHappypath.cy.js b/cypress-tests/cypress/e2e/happyPath/appbuilder/commonTestcases/components/componentDuplicationHappypath.cy.js
similarity index 100%
rename from cypress-tests/cypress/e2e/editor/widget/componentDuplicationHappypath.cy.js
rename to cypress-tests/cypress/e2e/happyPath/appbuilder/commonTestcases/components/componentDuplicationHappypath.cy.js
diff --git a/cypress-tests/cypress/e2e/editor/widget/componentsBasicHappypath.cy.js b/cypress-tests/cypress/e2e/happyPath/appbuilder/commonTestcases/components/componentsBasicHappypath.cy.js
similarity index 100%
rename from cypress-tests/cypress/e2e/editor/widget/componentsBasicHappypath.cy.js
rename to cypress-tests/cypress/e2e/happyPath/appbuilder/commonTestcases/components/componentsBasicHappypath.cy.js
diff --git a/cypress-tests/cypress/e2e/editor/widget/csa.cy.js b/cypress-tests/cypress/e2e/happyPath/appbuilder/commonTestcases/components/csa.cy.js
similarity index 100%
rename from cypress-tests/cypress/e2e/editor/widget/csa.cy.js
rename to cypress-tests/cypress/e2e/happyPath/appbuilder/commonTestcases/components/csa.cy.js
diff --git a/cypress-tests/cypress/e2e/editor/widget/datePickerHappyPath.cy.js b/cypress-tests/cypress/e2e/happyPath/appbuilder/commonTestcases/components/datePickerHappyPath.cy.js
similarity index 100%
rename from cypress-tests/cypress/e2e/editor/widget/datePickerHappyPath.cy.js
rename to cypress-tests/cypress/e2e/happyPath/appbuilder/commonTestcases/components/datePickerHappyPath.cy.js
diff --git a/cypress-tests/cypress/e2e/editor/widget/listViewHappyPath.cy.js b/cypress-tests/cypress/e2e/happyPath/appbuilder/commonTestcases/components/listViewHappyPath.cy.js
similarity index 100%
rename from cypress-tests/cypress/e2e/editor/widget/listViewHappyPath.cy.js
rename to cypress-tests/cypress/e2e/happyPath/appbuilder/commonTestcases/components/listViewHappyPath.cy.js
diff --git a/cypress-tests/cypress/e2e/editor/widget/modalHappyPath.cy.js b/cypress-tests/cypress/e2e/happyPath/appbuilder/commonTestcases/components/modalHappyPath.cy.js
similarity index 100%
rename from cypress-tests/cypress/e2e/editor/widget/modalHappyPath.cy.js
rename to cypress-tests/cypress/e2e/happyPath/appbuilder/commonTestcases/components/modalHappyPath.cy.js
diff --git a/cypress-tests/cypress/e2e/editor/widget/multiselectHappyPath.cy.js b/cypress-tests/cypress/e2e/happyPath/appbuilder/commonTestcases/components/multiselectHappyPath.cy.js
similarity index 100%
rename from cypress-tests/cypress/e2e/editor/widget/multiselectHappyPath.cy.js
rename to cypress-tests/cypress/e2e/happyPath/appbuilder/commonTestcases/components/multiselectHappyPath.cy.js
diff --git a/cypress-tests/cypress/e2e/editor/widget/numberInputHappyPath.cy.js b/cypress-tests/cypress/e2e/happyPath/appbuilder/commonTestcases/components/numberInputHappyPath.cy.js
similarity index 100%
rename from cypress-tests/cypress/e2e/editor/widget/numberInputHappyPath.cy.js
rename to cypress-tests/cypress/e2e/happyPath/appbuilder/commonTestcases/components/numberInputHappyPath.cy.js
diff --git a/cypress-tests/cypress/e2e/editor/widget/passwordInputHappyPath.cy.js b/cypress-tests/cypress/e2e/happyPath/appbuilder/commonTestcases/components/passwordInputHappyPath.cy.js
similarity index 100%
rename from cypress-tests/cypress/e2e/editor/widget/passwordInputHappyPath.cy.js
rename to cypress-tests/cypress/e2e/happyPath/appbuilder/commonTestcases/components/passwordInputHappyPath.cy.js
diff --git a/cypress-tests/cypress/e2e/editor/widget/tableRegression.cy.js b/cypress-tests/cypress/e2e/happyPath/appbuilder/commonTestcases/components/tableRegression.cy.js
similarity index 100%
rename from cypress-tests/cypress/e2e/editor/widget/tableRegression.cy.js
rename to cypress-tests/cypress/e2e/happyPath/appbuilder/commonTestcases/components/tableRegression.cy.js
diff --git a/cypress-tests/cypress/e2e/editor/widget/textHappyPath.cy.js b/cypress-tests/cypress/e2e/happyPath/appbuilder/commonTestcases/components/textHappyPath.cy.js
similarity index 100%
rename from cypress-tests/cypress/e2e/editor/widget/textHappyPath.cy.js
rename to cypress-tests/cypress/e2e/happyPath/appbuilder/commonTestcases/components/textHappyPath.cy.js
diff --git a/cypress-tests/cypress/e2e/editor/widget/textInputHappyPath.cy.js b/cypress-tests/cypress/e2e/happyPath/appbuilder/commonTestcases/components/textInputHappyPath.cy.js
similarity index 100%
rename from cypress-tests/cypress/e2e/editor/widget/textInputHappyPath.cy.js
rename to cypress-tests/cypress/e2e/happyPath/appbuilder/commonTestcases/components/textInputHappyPath.cy.js
diff --git a/cypress-tests/cypress/e2e/editor/globalSetingsHappyPath.cy.js b/cypress-tests/cypress/e2e/happyPath/appbuilder/commonTestcases/globalSetingsHappyPath.cy.js
similarity index 100%
rename from cypress-tests/cypress/e2e/editor/globalSetingsHappyPath.cy.js
rename to cypress-tests/cypress/e2e/happyPath/appbuilder/commonTestcases/globalSetingsHappyPath.cy.js
diff --git a/cypress-tests/cypress/e2e/editor/inspectorHappypath.cy.js b/cypress-tests/cypress/e2e/happyPath/appbuilder/commonTestcases/inspectorHappypath.cy.js
similarity index 100%
rename from cypress-tests/cypress/e2e/editor/inspectorHappypath.cy.js
rename to cypress-tests/cypress/e2e/happyPath/appbuilder/commonTestcases/inspectorHappypath.cy.js
diff --git a/cypress-tests/cypress/e2e/editor/multipage/multipageHappypath.cy.js b/cypress-tests/cypress/e2e/happyPath/appbuilder/commonTestcases/multipage/multipageHappypath.cy.js
similarity index 100%
rename from cypress-tests/cypress/e2e/editor/multipage/multipageHappypath.cy.js
rename to cypress-tests/cypress/e2e/happyPath/appbuilder/commonTestcases/multipage/multipageHappypath.cy.js
diff --git a/cypress-tests/cypress/e2e/editor/queries/chainingOfQueries.cy.js b/cypress-tests/cypress/e2e/happyPath/appbuilder/commonTestcases/queries/chainingOfQueries.cy.js
similarity index 100%
rename from cypress-tests/cypress/e2e/editor/queries/chainingOfQueries.cy.js
rename to cypress-tests/cypress/e2e/happyPath/appbuilder/commonTestcases/queries/chainingOfQueries.cy.js
diff --git a/cypress-tests/cypress/e2e/regressionSuite/appBuilder/queryPanel/queryEditorRegression.cy.js b/cypress-tests/cypress/e2e/happyPath/appbuilder/commonTestcases/queries/queryPanel/queryEditorRegression.cy.js
similarity index 100%
rename from cypress-tests/cypress/e2e/regressionSuite/appBuilder/queryPanel/queryEditorRegression.cy.js
rename to cypress-tests/cypress/e2e/happyPath/appbuilder/commonTestcases/queries/queryPanel/queryEditorRegression.cy.js
diff --git a/cypress-tests/cypress/e2e/regressionSuite/appBuilder/queryPanel/queryManagerRegression.cy.js b/cypress-tests/cypress/e2e/happyPath/appbuilder/commonTestcases/queries/queryPanel/queryManagerRegression.cy.js
similarity index 100%
rename from cypress-tests/cypress/e2e/regressionSuite/appBuilder/queryPanel/queryManagerRegression.cy.js
rename to cypress-tests/cypress/e2e/happyPath/appbuilder/commonTestcases/queries/queryPanel/queryManagerRegression.cy.js
diff --git a/cypress-tests/cypress/e2e/editor/queries/runjsHappyPath.cy.js b/cypress-tests/cypress/e2e/happyPath/appbuilder/commonTestcases/queries/runjsHappyPath.cy.js
similarity index 100%
rename from cypress-tests/cypress/e2e/editor/queries/runjsHappyPath.cy.js
rename to cypress-tests/cypress/e2e/happyPath/appbuilder/commonTestcases/queries/runjsHappyPath.cy.js
diff --git a/cypress-tests/cypress/e2e/editor/queries/runpyHappyPath.cy.js b/cypress-tests/cypress/e2e/happyPath/appbuilder/commonTestcases/queries/runpyHappyPath.cy.js
similarity index 100%
rename from cypress-tests/cypress/e2e/editor/queries/runpyHappyPath.cy.js
rename to cypress-tests/cypress/e2e/happyPath/appbuilder/commonTestcases/queries/runpyHappyPath.cy.js
diff --git a/cypress-tests/cypress/e2e/editor/data-source/azureBlobStorageHappyPath.cy.js b/cypress-tests/cypress/e2e/happyPath/marketplace/commonTestcases/data-source/azureBlobStorageHappyPath.cy.js
similarity index 100%
rename from cypress-tests/cypress/e2e/editor/data-source/azureBlobStorageHappyPath.cy.js
rename to cypress-tests/cypress/e2e/happyPath/marketplace/commonTestcases/data-source/azureBlobStorageHappyPath.cy.js
diff --git a/cypress-tests/cypress/e2e/editor/data-source/bigqueryHappyPath.cy.js b/cypress-tests/cypress/e2e/happyPath/marketplace/commonTestcases/data-source/bigqueryHappyPath.cy.js
similarity index 100%
rename from cypress-tests/cypress/e2e/editor/data-source/bigqueryHappyPath.cy.js
rename to cypress-tests/cypress/e2e/happyPath/marketplace/commonTestcases/data-source/bigqueryHappyPath.cy.js
diff --git a/cypress-tests/cypress/e2e/editor/data-source/clickHouseHappyPath.cy.js b/cypress-tests/cypress/e2e/happyPath/marketplace/commonTestcases/data-source/clickHouseHappyPath.cy.js
similarity index 100%
rename from cypress-tests/cypress/e2e/editor/data-source/clickHouseHappyPath.cy.js
rename to cypress-tests/cypress/e2e/happyPath/marketplace/commonTestcases/data-source/clickHouseHappyPath.cy.js
diff --git a/cypress-tests/cypress/e2e/editor/data-source/cosmosDbHappyPath.cy.js b/cypress-tests/cypress/e2e/happyPath/marketplace/commonTestcases/data-source/cosmosDbHappyPath.cy.js
similarity index 100%
rename from cypress-tests/cypress/e2e/editor/data-source/cosmosDbHappyPath.cy.js
rename to cypress-tests/cypress/e2e/happyPath/marketplace/commonTestcases/data-source/cosmosDbHappyPath.cy.js
diff --git a/cypress-tests/cypress/e2e/editor/data-source/couchDbHappyPath.cy.js b/cypress-tests/cypress/e2e/happyPath/marketplace/commonTestcases/data-source/couchDbHappyPath.cy.js
similarity index 100%
rename from cypress-tests/cypress/e2e/editor/data-source/couchDbHappyPath.cy.js
rename to cypress-tests/cypress/e2e/happyPath/marketplace/commonTestcases/data-source/couchDbHappyPath.cy.js
diff --git a/cypress-tests/cypress/e2e/editor/data-source/dynamoDbHappyPath.cy.js b/cypress-tests/cypress/e2e/happyPath/marketplace/commonTestcases/data-source/dynamoDbHappyPath.cy.js
similarity index 100%
rename from cypress-tests/cypress/e2e/editor/data-source/dynamoDbHappyPath.cy.js
rename to cypress-tests/cypress/e2e/happyPath/marketplace/commonTestcases/data-source/dynamoDbHappyPath.cy.js
diff --git a/cypress-tests/cypress/e2e/editor/data-source/elasticsearchHappyPath.cy.js b/cypress-tests/cypress/e2e/happyPath/marketplace/commonTestcases/data-source/elasticsearchHappyPath.cy.js
similarity index 100%
rename from cypress-tests/cypress/e2e/editor/data-source/elasticsearchHappyPath.cy.js
rename to cypress-tests/cypress/e2e/happyPath/marketplace/commonTestcases/data-source/elasticsearchHappyPath.cy.js
diff --git a/cypress-tests/cypress/e2e/editor/data-source/fireStoreHappyPath.cy.js b/cypress-tests/cypress/e2e/happyPath/marketplace/commonTestcases/data-source/fireStoreHappyPath.cy.js
similarity index 100%
rename from cypress-tests/cypress/e2e/editor/data-source/fireStoreHappyPath.cy.js
rename to cypress-tests/cypress/e2e/happyPath/marketplace/commonTestcases/data-source/fireStoreHappyPath.cy.js
diff --git a/cypress-tests/cypress/e2e/editor/data-source/influxDbHappyPath.cy.js b/cypress-tests/cypress/e2e/happyPath/marketplace/commonTestcases/data-source/influxDbHappyPath.cy.js
similarity index 100%
rename from cypress-tests/cypress/e2e/editor/data-source/influxDbHappyPath.cy.js
rename to cypress-tests/cypress/e2e/happyPath/marketplace/commonTestcases/data-source/influxDbHappyPath.cy.js
diff --git a/cypress-tests/cypress/e2e/editor/data-source/mariaDbHappyPath.cy.skip.js b/cypress-tests/cypress/e2e/happyPath/marketplace/commonTestcases/data-source/mariaDbHappyPath.cy.skip.js
similarity index 100%
rename from cypress-tests/cypress/e2e/editor/data-source/mariaDbHappyPath.cy.skip.js
rename to cypress-tests/cypress/e2e/happyPath/marketplace/commonTestcases/data-source/mariaDbHappyPath.cy.skip.js
diff --git a/cypress-tests/cypress/e2e/editor/data-source/mongoDbHappyPath.cy.js b/cypress-tests/cypress/e2e/happyPath/marketplace/commonTestcases/data-source/mongoDbHappyPath.cy.js
similarity index 100%
rename from cypress-tests/cypress/e2e/editor/data-source/mongoDbHappyPath.cy.js
rename to cypress-tests/cypress/e2e/happyPath/marketplace/commonTestcases/data-source/mongoDbHappyPath.cy.js
diff --git a/cypress-tests/cypress/e2e/editor/data-source/mysqlHappyPath.cy.js b/cypress-tests/cypress/e2e/happyPath/marketplace/commonTestcases/data-source/mysqlHappyPath.cy.js
similarity index 100%
rename from cypress-tests/cypress/e2e/editor/data-source/mysqlHappyPath.cy.js
rename to cypress-tests/cypress/e2e/happyPath/marketplace/commonTestcases/data-source/mysqlHappyPath.cy.js
diff --git a/cypress-tests/cypress/e2e/editor/data-source/oracleDbHappyPath.cy.skip.js b/cypress-tests/cypress/e2e/happyPath/marketplace/commonTestcases/data-source/oracleDbHappyPath.cy.skip.js
similarity index 100%
rename from cypress-tests/cypress/e2e/editor/data-source/oracleDbHappyPath.cy.skip.js
rename to cypress-tests/cypress/e2e/happyPath/marketplace/commonTestcases/data-source/oracleDbHappyPath.cy.skip.js
diff --git a/cypress-tests/cypress/e2e/editor/data-source/postgresHappyPath.cy.js b/cypress-tests/cypress/e2e/happyPath/marketplace/commonTestcases/data-source/postgresHappyPath.cy.js
similarity index 100%
rename from cypress-tests/cypress/e2e/editor/data-source/postgresHappyPath.cy.js
rename to cypress-tests/cypress/e2e/happyPath/marketplace/commonTestcases/data-source/postgresHappyPath.cy.js
diff --git a/cypress-tests/cypress/e2e/editor/data-source/redisHappyPath.cy.js b/cypress-tests/cypress/e2e/happyPath/marketplace/commonTestcases/data-source/redisHappyPath.cy.js
similarity index 100%
rename from cypress-tests/cypress/e2e/editor/data-source/redisHappyPath.cy.js
rename to cypress-tests/cypress/e2e/happyPath/marketplace/commonTestcases/data-source/redisHappyPath.cy.js
diff --git a/cypress-tests/cypress/e2e/editor/data-source/rethinkDbHappyPath.cy.skip.js b/cypress-tests/cypress/e2e/happyPath/marketplace/commonTestcases/data-source/rethinkDbHappyPath.cy.skip.js
similarity index 100%
rename from cypress-tests/cypress/e2e/editor/data-source/rethinkDbHappyPath.cy.skip.js
rename to cypress-tests/cypress/e2e/happyPath/marketplace/commonTestcases/data-source/rethinkDbHappyPath.cy.skip.js
diff --git a/cypress-tests/cypress/e2e/editor/data-source/s3HappyPath.cy.js b/cypress-tests/cypress/e2e/happyPath/marketplace/commonTestcases/data-source/s3HappyPath.cy.js
similarity index 100%
rename from cypress-tests/cypress/e2e/editor/data-source/s3HappyPath.cy.js
rename to cypress-tests/cypress/e2e/happyPath/marketplace/commonTestcases/data-source/s3HappyPath.cy.js
diff --git a/cypress-tests/cypress/e2e/editor/data-source/sapHanaHappyPath.cy.skip.js b/cypress-tests/cypress/e2e/happyPath/marketplace/commonTestcases/data-source/sapHanaHappyPath.cy.skip.js
similarity index 100%
rename from cypress-tests/cypress/e2e/editor/data-source/sapHanaHappyPath.cy.skip.js
rename to cypress-tests/cypress/e2e/happyPath/marketplace/commonTestcases/data-source/sapHanaHappyPath.cy.skip.js
diff --git a/cypress-tests/cypress/e2e/editor/data-source/smtpHappyPath.cy.js b/cypress-tests/cypress/e2e/happyPath/marketplace/commonTestcases/data-source/smtpHappyPath.cy.js
similarity index 100%
rename from cypress-tests/cypress/e2e/editor/data-source/smtpHappyPath.cy.js
rename to cypress-tests/cypress/e2e/happyPath/marketplace/commonTestcases/data-source/smtpHappyPath.cy.js
diff --git a/cypress-tests/cypress/e2e/editor/data-source/snowflakeHappyPath.cy.js b/cypress-tests/cypress/e2e/happyPath/marketplace/commonTestcases/data-source/snowflakeHappyPath.cy.js
similarity index 100%
rename from cypress-tests/cypress/e2e/editor/data-source/snowflakeHappyPath.cy.js
rename to cypress-tests/cypress/e2e/happyPath/marketplace/commonTestcases/data-source/snowflakeHappyPath.cy.js
diff --git a/cypress-tests/cypress/e2e/editor/data-source/sqlServerHappyPath.cy.js b/cypress-tests/cypress/e2e/happyPath/marketplace/commonTestcases/data-source/sqlServerHappyPath.cy.js
similarity index 100%
rename from cypress-tests/cypress/e2e/editor/data-source/sqlServerHappyPath.cy.js
rename to cypress-tests/cypress/e2e/happyPath/marketplace/commonTestcases/data-source/sqlServerHappyPath.cy.js
diff --git a/cypress-tests/cypress/e2e/editor/data-source/typeSenseHappyPath.cy.skip.js b/cypress-tests/cypress/e2e/happyPath/marketplace/commonTestcases/data-source/typeSenseHappyPath.cy.skip.js
similarity index 100%
rename from cypress-tests/cypress/e2e/editor/data-source/typeSenseHappyPath.cy.skip.js
rename to cypress-tests/cypress/e2e/happyPath/marketplace/commonTestcases/data-source/typeSenseHappyPath.cy.skip.js
diff --git a/cypress-tests/cypress/e2e/database/database.cy.skip.js b/cypress-tests/cypress/e2e/happyPath/marketplace/commonTestcases/database/database.cy.skip.js
similarity index 100%
rename from cypress-tests/cypress/e2e/database/database.cy.skip.js
rename to cypress-tests/cypress/e2e/happyPath/marketplace/commonTestcases/database/database.cy.skip.js
diff --git a/cypress-tests/cypress/e2e/exportImport/export.cy.js b/cypress-tests/cypress/e2e/happyPath/marketplace/commonTestcases/exportImport/export.cy.js
similarity index 100%
rename from cypress-tests/cypress/e2e/exportImport/export.cy.js
rename to cypress-tests/cypress/e2e/happyPath/marketplace/commonTestcases/exportImport/export.cy.js
diff --git a/cypress-tests/cypress/e2e/exportImport/import.cy.js b/cypress-tests/cypress/e2e/happyPath/marketplace/commonTestcases/exportImport/import.cy.js
similarity index 100%
rename from cypress-tests/cypress/e2e/exportImport/import.cy.js
rename to cypress-tests/cypress/e2e/happyPath/marketplace/commonTestcases/exportImport/import.cy.js
diff --git a/cypress-tests/cypress/e2e/editor/app-version/version.cy.js b/cypress-tests/cypress/e2e/happyPath/platform/ceTestcases/app-version/version.cy.js
similarity index 100%
rename from cypress-tests/cypress/e2e/editor/app-version/version.cy.js
rename to cypress-tests/cypress/e2e/happyPath/platform/ceTestcases/app-version/version.cy.js
diff --git a/cypress-tests/cypress/e2e/ce/appSlug.cy.js b/cypress-tests/cypress/e2e/happyPath/platform/ceTestcases/appSlug.cy.js
similarity index 100%
rename from cypress-tests/cypress/e2e/ce/appSlug.cy.js
rename to cypress-tests/cypress/e2e/happyPath/platform/ceTestcases/appSlug.cy.js
diff --git a/cypress-tests/cypress/e2e/ce/globalDataSources/globalDataSourcePermissions.cy.js b/cypress-tests/cypress/e2e/happyPath/platform/ceTestcases/globalDataSources/globalDataSourcePermissions.cy.js
similarity index 100%
rename from cypress-tests/cypress/e2e/ce/globalDataSources/globalDataSourcePermissions.cy.js
rename to cypress-tests/cypress/e2e/happyPath/platform/ceTestcases/globalDataSources/globalDataSourcePermissions.cy.js
diff --git a/cypress-tests/cypress/e2e/ce/groupDuplication.cy.js b/cypress-tests/cypress/e2e/happyPath/platform/ceTestcases/groupDuplication.cy.js
similarity index 100%
rename from cypress-tests/cypress/e2e/ce/groupDuplication.cy.js
rename to cypress-tests/cypress/e2e/happyPath/platform/ceTestcases/groupDuplication.cy.js
diff --git a/cypress-tests/cypress/e2e/ce/privateAndPublicApp.cy.js b/cypress-tests/cypress/e2e/happyPath/platform/ceTestcases/privateAndPublicApp.cy.js
similarity index 100%
rename from cypress-tests/cypress/e2e/ce/privateAndPublicApp.cy.js
rename to cypress-tests/cypress/e2e/happyPath/platform/ceTestcases/privateAndPublicApp.cy.js
diff --git a/cypress-tests/cypress/e2e/selfHost/selfHostSignUp.cy.js b/cypress-tests/cypress/e2e/happyPath/platform/ceTestcases/selfHost/selfHostSignUp.cy.js
similarity index 100%
rename from cypress-tests/cypress/e2e/selfHost/selfHostSignUp.cy.js
rename to cypress-tests/cypress/e2e/happyPath/platform/ceTestcases/selfHost/selfHostSignUp.cy.js
diff --git a/cypress-tests/cypress/e2e/ce/workspaceConstants.cy.js b/cypress-tests/cypress/e2e/happyPath/platform/ceTestcases/workspaceConstants.cy.js
similarity index 100%
rename from cypress-tests/cypress/e2e/ce/workspaceConstants.cy.js
rename to cypress-tests/cypress/e2e/happyPath/platform/ceTestcases/workspaceConstants.cy.js
diff --git a/cypress-tests/cypress/e2e/authentication/forgotPassword.cy.js b/cypress-tests/cypress/e2e/happyPath/platform/commonTestcases/authentication/forgotPassword.cy.js
similarity index 100%
rename from cypress-tests/cypress/e2e/authentication/forgotPassword.cy.js
rename to cypress-tests/cypress/e2e/happyPath/platform/commonTestcases/authentication/forgotPassword.cy.js
diff --git a/cypress-tests/cypress/e2e/authentication/login.cy.js b/cypress-tests/cypress/e2e/happyPath/platform/commonTestcases/authentication/login.cy.js
similarity index 100%
rename from cypress-tests/cypress/e2e/authentication/login.cy.js
rename to cypress-tests/cypress/e2e/happyPath/platform/commonTestcases/authentication/login.cy.js
diff --git a/cypress-tests/cypress/e2e/authentication/signUp.cy.js b/cypress-tests/cypress/e2e/happyPath/platform/commonTestcases/authentication/signUp.cy.js
similarity index 100%
rename from cypress-tests/cypress/e2e/authentication/signUp.cy.js
rename to cypress-tests/cypress/e2e/happyPath/platform/commonTestcases/authentication/signUp.cy.js
diff --git a/cypress-tests/cypress/e2e/workspace/appCreate.cy.js b/cypress-tests/cypress/e2e/happyPath/platform/commonTestcases/workspace/appCreate.cy.js
similarity index 100%
rename from cypress-tests/cypress/e2e/workspace/appCreate.cy.js
rename to cypress-tests/cypress/e2e/happyPath/platform/commonTestcases/workspace/appCreate.cy.js
diff --git a/cypress-tests/cypress/e2e/workspace/bulkUserUpload.cy.js b/cypress-tests/cypress/e2e/happyPath/platform/commonTestcases/workspace/bulkUserUpload.cy.js
similarity index 100%
rename from cypress-tests/cypress/e2e/workspace/bulkUserUpload.cy.js
rename to cypress-tests/cypress/e2e/happyPath/platform/commonTestcases/workspace/bulkUserUpload.cy.js
diff --git a/cypress-tests/cypress/e2e/workspace/dashboard.cy.js b/cypress-tests/cypress/e2e/happyPath/platform/commonTestcases/workspace/dashboard.cy.js
similarity index 100%
rename from cypress-tests/cypress/e2e/workspace/dashboard.cy.js
rename to cypress-tests/cypress/e2e/happyPath/platform/commonTestcases/workspace/dashboard.cy.js
diff --git a/cypress-tests/cypress/e2e/workspace/errorPage.cy.js b/cypress-tests/cypress/e2e/happyPath/platform/commonTestcases/workspace/errorPage.cy.js
similarity index 100%
rename from cypress-tests/cypress/e2e/workspace/errorPage.cy.js
rename to cypress-tests/cypress/e2e/happyPath/platform/commonTestcases/workspace/errorPage.cy.js
diff --git a/cypress-tests/cypress/e2e/workspace/manageGroups.cy.js b/cypress-tests/cypress/e2e/happyPath/platform/commonTestcases/workspace/manageGroups.cy.js
similarity index 100%
rename from cypress-tests/cypress/e2e/workspace/manageGroups.cy.js
rename to cypress-tests/cypress/e2e/happyPath/platform/commonTestcases/workspace/manageGroups.cy.js
diff --git a/cypress-tests/cypress/e2e/workspace/manageSSO.cy.js b/cypress-tests/cypress/e2e/happyPath/platform/commonTestcases/workspace/manageSSO.cy.js
similarity index 100%
rename from cypress-tests/cypress/e2e/workspace/manageSSO.cy.js
rename to cypress-tests/cypress/e2e/happyPath/platform/commonTestcases/workspace/manageSSO.cy.js
diff --git a/cypress-tests/cypress/e2e/workspace/manageUsers.cy.js b/cypress-tests/cypress/e2e/happyPath/platform/commonTestcases/workspace/manageUsers.cy.js
similarity index 100%
rename from cypress-tests/cypress/e2e/workspace/manageUsers.cy.js
rename to cypress-tests/cypress/e2e/happyPath/platform/commonTestcases/workspace/manageUsers.cy.js
diff --git a/cypress-tests/cypress/e2e/workspace/profile.cy.js b/cypress-tests/cypress/e2e/happyPath/platform/commonTestcases/workspace/profile.cy.js
similarity index 100%
rename from cypress-tests/cypress/e2e/workspace/profile.cy.js
rename to cypress-tests/cypress/e2e/happyPath/platform/commonTestcases/workspace/profile.cy.js
diff --git a/cypress-tests/cypress/e2e/workspace/userPermissions.cy.js b/cypress-tests/cypress/e2e/happyPath/platform/commonTestcases/workspace/userPermissions.cy.js
similarity index 100%
rename from cypress-tests/cypress/e2e/workspace/userPermissions.cy.js
rename to cypress-tests/cypress/e2e/happyPath/platform/commonTestcases/workspace/userPermissions.cy.js
diff --git a/cypress-tests/cypress/e2e/workspace/workspace.cy.js b/cypress-tests/cypress/e2e/happyPath/platform/commonTestcases/workspace/workspace.cy.js
similarity index 100%
rename from cypress-tests/cypress/e2e/workspace/workspace.cy.js
rename to cypress-tests/cypress/e2e/happyPath/platform/commonTestcases/workspace/workspace.cy.js

From 94de99b769feed1f6e6aaf4dd7cebaedcdc425a2 Mon Sep 17 00:00:00 2001
From: Adish M <adish.madhu@gmail.com>
Date: Tue, 5 Mar 2024 12:58:28 +0530
Subject: [PATCH 2/4] Correction in Postgrest version

---
 deploy/docker/docker-compose-db.yaml | 2 +-
 deploy/docker/docker-compose.yaml    | 2 +-
 deploy/kubernetes/AKS/postgrest.yaml | 2 +-
 deploy/kubernetes/GKE/postgrest.yaml | 2 +-
 deploy/kubernetes/postgrest.yaml     | 2 +-
 docker-compose.yaml                  | 2 +-
 docker/preview.Dockerfile            | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/deploy/docker/docker-compose-db.yaml b/deploy/docker/docker-compose-db.yaml
index 3ee231cb58..2dcef5c3e8 100644
--- a/deploy/docker/docker-compose-db.yaml
+++ b/deploy/docker/docker-compose-db.yaml
@@ -30,7 +30,7 @@ services:
 
   postgrest:
     container_name: postgrest
-    image: postgrest/postgrest:v10.1.1.20221215
+    image: postgrest/postgrest:v12.0.2
     restart: always
     depends_on:
       - postgres
diff --git a/deploy/docker/docker-compose.yaml b/deploy/docker/docker-compose.yaml
index ff815a013a..44fcea18ac 100644
--- a/deploy/docker/docker-compose.yaml
+++ b/deploy/docker/docker-compose.yaml
@@ -16,7 +16,7 @@ services:
     command: npm run start:prod
   # Uncomment if ENABLE_TOOLJET_DB=true
   postgrest:
-    image: postgrest/postgrest:v10.1.1.20221215
+    image: postgrest/postgrest:v12.0.2
     restart: always
     env_file: .env
     environment:
diff --git a/deploy/kubernetes/AKS/postgrest.yaml b/deploy/kubernetes/AKS/postgrest.yaml
index 65a36c8b36..d6c89be55c 100644
--- a/deploy/kubernetes/AKS/postgrest.yaml
+++ b/deploy/kubernetes/AKS/postgrest.yaml
@@ -19,7 +19,7 @@ spec:
     spec:
       containers:
       - name: postgrest
-        image: postgrest/postgrest:v10.1.1.20221215
+        image: postgrest/postgrest:v12.0.2
         ports:
         - containerPort: 3000
         env:
diff --git a/deploy/kubernetes/GKE/postgrest.yaml b/deploy/kubernetes/GKE/postgrest.yaml
index 65a36c8b36..d6c89be55c 100644
--- a/deploy/kubernetes/GKE/postgrest.yaml
+++ b/deploy/kubernetes/GKE/postgrest.yaml
@@ -19,7 +19,7 @@ spec:
     spec:
       containers:
       - name: postgrest
-        image: postgrest/postgrest:v10.1.1.20221215
+        image: postgrest/postgrest:v12.0.2
         ports:
         - containerPort: 3000
         env:
diff --git a/deploy/kubernetes/postgrest.yaml b/deploy/kubernetes/postgrest.yaml
index d906a66477..8789b0c889 100644
--- a/deploy/kubernetes/postgrest.yaml
+++ b/deploy/kubernetes/postgrest.yaml
@@ -19,7 +19,7 @@ spec:
     spec:
       containers:
       - name: postgrest
-        image: postgrest/postgrest:v10.1.1.20221215
+        image: postgrest/postgrest:v12.0.2
         ports:
         - containerPort: 3000
         env:
diff --git a/docker-compose.yaml b/docker-compose.yaml
index d865026dbc..363b06e1a8 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -52,7 +52,7 @@ services:
     command: npm run --prefix server start:dev
 
   postgrest:
-    image: postgrest/postgrest:v10.1.1.20221215
+    image: postgrest/postgrest:v12.0.2
     ports:
       - "3001:3000"
     env_file:
diff --git a/docker/preview.Dockerfile b/docker/preview.Dockerfile
index b15396cedf..60a6bab022 100644
--- a/docker/preview.Dockerfile
+++ b/docker/preview.Dockerfile
@@ -34,7 +34,7 @@ RUN npm --prefix server run build
 
 FROM node:18.18.2-buster
 # copy postgrest executable
-COPY --from=postgrest/postgrest /bin/postgrest /bin
+COPY --from=postgrest/postgrest:v12.0.2 /bin/postgrest /bin
 
 ENV NODE_ENV=production
 ENV NODE_OPTIONS="--max-old-space-size=4096"

From 03182fec1c24f7fe0d6799f6c098432f6e449db3 Mon Sep 17 00:00:00 2001
From: Ajith KV <ajith.jaban@gmail.com>
Date: Thu, 7 Mar 2024 13:02:31 +0530
Subject: [PATCH 3/4] Added data-cy attribute for sso components (#9014)

---
 .../OrganizationLogin/GithubSsoModal.jsx      |  2 +-
 .../OrganizationLogin/GoogleSsoModal.jsx      |  2 +-
 .../OrganizationLogin/SsoConfiguration.jsx    | 31 +++++++++++++++----
 .../WorkspaceSSOEnableModal.jsx               |  8 ++---
 4 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/frontend/src/_components/OrganizationLogin/GithubSsoModal.jsx b/frontend/src/_components/OrganizationLogin/GithubSsoModal.jsx
index 077859a2ea..a2ee10b9bd 100644
--- a/frontend/src/_components/OrganizationLogin/GithubSsoModal.jsx
+++ b/frontend/src/_components/OrganizationLogin/GithubSsoModal.jsx
@@ -135,7 +135,7 @@ export function GithubSSOModal({ settings, onClose, onUpdateSSOSettings, isInsta
       >
         <div>
           <label className="switch">
-            <input type="checkbox" checked={enabled} onChange={onToggleChange} />
+            <input type="checkbox" checked={enabled} onChange={onToggleChange} data-cy="github-toggle-input" />
             <span className="slider round"></span>
           </label>
           <span className="sso-type-header" data-cy="card-title" style={{ marginBottom: '0px', fontWeight: '500' }}>
diff --git a/frontend/src/_components/OrganizationLogin/GoogleSsoModal.jsx b/frontend/src/_components/OrganizationLogin/GoogleSsoModal.jsx
index 671a0150c8..f5f2440a64 100644
--- a/frontend/src/_components/OrganizationLogin/GoogleSsoModal.jsx
+++ b/frontend/src/_components/OrganizationLogin/GoogleSsoModal.jsx
@@ -105,7 +105,7 @@ export function GoogleSSOModal({ settings, onClose, onUpdateSSOSettings, isInsta
       >
         <div>
           <label className="switch">
-            <input type="checkbox" checked={enabled} onChange={onToggleChange} />
+            <input type="checkbox" checked={enabled} onChange={onToggleChange} data-cy="google-enable-toggle" />
             <span className="slider round"></span>
           </label>
           <span className="sso-type-header" data-cy="card-title" style={{ marginBottom: '0px', fontWeight: '500' }}>
diff --git a/frontend/src/_components/OrganizationLogin/SsoConfiguration.jsx b/frontend/src/_components/OrganizationLogin/SsoConfiguration.jsx
index b7b64175aa..a055401038 100644
--- a/frontend/src/_components/OrganizationLogin/SsoConfiguration.jsx
+++ b/frontend/src/_components/OrganizationLogin/SsoConfiguration.jsx
@@ -241,24 +241,35 @@ class SSOConfiguration extends React.Component {
     const isEnabled = this.state[isEnabledKey];
 
     return (
-      <div className="sso-option" key={key} onClick={() => this.openModal(key)}>
+      <div className="sso-option" key={key} onClick={() => this.openModal(key)} data-cy="sso-card">
         <div className="sso-option-label">
           {
-            <div style={{ display: 'flex', alignItems: 'center', justifyContent: 'center' }}>
+            <div
+              style={{ display: 'flex', alignItems: 'center', justifyContent: 'center' }}
+              data-cy={`${name.toLowerCase().replace(/\s+/g, '-')}-icon`}
+            >
               {this.getSSOIcon(key)}
-              <span style={{ marginLeft: 8 }}>{name}</span>
+              <span style={{ marginLeft: 8 }} data-cy={`${name.toLowerCase().replace(/\s+/g, '-')}-label`}>
+                {name}
+              </span>
               {
                 <img
                   src="/assets/images/EditIcon.png"
                   className="option-icon"
                   style={{ width: '14px', height: '14px', marginLeft: '8px' }}
+                  data-cy={`${name.toLowerCase().replace(/\s+/g, '-')}-edit-icon`}
                 />
               }
             </div>
           }
         </div>
         <label className="switch" onClick={(e) => e.stopPropagation()}>
-          <input type="checkbox" checked={isEnabled} onChange={() => this.toggleSSOOption(key)} />
+          <input
+            type="checkbox"
+            checked={isEnabled}
+            onChange={() => this.toggleSSOOption(key)}
+            data-cy={`${name.toLowerCase().replace(/\s+/g, '-')}-toggle`}
+          />
           <span className="slider round"></span>
         </label>
       </div>
@@ -270,7 +281,9 @@ class SSOConfiguration extends React.Component {
 
     return (
       <div className="sso-configuration">
-        <h4 style={{ fontSize: '12px' }}>SSO</h4>
+        <h4 style={{ fontSize: '12px' }} data-cy="sso-header">
+          SSO
+        </h4>
         <div
           className={`sso-option ${showDropdown ? 'clicked' : ''}`}
           style={{ paddingLeft: '0px', marginBottom: '1px' }}
@@ -290,6 +303,7 @@ class SSOConfiguration extends React.Component {
                 justifyContent: 'flex-start',
               }}
               bsPrefix="no-caret-dropdown-toggle"
+              data-testid="instance-sso-toggle"
             >
               <div
                 className="sso-option-label"
@@ -301,6 +315,7 @@ class SSOConfiguration extends React.Component {
                   paddingBottom: '6px',
                   height: '34px',
                 }}
+                data-cy="instance-sso-card"
               >
                 Default SSO {defaultSSO ? `(${this.state.inheritedInstanceSSO})` : ''}
                 <SolidIcon className="option-icon" name={showDropdown ? 'cheveronup' : 'cheverondown'} fill={'grey'} />
@@ -311,6 +326,7 @@ class SSOConfiguration extends React.Component {
               <Dropdown.Item
                 eventKey="Google"
                 disabled={!defaultSSO || this.isOptionEnabled('google') || !this.isInstanceOptionEnabled('google')} // Disable the item if defaultSSO is false
+                data-cy="dropdown-options-google"
               >
                 <div style={{ display: 'flex', alignItems: 'center', justifyContent: 'center' }}>
                   {this.getSSOIcon('google')}
@@ -320,6 +336,7 @@ class SSOConfiguration extends React.Component {
               <Dropdown.Item
                 eventKey="GitHub"
                 disabled={!defaultSSO || this.isOptionEnabled('git') || !this.isInstanceOptionEnabled('git')} // Disable the item if defaultSSO is false
+                data-cy="dropdown-options-git"
               >
                 <div style={{ display: 'flex', alignItems: 'center', justifyContent: 'center' }}>
                   {this.getSSOIcon('git')}
@@ -334,7 +351,9 @@ class SSOConfiguration extends React.Component {
             <span className="slider round"></span>
           </label>
         </div>
-        <p className="sso-note">Display default SSO for workspace URL login</p>
+        <p className="sso-note" data-cy="instance-sso-helper-text">
+          Display default SSO for workspace URL login
+        </p>
         {this.renderSSOOption('google', 'Google')}
         {this.renderSSOOption('git', 'GitHub')}
         {showModal && currentSSO === 'google' && (
diff --git a/frontend/src/_components/OrganizationLogin/WorkspaceSSOEnableModal.jsx b/frontend/src/_components/OrganizationLogin/WorkspaceSSOEnableModal.jsx
index a960be8725..e8dce168d9 100644
--- a/frontend/src/_components/OrganizationLogin/WorkspaceSSOEnableModal.jsx
+++ b/frontend/src/_components/OrganizationLogin/WorkspaceSSOEnableModal.jsx
@@ -15,12 +15,12 @@ function WorkspaceSSOEnableModal({ show, ssoKey, saveSettings, setShowModal, res
 
   const modalContent = (
     <div>
-      <p>
+      <p data-cy="modal-message">
         Enabling <strong>{ssoKey.charAt(0).toUpperCase() + ssoKey.slice(1)}</strong> at the workspace level will
         override any <strong>{ssoKey.charAt(0).toUpperCase() + ssoKey.slice(1)}</strong> configurations set at the
         instance level.
       </p>
-      <p>Are you sure you want to continue?</p>
+      <p data-cy="confirmation-text">Are you sure you want to continue?</p>
     </div>
   );
 
@@ -29,14 +29,14 @@ function WorkspaceSSOEnableModal({ show, ssoKey, saveSettings, setShowModal, res
       <ButtonSolid variant="tertiary" onClick={handleClose} data-cy="cancel-button">
         Cancel
       </ButtonSolid>
-      <ButtonSolid variant="primary" onClick={handleEnable}>
+      <ButtonSolid variant="primary" onClick={handleEnable} data-cy="enable-button">
         Enable
       </ButtonSolid>
     </>
   );
 
   const ModalTitle = () => (
-    <strong style={{ fontWeight: 500, fontSize: 'medium' }}>
+    <strong style={{ fontWeight: 500, fontSize: 'medium' }} data-cy="modal-title">
       Enable {ssoKey.charAt(0).toUpperCase() + ssoKey.slice(1)}
     </strong>
   );

From 1c1d2c61f123c95e7bf5f5c23b23b674a5f3cad3 Mon Sep 17 00:00:00 2001
From: Kiran Ashok <stepinfwd@gmail.com>
Date: Mon, 11 Mar 2024 14:07:46 +0530
Subject: [PATCH 4/4] hotfix: Make component hidden only when visibility is set
 to false (#9029)

* fix: make visibility none only when its set to false

* add visibility only for components which have visibility in styles

* making logic for visibility central

* version bump
---
 .version                    |  2 +-
 frontend/.version           |  2 +-
 frontend/src/Editor/Box.jsx | 18 +++++++++++-------
 server/.version             |  2 +-
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/.version b/.version
index 544fe5d438..5506598e0f 100644
--- a/.version
+++ b/.version
@@ -1 +1 @@
-2.32.2
+2.32.3
diff --git a/frontend/.version b/frontend/.version
index 544fe5d438..5506598e0f 100644
--- a/frontend/.version
+++ b/frontend/.version
@@ -1 +1 @@
-2.32.2
+2.32.3
diff --git a/frontend/src/Editor/Box.jsx b/frontend/src/Editor/Box.jsx
index 9fabd0b5b3..21a45089c3 100644
--- a/frontend/src/Editor/Box.jsx
+++ b/frontend/src/Editor/Box.jsx
@@ -156,6 +156,7 @@ export const Box = memo(
     const backgroundColor = yellow ? 'yellow' : '';
     const currentState = useCurrentState();
     const { events } = useAppInfo();
+    const shouldAddBoxShadowAndVisibility = ['TextInput', 'PasswordInput', 'NumberInput', 'Text'];
 
     const componentMeta = useMemo(() => {
       return componentTypes.find((comp) => component.component === comp.component);
@@ -171,14 +172,18 @@ export const Box = memo(
       mode === 'edit' && component.validate
         ? validateProperties(resolvedProperties, componentMeta.properties)
         : [resolvedProperties, []];
+    if (shouldAddBoxShadowAndVisibility.includes(component.component)) {
+      validatedProperties.visibility = validatedProperties.visibility !== false ? true : false;
+    }
 
     const resolvedStyles = resolveStyles(component, currentState, null, customResolvables);
-
     const [validatedStyles, styleErrors] =
       mode === 'edit' && component.validate
         ? validateProperties(resolvedStyles, componentMeta.styles)
         : [resolvedStyles, []];
-
+    if (!shouldAddBoxShadowAndVisibility.includes(component.component)) {
+      validatedStyles.visibility = validatedStyles.visibility !== false ? true : false;
+    }
     const resolvedGeneralProperties = resolveGeneralProperties(component, currentState, null, customResolvables);
     const [validatedGeneralProperties, generalPropertiesErrors] =
       mode === 'edit' && component.validate
@@ -186,7 +191,7 @@ export const Box = memo(
         : [resolvedGeneralProperties, []];
 
     const resolvedGeneralStyles = resolveGeneralStyles(component, currentState, null, customResolvables);
-    resolvedStyles.visibility = resolvedStyles.visibility !== false ? true : false;
+
     const [validatedGeneralStyles, generalStylesErrors] =
       mode === 'edit' && component.validate
         ? validateProperties(resolvedGeneralStyles, componentMeta.generalStyles)
@@ -276,13 +281,12 @@ export const Box = memo(
         ...{ validationObject: component.definition.validation, currentState },
         customResolveObjects: customResolvables,
       });
-    const shouldAddBoxShadow = ['TextInput', 'PasswordInput', 'NumberInput', 'Text'];
     return (
       <OverlayTrigger
         placement={inCanvas ? 'auto' : 'top'}
         delay={{ show: 500, hide: 0 }}
         trigger={
-          inCanvas && shouldAddBoxShadow.includes(component.component)
+          inCanvas && shouldAddBoxShadowAndVisibility.includes(component.component)
             ? !validatedProperties.tooltip?.toString().trim()
               ? null
               : ['hover', 'focus']
@@ -295,7 +299,7 @@ export const Box = memo(
             props,
             text: inCanvas
               ? `${
-                  shouldAddBoxShadow.includes(component.component)
+                  shouldAddBoxShadowAndVisibility.includes(component.component)
                     ? validatedProperties.tooltip
                     : validatedGeneralProperties.tooltip
                 }`
@@ -332,7 +336,7 @@ export const Box = memo(
               exposedVariables={exposedVariables}
               styles={{
                 ...validatedStyles,
-                ...(!shouldAddBoxShadow.includes(component.component)
+                ...(!shouldAddBoxShadowAndVisibility.includes(component.component)
                   ? { boxShadow: validatedGeneralStyles?.boxShadow }
                   : {}),
               }}
diff --git a/server/.version b/server/.version
index 544fe5d438..5506598e0f 100644
--- a/server/.version
+++ b/server/.version
@@ -1 +1 @@
-2.32.2
+2.32.3