Merge pull request #15969 from ToolJet/release/v3.21.20-beta

Release v3.21.20 beta

.dockerignore

@@ -2,3 +2,5 @@ docs/*
 tmp/*
 **/node_modules/*
 **/dist/*
+**/logs/*
+**/*.log

.env.example

@@ -2,7 +2,10 @@
 # The application expects a separate .env.test for test environment configuration
 # Get detailed information about each variable here: https://docs.tooljet.com/docs/setup/env-vars
 
-# TOOLJET_EDITION=ee
+# TOOLJET EDITION
+# Set to 'ee' for Enterprise Edition, 'ce' for Community Edition (default: ce)
+# For docker-compose: Set TOOLJET_EDITION=ee before running docker-compose up
+# TOOLJET_EDITION=ce
 
 TOOLJET_HOST=http://localhost:8082
 LOCKBOX_MASTER_KEY=0000000000000000000000000000000000000000000000000000000000000000
@@ -12,6 +15,7 @@ SECRET_KEY_BASE=replace_with_secret_key_base
 SERVER_HOST=<hostname>
 
 # DATABASE CONFIG
+# For docker-compose: PG_HOST should be 'postgres' (the service name)
 ORM_LOGGING=
 PG_DB=<db name>
 PG_USER=<db username>
@@ -36,6 +40,25 @@ PGRST_HOST=
 PGRST_JWT_SECRET=
 PGRST_DB_PRE_CONFIG=postgrest.pre_config
 
+## WORKFLOW CONFIG
+# Set to 'true' to enable BullMQ job processing and schedule loading
+WORKER=
+# Workflow dashboard password
+TOOLJET_QUEUE_DASH_PASSWORD=
+# Set to 'true' to bypass nsjail sandbox for Python execution
+# Use this for cloud platforms that don't support SYS_ADMIN capability (e.g., AWS Fargate, Render)
+# WARNING: Python code will run without isolation when bypassed
+TOOLJET_WORKFLOW_SANDBOX_BYPASS=
+# REDIS CONFIG
+# For docker-compose: REDIS_HOST should be 'redis' (the service name)
+REDIS_HOST=localhost
+REDIS_PORT=6379
+# Optionals
+REDIS_USERNAME=
+REDIS_PASSWORD=
+REDIS_DB=
+REDIS_TLS=
+
 # Checks every 24 hours to see if a new version of ToolJet is available
 # (Enabled by default. Set false to disable)
 CHECK_FOR_UPDATES=true
@@ -102,3 +125,27 @@ PAT_SESSION_EXPIRY=
 
 #pat expiry in days
 PAT_EXPIRY=
+
+#Enable Prometheus metrics endpoint at /metrics
+#ENABLE_METRICS=true
+
+#Disable custom query logging for ORM (ORM_LOGGING will still work)
+#DISABLE_CUSTOM_QUERY_LOGGING=true
+
+# This is to filter out slow queries which take more than the threshold (in milliseconds) to execute. custom query logging will log only those queries which take more than the threshold to execute.
+# Default value: 1 ms
+#SLOW_QUERY_LOGGING_THRESHOLD=1
+
+#['query', 'warn','error'] - To log only DB queries related logs. Works only if DISABLE_CUSTOM_QUERY_LOGGING is not set to true
+# CUSTOM_QUERY_LOGGING_LEVEL Internally uses TRANSACTION_LOGGING. query -> info, warn -> warn, error -> error
+# If TRANSACTION_LOGGING_LEVEL is set to error then CUSTOM_QUERY_LOGGING_LEVEL=query will not log any queries.
+#CUSTOM_QUERY_LOGGING_LEVEL=query
+
+#['trace', 'debug', 'info', 'warn','error'] 
+#Default values: development=trace, production=info, test=error
+#TRANSACTION_LOGGING_LEVEL=info  
+
+SCIM_BASIC_AUTH_USER=12345
+SCIM_BASIC_AUTH_PASS=12345
+SCIM_HEADER_AUTH_TOKEN=my-secure-header-token
+SCIM_ENABLED=true

.eslintignore

@@ -1,2 +0,0 @@
-node_modules/**
-cypress-tests/**

.github/copilot-instructions.md

@@ -0,0 +1,48 @@
+# ToolJet — Shared Copilot Instructions
+
+## Styling
+
+- Tailwind classes MUST use the `tw-` prefix (e.g., `tw-flex`, `tw-text-default`). Unprefixed Tailwind is a bug.
+- NEVER hardcode hex/rgb colors. Use CSS variable tokens via Tailwind (`tw-text-default`, `tw-bg-page-default`) or `var(--text-default)`.
+- Prefer Tailwind over Bootstrap for new code. Do not extend legacy `react-bootstrap` usage.
+- Use custom typography utilities (`tw-font-title-default`, `tw-font-body-default`, etc.) instead of ad-hoc font-size/weight.
+- Design tokens: `frontend/src/_styles/designtheme.scss` + `frontend/tailwind.config.js`.
+
+## Component Patterns
+
+- Check `frontend/src/_ui/` (53+ components) before creating new UI components.
+- Functional components with hooks only. No class components.
+- File structure: `ComponentName/index.js` + optional `ComponentName.jsx` + `style.scss`.
+- Compose with Radix UI primitives for accessible interactive elements.
+
+## Imports
+
+- Use `@/` path alias (maps to `frontend/src/`): `import Button from '@/_ui/Button'`.
+- No deep relative paths (`../../..` is a smell).
+
+## State Management
+
+- Zustand with Immer middleware only. No Redux/MobX/Recoil.
+- Use `shallow` comparison in `useStore` when selecting objects/arrays. Flag missing `shallow`.
+
+## Icons & Assets
+
+- Use Tabler Icons (`@tabler/icons-react`) or Lucide React (`lucide-react`). Do NOT add new icon packages.
+- Static assets: `frontend/assets/images/`.
+
+## Security
+
+- No API keys/secrets in client-side code.
+- Backend: parameterized queries only, never concatenate user input into SQL.
+
+## Common Review Flags
+
+- Hardcoded colors (hex/rgb/hsl in JSX or SCSS)
+- Missing `tw-` prefix on Tailwind classes
+- New `react-bootstrap` imports
+- Class components
+- `console.log` / debug leftovers
+- Unused imports
+- Missing `key` props in `.map()`
+- Missing `shallow` in `useStore` selectors
+- Direct DOM manipulation (except canvas drop calculations)

.github/instructions/appbuilder-review.instructions.md

@@ -0,0 +1,54 @@
+---
+applyTo: "frontend/src/AppBuilder/**/*"
+excludeAgent: "coding-agent"
+---
+
+# App Builder — Code Review Rules
+
+## Backward Compatibility (CRITICAL)
+
+No change should break existing saved applications. When reviewing, always ask: "Would an app saved before this PR still load and behave correctly after it?"
+
+## Resolution System (`{{}}`)
+
+- Flow: unresolved value → `extractAndReplaceReferencesFromString` → `resolveDynamicValues` → `resolveCode` (via `new Function()`) → resolved value stored in `resolvedSlice`.
+- `{{...}}` references MUST be registered in the dependency graph via `addReferencesForDependencyGraph`. Missing this causes stale renders.
+- After `setExposedValue`, `updateDependencyValues` MUST be called to propagate changes.
+- Inside ListView/Kanban, `customResolvables` provide row-scoped context (`listItem` / `cardData`).
+
+## Rendering Pipeline
+
+`AppCanvas → Container → WidgetWrapper → RenderWidget → Widget`
+
+- Widgets receive resolved props from `RenderWidget`. They must NOT directly access store state.
+- `setExposedVariable` and `fireEvent` are passed as callbacks — widgets use these to communicate outward.
+
+## Subcontainer Architecture
+
+- `SubcontainerContext` carries `contextPath` array: `[{ containerId, index }, ...]`.
+- Row-scoped resolution uses prototype overlay (`prepareRowScope`/`updateRowScope`).
+- Child-to-parent: `setExposedValuesPerRow` → `_deriveListviewChain` (no callback chains).
+- ListView nesting limited to **2 levels**. Only row 0 is editable; others are read-only mirrors.
+- `findNearestSubcontainerAncestor` is critical for dependency resolution — verify it's used when walking the component tree.
+- Keywords: `listItem` (ListView), `cardData` (Kanban). Don't mix them up.
+
+## Event & Query Systems
+
+- Events: `fireEvent → handleEvent → executeActionsForEventId → executeAction`. Events support `runOnlyIf` and `debounce`.
+- Queries: `runQuery → resolve options → API call → update exposedValues.queries[name] → trigger dependency updates`.
+- Event definitions live in `eventsSlice`, not in component definitions.
+
+## Bundle & Performance
+
+- Viewer (`/applications/*`) and editor are separate lazy bundles via `RootRouter.jsx`. Do not import editor-only code into viewer paths.
+- Avoid `JSON.parse(JSON.stringify(...))` or `_.cloneDeep` in render/hot paths. Use Immer.
+- Flag O(N) loops inside already-O(N) resolution paths (eager resolution for ListView children).
+
+## State Management
+
+- Global stores (`appDataStore`, `currentStateStore`, `dataQueriesStore`, `resolverStore`) should NOT be used in AppBuilder code unless absolutely critical. Prefer the AppBuilder store. Flag any new usage.
+- AppBuilder store: `AppBuilder/_stores/store.js` (30+ slices). All slices are namespaced by `moduleId` (default: `'canvas'`).
+
+## Security
+
+- `resolveCode` uses `new Function()` — be cautious about evaluated expressions.

.github/instructions/data-migrations.instructions.md

@@ -0,0 +1,31 @@
+---
+applyTo: "server/data-migrations/**/*"
+---
+
+# Data Migration — Logging Guidelines
+
+New migrations MUST include progress logging to help monitor deployments.
+
+## Required Logging Pattern
+
+1. **Baseline** — Before processing, query and log total records:
+   `[START] {Action} | Total: {Total}`
+
+2. **Progress** — During execution, log using current/total format:
+   `[PROGRESS] {Current}/{Total} ({Percentage}%)`
+
+3. **Confirmation** — Log final success:
+   `[SUCCESS] {Action} finished.`
+
+## Reviewer Checklist
+
+- [ ] Count query establishes a **total** before processing
+- [ ] Log statements use the **`x/total`** ratio pattern
+- [ ] Clear **success** log at the end
+- [ ] No silent bulk updates without console feedback
+
+## When Generating Migration Code
+
+- Include a count query for the denominator before processing.
+- Wrap iterative logic in a batch/loop that logs `current/total` progress.
+- Avoid silent bulk updates that provide no console feedback.

.github/instructions/server-widget-config-review.instructions.md

@@ -0,0 +1,18 @@
+---
+applyTo: "server/src/modules/apps/services/widget-config/**/*"
+excludeAgent: "coding-agent"
+---
+
+# Server Widget Config — Code Review Rules
+
+## Frontend Sync (CRITICAL)
+
+When any file here is modified, the corresponding config in `frontend/src/AppBuilder/WidgetManager/widgets/` MUST also be updated. Flag PRs that modify one without the other.
+
+## Key Changes Require Migrations
+
+If a config change moves, renames, or removes a key, a migration MUST be written in `server/migrations/` to transform saved app definitions. Flag any key restructuring that lacks an accompanying migration.
+
+## Backward Compatibility
+
+No change should break existing saved applications. Always ask: "Would an app saved before this PR still load and behave correctly after it?"

.github/instructions/widget-components-review.instructions.md

@@ -0,0 +1,14 @@
+---
+applyTo: "frontend/src/AppBuilder/Widgets/**/*"
+excludeAgent: "coding-agent"
+---
+
+# Widget Components — Code Review Rules
+
+## Component Rules
+
+- New widgets MUST be lazy-loaded.
+- Use `useBatchedUpdateEffectArray` for batched state updates.
+- Widgets receive resolved props from `RenderWidget`. They must NOT directly access store state.
+- `setExposedVariable` and `fireEvent` are passed as callbacks — widgets use these to communicate outward.
+- Default values should use design tokens, not hardcoded hex colors.

.github/instructions/widget-config-review.instructions.md

@@ -0,0 +1,24 @@
+---
+applyTo: "frontend/src/AppBuilder/WidgetManager/widgets/**/*"
+excludeAgent: "coding-agent"
+---
+
+# Widget Config — Code Review Rules
+
+## Server-Side Sync (CRITICAL)
+
+When any file here is modified, the corresponding config in `server/src/modules/apps/services/widget-config/` MUST also be updated. Flag PRs that modify one without the other.
+
+## Key Changes Require Migrations
+
+If a config change moves, renames, or removes a key (e.g., moving `loadingState` from `styles` to `properties`), this WILL break existing apps. A migration MUST be written in `server/migrations/` to transform saved app definitions. Flag any key restructuring that lacks an accompanying migration.
+
+## Widget Definition Rules
+
+- New widgets MUST be lazy-loaded.
+- Use `useBatchedUpdateEffectArray` for batched state updates.
+- Widget components must be registered in `componentTypes.js`.
+
+## Backward Compatibility
+
+Always ask: "Would an app saved before this PR still load and behave correctly after it?"

.github/workflows/ci.yml

@@ -2,7 +2,7 @@ name: CI
 # Controls when the workflow will run
 on:
   push:
-    branches: [develop, main]
+    branches: [develop, main, lts-3.16]
   pull_request:
     types: [labeled, unlabeled, closed]
 
@@ -30,10 +30,10 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v3
 
-      - name: Use Node.js 18.18.2
+      - name: Use Node.js 22.15.1
         uses: actions/setup-node@v3
         with:
-          node-version: 18.18.2
+          node-version: 22.15.1
 
       # Cache server node modules to speed up subsequent builds
       - name: Cache server node modules
@@ -124,10 +124,10 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v3
 
-      - name: Use Node.js 18.18.2
+      - name: Use Node.js 22.15.1
         uses: actions/setup-node@v3
         with:
-          node-version: 18.18.2
+          node-version: 22.15.1
 
       # Cache server node modules to speed up subsequent builds
       - name: Cache server node modules
@@ -185,10 +185,10 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v3
 
-      - name: Use Node.js 18.18.2
+      - name: Use Node.js 22.15.1
         uses: actions/setup-node@v3
         with:
-          node-version: 18.18.2
+          node-version: 22.15.1
 
       # Cache server node modules to speed up subsequent builds
       - name: Cache server node modules
@@ -245,10 +245,10 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v3
 
-      - name: Use Node.js 18.18.2
+      - name: Use Node.js 22.15.1
         uses: actions/setup-node@v3
         with:
-          node-version: 18.18.2
+          node-version: 22.15.1
 
       # Cache server node modules to speed up subsequent builds
       - name: Cache server node modules
@@ -301,7 +301,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 30 # Set a timeout of 30 minutes
     needs: build
-    container: node:18.18.2-bullseye
+    container: node:22.15.1-bullseye
     services:
       postgres:
         image: postgres
@@ -334,13 +334,13 @@ jobs:
       - run: npm --prefix server ci
       - run: npm --prefix server run db:create
       - run: npm --prefix server run db:migrate
-      - run: npm --prefix server run test
+      - run: npm --prefix server run test -- --group=working --group=workflows --group=security
 
   e2e-test:
     runs-on: ubuntu-latest
     timeout-minutes: 30 # Set a timeout of 30 minutes
     needs: build
-    container: node:18.18.2-bullseye
+    container: node:22.15.1-bullseye
     services:
       postgres:
         image: postgres
@@ -373,4 +373,4 @@ jobs:
       - run: npm --prefix server ci
       - run: npm --prefix server run db:create
       - run: npm --prefix server run db:migrate
-      - run: NODE_OPTIONS=--max_old_space_size=8096 npm --prefix server run test:e2e -- --silent --testTimeout=20000
+      - run: NODE_OPTIONS=--max_old_space_size=8096 npm --prefix server run test:e2e -- --silent --testTimeout=20000 --group=working

.github/workflows/cloud-frontend-gcp.yml

@@ -42,6 +42,11 @@ jobs:
           git clone --recurse-submodules --depth=1 --branch "$BRANCH" "$REPO" repo
           cd repo
 
+          echo "🔎 Main repo: verifying checkout"
+          MAIN_CURRENT=$(git rev-parse --abbrev-ref HEAD)
+          echo "✅ Main repo: successfully checked out branch $MAIN_CURRENT"
+          echo "📍 Main repo: current commit $(git rev-parse --short HEAD): $(git log -1 --pretty=%s)"
+
           echo "🔁 Updating submodules"
           git submodule update --init --recursive
 
@@ -68,20 +73,24 @@ jobs:
               echo "Previous HEAD position was $PREV: $(git log -1 --pretty=%s || echo 'unknown')"
               echo "✅ $name: checked out branch $BRANCH"
             else
-              echo "⚠️ $name: branch '$BRANCH' not found on origin. Falling back to 'main'"
+              echo "⚠️ $name: branch '$BRANCH' not found on origin. Falling back to 'lts-3.16'"
               PREV=$(git rev-parse --short HEAD || echo "unknown")
-              git checkout main && git pull origin main || {
-                echo "❌ $name: fallback to main failed"
+              git fetch origin lts-3.16:lts-3.16 || {
+                echo "❌ $name: fetch failed for lts-3.16"
+                exit 1
+              }
+              git checkout lts-3.16 || {
+                echo "❌ $name: fallback to lts-3.16 failed"
                 exit 1
               }
               echo "Previous HEAD position was $PREV: $(git log -1 --pretty=%s || echo 'unknown')"
-              echo "✅ $name: now on branch main"
+              echo "✅ $name: now on branch lts-3.16"
             fi
 
             CURRENT=$(git rev-parse --abbrev-ref HEAD)
             echo "🔎 $name: current branch = $CURRENT"
-            if [ "$CURRENT" != "$BRANCH" ] && [ "$CURRENT" != "main" ]; then
-              echo "❌ $name: unexpected branch state — wanted '$BRANCH' or fallback 'main', got '$CURRENT'"
+            if [ "$CURRENT" != "$BRANCH" ] && [ "$CURRENT" != "lts-3.16" ]; then
+              echo "❌ $name: unexpected branch state — wanted '$BRANCH' or fallback 'lts-3.16', got '$CURRENT'"
               exit 1
             fi
           '
@@ -110,7 +119,7 @@ jobs:
           TJDB_SQL_MODE_DISABLE: ${{ secrets.CLOUD_TJDB_SQL_MODE_DISABLE }}
           TOOLJET_SERVER_URL: ${{ secrets.CLOUD_TOOLJET_SERVER_URL }}
           TOOLJET_EDITION: cloud
-          WEBSITE_SIGNUP_URL: https://website-stage.tooljet.ai/ai-create-account
+          WEBSITE_SIGNUP_URL: https://website-stage.tooljet.ai/signup
 
       - name: 🚀 Deploy to Netlify
         run: |
@@ -129,5 +138,52 @@ jobs:
           SERVER_IP: ${{ secrets.CLOUD_SERVER_IP }}
           TJDB_SQL_MODE_DISABLE: ${{ secrets.CLOUD_TJDB_SQL_MODE_DISABLE }}
           TOOLJET_SERVER_URL: ${{ secrets.CLOUD_TOOLJET_SERVER_URL }}
-          WEBSITE_SIGNUP_URL: https://website-stage.tooljet.ai/ai-create-account
+          WEBSITE_SIGNUP_URL: https://website-stage.tooljet.ai/signup
           TOOLJET_EDITION: cloud
+
+  Purge_Cloudflare_Cache:
+    needs: deploy
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: ✅ Check user authorization
+        run: |
+          allowed_user1=${{ secrets.ALLOWED_USER1_USERNAME }}
+          allowed_user2=${{ secrets.ALLOWED_USER2_USERNAME }}
+          allowed_user3=${{ secrets.ALLOWED_USER3_USERNAME }}
+
+          if [[ "${{ github.actor }}" != "$allowed_user1" && \
+                "${{ github.actor }}" != "$allowed_user2" && \
+                "${{ github.actor }}" != "$allowed_user3" ]]; then
+            echo "❌ User '${{ github.actor }}' is not authorized to trigger this workflow."
+            exit 1
+          else
+            echo "✅ User '${{ github.actor }}' is authorized."
+          fi
+
+      - name: 🧹 Purge Cloudflare Cache
+        continue-on-error: true
+        run: |
+          echo "🔄 Purging Cloudflare cache for specific URLs..."
+          response=$(curl -s -w "\n%{http_code}" -X POST \
+            "https://api.cloudflare.com/client/v4/zones/${{ secrets.CLOUDFLARE_ZONE_ID_PROD }}/purge_cache" \
+            -H "Authorization: Bearer ${{ secrets.CLOUDFLARE_API_TOKEN_PROD }}" \
+            -H "Content-Type: application/json" \
+            --data '{
+              "files": [
+                "${{ secrets.CLOUDFLARE_CONFIG_URL_STAGE }}",
+                "${{ secrets.CLOUDFLARE_METADATA_URL_STAGE }}"
+              ]
+            }')
+
+          http_code=$(echo "$response" | tail -n1)
+          body=$(echo "$response" | sed '$d')
+
+          if [ "$http_code" = "200" ]; then
+            echo "✅ Cloudflare cache purged successfully for specified URLs"
+            echo "$body"
+          else
+            echo "⚠️ Cloudflare cache purge failed with status code: $http_code"
+            echo "$body"
+            exit 1
+          fi

.github/workflows/cloud-frontend.yml

@@ -42,6 +42,11 @@ jobs:
           git clone --recurse-submodules --depth=1 --branch "$BRANCH" "$REPO" repo
           cd repo
 
+          echo "🔎 Main repo: verifying checkout"
+          MAIN_CURRENT=$(git rev-parse --abbrev-ref HEAD)
+          echo "✅ Main repo: successfully checked out branch $MAIN_CURRENT"
+          echo "📍 Main repo: current commit $(git rev-parse --short HEAD): $(git log -1 --pretty=%s)"
+
           echo "🔁 Updating submodules"
           git submodule update --init --recursive
 
@@ -68,20 +73,24 @@ jobs:
               echo "Previous HEAD position was $PREV: $(git log -1 --pretty=%s || echo 'unknown')"
               echo "✅ $name: checked out branch $BRANCH"
             else
-              echo "⚠️ $name: branch '$BRANCH' not found on origin. Falling back to 'main'"
+              echo "⚠️ $name: branch '$BRANCH' not found on origin. Falling back to 'lts-3.16'"
               PREV=$(git rev-parse --short HEAD || echo "unknown")
-              git checkout main && git pull origin main || {
-                echo "❌ $name: fallback to main failed"
+              git fetch origin lts-3.16:lts-3.16 || {
+                echo "❌ $name: fetch failed for lts-3.16"
+                exit 1
+              }
+              git checkout lts-3.16 || {
+                echo "❌ $name: fallback to lts-3.16 failed"
                 exit 1
               }
               echo "Previous HEAD position was $PREV: $(git log -1 --pretty=%s || echo 'unknown')"
-              echo "✅ $name: now on branch main"
+              echo "✅ $name: now on branch lts-3.16"
             fi
 
             CURRENT=$(git rev-parse --abbrev-ref HEAD)
             echo "🔎 $name: current branch = $CURRENT"
-            if [ "$CURRENT" != "$BRANCH" ] && [ "$CURRENT" != "main" ]; then
-              echo "❌ $name: unexpected branch state — wanted '$BRANCH' or fallback 'main', got '$CURRENT'"
+            if [ "$CURRENT" != "$BRANCH" ] && [ "$CURRENT" != "lts-3.16" ]; then
+              echo "❌ $name: unexpected branch state — wanted '$BRANCH' or fallback 'lts-3.16', got '$CURRENT'"
               exit 1
             fi
           '
@@ -129,5 +138,52 @@ jobs:
           SERVER_IP: ${{ secrets.CLOUD_PROD_CLOUD_SERVER_IP }}
           TJDB_SQL_MODE_DISABLE: ${{ secrets.CLOUD_PROD_TJDB_SQL_MODE_DISABLE }}
           TOOLJET_SERVER_URL: ${{ secrets.CLOUD_PROD_TOOLJET_SERVER_URL }}
-          WEBSITE_SIGNUP_URL: https://tooljet.ai/ai-create-account
+          WEBSITE_SIGNUP_URL: https://www.tooljet.ai/create-account
           TOOLJET_EDITION: cloud
+
+  Purge_Cloudflare_Cache:
+    needs: deploy
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: ✅ Check user authorization
+        run: |
+          allowed_user1=${{ secrets.ALLOWED_USER1_USERNAME }}
+          allowed_user2=${{ secrets.ALLOWED_USER2_USERNAME }}
+          allowed_user3=${{ secrets.ALLOWED_USER3_USERNAME }}
+
+          if [[ "${{ github.actor }}" != "$allowed_user1" && \
+                "${{ github.actor }}" != "$allowed_user2" && \
+                "${{ github.actor }}" != "$allowed_user3" ]]; then
+            echo "❌ User '${{ github.actor }}' is not authorized to trigger this workflow."
+            exit 1
+          else
+            echo "✅ User '${{ github.actor }}' is authorized."
+          fi
+
+      - name: 🧹 Purge Cloudflare Cache
+        continue-on-error: true
+        run: |
+          echo "🔄 Purging Cloudflare cache for specific URLs..."
+          response=$(curl -s -w "\n%{http_code}" -X POST \
+            "https://api.cloudflare.com/client/v4/zones/${{ secrets.CLOUDFLARE_ZONE_ID_PROD }}/purge_cache" \
+            -H "Authorization: Bearer ${{ secrets.CLOUDFLARE_API_TOKEN_PROD }}" \
+            -H "Content-Type: application/json" \
+            --data '{
+              "files": [
+                "${{ secrets.CLOUDFLARE_CONFIG_URL_PROD }}",
+                "${{ secrets.CLOUDFLARE_METADATA_URL_PROD }}"
+              ]
+            }')
+
+          http_code=$(echo "$response" | tail -n1)
+          body=$(echo "$response" | sed '$d')
+
+          if [ "$http_code" = "200" ]; then
+            echo "✅ Cloudflare cache purged successfully for specified URLs"
+            echo "$body"
+          else
+            echo "⚠️ Cloudflare cache purge failed with status code: $http_code"
+            echo "$body"
+            exit 1
+          fi

.github/workflows/code-coverage.yml

@@ -1,13 +1,13 @@
 name: Cypress Code-Coverage
 
 on:
-  pull_request_target:
-    types: [labeled, unlabeled, closed]
+  pull_request:
+    types: [labeled, unlabeled, synchronize, closed]
 
   workflow_dispatch:
 
 env:
-  PR_NUMBER: ${{ github.event.number }}
+  PR_NUMBER: ${{ github.event.pull_request.number }}
   BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
 
 jobs:
@@ -15,26 +15,34 @@ jobs:
     name: Code coverage
     runs-on: ubuntu-22.04
 
-    if: ${{ github.event.action == 'labeled' && (github.event.label.name == 'check-coverage') }}
+    if: >-
+      (
+        (github.event.action == 'labeled' && github.event.label.name == 'check-coverage')
+        || (github.event.action == 'synchronize' && contains(github.event.pull_request.labels.*.name, 'check-coverage'))
+      )
+      && github.event.pull_request.head.repo.full_name == github.repository
 
     steps:
       - name: Setup Node.js
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v4
         with:
           node-version: 18.18.2
 
       - name: Set up Docker
         uses: docker-practice/actions-setup-docker@master
 
-      - name: Run PosgtreSQL Database Docker Container
+      - name: Run PostgreSQL Database Docker Container
         run: |
           sudo docker network create tooljet
-          sudo docker run -d --name postgres --network tooljet -p 5432:5432 -e POSTGRES_PASSWORD=postgres -e POSTGRES_USER=postgres -e POSTGRES_PORT=5432 -d postgres:13
+          sudo docker run -d --name postgres --network tooljet \
+            -p 5432:5432 \
+            -e POSTGRES_PASSWORD=postgres \
+            -e POSTGRES_USER=postgres \
+            -e POSTGRES_PORT=5432 \
+            postgres:13
 
       - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          ref: ${{ github.event.pull_request.head.ref }}
+        uses: actions/checkout@v4
 
       - name: Install and build dependencies
         run: |
@@ -61,7 +69,7 @@ jobs:
           echo "TOOLJET_DB_PASS=postgres" >> .env
           echo "PGRST_JWT_SECRET=r9iMKoe5CRMgvJBBtp4HrqN7QiPpUToj" >> .env
           echo "PGRST_HOST=localhost:3001" >> .env
-          echo "NODE_ENV=developement" >> .env
+          echo "NODE_ENV=development" >> .env
 
       - name: Set up database
         run: |
@@ -69,14 +77,16 @@ jobs:
           npm run --prefix server db:reset
           npm run --prefix server db:seed
 
-      - name: sleep 5
+      - name: Wait for database seed to settle
         run: sleep 5
 
       - name: Run PostgREST Docker Container
         run: |
           sudo docker run -d --name postgrest --network tooljet -p 3001:3000 \
-          -e PGRST_DB_URI="postgres://postgres:postgres@postgres:5432/tooljet" -e PGRST_DB_ANON_ROLE="postgres" -e PGRST_JWT_SECRET="r9iMKoe5CRMgvJBBtp4HrqN7QiPpUToj" \
-          postgrest/postgrest:v10.1.1.20221215
+            -e PGRST_DB_URI="postgres://postgres:postgres@postgres:5432/tooljet" \
+            -e PGRST_DB_ANON_ROLE="postgres" \
+            -e PGRST_JWT_SECRET="r9iMKoe5CRMgvJBBtp4HrqN7QiPpUToj" \
+            postgrest/postgrest:v10.1.1.20221215
 
       - name: Run plugins compilation in watch mode
         run: cd plugins && npm start &
@@ -94,7 +104,7 @@ jobs:
             sleep 5
           done'
 
-      - name: docker logs
+      - name: PostgREST logs
         run: sudo docker logs postgrest
 
       - name: Create Cypress environment file
@@ -107,25 +117,22 @@ jobs:
 
       - name: Install Cypress
         working-directory: ./cypress-tests
-        run: |
-          npm install
-        
+        run: npm install
 
       - name: Run Cypress tests
         working-directory: ./cypress-tests
-        run: |
-          npm run cy:run
+        run: npm run cy:run
 
       - name: Debugging
+        if: always()
         run: |
           ls -R cypress-tests
           ls -R /home/runner/work/ToolJet/ToolJet/cypress-tests
           cat /home/runner/work/ToolJet/ToolJet/cypress-tests/.nyc_output/out.json
-        
 
       - name: Upload Coverage Report
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: always()
         with:
           name: coverage
-          path: cypress-tests/coverage
+          path: cypress-tests/coverage

.github/workflows/cypress-marketplace.yml

@@ -6,51 +6,65 @@ on:
 
   workflow_dispatch:
 
+permissions:
+  contents: read
+  pull-requests: write
+  issues: write
+
 env:
   PR_NUMBER: ${{ github.event.number }}
   BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
+  TIMESTAMP: ${{ github.run_number }}-${{ github.run_attempt }}
 
 jobs:
   Cypress-Marketplace:
     runs-on: ubuntu-22.04
 
-    if: contains(github.event.pull_request.labels.*.name, 'run-cypress') ||
-      contains(github.event.pull_request.labels.*.name, 'run-cypress-marketplace-ce') ||
-      contains(github.event.pull_request.labels.*.name, 'run-cypress-marketplace-ee') ||
-      contains(github.event.pull_request.labels.*.name, 'run-cypress-ce')
+    if: contains(github.event.pull_request.labels.*.name, 'run-cypress-marketplace-ee')
 
     strategy:
+      fail-fast: false
       matrix:
-        edition: >-
-          ${{ 
-            contains(github.event.pull_request.labels.*.name, 'run-cypress') && fromJson('["ce", "ee"]') ||
-            contains(github.event.pull_request.labels.*.name, 'run-cypress-ce') && fromJson('["ce"]') ||
-            contains(github.event.pull_request.labels.*.name, 'run-cypress-marketplace-ce') && fromJson('["ce"]') ||
-            contains(github.event.pull_request.labels.*.name, 'run-cypress-marketplace-ee') && fromJson('["ee"]') ||
-            fromJson('[]')
-          }}
+        edition:
+          - ee
 
     steps:
+      - name: Debug labels and matrix edition
+        run: |
+          echo "Labels: ${{ toJSON(github.event.pull_request.labels.*.name) }}"
+          echo "Matrix edition: ${{ matrix.edition }}"
+
+      - name: Free up disk space
+        run: |
+          echo "Available disk space before cleanup:"
+          df -h
+
+          # Remove unnecessary packages
+          sudo apt-get remove -y '^aspnetcore-.*' '^dotnet-.*' '^llvm-.*' '^php.*' '^mongodb-.*' '^mysql-.*' azure-cli google-cloud-sdk hhvm firefox powershell mono-devel || true
+          sudo apt-get autoremove -y
+          sudo apt-get clean
+
+          # Remove large directories
+          sudo rm -rf /usr/share/dotnet
+          sudo rm -rf /usr/local/lib/android
+          sudo rm -rf /opt/ghc
+          sudo rm -rf /usr/local/share/boost
+          sudo rm -rf "$AGENT_TOOLSDIRECTORY"
+
+          # Clean Docker
+          docker system prune -af --volumes
+
+          echo "Available disk space after cleanup:"
+          df -h
+
       - name: Checkout
         uses: actions/checkout@v3
         with:
           ref: ${{ github.event.pull_request.head.ref }}
 
-      # Create Docker Buildx builder with platform configuration
-      - name: Set up Docker Buildx
-        run: |
-          mkdir -p ~/.docker/cli-plugins
-          curl -SL https://github.com/docker/buildx/releases/download/v0.11.0/buildx-v0.11.0.linux-amd64 -o ~/.docker/cli-plugins/docker-buildx
-          chmod a+x ~/.docker/cli-plugins/docker-buildx
-          docker buildx create --name mybuilder --platform linux/arm64,linux/amd64
-          docker buildx use mybuilder
-
       - name: Set DOCKER_CLI_EXPERIMENTAL
         run: echo "DOCKER_CLI_EXPERIMENTAL=enabled" >> $GITHUB_ENV
 
-      - name: use mybuilder buildx
-        run: docker buildx use mybuilder
-
       - name: Docker Login
         uses: docker/login-action@v2
         with:
@@ -60,34 +74,37 @@ jobs:
       - name: Set SAFE_BRANCH_NAME
         run: echo "SAFE_BRANCH_NAME=$(echo ${{ env.BRANCH_NAME }} | tr '/' '-')" >> $GITHUB_ENV
 
-      - name: Build CE Docker image
-        uses: docker/build-push-action@v4
-        with:
-          context: .
-          file: docker/ce-production.Dockerfile
-          push: true
-          tags: tooljet/tj-osv:${{ env.SAFE_BRANCH_NAME }}-ce
-          platforms: linux/amd64
-        env:
-          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
-          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+      - name: Log selected matrix
+        run: |
+          echo "Selected edition: ${{ matrix.edition }}"
+          echo "Matrix: ${{ toJSON(matrix) }}"
 
       - name: Build EE Docker image
         if: matrix.edition == 'ee'
-        uses: docker/build-push-action@v4
-        with:
-          context: .
-          file: docker/ee/ee-production.Dockerfile
-          push: true
-          tags: tooljet/tj-osv:${{ env.SAFE_BRANCH_NAME }}-ee
-          platforms: linux/amd64
-        env:
-          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
-          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+        run: |
+          echo "Building EE Docker image..."
+          docker buildx build \
+            --platform=linux/amd64 \
+            -f cypress-tests/cypress-lts.Dockerfile \
+            --build-arg CUSTOM_GITHUB_TOKEN=${{ secrets.CUSTOM_GITHUB_TOKEN }} \
+            --build-arg BRANCH_NAME=${{ github.event.pull_request.head.ref }} \
+            -t tooljet/tj-osv:${{ env.SAFE_BRANCH_NAME }}-ee \
+            --no-cache \
+            --load \
+            .
+
+          echo "Pushing EE Docker image..."
+          docker push tooljet/tj-osv:${{ env.SAFE_BRANCH_NAME }}-ee
+
+          echo "Cleaning up build cache..."
+          docker builder prune -af
+
+          echo "Disk space after build:"
+          df -h
 
       - name: Set up environment variables
         run: |
-          echo "TOOLJET_EDITION=${{ matrix.edition == 'ee' && 'EE' || 'CE' }}" >> .env
+          echo "TOOLJET_EDITION=${{ matrix.edition }}" >> .env
           echo "TOOLJET_HOST=http://localhost:3000" >> .env
           echo "LOCKBOX_MASTER_KEY=cd97331a419c09387bef49787f7da8d2a81d30733f0de6bed23ad8356d2068b2" >> .env
           echo "SECRET_KEY_BASE=7073b9a35a15dd20914ae17e36a693093f25b74b96517a5fec461fc901c51e011cd142c731bee48c5081ec8bac321c1f259ef097ef2a16f25df17a3798c03426" >> .env
@@ -97,37 +114,61 @@ jobs:
           echo "PG_PASS=postgres" >> .env
           echo "PG_PORT=5432" >> .env
           echo "ENABLE_TOOLJET_DB=true" >> .env
-          echo "PGRST_DB_PRE_CONFIG=postgrest.pre_config" >> .env
           echo "TOOLJET_DB=tooljet_db" >> .env
           echo "TOOLJET_DB_USER=postgres" >> .env
           echo "TOOLJET_DB_HOST=postgres" >> .env
           echo "TOOLJET_DB_PASS=postgres" >> .env
+          echo "TOOLJET_DB_STATEMENT_TIMEOUT=60000" >> .env
+          echo "TOOLJET_DB_RECONFIG=true" >> .env
           echo "PGRST_JWT_SECRET=r9iMKoe5CRMgvJBBtp4HrqN7QiPpUToj" >> .env
-          echo "PGRST_HOST=postgrest" >> .env
+          echo "PGRST_HOST=localhost:3001" >> .env
+          echo "PGRST_DB_PRE_CONFIG=postgrest.pre_config" >> .env
           echo "PGRST_DB_URI=postgres://postgres:postgres@postgres/tooljet_db" >> .env
-          echo "SSO_GIT_OAUTH2_CLIENT_ID=dummy" >> .env
-          echo "SSO_GIT_OAUTH2_CLIENT_SECRET=dummy" >> .env
-          echo "SSO_GIT_OAUTH2_HOST=dummy" >> .env
-          echo "SSO_GOOGLE_OAUTH2_CLIENT_ID=dummy" >> .env
+          echo "PGRST_SERVER_PORT=3001" >> .env
           echo "ENABLE_MARKETPLACE_FEATURE=true" >> .env
+          echo "ENABLE_MARKETPLACE_DEV_MODE=true" >> .env
+          echo "ENABLE_PRIVATE_APP_EMBED=true" >> .env
+          echo "SSO_GOOGLE_OAUTH2_CLIENT_ID=123456789.apps.googleusercontent.com" >> .env
+          echo "SSO_GOOGLE_OAUTH2_CLIENT_SECRET=ABCGFDNF-FHSDVFY-bskfh6234" >> .env
+          echo "SSO_GIT_OAUTH2_CLIENT_ID=1234567890" >> .env
+          echo "SSO_GIT_OAUTH2_CLIENT_SECRET=3346shfvkdjjsfkvxce32854e026a4531ed" >> .env
+          echo "SSO_OPENID_NAME=tj-oidc-simulator" >> .env
+          echo "SSO_OPENID_CLIENT_ID=${{ secrets.SSO_OPENID_CLIENT_ID }}" >> .env
+          echo "SSO_OPENID_CLIENT_SECRET=${{ secrets.SSO_OPENID_CLIENT_SECRET }}" >> .env
+          echo "ENABLE_EXTERNAL_API=true" >> .env
+          echo "EXTERNAL_API_ACCESS_TOKEN=d980eb3af24d783991cee51a2d84dce9f9bd41d4b46f441cc691ccebbecd3cbc" >> .env
+          echo "TOOLJET_GLOBAL_CONSTANTS__development='{\"envConstant\":\"globalUI\",\"headerKey\":\"customHeader\",\"ui_url\":\"http://20.29.40.108:4000/development\",\"headerValue\":\"key=value\"}'" >> .env
+          echo "TOOLJET_SECRET_CONSTANTS__development='{\"envSecret\":\"secret\",\"headerKey\":\"customHeader\",\"ui_url\":\"http://20.29.40.108:4000/development\",\"headerValue\":\"key=value\"}'" >> .env
+          echo "TOOLJET_GLOBAL_CONSTANTS__staging='{\"envConstant\":\"globalUI\",\"headerKey\":\"customHeader\",\"ui_url\":\"http://20.29.40.108:4000/staging\",\"headerValue\":\"key=value\"}'" >> .env
+          echo "TOOLJET_SECRET_CONSTANTS__staging='{\"envSecret\":\"secret\",\"headerKey\":\"customHeader\",\"ui_url\":\"http://20.29.40.108:4000/staging\",\"headerValue\":\"key=value\"}'" >> .env
+          echo "TOOLJET_GLOBAL_CONSTANTS__production='{\"envConstant\":\"globalUI\",\"headerKey\":\"customHeader\",\"ui_url\":\"http://20.29.40.108:4000/production\",\"headerValue\":\"key=value\"}'" >> .env
+          echo "TOOLJET_SECRET_CONSTANTS__production='{\"envSecret\":\"secret\",\"headerKey\":\"customHeader\",\"ui_url\":\"http://20.29.40.108:4000/production\",\"headerValue\":\"key=value\"}'" >> .env
+          echo "SAML_SET_ENTITY_ID_REDIRECT_URL=true" >> .env
+
+      - name: clean up old docker containers
+        run: |
+          docker system prune -af --volumes
+          echo "Disk space after Docker cleanup:"
+          df -h
 
       - name: Pulling the docker-compose file
         run: curl -LO https://tooljet-test.s3.us-west-1.amazonaws.com/docker-compose.yaml && mkdir postgres_data
 
-      - name: Update docker-compose file for CE
+      - name: Update docker-compose file
         run: |
-          # Update docker-compose.yaml with the new image
-          sed -i '/^[[:space:]]*tooljet:/,/^$/ s|^\([[:space:]]*image:[[:space:]]*\).*|\1tooljet/tj-osv:${{ env.SAFE_BRANCH_NAME }}-ce|' docker-compose.yaml
+          # Update docker-compose.yaml with the appropriate image based on edition
+          if [ "${{ matrix.edition }}" = "ce" ]; then
+            sed -i '/^[[:space:]]*tooljet:/,/^$/ s|^\([[:space:]]*image:[[:space:]]*\).*|\1tooljet/tj-osv:${{ env.SAFE_BRANCH_NAME }}-ce|' docker-compose.yaml
+          elif [ "${{ matrix.edition }}" = "ee" ]; then
+            sed -i '/^[[:space:]]*tooljet:/,/^$/ s|^\([[:space:]]*image:[[:space:]]*\).*|\1tooljet/tj-osv:${{ env.SAFE_BRANCH_NAME }}-ee|' docker-compose.yaml
+          fi
 
-      - name: Update docker-compose file for CE
-        if: matrix.edition == 'ee'
-        run: |
-          # Update docker-compose.yaml with the new image
-          sed -i '/^[[:space:]]*tooljet:/,/^$/ s|^\([[:space:]]*image:[[:space:]]*\).*|\1tooljet/tj-osv:${{ env.SAFE_BRANCH_NAME }}-ee|' docker-compose.yaml
+      - name: view docker-compose file
+        run: cat docker-compose.yaml
 
       - name: Install Docker Compose
         run: |
-          curl -L "https://github.com/docker/compose/releases/download/v2.10.2/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
+          curl -L "https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
           chmod +x /usr/local/bin/docker-compose
 
       - name: Run docker-compose file
@@ -136,31 +177,216 @@ jobs:
       - name: Checking containers
         run: docker ps -a
 
-      - name: Checking containers
-        run: docker ps -a
+      - name: sleep
+        run: sleep 80
 
       - name: docker logs
-        run: sudo docker logs Tooljet-app
+        run: docker-compose logs tooljet
 
       - name: Wait for the server to be ready
         run: |
-          timeout 1500 bash -c '
-          until curl --silent --fail http://localhost:3000; do
-            sleep 5
-          done'
+          echo "Waiting for ToolJet to start (timeout: 700 seconds)..."
+          SUCCESS_FOUND=false
+          TIMEOUT=700
+          ELAPSED=0
+
+          while [ $ELAPSED -lt $TIMEOUT ]; do
+            # Check for success message in logs
+            if docker-compose logs tooljet 2>/dev/null | grep -qE "TOOLJET APPLICATION STARTED SUCCESSFULLY|Ready to use at http://localhost:82|Ready to use at http://localhost:80"; then
+              echo "Found success message in logs!"
+              SUCCESS_FOUND=true
+              break
+            fi
+
+            echo "Still waiting... (${ELAPSED}s elapsed)"
+            sleep 10
+            ELAPSED=$((ELAPSED + 10))
+          done
+
+          if [ "$SUCCESS_FOUND" = false ]; then
+            echo "Timeout reached without finding success logs"
+            echo "Showing current logs for troubleshooting..."
+            docker-compose logs --tail=100 tooljet
+            exit 1
+          fi
+
+          echo "Server is ready!"
+
+      - name: Test database connection
+        run: |
+          # Wait for database to be ready
+          echo "Testing database connection..."
+          docker-compose exec -T postgres psql -U postgres -d tooljet_development -c "SELECT current_database();"
+
+      - name: Create delete_user procedure
+        run: |
+          echo "Creating delete_users stored procedure..."
+          docker-compose exec -T postgres psql -U postgres -d tooljet_development -c "
+          CREATE OR REPLACE PROCEDURE delete_users(p_emails TEXT[])
+          LANGUAGE plpgsql
+          AS \$\$
+          DECLARE
+            v_email TEXT;
+            v_user_id UUID;
+            v_organization_ids UUID[] := ARRAY[]::UUID[];
+            v_organizations_to_delete UUID[] := ARRAY[]::UUID[];
+            v_log_message TEXT;
+          BEGIN
+            IF COALESCE(array_length(p_emails, 1), 0) = 0 THEN
+              RAISE NOTICE 'delete_users: no emails provided';
+              RETURN;
+            END IF;
+
+            FOREACH v_email IN ARRAY p_emails LOOP
+              BEGIN
+                RAISE NOTICE '========================================';
+                RAISE NOTICE 'Starting user deletion for email: %', v_email;
+
+                -- Fetch user id
+                SELECT id INTO v_user_id
+                FROM users
+                WHERE email = v_email;
+
+                IF v_user_id IS NULL THEN
+                  RAISE NOTICE 'User with email % not found. Skipping.', v_email;
+                  CONTINUE;
+                END IF;
+
+                RAISE NOTICE 'User found with id: %', v_user_id;
+
+                -- Collect organization memberships
+                SELECT COALESCE(ARRAY_AGG(organization_id), ARRAY[]::UUID[])
+                INTO v_organization_ids
+                FROM organization_users
+                WHERE user_id = v_user_id;
+
+                RAISE NOTICE 'Found % organizations for user',
+                  COALESCE(array_length(v_organization_ids, 1), 0);
+
+                -- Find organizations with that single user
+                IF array_length(v_organization_ids, 1) > 0 THEN
+                  SELECT COALESCE(ARRAY_AGG(organization_id), ARRAY[]::UUID[])
+                  INTO v_organizations_to_delete
+                  FROM (
+                    SELECT organization_id
+                    FROM organization_users
+                    WHERE organization_id = ANY(v_organization_ids)
+                    GROUP BY organization_id
+                    HAVING COUNT(*) = 1
+                  ) subquery;
+                ELSE
+                  v_organizations_to_delete := ARRAY[]::UUID[];
+                END IF;
+
+                RAISE NOTICE 'Found % organizations to delete',
+                  COALESCE(array_length(v_organizations_to_delete, 1), 0);
+
+                -- Cascade delete records for orgs slated for removal
+                IF array_length(v_organizations_to_delete, 1) > 0 THEN
+                  WITH deleted_apps AS (
+                    DELETE FROM apps
+                    WHERE organization_id = ANY(v_organizations_to_delete)
+                    RETURNING id
+                  )
+                  SELECT 'Deleted ' || COUNT(*) || ' apps'
+                  INTO v_log_message FROM deleted_apps;
+                  RAISE NOTICE '%', v_log_message;
+
+                  WITH deleted_data_sources AS (
+                    DELETE FROM data_sources
+                    WHERE organization_id = ANY(v_organizations_to_delete)
+                    RETURNING id
+                  )
+                  SELECT 'Deleted ' || COUNT(*) || ' data sources'
+                  INTO v_log_message FROM deleted_data_sources;
+                  RAISE NOTICE '%', v_log_message;
+
+                  WITH deleted_organizations AS (
+                    DELETE FROM organizations
+                    WHERE id = ANY(v_organizations_to_delete)
+                    RETURNING id
+                  )
+                  SELECT 'Deleted ' || COUNT(*) || ' organizations'
+                  INTO v_log_message FROM deleted_organizations;
+                  RAISE NOTICE '%', v_log_message;
+                ELSE
+                  RAISE NOTICE 'No organizations removed for user %', v_email;
+                END IF;
+
+                -- Delete audit logs for orgs (if any) and user
+                WITH deleted_audit_logs AS (
+                  DELETE FROM audit_logs
+                  WHERE user_id = v_user_id
+                     OR organization_id = ANY(v_organizations_to_delete)
+                  RETURNING id
+                )
+                SELECT 'Deleted ' || COUNT(*) || ' audit logs'
+                INTO v_log_message FROM deleted_audit_logs;
+                RAISE NOTICE '%', v_log_message;
+
+                -- Delete organization membership records
+                DELETE FROM organization_users
+                WHERE user_id = v_user_id;
+
+                -- Delete the user
+                DELETE FROM users
+                WHERE id = v_user_id;
+
+                RAISE NOTICE 'Deleted user with id: %', v_user_id;
+                RAISE NOTICE 'User deletion completed for email: %', v_email;
+              EXCEPTION
+                WHEN OTHERS THEN
+                  RAISE NOTICE 'Error deleting user %: %', v_email, SQLERRM;
+                  -- continue with next email
+              END;
+            END LOOP;
+
+            RAISE NOTICE '========================================';
+            RAISE NOTICE 'delete_users procedure finished.';
+          END;
+          \$\$;"
+          echo "delete_users procedure created successfully"
 
       - name: Seeding (Setup Super Admin)
         run: |
-          curl 'http://localhost:3000/api/onboarding/setup-super-admin' \
+          curl --fail-with-body 'http://localhost:3000/api/onboarding/setup-super-admin' \
             -H 'Content-Type: application/json' \
             --data-raw '{
               "companyName": "ToolJet",
               "name": "The Developer",
-              "workspaceName": "Tooljet'\''s workspace",
+              "workspaceName": "My workspace",
               "email": "dev@tooljet.io",
               "password": "password"
             }'
 
+      - name: Seeding (Authenticate)
+        run: |
+          AUTH_RESPONSE=$(curl --fail-with-body \
+            -c /tmp/tj_cookies.txt \
+            'http://localhost:3000/api/authenticate' \
+            -H 'Content-Type: application/json' \
+            --data-raw '{
+              "email": "dev@tooljet.io",
+              "password": "password"
+            }')
+          echo "$AUTH_RESPONSE"
+          # Extract org ID and export for the next step via GITHUB_ENV
+          ORG_ID=$(echo "$AUTH_RESPONSE" | jq -r '.current_organization_id')
+          echo "TJ_ORG_ID=$ORG_ID" >> $GITHUB_ENV
+
+      - name: Seeding (Complete Onboarding)
+        run: |
+          # Sets onboarding_status = onboarding_completed so the frontend does not
+          # redirect every page visit to /setup, which would break all UI tests.
+          # tj-workspace-id header is required by JwtStrategy to resolve the user.
+          curl --fail-with-body \
+            -b /tmp/tj_cookies.txt \
+            -X POST \
+            'http://localhost:3000/api/onboarding/finish' \
+            -H 'Content-Type: application/json' \
+            -H "tj-workspace-id: $TJ_ORG_ID" \
+            --data-raw '{"region": "us"}'
+
       - name: Create Cypress environment file
         id: create-json
         uses: jsdaniell/create-json@1.1.2
@@ -170,8 +396,9 @@ jobs:
           dir: "./cypress-tests"
 
       - name: Marketplace
-        uses: cypress-io/github-action@v5
+        uses: cypress-io/github-action@v6
         with:
+          browser: chrome
           working-directory: ./cypress-tests
           config: "baseUrl=http://localhost:3000"
           config-file: cypress-marketplace.config.js
@@ -180,7 +407,7 @@ jobs:
         uses: actions/upload-artifact@v4
         if: always()
         with:
-          name: screenshots
+          name: screenshots-${{ matrix.edition }}
           path: cypress-tests/cypress/screenshots
 
   Cypress-Marketplace-Subpath:
@@ -238,6 +465,7 @@ jobs:
           echo "SUB_PATH=/apps/tooljet/" >> .env
           echo "NODE_ENV=production" >> .env
           echo "SERVE_CLIENT=true" >> .env
+          echo "LICENSE_KEY=${{ secrets.RENDER_LICENSE_KEY }}" >> .env
 
       - name: Pulling the docker-compose file
         run: curl -LO https://tooljet-test.s3.us-west-1.amazonaws.com/docker-compose.yaml && mkdir postgres_data

.github/workflows/deploy-to-stage.yml

@@ -4,18 +4,18 @@ on:
   workflow_dispatch:
     inputs:
       branch_name:
-        description: 'Git branch to build from'
+        description: "Git branch to build from"
         required: true
-        default: 'main'
+        default: "lts-3.16"
       dockerfile_path:
-        description: 'Path to Dockerfile'
+        description: "Path to Dockerfile"
         required: true
-        default: './docker/LTS/cloud/cloud-server.Dockerfile'
+        default: "./docker/LTS/cloud/cloud-server.Dockerfile"
         type: choice
         options:
           - ./docker/LTS/cloud/cloud-server.Dockerfile
       docker_tag:
-        description: 'Docker tag suffix (e.g., cloud-staging-v14)'
+        description: "Docker tag suffix (e.g., cloud-staging-v14)"
         required: true
 
 jobs:
@@ -82,7 +82,7 @@ jobs:
             BRANCH_NAME=${{ github.event.inputs.branch_name }}
 
       - name: Show the full Docker tag
-        run: | 
+        run: |
           echo "✅ Docker image tagged as: $IMAGE_TAG"
 
       # Deploy to AKS
@@ -144,6 +144,7 @@ jobs:
       - name: 📥 Manual Git checkout with submodules
         run: |
           set -e
+
           BRANCH="${{ github.event.inputs.branch_name }}"
           REPO="https://x-access-token:${{ secrets.CUSTOM_GITHUB_TOKEN }}@github.com/${{ github.repository }}"
 
@@ -155,6 +156,11 @@ jobs:
           git clone --recurse-submodules --depth=1 --branch "$BRANCH" "$REPO" repo
           cd repo
 
+          echo "🔎 Main repo: verifying checkout"
+          MAIN_CURRENT=$(git rev-parse --abbrev-ref HEAD)
+          echo "✅ Main repo: successfully checked out branch $MAIN_CURRENT"
+          echo "📍 Main repo: current commit $(git rev-parse --short HEAD): $(git log -1 --pretty=%s)"
+
           echo "🔁 Updating submodules"
           git submodule update --init --recursive
 
@@ -162,13 +168,44 @@ jobs:
 
           BRANCH="$BRANCH" git submodule foreach --recursive bash -c '
             name="$sm_path"
-            echo "↪ $name: checking out branch $BRANCH"
+            echo ""
+            echo "Entering '\''$name'\''"
+            echo "↪ $name: trying to checkout branch '\''$BRANCH'\''"
+
             if git ls-remote --exit-code --heads origin "$BRANCH" >/dev/null; then
-              git fetch origin "$BRANCH:$BRANCH"
-              git checkout "$BRANCH"
+              git fetch origin "$BRANCH:$BRANCH" || {
+                echo "❌ $name: fetch failed for $BRANCH"
+                exit 1
+              }
+
+              PREV=$(git rev-parse --short HEAD || echo "unknown")
+              git checkout "$BRANCH" || {
+                echo "❌ $name: checkout failed for $BRANCH"
+                exit 1
+              }
+
+              echo "Previous HEAD position was $PREV: $(git log -1 --pretty=%s || echo 'unknown')"
+              echo "✅ $name: checked out branch $BRANCH"
             else
-              echo "⚠️ Branch not found, falling back to main"
-              git checkout main && git pull origin main
+              echo "⚠️ $name: branch '$BRANCH' not found on origin. Falling back to 'lts-3.16'"
+              PREV=$(git rev-parse --short HEAD || echo "unknown")
+              git fetch origin lts-3.16:lts-3.16 || {
+                echo "❌ $name: fetch failed for lts-3.16"
+                exit 1
+              }
+              git checkout lts-3.16 || {
+                echo "❌ $name: fallback to lts-3.16 failed"
+                exit 1
+              }
+              echo "Previous HEAD position was $PREV: $(git log -1 --pretty=%s || echo 'unknown')"
+              echo "✅ $name: now on branch lts-3.16"
+            fi
+
+            CURRENT=$(git rev-parse --abbrev-ref HEAD)
+            echo "🔎 $name: current branch = $CURRENT"
+            if [ "$CURRENT" != "$BRANCH" ] && [ "$CURRENT" != "lts-3.16" ]; then
+              echo "❌ $name: unexpected branch state — wanted '$BRANCH' or fallback 'lts-3.16', got '$CURRENT'"
+              exit 1
             fi
           '
 
@@ -181,7 +218,7 @@ jobs:
         run: npm install
         working-directory: repo
 
-      - name: 🛠️ Build project
+      - name: 🛠️ Build the project
         run: npm run build:plugins:prod && npm run build:frontend
         working-directory: repo
         env:

.github/workflows/docker-release.yml

@@ -10,120 +10,128 @@ jobs:
     if: "${{ github.event.release }}"
 
     steps:
+      - name: Free up disk space
+        run: |
+          sudo rm -rf /usr/share/dotnet
+          sudo rm -rf /opt/ghc
+          sudo rm -rf /usr/local/share/boost
+          sudo rm -rf "$AGENT_TOOLSDIRECTORY"
+          sudo docker system prune -af
+          sudo apt-get clean
+          df -h
 
       - name: Checkout code to main for pre-release CE edition
         if: "!contains(github.event.release.tag_name, '-lts')"
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           ref: refs/heads/main
 
       - name: Checkout code to LTS for CE LTS edition
         if: "contains(github.event.release.tag_name, '-lts')"
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           ref: refs/heads/lts-3.16
 
-      # Create Docker Buildx builder with platform configuration
       - name: Set up Docker Buildx
-        run: |
-          mkdir -p ~/.docker/cli-plugins
-          curl -SL https://github.com/docker/buildx/releases/download/v0.11.0/buildx-v0.11.0.linux-amd64 -o ~/.docker/cli-plugins/docker-buildx
-          chmod a+x ~/.docker/cli-plugins/docker-buildx
-          docker buildx create --name mybuilder --platform linux/arm64,linux/amd64,linux/amd64/v2,linux/riscv64,linux/ppc64le,linux/s390x,linux/386,linux/mips64le,linux/mips64,linux/arm/v7,linux/arm/v6
-          docker buildx use mybuilder
-
-      - name: Set DOCKER_CLI_EXPERIMENTAL
-        run: echo "DOCKER_CLI_EXPERIMENTAL=enabled" >> $GITHUB_ENV
-
-      - name: use mybuilder buildx
-        run: docker buildx use mybuilder
+        uses: docker/setup-buildx-action@v3
 
       - name: Docker Login
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: Build and Push Docker image for pre-release tag
         if: "!contains(github.event.release.tag_name, '-lts')"
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           context: .
           file: docker/ce-production.Dockerfile
           push: true
           tags: tooljet/tooljet-ce:${{ github.event.release.tag_name }},tooljet/tooljet-ce:ce-latest
           platforms: linux/amd64
+          cache-from: type=gha,scope=ce
+          cache-to: type=gha,scope=ce,mode=min
         env:
           DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
           DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: Build and Push Docker image for LTS tag
         if: "contains(github.event.release.tag_name, '-lts')"
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           context: .
           file: docker/ce-production.Dockerfile
           push: true
           tags: tooljet/tooljet-ce:${{ github.event.release.tag_name }},tooljet/tooljet-ce:ce-lts-latest
           platforms: linux/amd64
+          cache-from: type=gha,scope=ce
+          cache-to: type=gha,scope=ce,mode=min
         env:
           DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
           DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: Send Slack Notification
         run: |
-          if [[ "${{ job.status }}" == "success" ]]; then
-            message="ToolJet community image published:\n\`tooljet/tooljet-ce:${{ github.event.release.tag_name }}\`"
+          # Determine release type and tags
+          if [[ "${{ github.event.release.tag_name }}" == *"-lts"* ]]; then
+            release_type="🔒 LTS Release"
+            branch="lts-3.16"
+            tags="tooljet/tooljet-ce:${{ github.event.release.tag_name }}, tooljet/tooljet-ce:ce-lts-latest"
           else
-            message="Job '${{ env.JOB_NAME }}' failed! tooljet/tooljet-ce:${{ github.event.release.tag_name }}"
+            release_type="🔄 Pre-release"
+            branch="main"
+            tags="tooljet/tooljet-ce:${{ github.event.release.tag_name }}, tooljet/tooljet-ce:ce-latest"
+          fi
+
+          # Build message based on job status
+          if [[ "${{ job.status }}" == "success" ]]; then
+            message="✅ *ToolJet Community Edition Published*\nVersion: \`${{ github.event.release.tag_name }}\`\nType: ${release_type}\nBranch: \`${branch}\`\nTags: \`${tags}\`"
+          else
+            message="❌ *ToolJet Community Edition Build Failed*\nVersion: \`${{ github.event.release.tag_name }}\`\nType: ${release_type}\nBranch: \`${branch}\`\nStatus: Build or push failed"
           fi
 
           curl -X POST -H 'Content-type: application/json' --data "{\"text\":\"$message\"}" ${{ secrets.SLACK_WEBHOOK_URL }}
 
-
   build-tooljet-image-for-ee-edtion:
-
     runs-on: ubuntu-latest
     if: "${{ github.event.release }}"
 
     steps:
+      - name: Free up disk space
+        run: |
+          sudo rm -rf /usr/share/dotnet
+          sudo rm -rf /opt/ghc
+          sudo rm -rf /usr/local/share/boost
+          sudo rm -rf "$AGENT_TOOLSDIRECTORY"
+          sudo docker system prune -af
+          sudo apt-get clean
+          df -h
+
       - name: Checkout code to main for pre-release EE edition
         if: "!contains(github.event.release.tag_name, '-lts')"
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           ref: refs/heads/main
 
       - name: Checkout code to LTS for EE LTS edition
         if: "contains(github.event.release.tag_name, '-lts')"
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           ref: refs/heads/lts-3.16
 
-      # Create Docker Buildx builder with platform configuration
       - name: Set up Docker Buildx
-        run: |
-          mkdir -p ~/.docker/cli-plugins
-          curl -SL https://github.com/docker/buildx/releases/download/v0.11.0/buildx-v0.11.0.linux-amd64 -o ~/.docker/cli-plugins/docker-buildx
-          chmod a+x ~/.docker/cli-plugins/docker-buildx
-          docker buildx create --name mybuilder --platform linux/arm64,linux/amd64,linux/amd64/v2,linux/riscv64,linux/ppc64le,linux/s390x,linux/386,linux/mips64le,linux/mips64,linux/arm/v7,linux/arm/v6
-          docker buildx use mybuilder
-
-      - name: Set DOCKER_CLI_EXPERIMENTAL
-        run: echo "DOCKER_CLI_EXPERIMENTAL=enabled" >> $GITHUB_ENV
-
-      - name: use mybuilder buildx
-        run: docker buildx use mybuilder
+        uses: docker/setup-buildx-action@v3
 
       - name: Docker Login
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
-
       - name: Build and Push Docker image for pre-release tag
         if: "!contains(github.event.release.tag_name, '-lts')"
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           context: .
           build-args: |
@@ -133,13 +141,15 @@ jobs:
           push: true
           tags: tooljet/tooljet-ee:${{ github.event.release.tag_name }},tooljet/tooljet-ee:ee-latest,tooljet/tooljet:ee-latest,tooljet/tooljet:${{ github.event.release.tag_name }}
           platforms: linux/amd64
+          cache-from: type=gha,scope=ee
+          cache-to: type=gha,scope=ee,mode=min
         env:
           DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
           DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: Build and Push Docker image for LTS tag
         if: "contains(github.event.release.tag_name, '-lts')"
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           context: .
           build-args: |
@@ -149,57 +159,67 @@ jobs:
           push: true
           tags: tooljet/tooljet-ee:${{ github.event.release.tag_name }},tooljet/tooljet-ee:ee-lts-latest,tooljet/tooljet:ee-lts-latest,tooljet/tooljet:${{ github.event.release.tag_name }}
           platforms: linux/amd64
+          cache-from: type=gha,scope=ee
+          cache-to: type=gha,scope=ee,mode=min
         env:
           DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
           DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: Send Slack Notification
         run: |
-          if [[ "${{ job.status }}" == "success" ]]; then
-            message="ToolJet enterprise image published:\n\`tooljet/tooljet-ee:${{ github.event.release.tag_name }}\`\n\`tooljet/tooljet:${{ github.event.release.tag_name }}\`"
+          # Determine release type and tags
+          if [[ "${{ github.event.release.tag_name }}" == *"-lts"* ]]; then
+            release_type="🔒 LTS Release"
+            branch="lts-3.16"
+            tags="tooljet/tooljet-ee:${{ github.event.release.tag_name }}, tooljet/tooljet:${{ github.event.release.tag_name }}"
           else
-            message="Job '${{ env.JOB_NAME }}' failed! Image built:\n\`tooljet/tooljet-ee:${{ github.event.release.tag_name }}\`\n\`tooljet/tooljet:${{ github.event.release.tag_name }}\`"
+            release_type="🔄 Pre-release"
+            branch="main"
+            tags="tooljet/tooljet-ee:${{ github.event.release.tag_name }}, tooljet/tooljet:${{ github.event.release.tag_name }}"
+          fi
+
+          # Build message based on job status
+          if [[ "${{ job.status }}" == "success" ]]; then
+            message="✅ *ToolJet Enterprise Edition Published*\nVersion: \`${{ github.event.release.tag_name }}\`\nType: ${release_type}\nBranch: \`${branch}\`\nTags: \`${tags}\`"
+          else
+            message="❌ *ToolJet Enterprise Edition Build Failed*\nVersion: \`${{ github.event.release.tag_name }}\`\nType: ${release_type}\nBranch: \`${branch}\`\nStatus: Build or push failed"
           fi
 
           curl -X POST -H 'Content-type: application/json' --data "{\"text\":\"$message\"}" ${{ secrets.SLACK_WEBHOOK_URL }}
 
-
   build-tooljet-image-for-cloud-edtion:
-
     runs-on: ubuntu-latest
     if: "${{ github.event.release }}"
 
     steps:
+      - name: Free up disk space
+        run: |
+          sudo rm -rf /usr/share/dotnet
+          sudo rm -rf /opt/ghc
+          sudo rm -rf /usr/local/share/boost
+          sudo rm -rf "$AGENT_TOOLSDIRECTORY"
+          sudo docker system prune -af
+          sudo apt-get clean
+          df -h
+
       - name: Checkout code to LTS for Cloud LTS edition
         if: "contains(github.event.release.tag_name, '-lts')"
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           ref: refs/heads/lts-3.16
 
-      # Create Docker Buildx builder with platform configuration
       - name: Set up Docker Buildx
-        run: |
-          mkdir -p ~/.docker/cli-plugins
-          curl -SL https://github.com/docker/buildx/releases/download/v0.11.0/buildx-v0.11.0.linux-amd64 -o ~/.docker/cli-plugins/docker-buildx
-          chmod a+x ~/.docker/cli-plugins/docker-buildx
-          docker buildx create --name mybuilder --platform linux/arm64,linux/amd64,linux/amd64/v2,linux/riscv64,linux/ppc64le,linux/s390x,linux/386,linux/mips64le,linux/mips64,linux/arm/v7,linux/arm/v6
-          docker buildx use mybuilder
-
-      - name: Set DOCKER_CLI_EXPERIMENTAL
-        run: echo "DOCKER_CLI_EXPERIMENTAL=enabled" >> $GITHUB_ENV
-
-      - name: use mybuilder buildx
-        run: docker buildx use mybuilder
+        uses: docker/setup-buildx-action@v3
 
       - name: Docker Login
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: Build and Push Docker image for LTS tag
         if: "contains(github.event.release.tag_name, '-lts')"
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           context: .
           build-args: |
@@ -209,56 +229,61 @@ jobs:
           push: true
           tags: tooljet/saas:${{ github.event.release.tag_name }}
           platforms: linux/amd64
+          cache-from: type=gha,scope=cloud
+          cache-to: type=gha,scope=cloud,mode=min
         env:
           DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
           DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: Send Slack Notification
         run: |
+          # Cloud edition only runs for LTS releases
+          release_type="🔒 LTS Release"
+          branch="lts-3.16"
+          tags="tooljet/saas:${{ github.event.release.tag_name }}"
+
+          # Build message based on job status
           if [[ "${{ job.status }}" == "success" ]]; then
-            message="ToolJet cloud image published:\n\`tooljet/saas:${{ github.event.release.tag_name }}\`"
+            message="✅ *ToolJet Cloud Edition Published*\nVersion: \`${{ github.event.release.tag_name }}\`\nType: ${release_type}\nBranch: \`${branch}\`\nTags: \`${tags}\`"
           else
-            message="Job '${{ env.JOB_NAME }}' failed! Image built:\n\`tooljet/saas:${{ github.event.release.tag_name }}\`"
+            message="❌ *ToolJet Cloud Edition Build Failed*\nVersion: \`${{ github.event.release.tag_name }}\`\nType: ${release_type}\nBranch: \`${branch}\`\nStatus: Build or push failed"
           fi
 
           curl -X POST -H 'Content-type: application/json' --data "{\"text\":\"$message\"}" ${{ secrets.SLACK_WEBHOOK_URL }}
 
-
   try-tooljet-image-build:
     runs-on: ubuntu-latest
     needs: build-tooljet-image-for-ee-edtion
     if: ${{ needs.build-tooljet-image-for-ee-edtion.result == 'success' }}
 
     steps:
+      - name: Free up disk space
+        run: |
+          sudo rm -rf /usr/share/dotnet
+          sudo rm -rf /opt/ghc
+          sudo rm -rf /usr/local/share/boost
+          sudo rm -rf "$AGENT_TOOLSDIRECTORY"
+          sudo docker system prune -af
+          sudo apt-get clean
+          df -h
+
       - name: Checkout code to develop
         if: "!contains(github.event.release.tag_name, '-lts')"
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           ref: refs/heads/main
 
       - name: Checkout code to lts-3.16
         if: contains(github.event.release.tag_name, '-lts')
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           ref: refs/heads/lts-3.16
 
-      # Create Docker Buildx builder with platform configuration
       - name: Set up Docker Buildx
-        run: |
-          mkdir -p ~/.docker/cli-plugins
-          curl -SL https://github.com/docker/buildx/releases/download/v0.11.0/buildx-v0.11.0.linux-amd64 -o ~/.docker/cli-plugins/docker-buildx
-          chmod a+x ~/.docker/cli-plugins/docker-buildx
-          docker buildx create --name mybuilder --platform linux/arm64,linux/amd64,linux/amd64/v2,linux/riscv64,linux/ppc64le,linux/s390x,linux/386,linux/mips64le,linux/mips64,linux/arm/v7,linux/arm/v6
-          docker buildx use mybuilder
-
-      - name: Set DOCKER_CLI_EXPERIMENTAL
-        run: echo "DOCKER_CLI_EXPERIMENTAL=enabled" >> $GITHUB_ENV
-
-      - name: use mybuilder buildx
-        run: docker buildx use mybuilder
+        uses: docker/setup-buildx-action@v3
 
       - name: Docker Login
-        uses: docker/login-action@v1
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
@@ -281,36 +306,52 @@ jobs:
 
       - name: Build and Push Docker image for non-EE-LTS
         if: "!contains(github.event.release.tag_name, '-lts')"
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           context: .
           file: docker/pre-release/ee/ee-try-tooljet.Dockerfile
           push: true
           tags: tooljet/try:${{ github.event.release.tag_name }},tooljet/try:ee-latest
           platforms: linux/amd64
+          cache-from: type=gha,scope=try
+          cache-to: type=gha,scope=try,mode=min
         env:
           DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
           DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: Build and Push Docker image for EE-LTS-3.0
         if: contains(github.event.release.tag_name, '-lts')
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           context: .
           file: docker/LTS/ee/ee-try-tooljet-lts.Dockerfile
           push: true
           tags: tooljet/try:${{ github.event.release.tag_name }},tooljet/try:ee-lts-latest
           platforms: linux/amd64
+          cache-from: type=gha,scope=try
+          cache-to: type=gha,scope=try,mode=min
         env:
           DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
           DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: Send Slack Notification
         run: |
-          if [[ "${{ job.status }}" == "success" ]]; then
-            message="Try-ToolJet image published:\\n\`tooljet/try:${{ github.event.release.tag_name }}\`"
+          # Determine release type and tags
+          if [[ "${{ github.event.release.tag_name }}" == *"-lts"* ]]; then
+            release_type="🔒 LTS Release"
+            branch="lts-3.16"
+            tags="tooljet/try:${{ github.event.release.tag_name }}, tooljet/try:ee-lts-latest"
           else
-            message="Job '${{ env.JOB_NAME }}' failed! tooljet/try:${{ github.event.release.tag_name }}"
+            release_type="🔄 Pre-release"
+            branch="main"
+            tags="tooljet/try:${{ github.event.release.tag_name }}, tooljet/try:ee-latest"
+          fi
+
+          # Build message based on job status
+          if [[ "${{ job.status }}" == "success" ]]; then
+            message="✅ *Try-ToolJet Image Published*\nVersion: \`${{ github.event.release.tag_name }}\`\nType: ${release_type}\nBranch: \`${branch}\`\nTags: \`${tags}\`"
+          else
+            message="❌ *Try-ToolJet Image Build Failed*\nVersion: \`${{ github.event.release.tag_name }}\`\nType: ${release_type}\nBranch: \`${branch}\`\nStatus: Build or push failed"
           fi
 
           curl -X POST -H 'Content-type: application/json' --data "{\"text\":\"$message\"}" ${{ secrets.SLACK_WEBHOOK_URL }}

.github/workflows/docs-netlify.yml

@@ -34,4 +34,4 @@ jobs:
           npm install -g netlify-cli
           netlify deploy --prod --dir=docs/build --auth=$NETLIFY_AUTH_TOKEN --site=${{ secrets.NETLIFY_SITE_ID }}
         env:
-          NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
+          NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}

.github/workflows/grype-slack-notify.yml

@@ -0,0 +1,194 @@
+name: Grype - Docker Image Vulnerability Scan
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: "30 6 * * 1"
+
+jobs:
+  PeriodicVulnerability-CheckOn-docker-image-lts:
+    if: github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Free up disk space
+        run: |
+          echo "=== Disk space before cleanup ==="
+          df -h
+          sudo rm -rf /usr/share/dotnet
+          sudo rm -rf /opt/ghc
+          sudo rm -rf /usr/local/share/boost
+          sudo rm -rf "$AGENT_TOOLSDIRECTORY"
+          sudo docker system prune -af
+          sudo apt-get clean
+          echo "=== Disk space after cleanup ==="
+          df -h
+
+      - name: Pull ToolJet LTS Docker image
+        run: docker pull tooljet/tooljet:ee-lts-latest
+
+      - name: Grype Scan - Table Output (visible in logs)
+        uses: anchore/scan-action@v7
+        with:
+          image: 'tooljet/tooljet:ee-lts-latest'
+          fail-build: false
+          severity-cutoff: high
+          output-format: table
+          only-fixed: true
+
+      - name: Grype Scan - JSON Output (for report)
+        uses: anchore/scan-action@v7
+        with:
+          image: 'tooljet/tooljet:ee-lts-latest'
+          fail-build: false
+          severity-cutoff: high
+          output-format: json
+          output-file: grype-lts-results.json
+          only-fixed: true
+
+      - name: Parse Results
+        id: parse-grype
+        run: |
+          if [ -f grype-lts-results.json ]; then
+            critical=$(jq '[.matches[]? | select(.vulnerability.severity=="Critical")] | length' grype-lts-results.json)
+            high=$(jq '[.matches[]? | select(.vulnerability.severity=="High")] | length' grype-lts-results.json)
+          else
+            critical=0
+            high=0
+          fi
+          total=$((critical + high))
+          echo "critical=$critical" >> $GITHUB_OUTPUT
+          echo "high=$high" >> $GITHUB_OUTPUT
+          echo "total=$total" >> $GITHUB_OUTPUT
+          echo "=== Vulnerability Summary ==="
+          echo "Critical: $critical"
+          echo "High: $high"
+          echo "Total: $total"
+
+      - name: Upload JSON Report as Artifact
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: grype-lts-scan-report
+          path: grype-lts-results.json
+          retention-days: 7
+          if-no-files-found: warn
+
+      - name: Determine notification color
+        id: determine-color
+        run: |
+          critical=${{ steps.parse-grype.outputs.critical }}
+          high=${{ steps.parse-grype.outputs.high }}
+
+          if [ "$critical" -gt 0 ]; then
+            echo "color=#FF0000" >> $GITHUB_OUTPUT
+          elif [ "$high" -gt 0 ]; then
+            echo "color=#FFA500" >> $GITHUB_OUTPUT
+          else
+            echo "color=#36A64F" >> $GITHUB_OUTPUT
+          fi
+
+      - name: Send Slack Notification
+        run: |
+          payload=$(cat <<EOF
+          {
+            "attachments": [
+              {
+                "color": "${{ steps.determine-color.outputs.color }}",
+                "blocks": [
+                  {
+                    "type": "header",
+                    "text": {
+                      "type": "plain_text",
+                      "text": "🐳 Docker Image Vulnerability Scan Report",
+                      "emoji": true
+                    }
+                  },
+                  {
+                    "type": "section",
+                    "fields": [
+                      {
+                        "type": "mrkdwn",
+                        "text": "*Repository:*\n${{ github.repository }}"
+                      },
+                      {
+                        "type": "mrkdwn",
+                        "text": "*Image:*\ntooljet/tooljet:ee-lts-latest"
+                      },
+                      {
+                        "type": "mrkdwn",
+                        "text": "*Scanner:*\nGrype"
+                      },
+                      {
+                        "type": "mrkdwn",
+                        "text": "*Scan Time:*\n$(date -u +"%Y-%m-%d %H:%M UTC")"
+                      }
+                    ]
+                  },
+                  {
+                    "type": "divider"
+                  },
+                  {
+                    "type": "section",
+                    "text": {
+                      "type": "mrkdwn",
+                      "text": "*Docker Image Vulnerabilities (fixable only):*"
+                    }
+                  },
+                  {
+                    "type": "section",
+                    "fields": [
+                      {
+                        "type": "mrkdwn",
+                        "text": "🔴 *Critical:*\n${{ steps.parse-grype.outputs.critical }}"
+                      },
+                      {
+                        "type": "mrkdwn",
+                        "text": "🟠 *High:*\n${{ steps.parse-grype.outputs.high }}"
+                      },
+                      {
+                        "type": "mrkdwn",
+                        "text": "📊 *Total:*\n${{ steps.parse-grype.outputs.total }}"
+                      }
+                    ]
+                  },
+                  {
+                    "type": "divider"
+                  },
+                  {
+                    "type": "actions",
+                    "elements": [
+                      {
+                        "type": "button",
+                        "text": {
+                          "type": "plain_text",
+                          "text": "📥 Download Full Report",
+                          "emoji": true
+                        },
+                        "url": "https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}",
+                        "style": "primary"
+                      }
+                    ]
+                  }
+                ]
+              }
+            ]
+          }
+          EOF
+          )
+
+          response=$(curl -s -w "%{http_code}" -X POST \
+            -H 'Content-type: application/json' \
+            --data "$payload" \
+            "${{ secrets.SLACK_WEBHOOK_URL_VUR }}")
+
+          http_code="${response: -3}"
+          if [ "$http_code" != "200" ]; then
+            echo "Slack notification failed with HTTP $http_code"
+            exit 1
+          fi
+
+          echo "Slack notification sent successfully"

.github/workflows/license-compliance.yml

@@ -0,0 +1,195 @@
+name: License Compliance Check
+
+on:
+  pull_request:
+    types: [opened, synchronize, reopened]
+
+jobs:
+  license-check:
+    name: Check New Package Licenses
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+      contents: read
+
+    steps:
+      - name: Check licenses of new packages
+        uses: actions/github-script@v7
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            const https = require('https');
+
+            // ── Fetch license from npm registry ──────────────────────────────
+
+            function fetchLicense(packageName) {
+              return new Promise((resolve) => {
+                const encoded = packageName.replace('/', '%2F');
+                const url = `https://registry.npmjs.org/${encoded}/latest`;
+                https.get(url, { headers: { 'User-Agent': 'tooljet-license-checker' } }, (res) => {
+                  let data = '';
+                  res.on('data', chunk => data += chunk);
+                  res.on('end', () => {
+                    try {
+                      const json = JSON.parse(data);
+                      resolve(json.license || 'UNKNOWN');
+                    } catch {
+                      resolve('UNKNOWN');
+                    }
+                  });
+                }).on('error', () => resolve('UNKNOWN'));
+              });
+            }
+
+            // ── License check — ONLY exact MIT or Apache-2.0 ─────────────────
+            // Dual licenses like "(MIT OR GPL-3.0-or-later)" are NOT permitted.
+
+            function isPermitted(license) {
+              if (!license || license === 'UNKNOWN') return false;
+              const l = license.trim();
+              return l === 'MIT' || l === 'Apache-2.0';
+            }
+
+            // ── Get PR diff files from GitHub API ─────────────────────────────
+
+            const prFiles = await github.rest.pulls.listFiles({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              pull_number: context.issue.number,
+              per_page: 100,
+            });
+
+            const pkgFiles = prFiles.data.filter(f =>
+              f.filename.endsWith('package.json') &&
+              !f.filename.includes('node_modules')
+            );
+
+            if (pkgFiles.length === 0) {
+              console.log('No package.json files changed in this PR. Skipping.');
+              return;
+            }
+
+            console.log(`package.json files changed: ${pkgFiles.map(f => f.filename).join(', ')}`);
+
+            // ── Extract newly added packages from diff patch ──────────────────
+
+            function extractAddedPackages(patch) {
+              if (!patch) return [];
+              const packages = [];
+              for (const line of patch.split('\n')) {
+                if (!line.startsWith('+') || line.startsWith('+++')) continue;
+                const match = line.match(/^\+\s*"(@?[a-zA-Z0-9][\w\-\.\/]*)"\s*:\s*"\^?[\d~*]/);
+                if (match) {
+                  packages.push(match[1]);
+                }
+              }
+              return packages;
+            }
+
+            // ── Main scan ─────────────────────────────────────────────────────
+
+            const violations = [];
+            const permitted  = [];
+
+            for (const file of pkgFiles) {
+              console.log(`\n── Scanning: ${file.filename}`);
+
+              const addedPackages = extractAddedPackages(file.patch);
+
+              if (addedPackages.length === 0) {
+                console.log('  No new packages added.');
+                continue;
+              }
+
+              console.log(`  New packages found: ${addedPackages.join(', ')}`);
+
+              for (const pkg of addedPackages) {
+                const license = await fetchLicense(pkg);
+                const ok      = isPermitted(license);
+
+                if (ok) {
+                  console.log(`  [OK]       ${pkg} — ${license}`);
+                  permitted.push({ pkg, license, file: file.filename });
+                } else {
+                  console.log(`  [FAIL]     ${pkg} — ${license}`);
+                  violations.push({ pkg, license, file: file.filename });
+                }
+              }
+            }
+
+            console.log(`\n── Summary`);
+            console.log(`   Permitted : ${permitted.length}`);
+            console.log(`   Violations: ${violations.length}`);
+
+            // ── Delete previous bot comment if any ────────────────────────────
+
+            const comments = await github.rest.issues.listComments({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: context.issue.number,
+            });
+            for (const comment of comments.data) {
+              if (comment.body.includes('<!-- license-compliance-bot -->')) {
+                await github.rest.issues.deleteComment({
+                  owner: context.repo.owner,
+                  repo: context.repo.repo,
+                  comment_id: comment.id,
+                });
+              }
+            }
+
+            // ── Skip comment if nothing new was added ─────────────────────────
+
+            if (permitted.length === 0 && violations.length === 0) {
+              console.log('No new packages detected in diff. Skipping comment.');
+              return;
+            }
+
+            // ── Build and post comment ────────────────────────────────────────
+
+            let body = `<!-- license-compliance-bot -->\n`;
+
+            if (violations.length === 0) {
+              body += `## ✅ License Compliance Check Passed\n\n`;
+              body += `All new packages added in this PR use permitted licenses (MIT or Apache-2.0).\n\n`;
+              body += `| Package | License | File |\n|---|---|---|\n`;
+              body += permitted.map(p =>
+                `| \`${p.pkg}\` | \`${p.license}\` | \`${p.file}\` |`
+              ).join('\n');
+              body += '\n';
+            } else {
+              body += `## ❌ License Compliance Check Failed\n\n`;
+              body += `This PR adds package(s) with licenses that are **not permitted**.\n`;
+              body += `Only \`MIT\` and \`Apache-2.0\` licenses are allowed.\n\n`;
+              body += `### 🚫 Not Permitted\n\n`;
+              body += `| Package | License | File |\n|---|---|---|\n`;
+              body += violations.map(v =>
+                `| \`${v.pkg}\` | \`${v.license}\` | \`${v.file}\` |`
+              ).join('\n');
+              body += `\n\n`;
+              body += `> ❌ The package(s) above are not permitted. Please replace them with an equivalent that uses an MIT or Apache-2.0 license.\n`;
+              body += `> If this package genuinely needs to be exempted, a maintainer can bypass this check using the bypass rules option on this PR.\n\n`;
+              if (permitted.length > 0) {
+                body += `### ✅ Permitted Packages\n\n`;
+                body += `| Package | License | File |\n|---|---|---|\n`;
+                body += permitted.map(p =>
+                  `| \`${p.pkg}\` | \`${p.license}\` | \`${p.file}\` |`
+                ).join('\n');
+                body += '\n';
+              }
+            }
+
+            await github.rest.issues.createComment({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: context.issue.number,
+              body,
+            });
+
+            if (violations.length > 0) {
+              core.setFailed(
+                `License check failed: ${violations.length} package(s) with non-permitted licenses. See PR comment for details.`
+              );
+            }
+
+            

.github/workflows/maketplace-plugins-deploy.yml

@@ -38,7 +38,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v2
         with:
-          node-version: 18.18.2
+          node-version: 22.15.1
 
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v4
@@ -63,12 +63,11 @@ jobs:
             npm run build --workspace=plugins/$plugin || exit 1
           done
 
-
       - name: Build marketplace plugins and capture summary
         run: |
           cd marketplace
           echo "🚀 Uploading to S3"
-          AWS_BUCKET=tooljet-plugins-stage node scripts/upload-to-s3.js | tee upload_summary.log
+          AWS_BUCKET=tooljet-plugins-stage bash scripts/upload-to-s3.sh | tee upload_summary.log
 
       - name: Extract upload summary
         id: upload_summary
@@ -133,4 +132,4 @@ jobs:
               owner: context.repo.owner,
               repo: context.repo.repo,
               body: `❌ Marketplace Plugin deployment failed.\n\n🔍 [View Deployment Logs & Summary](${runUrl})`
-            });
+            });

.github/workflows/manual-docker-build.yml

@@ -4,14 +4,19 @@ on:
   workflow_dispatch:
     inputs:
       branch_name:
-        description: 'Git branch to build from'
+        description: "Git branch to build from"
         required: true
-        default: 'main'
+        default: "main"
       dockerfile_path:
-        description: 'Path to Dockerfile'
+        description: "Path to Dockerfile"
         required: true
+        type: choice
+        options:
+          - ./docker/LTS/ee/ee-production.Dockerfile
+          - ./docker/pre-release/ee/ee-production.Dockerfile
+          - ./docker/LTS/cloud/cloud-server.Dockerfile
       docker_tag:
-        description: 'Docker tag suffix (e.g., pre-release-14)'
+        description: "Docker tag suffix (e.g., pre-release-14)"
         required: true
 
 jobs:

.github/workflows/marketplace-plugins-deploy-production.yml

@@ -0,0 +1,180 @@
+name: Marketplace Plugin Production Deploy
+
+on:
+  pull_request_target:
+    types: [labeled, unlabeled, closed]
+
+  workflow_dispatch:
+    inputs:
+      branch:
+        description: "Branch to deploy from"
+        required: true
+        default: "lts-3.16"
+      plugin_name:
+        description: "Plugin name to deploy individually (leave empty to deploy all)"
+        required: false
+        default: ""
+
+env:
+  PR_NUMBER: ${{ github.event.number }}
+  BRANCH_NAME: ${{ github.event.inputs.branch || github.head_ref || github.ref_name }}
+
+jobs:
+  deploy-marketplace-plugin-production:
+    if: |
+      github.event_name == 'workflow_dispatch' ||
+      (github.event.action == 'labeled' && github.event.label.name == 'deploy-marketplace-plugin-prod')
+    runs-on: ubuntu-latest
+    steps:
+      - name: ✅ Check user authorization
+        run: |
+          allowed_user1="${{ secrets.ALLOWED_USER1_USERNAME }}"
+          allowed_user2="${{ secrets.ALLOWED_USER2_USERNAME }}"
+          allowed_user3="${{ secrets.ALLOWED_USER3_USERNAME }}"
+
+          if [[ "${{ github.actor }}" != "$allowed_user1" && \
+                "${{ github.actor }}" != "$allowed_user2" && \
+                "${{ github.actor }}" != "$allowed_user3" ]]; then
+            echo "❌ User '${{ github.actor }}' is not authorized to trigger this workflow."
+            echo "Only the following users can deploy to production:"
+            echo "  - $allowed_user1"
+            echo "  - $allowed_user2"
+            echo "  - $allowed_user3"
+            exit 1
+          else
+            echo "✅ User '${{ github.actor }}' is authorized to deploy to production."
+          fi
+
+      - name: Sync repo
+        uses: actions/checkout@v3
+
+      - name: Check if PR is from the same repo
+        if: github.event_name == 'pull_request_target'
+        id: check_repo
+        run: echo "::set-output name=is_fork::$(if [[ '${{ github.event.pull_request.head.repo.full_name }}' != '${{ github.event.pull_request.base.repo.full_name }}' ]]; then echo true; else echo false; fi)"
+
+      - name: Fetch the remote branch if it's a forked PR
+        if: github.event_name == 'pull_request_target' && steps.check_repo.outputs.is_fork == 'true'
+        run: |
+          git fetch origin pull/${{ github.event.number }}/head:${{ env.BRANCH_NAME }}
+          git checkout ${{ env.BRANCH_NAME }}
+
+      - name: Checkout PR branch
+        if: github.event_name == 'pull_request_target' && steps.check_repo.outputs.is_fork == 'false'
+        uses: actions/checkout@v3
+        with:
+          ref: ${{ github.event.pull_request.head.ref }}
+
+      - name: Checkout specified branch
+        if: github.event_name == 'workflow_dispatch'
+        uses: actions/checkout@v3
+        with:
+          ref: ${{ github.event.inputs.branch }}
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v2
+        with:
+          node-version: 22.15.1
+
+      - name: Configure AWS Credentials
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_PROD_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_PROD_ACCESS_KEY }}
+          aws-region: us-east-2
+
+      - name: Install and build dependencies in order
+        run: |
+          cd marketplace
+          echo "🔧 Installing all workspace dependencies"
+          npm install
+
+          echo "🏗️ Building 'common' plugin first"
+          npm run build --workspace=plugins/common || exit 1
+
+          echo "🔁 Building all remaining plugins"
+          PLUGINS=$(ls plugins | grep -v '^common$')
+          for plugin in $PLUGINS; do
+            echo "🔨 Building plugin: $plugin"
+            npm run build --workspace=plugins/$plugin || exit 1
+          done
+
+      - name: Build marketplace plugins and capture summary
+        run: |
+          cd marketplace
+          echo "🚀 Uploading to S3 Production"
+          AWS_BUCKET=${{ secrets.S3_BUCKET_PRODUCTION }} bash scripts/upload-to-s3.sh ${{ github.event.inputs.plugin_name }} | tee upload_summary.log
+
+      - name: Extract upload summary
+        id: upload_summary
+        run: |
+          SUMMARY=$(awk '/UPLOAD SUMMARY/,0' marketplace/upload_summary.log)
+          echo "UPLOAD_SUMMARY<<EOF" >> $GITHUB_ENV
+          echo "$SUMMARY" >> $GITHUB_ENV
+          echo "EOF" >> $GITHUB_ENV
+
+      - name: Output summary to logs (manual trigger)
+        if: success() && github.event_name == 'workflow_dispatch'
+        run: |
+          echo "========================================="
+          echo "PRODUCTION DEPLOYMENT SUMMARY"
+          echo "========================================="
+          echo "${{ env.UPLOAD_SUMMARY }}"
+          echo "========================================="
+
+      - name: Comment on success
+        if: success() && github.event_name == 'pull_request_target'
+        uses: actions/github-script@v5
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            const runId = process.env.GITHUB_RUN_ID;
+            const runUrl = `https://github.com/${{ github.repository }}/actions/runs/${runId}`;
+            const summary = process.env.UPLOAD_SUMMARY;
+            const body = `✅ Marketplace Plugin deployed to **PRODUCTION** bucket\n\n🔍 [View Deployment Logs & Summary](${runUrl})\n\n\`\`\`\n${summary}\n\`\`\``;
+
+            github.rest.issues.createComment({
+              issue_number: context.issue.number,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              body
+            });
+
+      - name: Label update on success
+        if: success() && github.event_name == 'pull_request_target'
+        uses: actions/github-script@v6
+        with:
+          script: |
+            try {
+              await github.rest.issues.removeLabel({
+                issue_number: context.issue.number,
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                name: 'deploy-marketplace-plugin-prod'
+              })
+            } catch (e) {
+              console.log(e)
+            }
+
+            await github.rest.issues.addLabels({
+              issue_number: context.issue.number,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              labels: ['plugin-deployed-production']
+            })
+
+      - name: Comment on failure
+        if: failure() && github.event_name == 'pull_request_target'
+        uses: actions/github-script@v6
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            const runId = process.env.GITHUB_RUN_ID;
+            const runUrl = `https://github.com/${{ github.repository }}/actions/runs/${runId}`;
+
+            await github.rest.issues.createComment({
+              issue_number: context.issue.number,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              body: `❌ Marketplace Plugin deployment to **PRODUCTION** failed.\n\n🔍 [View Deployment Logs & Summary](${runUrl})`
+            });

.github/workflows/merging-pr.yml

@@ -6,33 +6,38 @@ on:
 
 jobs:
   merge-submodules:
-    if: github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'main' && github.event.pull_request.base.ref == 'lts-3.16'
+    if: |
+      github.event.pull_request.merged == true &&
+      (github.event.pull_request.base.ref == 'main' || github.event.pull_request.base.ref == 'lts-3.16') &&
+      !startsWith(github.event.pull_request.head.ref, 'release/')
     runs-on: ubuntu-latest
 
     steps:
-      - name: Extract Branch Name
-        run: echo "BRANCH_NAME=${{ github.event.pull_request.head.ref }}" >> $GITHUB_ENV
+      - name: Extract Branch Name and Base Branch
+        run: |
+          echo "BRANCH_NAME=${{ github.event.pull_request.head.ref }}" >> $GITHUB_ENV
+          echo "BASE_BRANCH=${{ github.event.pull_request.base.ref }}" >> $GITHUB_ENV
 
       - name: Merge PR in ee-server (if exists)
         run: |
-          PR=$(gh pr list -R ToolJet/ee-server --head "$BRANCH_NAME" --state open --json number -q '.[0].number')
+          PR=$(gh pr list -R ToolJet/ee-server --head "$BRANCH_NAME" --base "$BASE_BRANCH" --state open --json number -q '.[0].number')
           if [ -n "$PR" ]; then
-            echo "Found ee-server PR: #$PR"
+            echo "Found ee-server PR: #$PR targeting $BASE_BRANCH"
             gh pr merge -R ToolJet/ee-server "$PR" --merge --admin
           else
-            echo "No open ee-server PR for branch $BRANCH_NAME"
+            echo "No open ee-server PR for branch $BRANCH_NAME targeting $BASE_BRANCH"
           fi
         env:
           GH_TOKEN: ${{ secrets.TOKEN_PR }}
 
       - name: Merge PR in ee-frontend (if exists)
         run: |
-          PR=$(gh pr list -R ToolJet/ee-frontend --head "$BRANCH_NAME" --state open --json number -q '.[0].number')
+          PR=$(gh pr list -R ToolJet/ee-frontend --head "$BRANCH_NAME" --base "$BASE_BRANCH" --state open --json number -q '.[0].number')
           if [ -n "$PR" ]; then
-            echo "Found ee-frontend PR: #$PR"
+            echo "Found ee-frontend PR: #$PR targeting $BASE_BRANCH"
             gh pr merge -R ToolJet/ee-frontend "$PR" --merge --admin
           else
-            echo "No open ee-frontend PR for branch $BRANCH_NAME"
+            echo "No open ee-frontend PR for branch $BRANCH_NAME targeting $BASE_BRANCH"
           fi
         env:
           GH_TOKEN: ${{ secrets.TOKEN_PR }}
@@ -40,7 +45,10 @@ jobs:
 
   update-submodule-sha:
     needs: merge-submodules
-    if: github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'main' && github.event.pull_request.base.ref == 'lts-3.16'
+    if: |
+      github.event.pull_request.merged == true &&
+      (github.event.pull_request.base.ref == 'main' || github.event.pull_request.base.ref == 'lts-3.16') &&
+      !startsWith(github.event.pull_request.head.ref, 'release/')
     runs-on: ubuntu-latest
 
     steps:
@@ -48,16 +56,58 @@ jobs:
         uses: actions/checkout@v4
         with:
           token: ${{ secrets.TOKEN_PR }}
-          ref: main
+          ref: ${{ github.event.pull_request.base.ref }}
           submodules: recursive
 
-      - name: Update submodules to latest main
+      - name: Wait for merge completion
+        run: |
+          echo "Waiting for submodule merges to complete..."
+          sleep 60
+
+      - name: Update submodules to latest ${{ github.event.pull_request.base.ref }}
         run: |
           git config user.name "adishM98 Bot"
           git config user.email "adish.madhu@gmail.com"
 
-          git submodule update --remote frontend/ee
-          git submodule update --remote server/ee
+          # Update submodules to match the base branch
+          BASE_BRANCH="${{ github.event.pull_request.base.ref }}"
+          
+          echo "Updating submodules to latest commit SHA from $BASE_BRANCH branch"
+          
+          # Get latest commit SHA from ee-frontend repository
+          echo "Fetching latest commit from ToolJet/ee-frontend:$BASE_BRANCH"
+          FRONTEND_SHA=$(gh api repos/ToolJet/ee-frontend/branches/$BASE_BRANCH --jq '.commit.sha' 2>/dev/null || gh api repos/ToolJet/ee-frontend/branches/main --jq '.commit.sha')
+          echo "Frontend SHA: $FRONTEND_SHA"
+          
+          # Get latest commit SHA from ee-server repository  
+          echo "Fetching latest commit from ToolJet/ee-server:$BASE_BRANCH"
+          SERVER_SHA=$(gh api repos/ToolJet/ee-server/branches/$BASE_BRANCH --jq '.commit.sha' 2>/dev/null || gh api repos/ToolJet/ee-server/branches/main --jq '.commit.sha')
+          echo "Server SHA: $SERVER_SHA"
+          
+          # Update submodule pointers to specific commit SHAs
+          cd frontend/ee
+          git fetch origin $BASE_BRANCH
+          if git cat-file -e "$FRONTEND_SHA" 2>/dev/null; then
+            git checkout "$FRONTEND_SHA"
+            echo "Successfully checked out frontend SHA: $FRONTEND_SHA"
+          else
+            echo "Error: Frontend SHA $FRONTEND_SHA not found. Fetching all refs..."
+            git fetch origin
+            git checkout "$FRONTEND_SHA"
+          fi
+          cd ../..
+
+          cd server/ee
+          git fetch origin $BASE_BRANCH
+          if git cat-file -e "$SERVER_SHA" 2>/dev/null; then
+            git checkout "$SERVER_SHA"
+            echo "Successfully checked out server SHA: $SERVER_SHA"
+          else
+            echo "Error: Server SHA $SERVER_SHA not found. Fetching all refs..."
+            git fetch origin
+            git checkout "$SERVER_SHA"
+          fi
+          cd ../..
 
           git add frontend/ee server/ee
 
@@ -72,11 +122,11 @@ jobs:
         uses: peter-evans/create-pull-request@v6
         with:
           token: ${{ secrets.TOKEN_PR }}
-          commit-message: "🚀 chore: update submodules to latest main after auto-merge"
+          commit-message: "🚀 chore: update submodules to latest ${{ github.event.pull_request.base.ref }} after auto-merge"
           title: "🚀 chore: update submodules"
           body: "Auto-generated PR to update submodules after base PR merge"
           branch: auto/update-submodules-${{ github.run_id }}
-          base: main
+          base: ${{ github.event.pull_request.base.ref }}
 
       - name: Auto-merge PR
         if: steps.cpr.outputs.pull-request-number != ''
@@ -116,7 +166,7 @@ jobs:
           fi
 
           echo "" >> comment.md
-          echo "📝 **Note**: The submodule PRs will be auto-merged once you merge this base PR-$PR_NUMBER into \`main\`." >> comment.md
+          echo "📝 **Note**: The submodule PRs will be auto-merged once you merge this base PR-$PR_NUMBER into \`${{ github.event.pull_request.base.ref }}\`." >> comment.md
 
           gh pr comment "$PR_NUMBER" --repo ToolJet/ToolJet --body-file comment.md
 

.github/workflows/packer-build.yml

@@ -7,20 +7,55 @@ on:
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
     inputs:
+      branch:
+        description: "Branch to build from (e.g. lts-3.16)"
+        required: true
+        default: "lts-3.16"
       version:
         description: "RELEASE_VERSION"
+        required: true
+      region:
+        description: "AWS region to build AMI in (default: us-west-1)"
+        required: false
+        default: "us-west-1"
 
 jobs:
+  check-version:
+    runs-on: ubuntu-latest
+    name: check-version
+    outputs:
+      should_build: ${{ steps.check.outputs.should_build }}
+    steps:
+      - name: Check if version is AMI-eligible (multiple of 10)
+        id: check
+        run: |
+          if [[ "${{ github.event_name }}" == "workflow_dispatch" ]]; then
+            echo "Manual dispatch — always build"
+            echo "should_build=true" >> $GITHUB_OUTPUT
+          else
+            TAG="${GITHUB_REF#refs/*/}"
+            # Extract patch number: v3.20.100-lts → 100
+            PATCH=$(echo "$TAG" | sed 's/^v//' | cut -d'.' -f3 | cut -d'-' -f1)
+            if (( PATCH % 10 == 0 )); then
+              echo "Version $TAG is AMI-eligible (patch $PATCH is multiple of 10)"
+              echo "should_build=true" >> $GITHUB_OUTPUT
+            else
+              echo "Skipping AMI build — $TAG patch $PATCH is not a multiple of 10"
+              echo "should_build=false" >> $GITHUB_OUTPUT
+            fi
+          fi
+
   packer-ee:
+    needs: check-version
+    if: needs.check-version.outputs.should_build == 'true'
     runs-on: ubuntu-latest
     name: packer-ee
 
     steps:
-      - name: Checkout code to lts-3.16 branch
-        if: contains(github.event.release.tag_name, '-lts')
+      - name: Checkout code
         uses: actions/checkout@v2
         with:
-          ref: refs/heads/lts-3.16
+          ref: refs/heads/${{ github.event.inputs.branch || 'lts-3.16' }}
 
       - name: Setting tag
         if: "${{ github.event.inputs.version != '' }}"
@@ -35,7 +70,7 @@ jobs:
         with:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          aws-region: us-west-1
+          aws-region: ${{ github.event.inputs.region || 'us-west-1' }}
 
       # Initialize Packer templates
       - name: Initialize Packer Template
@@ -61,26 +96,43 @@ jobs:
       # Dynamically update setup_machine.sh with PAT
       - name: Validate PAT
         run: |
-          sed -i "s|git config --global url."https://x-access-token:CUSTOM_GITHUB_TOKEN@github.com/".insteadOf "https://github.com/"|git config --global url."https://x-access-token:${ secrets.CUSTOM_GITHUB_TOKEN }@github.com/".insteadOf "https://github.com/"|g" ./deploy/ec2/ee/setup_machine.sh
+          sed -i "s|CUSTOM_GITHUB_TOKEN|${{ secrets.CUSTOM_GITHUB_TOKEN }}|g" ./deploy/ec2/ee/setup_machine.sh
 
       # build artifact
       - name: Build Artifact
+        id: packer-build
         uses: hashicorp/packer-github-actions@master
         with:
           command: build
           #The the below argument is specific for building EE AMI image
-          arguments: -color=false -on-error=abort -var ami_name=tooljet_${{ env.RELEASE_VERSION }}.ubuntu_jammy
+          arguments: -color=false -on-error=abort -var ami_name=tooljet_${{ env.RELEASE_VERSION }}.ubuntu_jammy -var ami_region=${{ github.event.inputs.region || 'us-west-1' }}
           target: .
           working_directory: deploy/ec2/ee
         env:
           PACKER_LOG: 1
 
-      - name: Send Slack Notification
+      - name: Cleanup EC2 instances
+        if: always()
         run: |
-          if [[ "${{ job.status }}" == "success" ]]; then
-            message="ToolJet enterprise AWS AMI published:\\n\`tooljet_${{ env.RELEASE_VERSION }}.ubuntu-jammy\`"
+          echo "Listing all EC2 instances..."
+
+          INSTANCE_IDS=$(aws ec2 describe-instances \
+            --region ${{ github.event.inputs.region || 'us-west-1' }} \
+            --query 'Reservations[*].Instances[*].InstanceId' \
+            --output text)
+
+          if [ -n "$INSTANCE_IDS" ] && [ "$INSTANCE_IDS" != "None" ]; then
+            echo "Found instances: $INSTANCE_IDS"
+            aws ec2 terminate-instances --region ${{ github.event.inputs.region || 'us-west-1' }} --instance-ids $INSTANCE_IDS
+            echo "Terminated instances: $INSTANCE_IDS"
           else
-            message="ToolJet enterprise AWS AMI release failed! \\n\`tooljet_${{ env.RELEASE_VERSION }}.ubuntu-jammy\`"
+            echo "No instances found to cleanup"
           fi
 
+      - name: Send Slack Notification
+        if: success()
+        run: |
+          ami_name="tooljet_${{ env.RELEASE_VERSION }}.ubuntu_jammy"
+          message="✅ *ToolJet Enterprise AWS AMI Published*\nVersion: \`${{ env.RELEASE_VERSION }}\`\nType: 🔒 LTS Release\nBranch: \`${{ github.event.inputs.branch || 'lts-3.16' }}\`\nRegion: \`${{ github.event.inputs.region || 'us-west-1' }}\`\nAMI Name: \`${ami_name}\`"
+
           curl -X POST -H 'Content-type: application/json' --data "{\"text\":\"$message\"}" ${{ secrets.SLACK_WEBHOOK_URL }}

.github/workflows/release-automation.yml

@@ -0,0 +1,395 @@
+name: Release Automation
+
+on:
+  pull_request:
+    types: [closed]
+    branches: [main]
+    # Uncomment the line below to also trigger on lts-3.16 branch
+    # branches: [main, lts-3.16]
+
+permissions:
+  contents: write
+  pull-requests: write
+  issues: read
+
+jobs:
+  release-automation:
+    if: |
+      github.event.pull_request.merged == true &&
+      startsWith(github.event.pull_request.head.ref, 'release/') &&
+      contains(github.event.pull_request.title, '|') &&
+      contains(github.event.pull_request.title, '[') &&
+      contains(github.event.pull_request.title, ']')
+    runs-on: ubuntu-latest
+
+    outputs:
+      version: ${{ steps.extract-version.outputs.version }}
+      tag: ${{ steps.create-tag.outputs.tag }}
+      release_notes: ${{ steps.generate-notes.outputs.release_notes }}
+
+    steps:
+      - name: Extract Branch Name and Base Branch
+        run: |
+          echo "BRANCH_NAME=${{ github.event.pull_request.head.ref }}" >> $GITHUB_ENV
+          echo "BASE_BRANCH=${{ github.event.pull_request.base.ref }}" >> $GITHUB_ENV
+
+      - name: Merge PR in ee-server (if exists)
+        run: |
+          PR=$(gh pr list -R ToolJet/ee-server --head "$BRANCH_NAME" --base "$BASE_BRANCH" --state open --json number -q '.[0].number')
+          if [ -n "$PR" ]; then
+            echo "Found ee-server PR: #$PR targeting $BASE_BRANCH"
+            gh pr merge -R ToolJet/ee-server "$PR" --merge --admin
+          else
+            echo "No open ee-server PR for branch $BRANCH_NAME targeting $BASE_BRANCH"
+          fi
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Merge PR in ee-frontend (if exists)
+        run: |
+          PR=$(gh pr list -R ToolJet/ee-frontend --head "$BRANCH_NAME" --base "$BASE_BRANCH" --state open --json number -q '.[0].number')
+          if [ -n "$PR" ]; then
+            echo "Found ee-frontend PR: #$PR targeting $BASE_BRANCH"
+            gh pr merge -R ToolJet/ee-frontend "$PR" --merge --admin
+          else
+            echo "No open ee-frontend PR for branch $BRANCH_NAME targeting $BASE_BRANCH"
+          fi
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Wait for submodule merges to complete
+        run: |
+          echo "Waiting for submodule merges to complete..."
+          sleep 30
+
+      - name: Extract Version from PR Title
+        id: extract-version
+        run: |
+          TITLE="${{ github.event.pull_request.title }}"
+          echo "PR Title: $TITLE"
+          
+          # Extract the complete tag from text after | character
+          if [[ "$TITLE" =~ \|.*\[([^]]+)\] ]]; then
+            TAG="${BASH_REMATCH[1]}"
+            echo "Extracted tag: $TAG"
+            echo "version=$TAG" >> $GITHUB_OUTPUT
+          else
+            echo "❌ No valid tag format found in PR title"
+            echo "Expected format: 'some text | [tag]'"
+            echo "Examples: 'platform release | [v3.16-beta.1]' or 'hotfix | [v3.16.18-lts]'"
+            exit 1
+          fi
+
+      - name: Checkout Repository
+        if: steps.extract-version.outputs.version != ''
+        uses: actions/checkout@v4
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          fetch-depth: 0
+          submodules: recursive
+
+      - name: Configure Git
+        run: |
+          git config user.name "GitHub Actions Bot"
+          git config user.email "adish.madhu@gmail.com"
+
+      - name: Create Version Bump Branch
+        id: create-branch
+        run: |
+          TAG="${{ steps.extract-version.outputs.version }}"
+          # Create branch name using tag without special characters
+          CLEAN_TAG=$(echo "$TAG" | sed 's/[^a-zA-Z0-9.-]//g')
+          BRANCH_NAME="version-bump-$CLEAN_TAG-$(date +%s)"
+          echo "branch_name=$BRANCH_NAME" >> $GITHUB_OUTPUT
+          git checkout -b "$BRANCH_NAME"
+
+      - name: Update Version Files
+        run: |
+          TAG="${{ steps.extract-version.outputs.version }}"
+          # Remove 'v' prefix for .version files if present
+          VERSION="${TAG#v}"
+          
+          # Update all three .version files
+          echo "$VERSION" > .version
+          echo "$VERSION" > server/.version
+          echo "$VERSION" > frontend/.version
+          
+          echo "Updated all .version files to: $VERSION (from tag: $TAG)"
+          echo "Files updated:"
+          echo "  - ./.version"
+          echo "  - ./server/.version"
+          echo "  - ./frontend/.version"
+
+
+      - name: Update Submodules to Latest
+        run: |
+          echo "Updating submodules to latest commits..."
+          
+          # Determine which branch to use for submodules
+          BASE_BRANCH="${{ github.event.pull_request.base.ref }}"
+          
+          # For main branch, use main in submodules
+          # For lts-3.16 branch, use lts-3.16 in submodules (when enabled)
+          if [ "$BASE_BRANCH" = "lts-3.16" ]; then
+            SUBMODULE_BRANCH="lts-3.16"
+          else
+            SUBMODULE_BRANCH="main"
+          fi
+          
+          echo "Base branch: $BASE_BRANCH"
+          echo "Using submodule branch: $SUBMODULE_BRANCH"
+          
+          # Get latest commit SHAs from submodule repositories
+          echo "Fetching latest commit from ToolJet/ee-frontend:$SUBMODULE_BRANCH"
+          FRONTEND_SHA=$(gh api repos/ToolJet/ee-frontend/branches/$SUBMODULE_BRANCH --jq '.commit.sha' || gh api repos/ToolJet/ee-frontend/branches/main --jq '.commit.sha')
+          echo "Frontend SHA: $FRONTEND_SHA"
+          
+          echo "Fetching latest commit from ToolJet/ee-server:$SUBMODULE_BRANCH"
+          SERVER_SHA=$(gh api repos/ToolJet/ee-server/branches/$SUBMODULE_BRANCH --jq '.commit.sha' || gh api repos/ToolJet/ee-server/branches/main --jq '.commit.sha')
+          echo "Server SHA: $SERVER_SHA"
+          
+          # Update submodule pointers to specific commit SHAs
+          cd frontend/ee
+          git fetch origin
+          git checkout "$FRONTEND_SHA"
+          cd ../..
+          
+          cd server/ee
+          git fetch origin
+          git checkout "$SERVER_SHA"
+          cd ../..
+          
+          # Check if there are any changes
+          if ! git diff --quiet .version server/.version frontend/.version frontend/ee server/ee; then
+            echo "Changes detected in version files and/or submodules"
+          else
+            echo "No changes detected"
+          fi
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Commit Changes
+        run: |
+          TAG="${{ steps.extract-version.outputs.version }}"
+          VERSION="${TAG#v}"  # Remove 'v' prefix for display
+          git add .version server/.version frontend/.version frontend/ee server/ee
+          
+          # Only commit if there are changes
+          if ! git diff --cached --quiet; then
+            git commit -m "Version bump to $TAG
+          
+          - Update .version files to $VERSION
+          - Update submodules to latest commit SHA
+
+          else
+            echo "No changes to commit"
+          fi
+
+      - name: Create Version Bump PR
+        id: create-pr
+        uses: peter-evans/create-pull-request@v6
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          branch: ${{ steps.create-branch.outputs.branch_name }}
+          title: "Version bump to ${{ steps.extract-version.outputs.version }}"
+          body: |
+            ## Version Bump to ${{ steps.extract-version.outputs.version }}
+            
+            This PR updates the version files and submodules for the release version ${{ steps.extract-version.outputs.version }}.
+            
+            ### Changes:
+            - ✅ Updated `.version` files (root, server, frontend) to `${{ steps.extract-version.outputs.version }}`
+            - ✅ Updated submodules to latest commits
+            
+            ### Auto-generated
+            This PR was automatically created by the release automation workflow.
+            
+          base: ${{ github.event.pull_request.base.ref }}
+          # When lts-3.16 is enabled, this will use the correct base branch
+
+      - name: Auto-merge Version Bump PR
+        if: steps.create-pr.outputs.pull-request-number != ''
+        run: |
+          PR_NUMBER="${{ steps.create-pr.outputs.pull-request-number }}"
+          echo "Auto-merging version bump PR #$PR_NUMBER"
+          
+          # Wait a moment for PR to be fully created
+          sleep 10
+          
+          # Merge the PR
+          gh pr merge "$PR_NUMBER" --squash --admin
+          
+          # Wait for merge to complete
+          sleep 10
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Checkout Updated Base Branch
+        run: |
+          BASE_BRANCH="${{ github.event.pull_request.base.ref }}"
+          git fetch origin "$BASE_BRANCH"
+          git checkout "$BASE_BRANCH"
+          git pull origin "$BASE_BRANCH"
+
+      - name: Create Git Tag
+        id: create-tag
+        run: |
+          TAG="${{ steps.extract-version.outputs.version }}"
+          BASE_BRANCH="${{ github.event.pull_request.base.ref }}"
+          
+          # Determine correct branch for tag creation based on tag type
+          if [[ "$TAG" == *"lts"* ]]; then
+            TARGET_BRANCH="lts-3.16"
+            echo "LTS tag detected - creating tag from lts-3.16 branch"
+          elif [[ "$TAG" == *"beta"* ]]; then
+            TARGET_BRANCH="main"
+            echo "Beta tag detected - creating tag from main branch"
+          else
+            # Default to the base branch of the PR
+            TARGET_BRANCH="$BASE_BRANCH"
+            echo "Using PR base branch: $TARGET_BRANCH"
+          fi
+          
+          echo "Creating tag: $TAG from branch: $TARGET_BRANCH in base repo and submodules"
+          
+          # Ensure we're on the correct branch and it's up to date
+          git fetch origin "$TARGET_BRANCH"
+          git checkout "$TARGET_BRANCH"
+          git pull origin "$TARGET_BRANCH"
+          
+          # Create and push the tag in the base repository
+          echo "Creating tag in base repository..."
+          git tag -a "$TAG" -m "Release $TAG"
+          git push origin "$TAG"
+          
+          # Create tags in submodules
+          echo "Creating tag in ee-frontend submodule..."
+          cd frontend/ee
+          git fetch origin
+          if [[ "$TAG" == *"lts"* ]]; then
+            git checkout lts-3.16 2>/dev/null || git checkout main
+          else
+            git checkout main
+          fi
+          git pull origin HEAD
+          git tag -a "$TAG" -m "Release $TAG"
+          git push origin "$TAG"
+          cd ../..
+          
+          echo "Creating tag in ee-server submodule..."
+          cd server/ee
+          git fetch origin
+          if [[ "$TAG" == *"lts"* ]]; then
+            git checkout lts-3.16 2>/dev/null || git checkout main
+          else
+            git checkout main
+          fi
+          git pull origin HEAD
+          git tag -a "$TAG" -m "Release $TAG"
+          git push origin "$TAG"
+          cd ../..
+          
+          echo "Tags created successfully in all repositories"
+          echo "tag=$TAG" >> $GITHUB_OUTPUT
+
+      - name: Generate Release Notes
+        id: generate-notes
+        run: |
+          TAG="${{ steps.extract-version.outputs.version }}"
+          
+          # Get the previous tag
+          PREVIOUS_TAG=$(git describe --tags --abbrev=0 HEAD~1 2>/dev/null || echo "")
+          
+          echo "Current tag: $TAG"
+          echo "Previous tag: $PREVIOUS_TAG"
+          
+          # Generate release notes using GitHub's auto-generation
+          BASE_BRANCH="${{ github.event.pull_request.base.ref }}"
+          if [ -n "$PREVIOUS_TAG" ]; then
+            NOTES=$(gh api --method POST /repos/ToolJet/ToolJet/releases/generate-notes \
+              -f tag_name="$TAG" \
+              -f previous_tag_name="$PREVIOUS_TAG" \
+              -f target_commitish="$BASE_BRANCH" \
+              --jq '.body')
+          else
+            NOTES="Initial release version $TAG"
+          fi
+          
+          # Set multiline output
+          {
+            echo 'release_notes<<EOF'
+            echo "$NOTES"
+            echo 'EOF'
+          } >> $GITHUB_OUTPUT
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Send Slack Notification
+        if: steps.generate-notes.outputs.release_notes != ''
+        run: |
+          TAG="${{ steps.extract-version.outputs.version }}"
+          REPO_URL="https://github.com/ToolJet/ToolJet/releases/tag/$TAG"
+          
+          # Create simplified Slack message
+          SLACK_MESSAGE="🚀 New Release: $TAG
+          
+          Tag: $TAG
+          
+          A new release has been created and is ready for testing.
+          
+          Release: $REPO_URL
+          
+          Please test thoroughly before promotion."
+          
+          # Send to Slack (using webhook URL from secrets)
+          if [ -n "${{ secrets.SLACK_WEBHOOK_URL }}" ]; then
+            curl -X POST -H 'Content-type: application/json' \
+              --data "{\"text\":\"$SLACK_MESSAGE\"}" \
+              "${{ secrets.SLACK_WEBHOOK_URL }}"
+            echo "✅ Slack notification sent successfully"
+          else
+            echo "⚠️ SLACK_WEBHOOK_URL secret not configured - skipping notification"
+          fi
+
+      - name: Create GitHub Release
+        if: steps.create-tag.outputs.tag != ''
+        run: |
+          TAG="${{ steps.create-tag.outputs.tag }}"
+          
+          # Determine if this is a pre-release based on tag content
+          if [[ "$TAG" == *"beta"* ]]; then
+            PRERELEASE_FLAG="--prerelease"
+            NOTES_PREFIX="Pre-release version $TAG for testing purposes."
+          elif [[ "$TAG" == *"lts"* ]]; then
+            PRERELEASE_FLAG=""
+            NOTES_PREFIX="LTS release version $TAG."
+          else
+            PRERELEASE_FLAG="--prerelease"
+            NOTES_PREFIX="Release version $TAG."
+          fi
+          
+          gh release create "$TAG" \
+            --title "Release $TAG" \
+            --generate-notes \
+            $PRERELEASE_FLAG \
+            --notes "$NOTES_PREFIX Please test thoroughly before promotion."
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Summary
+        run: |
+          echo "## 🎉 Release Automation Complete!" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "### ✅ Completed Tasks:" >> $GITHUB_STEP_SUMMARY
+          echo "- [x] Extracted version: \`${{ steps.extract-version.outputs.version }}\`" >> $GITHUB_STEP_SUMMARY
+          echo "- [x] Updated .version file" >> $GITHUB_STEP_SUMMARY
+          echo "- [x] Updated submodules to latest commits" >> $GITHUB_STEP_SUMMARY
+          echo "- [x] Created and merged version bump PR" >> $GITHUB_STEP_SUMMARY
+          echo "- [x] Created git tag: \`${{ steps.create-tag.outputs.tag }}\`" >> $GITHUB_STEP_SUMMARY
+          echo "- [x] Generated release notes" >> $GITHUB_STEP_SUMMARY
+          echo "- [x] Sent Slack notification" >> $GITHUB_STEP_SUMMARY
+          echo "- [x] Created GitHub release" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "### 🔗 Links:" >> $GITHUB_STEP_SUMMARY
+          echo "- [Tag](${{ github.server_url }}/${{ github.repository }}/releases/tag/${{ steps.create-tag.outputs.tag }})" >> $GITHUB_STEP_SUMMARY
+          echo "- [Release](${{ github.server_url }}/${{ github.repository }}/releases/tag/${{ steps.create-tag.outputs.tag }})" >> $GITHUB_STEP_SUMMARY

.github/workflows/render-preview-deploy.yml

@@ -5,8 +5,8 @@ on:
   issue_comment:
     types: [created, edited, deleted]
 env:
-  PR_NUMBER: ${{ github.event.number }}
-  BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
+  PR_NUMBER: ${{ github.event.pull_request.number || github.event.issue.number }}
+  BRANCH_NAME: ${{ github.event.pull_request.head.ref || github.head_ref || github.ref_name }}
 
 permissions:
   pull-requests: write
@@ -15,11 +15,26 @@ permissions:
 jobs:
 
 # Community Edition CE
-  create-ce-review-app:
-    if: ${{ github.event.action == 'labeled' && (github.event.label.name == 'create-ce-review-app' || github.event.label.name == 'review-app') }}
+  create-ce-review-app-old:
+    if: ${{ github.event.action == 'labeled' && (github.event.label.name == 'create-ce-review-app-old' || github.event.label.name == 'review-app') }}
     runs-on: ubuntu-latest
 
     steps:
+      - name: Get PR details for issue_comment events
+        if: github.event_name == 'issue_comment'
+        uses: actions/github-script@v6
+        with:
+          script: |
+            const pr = await github.rest.pulls.get({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              pull_number: context.issue.number
+            });
+            core.exportVariable('PR_NUMBER', pr.data.number);
+            core.exportVariable('BRANCH_NAME', pr.data.head.ref);
+            console.log(`✅ PR Number: ${pr.data.number}`);
+            console.log(`✅ Branch Name: ${pr.data.head.ref}`);
+
       - name: Sync repo
         uses: actions/checkout@v3
 
@@ -218,7 +233,7 @@ jobs:
                 issue_number: context.issue.number,
                 owner: context.repo.owner,
                 repo: context.repo.repo,
-                name: 'create-ce-review-app'
+                name: 'create-ce-review-app-old'
               })
             } catch (e) {
               console.log(e)
@@ -228,11 +243,11 @@ jobs:
               issue_number: context.issue.number,
               owner: context.repo.owner,
               repo: context.repo.repo,
-              labels: ['active-ce-review-app']
+              labels: ['active-ce-review-app-old']
             })
 
-  destroy-ce-review-app:
-    if: ${{ (github.event.action == 'labeled' && github.event.label.name == 'destroy-ce-review-app') || github.event.action == 'closed' }}
+  destroy-ce-review-app-old:
+    if: ${{ (github.event.action == 'labeled' && github.event.label.name == 'destroy-ce-review-app-old') || github.event.action == 'closed' }}
     runs-on: ubuntu-latest
 
     steps:
@@ -257,7 +272,7 @@ jobs:
                 issue_number: context.issue.number,
                 owner: context.repo.owner,
                 repo: context.repo.repo,
-                name: 'destroy-ce-review-app'
+                name: 'destroy-ce-review-app-old'
               })
             } catch (e) {
               console.log(e)
@@ -268,7 +283,7 @@ jobs:
                 issue_number: context.issue.number,
                 owner: context.repo.owner,
                 repo: context.repo.repo,
-                name: 'suspend-ce-review-app'
+                name: 'suspend-ce-review-app-old'
               })
             } catch (e) {
               console.log(e)
@@ -279,44 +294,15 @@ jobs:
                 issue_number: context.issue.number,
                 owner: context.repo.owner,
                 repo: context.repo.repo,
-                name: 'active-ce-review-app'
+                name: 'active-ce-review-app-old'
               })
             } catch (e) {
               console.log(e)
             }
 
-      # - name: Install PostgreSQL client
-      #   run: |
-      #     sudo apt update
-      #     sudo apt install postgresql-client -y
-
-      # - name: Wait after installing PostgreSQL
-      #   run: sleep 25
-
-      # - name: Drop PostgreSQL PR databases
-      #   env:
-      #     PGHOST: ${{ secrets.RENDER_DS_PG_HOST }}
-      #     PGPORT: 5432
-      #     PGUSER: ${{ secrets.RENDER_DS_PG_USER }}
-      #     PGDATABASE: ${{ env.PR_NUMBER }}-ce
-      #     PGTJBDATABASE: ${{ env.PR_NUMBER }}-ce-tjdb
-      #   run: |
-      #     if PGPASSWORD=${{ secrets.RENDER_DS_PG_PASS }} psql -h $PGHOST -p $PGPORT -U $PGUSER -lqt | cut -d \| -f 1 | grep -qw $PGDATABASE; then
-      #       echo "Database $PGDATABASE exists, deleting..."
-      #       PGPASSWORD=${{ secrets.RENDER_DS_PG_PASS }} psql -h $PGHOST -p $PGPORT -U $PGUSER -d postgres -c "drop database \"$PGDATABASE\" ;"
-      #     else
-      #       echo "Database $PGDATABASE does not exist."
-      #     fi
-
-      #     if PGPASSWORD=${{ secrets.RENDER_DS_PG_PASS }} psql -h $PGHOST -p $PGPORT -U $PGUSER -lqt | cut -d \| -f 1 | grep -qw $PGTJBDATABASE; then
-      #       echo "Database $PGTJBDATABASE exists, deleting..."
-      #       PGPASSWORD=${{ secrets.RENDER_DS_PG_PASS }} psql -h $PGHOST -p $PGPORT -U $PGUSER -d postgres -c "drop database \"$PGTJBDATABASE\" ;"
-      #     else
-      #       echo "Database $PGTJBDATABASE does not exist."
-      #     fi
-
-  suspend-ce-review-app:
-    if: ${{ github.event.action == 'labeled' && github.event.label.name == 'suspend-ce-review-app' }}
+     
+  suspend-ce-review-app-old:
+    if: ${{ github.event.action == 'labeled' && github.event.label.name == 'suspend-ce-review-app-old' }}
     runs-on: ubuntu-latest
 
     steps:
@@ -341,14 +327,14 @@ jobs:
                 issue_number: context.issue.number,
                 owner: context.repo.owner,
                 repo: context.repo.repo,
-                name: 'active-ce-review-app'
+                name: 'active-ce-review-app-old'
               })
             } catch (e) {
               console.log(e)
             }
 
-  resume-ce-review-app:
-    if: ${{ github.event.action == 'unlabeled' && github.event.label.name == 'suspend-ce-review-app' }}
+  resume-ce-review-app-old:
+    if: ${{ github.event.action == 'unlabeled' && github.event.label.name == 'suspend-ce-review-app-old' }}
     runs-on: ubuntu-latest
 
     steps:
@@ -372,7 +358,7 @@ jobs:
               issue_number: context.issue.number,
               owner: context.repo.owner,
               repo: context.repo.repo,
-              labels: ['active-ce-review-app']
+              labels: ['active-ce-review-app-old']
             })
 
             try {
@@ -380,7 +366,7 @@ jobs:
                 issue_number: context.issue.number,
                 owner: context.repo.owner,
                 repo: context.repo.repo,
-                name: 'suspend-ce-review-app'
+                name: 'suspend-ce-review-app-old'
               })
             } catch (e) {
               console.log(e)
@@ -390,11 +376,28 @@ jobs:
 
 # Enterprise Edition
 
-  create-ee-review-app:
-    if: ${{ github.event.action == 'labeled' && (github.event.label.name == 'create-ee-review-app' || github.event.label.name == 'review-app') }}
+  create-ee-review-app-old:
+    if: |
+      (github.event.action == 'labeled' && (github.event.label.name == 'create-ee-review-app-old' || github.event.label.name == 'create-ee-lts-review-app-old' || github.event.label.name == 'review-app-old')) ||
+      (github.event.action == 'created' && (contains(github.event.comment.body, '/deploy-ee') || contains(github.event.comment.body, '/deploy-ee-lts')))
     runs-on: ubuntu-latest
 
     steps:
+      - name: Get PR details for issue_comment events
+        if: github.event_name == 'issue_comment'
+        uses: actions/github-script@v6
+        with:
+          script: |
+            const pr = await github.rest.pulls.get({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              pull_number: context.issue.number
+            });
+            core.exportVariable('PR_NUMBER', pr.data.number);
+            core.exportVariable('BRANCH_NAME', pr.data.head.ref);
+            console.log(`✅ PR Number: ${pr.data.number}`);
+            console.log(`✅ Branch Name: ${pr.data.head.ref}`);
+
       - name: Sync repo
         uses: actions/checkout@v3
 
@@ -426,25 +429,26 @@ jobs:
         if: env.is_fork == 'false'
         uses: actions/checkout@v3
 
-      - name: Detect base branch and set Dockerfile path
+      - name: Determine Dockerfile path
         run: |
-          BASE_BRANCH="${{ github.event.pull_request.base.ref }}"
-          echo "Base branch: $BASE_BRANCH"
-          
-          if [[ "$BASE_BRANCH" == "main" || "$BASE_BRANCH" == release/* ]]; then
-            DOCKERFILE="./docker/pre-release/ee/ee-preview.Dockerfile"
-            echo "Using pre-release track"
-          elif [[ "$BASE_BRANCH" == "lts-3.16" || "$BASE_BRANCH" == release-lts/* ]]; then
+          # Check if LTS deployment is requested via comment or label
+          if [[ "${{ github.event.action }}" == "labeled" && "${{ github.event.label.name }}" == "create-ee-lts-review-app-old" ]]; then
             DOCKERFILE="./docker/LTS/ee/ee-preview.Dockerfile"
-            echo "Using LTS track"
+            EDITION_TYPE="LTS"
+            echo "Using LTS EE Dockerfile (triggered by label)"
+          elif [[ "${{ github.event.action }}" == "created" && "${{ github.event.comment.body }}" == *"/deploy-ee-lts"* ]]; then
+            DOCKERFILE="./docker/LTS/ee/ee-preview.Dockerfile"
+            EDITION_TYPE="LTS"
+            echo "Using LTS EE Dockerfile (triggered by comment)"
           else
-            echo "Error: Unsupported base branch '$BASE_BRANCH'"
-            echo "Supported branches: main, release/*, lts-3.16, release-lts/*"
-            exit 1
+            DOCKERFILE="./docker/pre-release/ee/ee-preview.Dockerfile"
+            EDITION_TYPE="pre-release"
+            echo "Using pre-release EE Dockerfile"
           fi
-          
+          echo "Edition Type: $EDITION_TYPE"
           echo "Selected Dockerfile: $DOCKERFILE"
           echo "DOCKERFILE=$DOCKERFILE" >> $GITHUB_ENV
+          echo "EDITION_TYPE=$EDITION_TYPE" >> $GITHUB_ENV
 
       - name: Creating deployment for Enterprise Edition
         id: create-ee-deployment
@@ -561,23 +565,27 @@ jobs:
               },
               {
                 "key": "REDIS_HOST",
-                "value": "${{ secrets.RENDER_REDIS_HOST }}"
+                "value": "localhost"
               },
               {
                 "key": "REDIS_PORT",
-                "value": "${{ secrets.RENDER_REDIS_PORT }}"
+                "value": "6379"
               },
               {
-                "key": "TEMPORAL_SERVER_ADDRESS",
-                "value": "https://auto-setup-1-25-1.onrender.com"
+                "key": "REDIS_DB",
+                "value": "0"
               },
               {
-                "key": "TEMPORAL_TASK_QUEUE_NAME_FOR_WORKFLOWS",
-                "value": "tooljet-ee-pr-${{ env.PR_NUMBER }}"
+                "key": "REDIS_TLS_ENABLED",
+                "value": "false"
               },
               {
-                "key": "TOOLJET_WORKFLOWS_TEMPORAL_NAMESPACE",
-                "value": "default"
+                "key": "REDIS_PASSWORD",
+                "value": ""
+              },
+              {
+                "key": "WORKER",
+                "value": "true"
               },
               {
                 "key": "TOOLJET_MARKETPLACE_URL",
@@ -590,6 +598,10 @@ jobs:
               {
                 "key": "CUSTOM_GITHUB_TOKEN",
                 "value": "${{ secrets.CUSTOM_GITHUB_TOKEN }}"
+              },
+              {
+                "key": "TOOLJET_WORKFLOW_SANDBOX_BYPASS",
+                "value": "true"
               }
             ],
             "serviceDetails": {
@@ -626,11 +638,12 @@ jobs:
         with:
           github-token: ${{secrets.GITHUB_TOKEN}}
           script: |
+            const editionType = '${{ env.EDITION_TYPE }}' === 'LTS' ? '(LTS)' : '';
             github.rest.issues.createComment({
               issue_number: context.issue.number,
               owner: context.repo.owner,
               repo: context.repo.repo,
-              body: 'Enterpise Edition: \n Deployment: https://tooljet-ee-pr-${{ env.PR_NUMBER }}.onrender.com \n Dashboard: https://dashboard.render.com/web/${{ env.SERVICE_ID }}'
+              body: `Enterprise Edition ${editionType}: \n Deployment: https://tooljet-ee-pr-${{ env.PR_NUMBER }}.onrender.com \n Dashboard: https://dashboard.render.com/web/${{ env.SERVICE_ID }}`
             })
 
       - uses: actions/github-script@v6
@@ -641,7 +654,18 @@ jobs:
                 issue_number: context.issue.number,
                 owner: context.repo.owner,
                 repo: context.repo.repo,
-                name: 'create-ee-review-app'
+                name: 'create-ee-review-app-old'
+              })
+            } catch (e) {
+              console.log(e)
+            }
+            
+            try {
+              await github.rest.issues.removeLabel({
+                issue_number: context.issue.number,
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                name: 'create-ee-lts-review-app-old'
               })
             } catch (e) {
               console.log(e)
@@ -651,11 +675,11 @@ jobs:
               issue_number: context.issue.number,
               owner: context.repo.owner,
               repo: context.repo.repo,
-              labels: ['active-ee-review-app']
+              labels: ['active-ee-review-app-old']
             })
 
-  destroy-ee-review-app:
-    if: ${{ (github.event.action == 'labeled' && github.event.label.name == 'destroy-ee-review-app') || github.event.action == 'closed' }}
+  destroy-ee-review-app-old:
+    if: ${{ (github.event.action == 'labeled' && github.event.label.name == 'destroy-ee-review-app-old') || github.event.action == 'closed' }}
     runs-on: ubuntu-latest
 
     steps:
@@ -680,7 +704,7 @@ jobs:
                 issue_number: context.issue.number,
                 owner: context.repo.owner,
                 repo: context.repo.repo,
-                name: 'destroy-ee-review-app'
+                name: 'destroy-ee-review-app-old'
               })
             } catch (e) {
               console.log(e)
@@ -691,7 +715,7 @@ jobs:
                 issue_number: context.issue.number,
                 owner: context.repo.owner,
                 repo: context.repo.repo,
-                name: 'suspend-ee-review-app'
+                name: 'suspend-ee-review-app-old'
               })
             } catch (e) {
               console.log(e)
@@ -702,44 +726,16 @@ jobs:
                 issue_number: context.issue.number,
                 owner: context.repo.owner,
                 repo: context.repo.repo,
-                name: 'active-ee-review-app'
+                name: 'active-ee-review-app-old'
               })
             } catch (e) {
               console.log(e)
             }
 
-      # - name: Install PostgreSQL client
-      #   run: |
-      #     sudo apt update
-      #     sudo apt install postgresql-client -y
 
-      # - name: Wait after installing PostgreSQL
-      #   run: sleep 25
 
-      # - name: Drop PostgreSQL PR databases
-      #   env:
-      #     PGHOST: ${{ secrets.RENDER_DS_PG_HOST }}
-      #     PGPORT: 5432
-      #     PGUSER: ${{ secrets.RENDER_DS_PG_USER }}
-      #     PGDATABASE: ${{ env.PR_NUMBER }}-ee
-      #     PGTJBDATABASE: ${{ env.PR_NUMBER }}-ee-tjdb
-      #   run: |
-      #     if PGPASSWORD=${{ secrets.RENDER_DS_PG_PASS }} psql -h $PGHOST -p $PGPORT -U $PGUSER -lqt | cut -d \| -f 1 | grep -qw $PGDATABASE; then
-      #       echo "Database $PGDATABASE exists, deleting..."
-      #       PGPASSWORD=${{ secrets.RENDER_DS_PG_PASS }} psql -h $PGHOST -p $PGPORT -U $PGUSER -d postgres -c "drop database \"$PGDATABASE\" ;"
-      #     else
-      #       echo "Database $PGDATABASE does not exist."
-      #     fi
-
-      #     if PGPASSWORD=${{ secrets.RENDER_DS_PG_PASS }} psql -h $PGHOST -p $PGPORT -U $PGUSER -lqt | cut -d \| -f 1 | grep -qw $PGTJBDATABASE; then
-      #       echo "Database $PGTJBDATABASE exists, deleting..."
-      #       PGPASSWORD=${{ secrets.RENDER_DS_PG_PASS }} psql -h $PGHOST -p $PGPORT -U $PGUSER -d postgres -c "drop database \"$PGTJBDATABASE\" ;"
-      #     else
-      #       echo "Database $PGTJBDATABASE does not exist."
-      #     fi
-
-  suspend-ee-review-app:
-    if: ${{ github.event.action == 'labeled' && github.event.label.name == 'suspend-ee-review-app' }}
+  suspend-ee-review-app-old:
+    if: ${{ github.event.action == 'labeled' && github.event.label.name == 'suspend-ee-review-app-old' }}
     runs-on: ubuntu-latest
 
     steps:
@@ -764,14 +760,14 @@ jobs:
                 issue_number: context.issue.number,
                 owner: context.repo.owner,
                 repo: context.repo.repo,
-                name: 'active-ee-review-app'
+                name: 'active-ee-review-app-old'
               })
             } catch (e) {
               console.log(e)
             }
 
-  resume-ee-review-app:
-    if: ${{ github.event.action == 'unlabeled' && github.event.label.name == 'suspend-ee-review-app' }}
+  resume-ee-review-app-old:
+    if: ${{ github.event.action == 'unlabeled' && github.event.label.name == 'suspend-ee-review-app-old' }}
     runs-on: ubuntu-latest
 
     steps:
@@ -795,7 +791,7 @@ jobs:
               issue_number: context.issue.number,
               owner: context.repo.owner,
               repo: context.repo.repo,
-              labels: ['active-ee-review-app']
+              labels: ['active-ee-review-app-old']
             })
 
             try {
@@ -803,7 +799,7 @@ jobs:
                 issue_number: context.issue.number,
                 owner: context.repo.owner,
                 repo: context.repo.repo,
-                name: 'suspend-ee-review-app'
+                name: 'suspend-ee-review-app-old'
               })
             } catch (e) {
               console.log(e)
@@ -811,369 +807,6 @@ jobs:
 
 
 
-
-# Cloud Edition
-
-  # create-cloud-review-app:
-  #   if: ${{ github.event.action == 'labeled' && (github.event.label.name == 'create-cloud-review-app' || github.event.label.name == 'review-app') }}
-  #   runs-on: ubuntu-latest
-
-  #   steps:
-  #     - name: Creating deployment for Cloud Edition
-  #       id: create-cloud-deployment
-  #       run: |
-  #         export RESPONSE=$(curl --request POST \
-  #         --url https://api.render.com/v1/services \
-  #         --header 'accept: application/json' \
-  #         --header 'content-type: application/json' \
-  #         --header 'Authorization: Bearer ${{ secrets.RENDER_API_KEY }}' \
-  #         --data '
-  #         {
-  #           "autoDeploy": "yes",
-  #           "branch": "${{ env.BRANCH_NAME }}",
-  #           "name": "ToolJet Cloud PR #${{ env.PR_NUMBER }}",
-  #           "notifyOnFail": "default",
-  #           "ownerId": "tea-caeo4bj19n072h3dddc0",
-  #           "repo": "https://github.com/ToolJet/ToolJet",
-  #           "slug": "tooljet-cloud-pr-${{ env.PR_NUMBER }}",
-  #           "suspended": "not_suspended",
-  #           "suspenders": [],
-  #           "type": "web_service",
-  #           "envVars": [
-  #             {
-  #               "key": "PG_HOST",
-  #               "value": "${{ secrets.RENDER_PG_HOST }}"
-  #             },
-  #             {
-  #               "key": "PG_PORT",
-  #               "value": "5432"
-  #             },
-  #             {
-  #               "key": "PG_USER",
-  #               "value": "${{ secrets.RENDER_PG_USER }}"
-  #             },
-  #             {
-  #               "key": "PG_PASS",
-  #               "value": "${{ secrets.RENDER_PG_PASS }}"
-  #             },
-  #             {
-  #               "key": "PG_DB",
-  #               "value": "${{ env.PR_NUMBER }}-cloud"
-  #             },
-  #             {
-  #               "key": "TOOLJET_DB",
-  #               "value": "${{ env.PR_NUMBER }}-cloud-tjdb"
-  #             },
-  #             {
-  #               "key": "TOOLJET_DB_HOST",
-  #               "value": "${{ secrets.RENDER_PG_HOST }}"
-  #             },
-  #             {
-  #               "key": "TOOLJET_DB_USER",
-  #               "value": "${{ secrets.RENDER_PG_USER }}"
-  #             },
-  #             {
-  #               "key": "TOOLJET_DB_PASS",
-  #               "value": "${{ secrets.RENDER_PG_PASS }}"
-  #             },
-  #             {
-  #               "key": "TOOLJET_DB_PORT",
-  #               "value": "5432"
-  #             },
-  #             {
-  #               "key": "PGRST_DB_PRE_CONFIG",
-  #               "value": "postgrest.pre_config"
-  #             },
-  #             {
-  #               "key": "PGRST_DB_URI",
-  #               "value": "postgres://${{ secrets.RENDER_PG_USER }}:${{ secrets.RENDER_PG_PASS }}@${{ secrets.RENDER_PG_HOST }}/${{ env.PR_NUMBER }}-cloud-tjdb"
-  #             },
-  #             {
-  #               "key": "PGRST_HOST",
-  #               "value": "127.0.0.1:3000"
-  #             },
-  #             {
-  #               "key": "PGRST_JWT_SECRET",
-  #               "value": "r9iMKoe5CRMgvJBBtp4HrqN7QiPpUToj"
-  #             },
-  #             {
-  #               "key": "PGRST_LOG_LEVEL",
-  #               "value": "info"
-  #             },
-  #             {
-  #               "key": "PORT",
-  #               "value": "80"
-  #             },
-  #             {
-  #               "key": "TOOLJET_HOST",
-  #               "value": "https://tooljet-cloud-pr-${{ env.PR_NUMBER }}.onrender.com"
-  #             },
-  #             {
-  #               "key": "DISABLE_TOOLJET_TELEMETRY",
-  #               "value": "true"
-  #             },
-  #             {
-  #               "key": "SMTP_ADDRESS",
-  #               "value": "smtp.mailtrap.io"
-  #             },
-  #             {
-  #               "key": "SMTP_DOMAIN",
-  #               "value": "smtp.mailtrap.io"
-  #             },
-  #             {
-  #               "key": "SMTP_PORT",
-  #               "value": "2525"
-  #             },
-  #             {
-  #               "key": "SMTP_USERNAME",
-  #               "value": "${{ secrets.RENDER_SMTP_USERNAME }}"
-  #             },
-  #             {
-  #               "key": "SMTP_PASSWORD",
-  #               "value": "${{ secrets.RENDER_SMTP_PASSWORD }}"
-  #             },
-  #             {
-  #               "key": "REDIS_HOST",
-  #               "value": "${{ secrets.RENDER_REDIS_HOST }}"
-  #             },
-  #             {
-  #               "key": "REDIS_PORT",
-  #               "value": "${{ secrets.RENDER_REDIS_PORT }}"
-  #             },
-  #             {
-  #               "key": "TEMPORAL_SERVER_ADDRESS",
-  #               "value": "https://auto-setup-1-25-1.onrender.com"
-  #             },
-  #             {
-  #               "key": "TEMPORAL_TASK_QUEUE_NAME_FOR_WORKFLOWS",
-  #               "value": "tooljet-cloud-pr-${{ env.PR_NUMBER }}"
-  #             },
-  #             {
-  #               "key": "TOOLJET_WORKFLOWS_TEMPORAL_NAMESPACE",
-  #               "value": "default"
-  #             },
-  #             {
-  #               "key": "TOOLJET_MARKETPLACE_URL",
-  #               "value": "${{ secrets.MARKETPLACE_BUCKET }}"
-  #             },
-  #             {
-  #               "key": "CUSTOM_GITHUB_TOKEN",
-  #               "value": "${{ secrets.CUSTOM_GITHUB_TOKEN }}"
-  #             }
-  #           ],
-  #           "serviceDetails": {
-  #             "disk": null,
-  #             "env": "docker",
-  #             "envSpecificDetails": {
-  #               "dockerCommand": "",
-  #               "dockerContext": "./",
-  #               "dockerfilePath": "./docker/cloud/cloud-preview.Dockerfile"
-  #               },
-  #               "healthCheckPath": "/api/health",
-  #               "numInstances": 1,
-  #               "openPorts": [{
-  #               "port": 80,
-  #               "protocol": "TCP"
-  #               }],
-  #               "plan": "starter",
-  #               "pullRequestPreviewsEnabled": "no",
-  #               "region": "oregon",
-  #               "url": "https://tooljet-cloud-pr-${{ env.PR_NUMBER }}.onrender.com"
-  #           }
-  #         }')
-
-  #         echo "response: $RESPONSE"
-  #         export SERVICE_ID=$(echo $RESPONSE | jq -r '.service.id')
-  #         echo "SERVICE_ID=$SERVICE_ID" >> $GITHUB_ENV
-
-  #     - name: Comment deployment URL
-  #       uses: actions/github-script@v5
-  #       with:
-  #         github-token: ${{secrets.GITHUB_TOKEN}}
-  #         script: |
-  #           github.rest.issues.createComment({
-  #             issue_number: context.issue.number,
-  #             owner: context.repo.owner,
-  #             repo: context.repo.repo,
-  #             body: 'Cloud Edition: \n Deployment: https://tooljet-cloud-pr-${{ env.PR_NUMBER }}.onrender.com \n Dashboard: https://dashboard.render.com/web/${{ env.SERVICE_ID }}'
-  #           })
-
-  #     - uses: actions/github-script@v6
-  #       with:
-  #         script: |
-  #           try {
-  #             await github.rest.issues.removeLabel({
-  #               issue_number: context.issue.number,
-  #               owner: context.repo.owner,
-  #               repo: context.repo.repo,
-  #               name: 'create-cloud-review-app'
-  #             })
-  #           } catch (e) {
-  #             console.log(e)
-  #           }
-
-  #           await github.rest.issues.addLabels({
-  #             issue_number: context.issue.number,
-  #             owner: context.repo.owner,
-  #             repo: context.repo.repo,
-  #             labels: ['active-cloud-review-app']
-  #           })
-
-  # destroy-cloud-review-app:
-  #   if: ${{ (github.event.action == 'labeled' && github.event.label.name == 'destroy-cloud-review-app') || github.event.action == 'closed' }}
-  #   runs-on: ubuntu-latest
-
-  #   steps:
-  #     - name: Delete service
-  #       run: |
-  #         export SERVICE_ID=$(curl --request GET \
-  #         --url 'https://api.render.com/v1/services?name=ToolJet%20PR%20%23${{ env.PR_NUMBER }}&limit=1' \
-  #         --header 'accept: application/json' \
-  #         --header 'authorization: Bearer ${{ secrets.RENDER_API_KEY }}' | \
-  #          jq -r '.[0].service.id')
-
-  #         curl --request DELETE \
-  #         --url https://api.render.com/v1/services/$SERVICE_ID \
-  #         --header 'accept: application/json' \
-  #         --header 'authorization: Bearer ${{ secrets.RENDER_API_KEY }}'
-
-  #     - uses: actions/github-script@v6
-  #       with:
-  #         script: |
-  #           try {
-  #             await github.rest.issues.removeLabel({
-  #               issue_number: context.issue.number,
-  #               owner: context.repo.owner,
-  #               repo: context.repo.repo,
-  #               name: 'destroy-cloud-review-app'
-  #             })
-  #           } catch (e) {
-  #             console.log(e)
-  #           }
-
-  #           try {
-  #             await github.rest.issues.removeLabel({
-  #               issue_number: context.issue.number,
-  #               owner: context.repo.owner,
-  #               repo: context.repo.repo,
-  #               name: 'suspend-cloud-review-app'
-  #             })
-  #           } catch (e) {
-  #             console.log(e)
-  #           }
-
-  #           try {
-  #             await github.rest.issues.removeLabel({
-  #               issue_number: context.issue.number,
-  #               owner: context.repo.owner,
-  #               repo: context.repo.repo,
-  #               name: 'active-cloud-review-app'
-  #             })
-  #           } catch (e) {
-  #             console.log(e)
-  #           }
-
-  #     - name: Install PostgreSQL client
-  #       run: |
-  #         sudo apt update
-  #         sudo apt install postgresql-client -y
-
-  #     - name: Wait after installing PostgreSQL
-  #       run: sleep 25
-
-  #     - name: Drop PostgreSQL PR databases
-  #       env:
-  #         PGHOST: ${{ secrets.RENDER_DS_PG_HOST }}
-  #         PGPORT: 5432
-  #         PGUSER: ${{ secrets.RENDER_DS_PG_USER }}
-  #         PGDATABASE: ${{ env.PR_NUMBER }}-cloud
-  #         PGTJBDATABASE: ${{ env.PR_NUMBER }}-cloud-tjdb
-  #       run: |
-  #         if PGPASSWORD=${{ secrets.RENDER_DS_PG_PASS }} psql -h $PGHOST -p $PGPORT -U $PGUSER -lqt | cut -d \| -f 1 | grep -qw $PGDATABASE; then
-  #           echo "Database $PGDATABASE exists, deleting..."
-  #           PGPASSWORD=${{ secrets.RENDER_DS_PG_PASS }} psql -h $PGHOST -p $PGPORT -U $PGUSER -d postgres -c "drop database \"$PGDATABASE\" ;"
-  #         else
-  #           echo "Database $PGDATABASE does not exist."
-  #         fi
-
-  #         if PGPASSWORD=${{ secrets.RENDER_DS_PG_PASS }} psql -h $PGHOST -p $PGPORT -U $PGUSER -lqt | cut -d \| -f 1 | grep -qw $PGTJBDATABASE; then
-  #           echo "Database $PGTJBDATABASE exists, deleting..."
-  #           PGPASSWORD=${{ secrets.RENDER_DS_PG_PASS }} psql -h $PGHOST -p $PGPORT -U $PGUSER -d postgres -c "drop database \"$PGTJBDATABASE\" ;"
-  #         else
-  #           echo "Database $PGTJBDATABASE does not exist."
-  #         fi
-
-  # suspend-cloud-review-app:
-  #   if: ${{ github.event.action == 'labeled' && github.event.label.name == 'suspend-cloud-review-app' }}
-  #   runs-on: ubuntu-latest
-
-  #   steps:
-  #     - name: Suspend service
-  #       run: |
-  #         export SERVICE_ID=$(curl --request GET \
-  #         --url 'https://api.render.com/v1/services?name=ToolJet%20PR%20%23${{ env.PR_NUMBER }}&limit=1' \
-  #         --header 'accept: application/json' \
-  #         --header 'authorization: Bearer ${{ secrets.RENDER_API_KEY }}' | \
-  #          jq -r '.[0].service.id')
-
-  #         curl --request POST \
-  #         --url https://api.render.com/v1/services/$SERVICE_ID/suspend \
-  #         --header 'accept: application/json' \
-  #         --header 'authorization: Bearer ${{ secrets.RENDER_API_KEY }}'
-
-  #     - uses: actions/github-script@v6
-  #       with:
-  #         script: |
-  #           try {
-  #             await github.rest.issues.removeLabel({
-  #               issue_number: context.issue.number,
-  #               owner: context.repo.owner,
-  #               repo: context.repo.repo,
-  #               name: 'active-cloud-review-app'
-  #             })
-  #           } catch (e) {
-  #             console.log(e)
-  #           }
-
-  # resume-cloud-review-app:
-  #   if: ${{ github.event.action == 'unlabeled' && github.event.label.name == 'suspend-cloud-review-app' }}
-  #   runs-on: ubuntu-latest
-
-  #   steps:
-  #     - name: Resume service
-  #       run: |
-  #         export SERVICE_ID=$(curl --request GET \
-  #         --url 'https://api.render.com/v1/services?name=ToolJet%20PR%20%23${{ env.PR_NUMBER }}&limit=1' \
-  #         --header 'accept: application/json' \
-  #         --header 'authorization: Bearer ${{ secrets.RENDER_API_KEY }}' | \
-  #          jq -r '.[0].service.id')
-
-  #         curl --request POST \
-  #         --url https://api.render.com/v1/services/$SERVICE_ID/resume \
-  #         --header 'accept: application/json' \
-  #         --header 'authorization: Bearer ${{ secrets.RENDER_API_KEY }}'
-
-  #     - uses: actions/github-script@v6
-  #       with:
-  #         script: |
-  #           await github.rest.issues.addLabels({
-  #             issue_number: context.issue.number,
-  #             owner: context.repo.owner,
-  #             repo: context.repo.repo,
-  #             labels: ['active-cloud-review-app']
-  #           })
-
-  #           try {
-  #             await github.rest.issues.removeLabel({
-  #               issue_number: context.issue.number,
-  #               owner: context.repo.owner,
-  #               repo: context.repo.repo,
-  #               name: 'suspend-cloud-review-app'
-  #             })
-  #           } catch (e) {
-  #             console.log(e)
-  #           }
-
   redeploy-review-app:
     if: ${{ github.event.action == 'synchronize' || github.event.action == 'opened' }}
     runs-on: ubuntu-latest
@@ -1191,7 +824,7 @@ jobs:
             return labels.data.map(l => l.name);
 
       - name: Redeploy CE review app if active
-        if: contains(steps.get_labels.outputs.result, 'active-ce-review-app')
+        if: contains(steps.get_labels.outputs.result, 'active-ce-review-app-old')
         id: redeploy_ce
         env:
           RENDER_API_KEY: ${{ secrets.RENDER_API_KEY }}
@@ -1213,7 +846,7 @@ jobs:
 
 
       - name: Redeploy EE review app if active
-        if: contains(steps.get_labels.outputs.result, 'active-ee-review-app')
+        if: contains(steps.get_labels.outputs.result, 'active-ee-review-app-old')
         id: redeploy_ee
         env:
           RENDER_API_KEY: ${{ secrets.RENDER_API_KEY }}
@@ -1404,3 +1037,4 @@ jobs:
             } catch (e) {
               console.log(e)
             }
+            

.github/workflows/render-suspend-labeler.yml

@@ -79,3 +79,75 @@ jobs:
               labels: ['suspend-ee-review-app']
             })
           }
+
+  label-stale-ee-lts-deploys:
+    runs-on: ubuntu-latest
+    permissions:
+        pull-requests: write
+    steps:
+    - uses: akshaysasidrn/stale-label-fetch@v1.1
+      id: stale-label
+      with:
+        github-token: ${{ secrets.GITHUB_TOKEN }}
+        stale-label: 'active-ee-lts-review-app'
+        stale-time: '86400'
+        type: 'pull_request'
+    - name: Get stale numbers
+      run: echo "Matched PR numbers - ${{ steps.stale-label.outputs.stale-numbers }}"
+    - name: Add suspend label
+      uses: actions/github-script@v6
+      env:
+        STALE_NUMBERS: ${{ steps.stale-label.outputs.stale-numbers }}
+      with:
+        github-token: ${{ secrets.TJ_BOT_PAT }}
+        script: |
+          if (!process.env.STALE_NUMBERS) return
+
+          const prNumbers = process.env.STALE_NUMBERS.split(",")
+
+          console.log(`Adding suspend labels for EE LTS: ${prNumbers}`)
+
+          for (const prNumber of prNumbers) {
+            github.rest.issues.addLabels({
+              issue_number: prNumber,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              labels: ['suspend-ee-lts-review-app']
+            })
+          }
+
+  label-stale-ee-pre-release-deploys:
+    runs-on: ubuntu-latest
+    permissions:
+        pull-requests: write
+    steps:
+    - uses: akshaysasidrn/stale-label-fetch@v1.1
+      id: stale-label
+      with:
+        github-token: ${{ secrets.GITHUB_TOKEN }}
+        stale-label: 'active-ee-pre-release-review-app'
+        stale-time: '86400'
+        type: 'pull_request'
+    - name: Get stale numbers
+      run: echo "Matched PR numbers - ${{ steps.stale-label.outputs.stale-numbers }}"
+    - name: Add suspend label
+      uses: actions/github-script@v6
+      env:
+        STALE_NUMBERS: ${{ steps.stale-label.outputs.stale-numbers }}
+      with:
+        github-token: ${{ secrets.TJ_BOT_PAT }}
+        script: |
+          if (!process.env.STALE_NUMBERS) return
+
+          const prNumbers = process.env.STALE_NUMBERS.split(",")
+
+          console.log(`Adding suspend labels for EE Pre-release: ${prNumbers}`)
+
+          for (const prNumber of prNumbers) {
+            github.rest.issues.addLabels({
+              issue_number: prNumber,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              labels: ['suspend-ee-pre-release-review-app']
+            })
+          }

.github/workflows/story-book.yml

@@ -0,0 +1,215 @@
+name: Render PR for Story Book
+on:
+  pull_request_target:
+    types: [labeled, unlabeled, closed]
+env:
+  PR_NUMBER: ${{ github.event.number }}
+  BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
+
+permissions:
+  pull-requests: write
+  issues: write
+
+jobs:
+  create-review-storybook-app:
+    if: ${{ github.event.action == 'labeled' && github.event.label.name == 'create-review-storybook-app' }}
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Create deployment
+        id: create-deployment
+        run: |
+          export RESPONSE=$(curl --request POST \
+          --url https://api.render.com/v1/services \
+          --header 'accept: application/json' \
+          --header 'content-type: application/json' \
+          --header 'Authorization: Bearer ${{ secrets.RENDER_API_KEY }}' \
+          --data '
+          {
+            "type": "static_site",
+            "autoDeploy": "yes",
+            "branch": "${{ env.BRANCH_NAME }}",
+            "name": "storybook PR #${{ env.PR_NUMBER }}",
+            "ownerId": "tea-caeo4bj19n072h3dddc0",
+            "repo": "${{ github.event.pull_request.head.repo.git_url }}",
+            "rootDir": "frontend",
+            "envVars": [
+              {
+                "key": "NODE_VERSION",
+                "value": "v22.15.1"
+              },
+              {
+                "key": "NPM_VERSION",
+                "value": "10.9.2"
+              }
+            ],
+            "serviceDetails": {
+                "pullRequestPreviewsEnabled": "no",
+                "buildCommand": "npm i && npx storybook build",
+                "publishPath": "storybook-static/"
+            }
+          }')
+
+          echo "response: $RESPONSE"
+          export SERVICE_ID=$(echo $RESPONSE | jq -r '.service.id')
+          export SERVICE_URL=$(echo $RESPONSE | jq -r '.service.serviceDetails.url')
+          echo "SERVICE_ID=$SERVICE_ID" >> $GITHUB_ENV
+          echo "SERVICE_URL=$SERVICE_URL" >> $GITHUB_ENV
+
+      - name: Comment deployment URL
+        uses: actions/github-script@v6
+        with:
+          github-token: ${{secrets.GITHUB_TOKEN}}
+          script: |
+            github.rest.issues.createComment({
+              issue_number: context.issue.number,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              body: 'Deployment: ${{ env.SERVICE_URL }} \n Dashboard: https://dashboard.render.com/static/${{ env.SERVICE_ID }}'
+            })
+
+      - uses: actions/github-script@v6
+        with:
+          script: |
+            try {
+              await github.rest.issues.removeLabel({
+                issue_number: context.issue.number,
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                name: 'create-review-storybook-app'
+              })
+            } catch (e) {
+              console.log(e)
+            }
+
+            await github.rest.issues.addLabels({
+              issue_number: context.issue.number,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              labels: ['active-review-storybook-app']
+            })
+
+  destroy-review-storybook-app:
+    if: ${{ (github.event.action == 'labeled' && github.event.label.name == 'destroy-review-storybook-app') || github.event.action == 'closed' }}
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Delete service
+        run: |
+          export SERVICE_ID=$(curl --request GET \
+          --url 'https://api.render.com/v1/services?name=storybook%20PR%20%23${{ env.PR_NUMBER }}&limit=1' \
+          --header 'accept: application/json' \
+          --header 'authorization: Bearer ${{ secrets.RENDER_API_KEY }}' | \
+           jq -r '.[0].service.id')
+
+          curl --request DELETE \
+          --url https://api.render.com/v1/services/$SERVICE_ID \
+          --header 'accept: application/json' \
+          --header 'authorization: Bearer ${{ secrets.RENDER_API_KEY }}'
+
+      - uses: actions/github-script@v6
+        with:
+          script: |
+            try {
+              await github.rest.issues.removeLabel({
+                issue_number: context.issue.number,
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                name: 'destroy-review-storybook-app'
+              })
+            } catch (e) {
+              console.log(e)
+            }
+
+            try {
+              await github.rest.issues.removeLabel({
+                issue_number: context.issue.number,
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                name: 'suspend-review-storybook-app'
+              })
+            } catch (e) {
+              console.log(e)
+            }
+
+            try {
+              await github.rest.issues.removeLabel({
+                issue_number: context.issue.number,
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                name: 'active-review-storybook-app'
+              })
+            } catch (e) {
+              console.log(e)
+            }
+
+  suspend-review-storybook-app:
+    if: ${{ github.event.action == 'labeled' && github.event.label.name == 'suspend-review-storybook-app' }}
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Suspend service
+        run: |
+          export SERVICE_ID=$(curl --request GET \
+          --url 'https://api.render.com/v1/services?name=storybook%20PR%20%23${{ env.PR_NUMBER }}&limit=1' \
+          --header 'accept: application/json' \
+          --header 'authorization: Bearer ${{ secrets.RENDER_API_KEY }}' | \
+           jq -r '.[0].service.id')
+
+          curl --request POST \
+          --url https://api.render.com/v1/services/$SERVICE_ID/suspend \
+          --header 'accept: application/json' \
+          --header 'authorization: Bearer ${{ secrets.RENDER_API_KEY }}'
+
+      - uses: actions/github-script@v6
+        with:
+          script: |
+            try {
+              await github.rest.issues.removeLabel({
+                issue_number: context.issue.number,
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                name: 'active-review-storybook-app'
+              })
+            } catch (e) {
+              console.log(e)
+            }
+
+  resume-review-storybook-app:
+    if: ${{ github.event.action == 'unlabeled' && github.event.label.name == 'suspend-review-storybook-app' }}
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Resume service
+        run: |
+          export SERVICE_ID=$(curl --request GET \
+          --url 'https://api.render.com/v1/services?name=storybook%20PR%20%23${{ env.PR_NUMBER }}&limit=1' \
+          --header 'accept: application/json' \
+          --header 'authorization: Bearer ${{ secrets.RENDER_API_KEY }}' | \
+           jq -r '.[0].service.id')
+
+          curl --request POST \
+          --url https://api.render.com/v1/services/$SERVICE_ID/resume \
+          --header 'accept: application/json' \
+          --header 'authorization: Bearer ${{ secrets.RENDER_API_KEY }}'
+
+      - uses: actions/github-script@v6
+        with:
+          script: |
+            await github.rest.issues.addLabels({
+              issue_number: context.issue.number,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              labels: ['active-review-storybook-app']
+            })
+
+            try {
+              await github.rest.issues.removeLabel({
+                issue_number: context.issue.number,
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                name: 'suspend-review-storybook-app'
+              })
+            } catch (e) {
+              console.log(e)
+            }

.github/workflows/update-test-system.yml

@@ -0,0 +1,268 @@
+name: Update test system (LTS and pre-release)
+
+on:
+  workflow_dispatch:
+    inputs:
+      branch_name:
+        description: "Git branch to build from"
+        required: true
+        default: "main"
+      dockerfile_path:
+        description: "Select Dockerfile"
+        required: true
+        type: choice
+        options:
+          - ./docker/LTS/ee/ee-production.Dockerfile
+          - ./docker/pre-release/ee/ee-production.Dockerfile
+      docker_tag:
+        description: "Docker tag suffix (e.g., pre-release-14, 3.16-lts, etc.)"
+        required: true
+      test_system:
+        description: "Select test system"
+        required: true
+        type: choice
+        options:
+          - app-builder-3.16-lts
+          - app-builder-pre-release
+          - platform-3.16-lts
+          - platform-pre-release
+          - marketplace-3.16-lts
+          - marketplace-pre-release
+          - ai-3.16-lts
+          - ai-pre-release
+
+jobs:
+  build-and-deploy:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: ✅ Check user authorization
+        run: |
+          # Define allowed users
+          allowed_users=(
+            "${{ secrets.ALLOWED_USER1_TEST_SYSTEM }}"
+            "${{ secrets.ALLOWED_USER2_TEST_SYSTEM }}"
+            "${{ secrets.ALLOWED_USER3_TEST_SYSTEM }}"
+            "${{ secrets.ALLOWED_USER4_TEST_SYSTEM }}"
+            "${{ secrets.ALLOWED_USER5_TEST_SYSTEM }}"
+            "${{ secrets.ALLOWED_USER6_TEST_SYSTEM }}"
+            "${{ secrets.ALLOWED_USER7_TEST_SYSTEM }}"
+            "${{ secrets.ALLOWED_USER8_TEST_SYSTEM }}"
+            "${{ secrets.ALLOWED_USER9_TEST_SYSTEM }}"
+            "${{ secrets.ALLOWED_USER10_TEST_SYSTEM }}"
+            "${{ secrets.ALLOWED_USER11_TEST_SYSTEM }}"
+            "${{ secrets.ALLOWED_USER12_TEST_SYSTEM }}"
+            "${{ secrets.ALLOWED_USER13_TEST_SYSTEM }}"
+            "${{ secrets.ALLOWED_USER14_TEST_SYSTEM }}"
+          )
+
+          current_user="${{ github.actor }}"
+          authorized=false
+
+          for user in "${allowed_users[@]}"; do
+            if [[ "$current_user" == "$user" ]]; then
+              authorized=true
+              break
+            fi
+          done
+
+          if [[ "$authorized" == "false" ]]; then
+            echo "❌ User '$current_user' is not authorized to trigger this workflow."
+            exit 1
+          else
+            echo "✅ User '$current_user' is authorized."
+          fi
+
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.inputs.branch_name }}
+          fetch-depth: 0
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log in to DockerHub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Generate full Docker tag
+        id: taggen
+        run: |
+          input_tag="${{ github.event.inputs.docker_tag }}"
+          if [[ "$input_tag" == *"/"* ]]; then
+            echo "tag=$input_tag" >> $GITHUB_OUTPUT
+          else
+            echo "tag=tooljet/tj-osv:$input_tag" >> $GITHUB_OUTPUT
+          fi
+
+      - name: Build and Push Docker image
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          file: ${{ github.event.inputs.dockerfile_path }}
+          push: true
+          tags: ${{ steps.taggen.outputs.tag }}
+          platforms: linux/amd64
+          build-args: |
+            CUSTOM_GITHUB_TOKEN=${{ secrets.CUSTOM_GITHUB_TOKEN }}
+            BRANCH_NAME=${{ github.event.inputs.branch_name }}
+
+      - name: Show the full Docker tag
+        run: echo "✅ Docker image built and pushed:${{ steps.taggen.outputs.tag }}"
+
+      - name: Install SSH and JQ
+        run: sudo apt-get install -y jq openssh-client
+
+      - name: Determine target host
+        id: vmhost
+        run: |
+          test_system="${{ github.event.inputs.test_system }}"
+          vm_host=$(echo '${{ secrets.VM_HOST_MAP_JSON }}' | jq -r --arg sys "$test_system" '.[$sys]')
+
+          if [[ -z "$vm_host" || "$vm_host" == "null" ]]; then
+            echo "VM mapping not found for $test_system"
+            exit 1
+          fi
+
+          echo "host=$vm_host" >> $GITHUB_OUTPUT
+
+      - name: Deploy to target environment
+        run: |
+          echo "$SSH_KEY" > key.pem
+          chmod 600 key.pem
+
+          IMAGE_TAG="${{ steps.taggen.outputs.tag }}"
+          TARGET_SYSTEM="${{ github.event.inputs.test_system }}"
+
+          # Debug: Show what we're deploying
+          echo "DEBUG: IMAGE_TAG=$IMAGE_TAG"
+          echo "DEBUG: TARGET_SYSTEM=$TARGET_SYSTEM"
+
+          ssh -o StrictHostKeyChecking=no -i key.pem $SSH_USER@${{ steps.vmhost.outputs.host }} << EOF
+          set -e
+
+          IMAGE_TAG="$IMAGE_TAG"
+          TARGET_SYSTEM="$TARGET_SYSTEM"
+
+          cd ~
+          echo "📁 Finding correct deployment directory"
+
+          # Debug: Show variables on remote host
+          echo "Debug on remote: IMAGE_TAG=\$IMAGE_TAG"
+          echo "Debug on remote: TARGET_SYSTEM=\$TARGET_SYSTEM"
+
+          if [[ "\$TARGET_SYSTEM" == *-3.16-lts ]]; then
+            echo "Detected LTS system: \$TARGET_SYSTEM"
+            echo "🔍 Searching for LTS directories..."
+            
+            # Find LTS directories dynamically
+            LTS_DIRS=\$(ls -1d ./*-lts 2>/dev/null | grep -E '[0-9]+\.[0-9]+' | sed 's|^\./||' | sort -V; \\
+                       ls -1d ./*-lts 2>/dev/null | grep -Ev '[0-9]+\.[0-9]+' | sed 's|^\./||' | sort)
+            
+            if [[ -z "\$LTS_DIRS" ]]; then
+              echo "❌ No LTS directories found!"
+              echo "Available directories:"
+              ls -la | grep "^d"
+              exit 1
+            fi
+            
+            echo "Available LTS directories:"
+            echo "\$LTS_DIRS"
+            
+            # Choose the first available LTS directory
+            SELECTED_LTS_DIR=\$(echo "\$LTS_DIRS" | head -n 1)
+            
+            echo "📂 Selected LTS directory: \$SELECTED_LTS_DIR"
+            cd "\$SELECTED_LTS_DIR"
+            echo "✅ Now in directory: \$(pwd)"
+          else
+            echo "Detected pre-release system: \$TARGET_SYSTEM"
+            echo "📂 Moving to target directory: \$TARGET_SYSTEM"
+            cd ~
+            echo "✅ Now in directory: \$(pwd)"
+          fi
+
+          echo "🔐 Docker login"
+          echo "${{ secrets.DOCKER_PASSWORD }}" | sudo docker login --username "${{ secrets.DOCKER_USERNAME }}" --password-stdin
+
+          echo "current image"
+          cat .env | grep TOOLJET_IMAGE
+
+          echo "📦 Reading current TOOLJET_IMAGE from .env"
+          CURRENT_IMAGE=\$(grep '^TOOLJET_IMAGE=' .env | cut -d '=' -f2- | tr -d '"' | tr -d "'")
+          echo "Found CURRENT_IMAGE: \$CURRENT_IMAGE"
+
+          echo "🛑 Stopping containers"
+          sudo docker-compose down
+
+          echo "📝 Updating .env with new image"
+          sudo sed -i "s|^TOOLJET_IMAGE=.*|TOOLJET_IMAGE=\$IMAGE_TAG|" .env
+
+          echo "📥 Pulling new image: \$IMAGE_TAG"
+          if [ -z "\$IMAGE_TAG" ]; then
+            echo "❌ IMAGE_TAG is empty!"
+            exit 1
+          fi
+          sudo docker pull "\$IMAGE_TAG"
+
+          echo "🚀 Starting container in background"
+          sudo docker-compose up -d
+
+          # Wait for ToolJet to start and show success message
+          echo "⏳ Waiting for ToolJet to start (timeout: 300 seconds)..."
+          SUCCESS_FOUND=false
+          TIMEOUT=300
+          ELAPSED=0
+
+          while [ \$ELAPSED -lt \$TIMEOUT ]; do
+            # Check for success message in logs
+            if sudo docker-compose logs 2>/dev/null | grep -qE "🚀 TOOLJET APPLICATION STARTED SUCCESSFULLY|Ready to use at http://localhost:82 🚀|Ready to use at http://localhost:80"; then
+              echo "✅ Found success message in logs!"
+              SUCCESS_FOUND=true
+              break
+            fi
+            
+            echo "⏳ Still waiting... (\${ELAPSED}s elapsed)"
+            sleep 10
+            ELAPSED=\$((ELAPSED + 10))
+          done
+
+          if [ "\$SUCCESS_FOUND" = false ]; then
+            echo "❌ Timeout reached without finding success logs"
+            echo "📄 Showing current logs for troubleshooting..."
+            sudo docker-compose logs --tail=50
+            echo ""
+            echo "=== CONTAINER STATUS ==="
+            sudo docker-compose ps
+            echo ""
+            
+            echo "🛑 Starting rollback process..."
+            sudo docker-compose down
+            
+            echo "🔄 Reverting to previous image: \$CURRENT_IMAGE"
+            sudo sed -i "s|^TOOLJET_IMAGE=.*|TOOLJET_IMAGE=\$CURRENT_IMAGE|" .env
+            
+            echo "🔄 Starting previous image..."
+            sudo docker-compose up -d
+            echo "✅ Rollback completed!"
+            exit 1
+          fi
+
+          echo "✅ Deployment successful!"
+
+          echo "📌 Storing successful deployment info in .env"
+          sudo sed -i "/^OLD_IMAGE=/d" .env
+          echo "OLD_IMAGE=\$CURRENT_IMAGE" | sudo tee -a .env
+          echo "📄 Final application logs:"
+          sudo docker-compose logs --tail=50
+
+          echo "🧹 Pruning old Docker images"
+          sudo docker image prune -a -f
+
+          EOF
+        env:
+          SSH_USER: ${{ secrets.AZURE_VM_USER }}
+          SSH_KEY: ${{ secrets.AZURE_VM_KEY }}

.github/workflows/updating-dockertag.yml

@@ -1,51 +0,0 @@
-name: Update LTS Table
-
-on:
-  workflow_dispatch:  # manually triggered
-  schedule:
-    - cron: '30 5 * * 1,4'
-
-jobs:
-  update-lts:
-    name: Regenerate LTS Version Table
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: ⬇️ Checkout repo
-        uses: actions/checkout@v4
-        with:
-          ref: develop
-
-      - name: 🛠 Setup Git
-        run: |
-          git config user.name "tooljet-bot"
-          git config user.email "bot@tooljet.com"
-
-      - name: 💻 Install dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y jq curl
-
-      - name: 🧠 Run regenerate_lts_table.sh
-        run: bash ./docs/regenerate_lts_table.sh
-
-      - name: 📦 Create Pull Request
-        id: cpr
-        uses: peter-evans/create-pull-request@v6
-        with:
-          commit-message: "docs: update LTS version table"
-          branch: auto/update-lts-${{ github.run_id }}
-          title: "docs: update LTS version table"
-          body: "Automated update of the LTS version table from DockerHub."
-          base: develop
-
-      - name: 🤖 Auto-merge the PR (fallback if needed)
-        run: |
-          echo "ℹ️  Attempting auto-merge of PR #${PR_NUMBER}..."
-          gh pr merge --squash --auto "$PR_NUMBER" --repo ToolJet/ToolJet || {
-            echo "⚠️ Auto-merge failed. Trying direct squash merge instead..."
-            gh pr merge --squash --admin "$PR_NUMBER" --repo ToolJet/ToolJet
-          }
-        env:
-          GH_TOKEN: ${{ secrets.TOKEN_PR }}
-          PR_NUMBER: ${{ steps.cpr.outputs.pull-request-number }}

.gitignore

@@ -30,6 +30,7 @@
 /frontend/.firebase
 /.env
 /.env.test
+/.env.bak
 /docs/.firebase
 /docs/.firebaserc
 /node_modules
@@ -37,3 +38,12 @@
 
 .idea/*
 ti-*
+.claude/
+.worktrees/
+
+
+.tj_env.*
+.local/
+taskfile.*
+.serena/
+docs/superpowers/

.gitmodules

@@ -1,8 +1,8 @@
 [submodule "frontend/ee"]
 	path = frontend/ee
 	url = https://github.com/ToolJet/ee-frontend.git
-    branch = main
+    branch = lts-3.16
 [submodule "server/ee"]
 	path = server/ee
 	url = https://github.com/ToolJet/ee-server.git
-    branch = main
+    branch = lts-3.16

.husky/pre-commit

@@ -1,4 +1 @@
-#!/bin/sh
-# . "$(dirname "$0")/_/husky.sh"
-
-# npx lint-staged
+npx lint-staged

.node-version

@@ -0,0 +1 @@
+22.15.1

.version

@@ -1 +1 @@
-3.16.1-lts
+3.21.20-beta

.vscode/settings.json

@@ -1,28 +1,27 @@
 {
-    "[javascript, typescript]": {
-        "editor.defaultFormatter": "dbaeumer.vscode-eslint"
+  "[javascript, typescript]": {
+    "editor.defaultFormatter": "dbaeumer.vscode-eslint"
+  },
+  "eslint.validate": [
+    "javascript",
+    "javascriptreact",
+    "typescript",
+    "typescriptreact"
+  ],
+  "eslint.useFlatConfig": true,
+  "editor.formatOnSave": false,
+  "editor.codeActionsOnSave": {
+    "source.fixAll.eslint": "explicit"
+  },
+  "json.schemas": [
+    {
+      "fileMatch": ["/*.operations.json"],
+      "url": "https://raw.githubusercontent.com/ToolJet/ToolJet/develop/plugins/schemas/operations.schema.json"
     },
-    "eslint.validate": [
-        "javascript",
-        "javascriptreact",
-        "typescript",
-        "typescriptreact"
-    ],
-    "eslint.format.enable": true,
-    "editor.formatOnSave": true,
-    "json.schemas": [
-        {
-            "fileMatch": [
-                "/*.operations.json"
-            ],
-            "url": "https://raw.githubusercontent.com/ToolJet/ToolJet/develop/plugins/schemas/operations.schema.json"
-        },
-        {
-            "fileMatch": [
-                "/*.manifest.json"
-            ],
-            "url": "https://raw.githubusercontent.com/ToolJet/ToolJet/develop/plugins/schemas/manifest.schema.json"
-        }
-    ],
-    "CodeGPT.apiKey": "CodeGPT Plus Beta"
-}
+    {
+      "fileMatch": ["/*.manifest.json"],
+      "url": "https://raw.githubusercontent.com/ToolJet/ToolJet/develop/plugins/schemas/manifest.schema.json"
+    }
+  ],
+  "CodeGPT.apiKey": "CodeGPT Plus Beta"
+}

AUTORESEARCH_PLAN.md

@@ -0,0 +1,181 @@
+# Autoresearch Plan: ToolJet Test Suite — Zero Skips
+
+## Config
+
+```yaml
+goal: "Zero skipped/failing tests. Every test either passes or is deleted."
+scope: "server/test/**/*spec.ts"
+metric: "skipped_count + failed_count → 0"
+verify: "npx jest <file> --forceExit --no-coverage 2>&1 | tail -30"
+guard: "npx jest --forceExit --no-coverage 2>&1 | tail -10"
+direction: "One file per iteration. Check if feature code exists → fix test or delete test. Add @group working."
+iterations: unbounded
+workdir: "/Users/akshaysasidharan/code/ToolJet/.worktrees/fix_test_suite"
+```
+
+## Decisions
+
+| Decision | Choice | Rationale |
+|----------|--------|-----------|
+| Files for removed features | **Delete entirely** | Clean slate; EE can recreate if needed |
+| group_permissions.e2e-spec.ts | **Delete and create fresh** | v2 API is too different for inline rewrite |
+| Iteration strategy | **One file per iteration** | Most surgical; verify each fix before moving on |
+| Iteration bound | **Unbounded** | Run until 0 skips + 0 failures |
+
+## Current State
+
+- **40 test files** in `server/test/`
+- **43+ explicit skips** across 18 files
+- **0 files** have `@group working` → **all excluded from CI**
+- **3 files** to delete (feature removed from codebase)
+- **1 file** to delete-and-recreate (group_permissions — full API rewrite)
+
+## Per-Iteration Algorithm
+
+```
+FOR each test file (ordered by skip count DESC):
+  1. READ the test file — list every skip with its TODO reason
+  2. FOR each skipped test:
+     a. GREP codebase for the endpoint/service/feature being tested
+     b. IF feature exists in current code → FIX the test:
+        - Update endpoint URL
+        - Update request/response shape
+        - Update permission assertions
+        - Update entity names
+     c. IF feature removed from codebase → DELETE the test
+  3. REMOVE all xit/describe.skip/it.skip — replace with working it/describe
+  4. ADD @group working tag to the file (jsdoc comment before describe)
+  5. RUN the file individually — verify ALL tests pass
+  6. IF any test still fails → investigate root cause, fix or delete with justification
+  7. COMMIT: "fix(tests): rehabilitate <filename> — N fixed, M deleted"
+  8. RECORD iteration result in AUTORESEARCH_LOG.md
+```
+
+## Iteration Order
+
+### Phase 1: Delete Dead Files (iterations 1-3)
+
+These test files correspond to features that no longer exist in the codebase.
+
+| # | File | Reason | Action |
+|---|------|--------|--------|
+| 1 | `controllers/org_environment_variables.e2e-spec.ts` | OrgEnvironmentVariable entity removed | DELETE file |
+| 2 | `controllers/oauth/oauth-saml.e2e-spec.ts` | CE SamlService throws 'not implemented' | DELETE file |
+| 3 | `controllers/oauth/oauth-ldap.e2e-spec.ts` | ldapjs not in dependency tree | DELETE file |
+
+### Phase 2: Fix High-Skip Files (iterations 4-10)
+
+Files with the most skips — fixing these has the highest impact on the metric.
+
+| # | File | Skips | Key Changes Needed |
+|---|------|-------|--------------------|
+| 4 | `controllers/apps.e2e-spec.ts` | 24+ | Clone→v2/resources/clone, export/import→v2/resources, permission rework, delete thread/comment tests |
+| 5 | `controllers/data_sources.e2e-spec.ts` | 12 | Global DS API, ValidateDataSourceGuard, remove app_version_id scoping |
+| 6 | `controllers/data_queries.e2e-spec.ts` | 6 | Version-in-URL pattern, new query endpoints |
+| 7 | `controllers/group_permissions.e2e-spec.ts` | ~33 | DELETE file, CREATE fresh test for v2 GroupPermissions API |
+| 8 | `controllers/session.e2e-spec.ts` | 1 | Fix org creation (POST /api/organizations removed) |
+| 9 | `controllers/users.e2e-spec.ts` | 1 | Fix GET /api/users/all → GET /api/users |
+| 10 | `controllers/instance_settings.e2e-spec.ts` | ALL | DELETE (CE InstanceSettingsController throws for all CRUD) |
+
+### Phase 3: Fix Onboarding & OAuth (iterations 11-18)
+
+| # | File | Skips | Key Changes Needed |
+|---|------|-------|--------------------|
+| 11 | `controllers/onboarding/form-auth.e2e-spec.ts` | 1 | Fix signup/invite endpoints |
+| 12 | `controllers/onboarding/git-sso-auth.e2e-spec.ts` | 1 | Fix SSO flow |
+| 13 | `controllers/onboarding/google-sso-auth.e2e-spec.ts` | 1 | Fix SSO flow |
+| 14 | `controllers/oauth/oauth-git.e2e-spec.ts` | 0 | Verify + add @group working |
+| 15 | `controllers/oauth/oauth-git-instance.e2e-spec.ts` | 0 | Verify + add @group working |
+| 16 | `controllers/oauth/oauth-google.e2e-spec.ts` | 0 | Verify + add @group working |
+| 17 | `controllers/oauth/oauth-google-instance.e2e-spec.ts` | 0 | Verify + add @group working |
+| 18 | `controllers/tooljet_db.e2e-spec.ts` | 2 | Assess postgrest dep — fix or delete |
+
+### Phase 4: Fix Remaining E2E (iterations 19-30)
+
+Files with 0 explicit skips but no @group working — need verification.
+
+| # | File | Notes |
+|---|------|-------|
+| 19 | `controllers/app.e2e-spec.ts` | Verify passes, add @group working |
+| 20 | `controllers/audit_logs.e2e-spec.ts` | Fix TODO at line 137, add @group working |
+| 21 | `controllers/files.e2e-spec.ts` | Verify + tag |
+| 22 | `controllers/folder_apps.e2e-spec.ts` | Verify + tag |
+| 23 | `controllers/folders.e2e-spec.ts` | Verify + tag |
+| 24 | `controllers/import_export_resources.e2e-spec.ts` | Has @group but not `working` — add it |
+| 25 | `controllers/library_apps.e2e-spec.ts` | Verify + tag |
+| 26 | `controllers/org_constants.e2e-spec.ts` | Verify + tag |
+| 27 | `controllers/organization_users.e2e-spec.ts` | Verify + tag |
+| 28 | `controllers/organizations.e2e-spec.ts` | Verify + tag |
+| 29 | `controllers/personal-ws-disabled/app.e2e-spec.ts` | Verify + tag |
+| 30 | `controllers/super-admin/app.e2e-spec.ts` | Verify + tag |
+
+### Phase 5: Fix Unit Tests (iterations 31-38)
+
+| # | File | Notes |
+|---|------|-------|
+| 31 | `services/users.service.spec.ts` | Rewrite for new permission system |
+| 32 | `services/app_import_export.service.spec.ts` | Fix TypeORM + permission migration |
+| 33 | `services/tooljet_db_import_export_service.spec.ts` | Fix TypeORM patterns |
+| 34 | `services/tooljet_db_operations.service.spec.ts` | Verify + tag |
+| 35 | `modules/data-queries/util.service.spec.ts` | Fix template resolution TODO |
+| 36 | `services/encryption.service.spec.ts` | Has @group unit — add working, verify |
+| 37 | `services/session.service.spec.ts` | Verify + tag |
+| 38 | `services/folder_apps.service.spec.ts` | Verify + tag |
+
+### Phase 6: Workflow Tests (iterations 39-43)
+
+| # | File | Notes |
+|---|------|-------|
+| 39 | `controllers/workflow-bundles.e2e-spec.ts` | Has @group workflows — add working, verify |
+| 40 | `controllers/workflow-executions.e2e-spec.ts` | Has @group workflows — add working, verify |
+| 41 | `controllers/workflow-webhook.e2e-spec.ts` | Verify + tag |
+| 42 | `controllers/tooljetdb_roles.e2e-spec.ts` | Has @group database — add working, verify |
+| 43 | Remaining workflow unit tests | python-*, npm-*, pypi-*, javascript-* — add working, verify |
+
+### Phase 7: Final Verification
+
+| # | Task |
+|---|------|
+| 44 | Run FULL test suite (no group filter) — verify 0 skips, 0 failures |
+| 45 | Run with `--group=working` — verify same result (all files tagged) |
+| 46 | Update CI config if needed |
+| 47 | Final commit + TRIAGE.md update |
+
+## Endpoint Reference (for fixing tests)
+
+| Old Endpoint | New Endpoint |
+|-------------|-------------|
+| `POST /api/apps/:id/clone` | `POST /api/v2/resources/clone` |
+| `GET /api/apps/:id/export` | `POST /api/v2/resources/export` |
+| `POST /api/apps/import` | `POST /api/v2/resources/import` |
+| `GET /api/users/all` | `GET /api/users` (EE only) |
+| `POST /api/organizations` | Removed |
+| `POST /api/data-sources` | Now creates global DS (no app_version_id) |
+| `PUT /api/data-sources/:id` | Now requires ValidateDataSourceGuard |
+| `DELETE /api/data-sources/:id` | Now requires ValidateDataSourceGuard |
+| `GET /api/data-sources?app_version_id=` | Removed |
+| `PATCH /api/data-queries/:id` | Now requires version in URL |
+| `DELETE /api/data-queries/:id` | Now requires version in URL |
+| `GET /api/data-queries?app_version_id=` | Removed |
+
+## Permission System Reference
+
+| Old | New |
+|-----|-----|
+| `GroupPermission` | `GroupPermissions` |
+| `AppGroupPermission` | `AppsGroupPermissions` |
+| `UserGroupPermission` | `GroupUsers` |
+| `all_users` | `end-user` |
+| `.group` | `.name` |
+| `folderCreate` | `folderCRUD` |
+| `orgEnvironmentVariableCreate` | `orgConstantCRUD` |
+
+## Success Criteria
+
+- [ ] 0 `xit(`, `describe.skip(`, `it.skip(`, `test.skip(` in any test file
+- [ ] Every surviving test file has `@group working`
+- [ ] `npx jest --forceExit` passes with 0 failures
+- [ ] `npx jest --group=working --forceExit` produces identical results
+- [ ] Dead feature test files deleted (org_env_vars, oauth-saml, oauth-ldap, instance_settings)
+- [ ] group_permissions.e2e-spec.ts rewritten for v2 API
+- [ ] All commits follow pattern: `fix(tests): rehabilitate <filename>`

CODEOWNERS

@@ -1,25 +1,20 @@
 # Code owners for specific package.json and package-lock.json files
-/server/package.json @shah21 @gsmithun4 @adishm98
-/server/package-lock.json @shah21 @gsmithun4 @adishm98
+/server/* @gsmithun4 @shah21 @akshaysasidrn
 
-/frontend/package.json @shah21 @gsmithun4 @adishm98
-/frontend/package-lock.json @shah21 @gsmithun4 @adishm98
+/frontend/* @johnsoncherian @kavinvenkatachalam
 
-/marketplace/package.json @shah21 @gsmithun4 @adishm98
-/marketplace/package-lock.json @shah21 @gsmithun4 @adishm98
+/marketplace/* @ganesh8056 @gsmithun4
 
-/cypress/package.json @shah21 @gsmithun4 @adishm98
-/cypress/package-lock.json @shah21 @gsmithun4 @adishm98
+/cypress/* @emidhun @ajith-k-v @Mekhla-Asopa
+/plugins/* @ganesh8056 @gsmithun4
 
-/plugins/package.json @shah21 @gsmithun4 @adishm98
-/plugins/package-lock.json @shah21 @gsmithun4 @adishm98
+.github/workflows/ @adishm98 @slancerk
+/docker/* @adishm98 @slancerk
+/deploy/* @adishm98 @slancerk
 
-/package.json @shah21 @gsmithun4 @adishm98
-/package-lock.json @shah21 @gsmithun4 @adishm98
+# Code owners for specific files
+**/module.ts @gsmithun4
 
-# Code owners for all module.ts files
-**/module.ts @shah21 @gsmithun4
-
-# Server migration directories
-/server/migrations/* @shah21 @gsmithun4
-/server/data-migrations/* @shah21 @gsmithun4
+# Code owners for specific directories
+/server/migrations/* @gsmithun4
+/server/data-migrations/* @gsmithun4

README.md

@@ -46,7 +46,7 @@ ToolJet is an **open-source low-code framework** to build and deploy internal to
 <hr>
 
 ## Quickstart
-The easiest way to get started with ToolJet is by creating a [ToolJet Cloud](https://tooljet.ai) account. ToolJet Cloud offers a hosted solution of ToolJet. If you want to self-host ToolJet, kindly proceed to [deployment documentation](https://docs.tooljet.ai/docs/setup/).
+The easiest way to get started with ToolJet is by creating a [ToolJet Cloud](https://tooljet.com) account. ToolJet Cloud offers a hosted solution of ToolJet. If you want to self-host ToolJet, kindly proceed to [deployment documentation](https://docs.tooljet.com/docs/setup/).
 
 ### Try using Docker
 Want to give ToolJet a quick spin on your local machine? You can run the following command from your terminal to have ToolJet up and running right away.
@@ -66,35 +66,35 @@ docker run \
 
 ## Tutorials and examples
 
-[Time Tracker Application](https://docs.tooljet.ai/docs/#quickstart-guide)<br>
-[Build your own CMS using low-code](https://blog.tooljet.ai/build-cms-using-lowcode-and-mongodb/)<br>
-[AWS S3 Browser](https://blog.tooljet.ai/build-an-aws-s3-broswer-with-tooljet/)<br>
+[Time Tracker Application](https://docs.tooljet.com/docs/#quickstart-guide)<br>
+[Build your own CMS using low-code](https://blog.tooljet.com/build-cms-using-lowcode-and-mongodb/)<br>
+[AWS S3 Browser](https://blog.tooljet.com/build-an-aws-s3-broswer-with-tooljet/)<br>
 
 ## Documentation
-Documentation is available at https://docs.tooljet.ai.
+Documentation is available at https://docs.tooljet.com.
 
-- [Getting Started](https://docs.tooljet.ai)<br>
-- [Data source Reference](https://docs.tooljet.ai/docs/data-sources/airtable/)<br>
-- [Component Reference](https://docs.tooljet.ai/docs/widgets/button)
+- [Getting Started](https://docs.tooljet.com)<br>
+- [Data source Reference](https://docs.tooljet.com/docs/data-sources/airtable/)<br>
+- [Component Reference](https://docs.tooljet.com/docs/widgets/button)
 
 ## Self-hosted
 You can use ToolJet Cloud for a fully managed solution. If you want to self-host ToolJet, we have guides on deploying ToolJet on Kubernetes, AWS EC2, Docker, and more.
 
 | Provider  | Documentation |
 | :------------- | :------------- |
-| Digital Ocean | [Link](https://docs.tooljet.ai/docs/setup/digitalocean)  |
-| Docker  | [Link](https://docs.tooljet.ai/docs/setup/docker)   |
-| AWS EC2 | [Link](https://docs.tooljet.ai/docs/setup/ec2)  |
-| AWS ECS | [Link](https://docs.tooljet.ai/docs/setup/ecs)   |
-| OpenShift | [Link](https://docs.tooljet.ai/docs/setup/openshift)   |
-| Helm | [Link](https://docs.tooljet.ai/docs/setup/helm)   |
-| AWS EKS (Kubernetes) | [Link](https://docs.tooljet.ai/docs/setup/kubernetes)   |
-| GCP GKE (Kubernetes) | [Link](https://docs.tooljet.ai/docs/setup/kubernetes-gke)   |
-| Azure AKS (Kubernetes) | [Link](https://docs.tooljet.ai/docs/setup/kubernetes-aks)   |
-| Azure Container | [Link](https://docs.tooljet.ai/docs/setup/azure-container)   |
-| Google Cloud Run  | [Link](https://docs.tooljet.ai/docs/setup/google-cloud-run)   |
-| Deploying ToolJet client  | [Link](https://docs.tooljet.ai/docs/setup/client)   |
-| Deploying ToolJet on a Subpath  | [Link](https://docs.tooljet.ai/docs/setup/tooljet-subpath/)   |
+| Digital Ocean | [Link](https://docs.tooljet.com/docs/setup/digitalocean)  |
+| Docker  | [Link](https://docs.tooljet.com/docs/setup/docker)   |
+| AWS EC2 | [Link](https://docs.tooljet.com/docs/setup/ec2)  |
+| AWS ECS | [Link](https://docs.tooljet.com/docs/setup/ecs)   |
+| OpenShift | [Link](https://docs.tooljet.com/docs/setup/openshift)   |
+| Helm | [Link](https://docs.tooljet.com/docs/setup/helm)   |
+| AWS EKS (Kubernetes) | [Link](https://docs.tooljet.com/docs/setup/kubernetes)   |
+| GCP GKE (Kubernetes) | [Link](https://docs.tooljet.com/docs/setup/kubernetes-gke)   |
+| Azure AKS (Kubernetes) | [Link](https://docs.tooljet.com/docs/setup/kubernetes-aks)   |
+| Azure Container | [Link](https://docs.tooljet.com/docs/setup/azure-container)   |
+| Google Cloud Run  | [Link](https://docs.tooljet.com/docs/setup/google-cloud-run)   |
+| Deploying ToolJet client  | [Link](https://docs.tooljet.com/docs/setup/client)   |
+| Deploying ToolJet on a Subpath  | [Link](https://docs.tooljet.com/docs/setup/tooljet-subpath/)   |
 
 ## Marketplace 
 ToolJet can now be found on both AWS and Azure Marketplaces, making it simpler than ever to access and deploy our app-building platform.
@@ -102,9 +102,9 @@ ToolJet can now be found on both AWS and Azure Marketplaces, making it simpler t
 Find ToolJet on AWS Marketplace [here](https://aws.amazon.com/marketplace/pp/prodview-fxjto27jkpqfg?sr=0-1&ref_=beagle&applicationId=AWSMPContessa) and explore seamless integration on Azure Marketplace [here](https://azuremarketplace.microsoft.com/en-us/marketplace/apps/tooljetsolutioninc1679496832216.tooljet?tab=Overview).
 
 ## Community support
-For general help using ToolJet, please refer to the official [documentation](https://docs.tooljet.ai/docs/). For additional help, you can use one of these channels to ask a question:
+For general help using ToolJet, please refer to the official [documentation](https://docs.tooljet.com/docs/). For additional help, you can use one of these channels to ask a question:
 
-- [Slack](https://tooljet.ai/slack) - Discussions with the community and the team.
+- [Slack](https://tooljet.com/slack) - Discussions with the community and the team.
 - [GitHub](https://github.com/ToolJet/ToolJet/issues) - For bug reports and feature requests.
 - [𝕏 (Twitter)](https://twitter.com/ToolJet) - Get the product updates quickly.
 

THIRD-PARTY-NOTICES

@@ -0,0 +1,135 @@
+THIRD-PARTY SOFTWARE NOTICES AND INFORMATION
+
+ToolJet incorporates third-party software components. The following notices
+are provided for informational purposes. ToolJet licenses these components
+under the permissive license option where dual licensing is available.
+
+This file documents the elected license for each dual-licensed dependency
+used in the project.
+
+================================================================================
+
+1. jszip (https://github.com/Stuk/jszip)
+
+   Version: 3.10.1
+   Scope: server
+   Available licenses: (MIT OR GPL-3.0-or-later)
+   Elected license: MIT
+
+   Copyright (c) 2009-2016 Stuart Knightley, David Duponchel,
+   Franz Buchinger, Antonio Afonso
+
+   Permission is hereby granted, free of charge, to any person obtaining a
+   copy of this software and associated documentation files (the "Software"),
+   to deal in the Software without restriction, including without limitation
+   the rights to use, copy, modify, merge, publish, distribute, sublicense,
+   and/or sell copies of the Software, and to permit persons to whom the
+   Software is furnished to do so, subject to the following conditions:
+
+   The above copyright notice and this permission notice shall be included
+   in all copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+   FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+   DEALINGS IN THE SOFTWARE.
+
+================================================================================
+
+2. dompurify (https://github.com/cure53/DOMPurify)
+
+   Version: 3.2.7
+   Scope: frontend
+   Available licenses: (MPL-2.0 OR Apache-2.0)
+   Elected license: Apache-2.0
+
+   Copyright 2025 Dr.-Ing. Mario Heiderich, Cure53
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+================================================================================
+
+3. node-forge (https://github.com/digitalbazaar/forge)
+
+   Version: 1.3.3
+   Scope: server (transitive dependency)
+   Available licenses: (BSD-3-Clause OR GPL-2.0)
+   Elected license: BSD-3-Clause
+
+   Copyright (c) 2010, Digital Bazaar, Inc.
+   All rights reserved.
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions are met:
+
+     * Redistributions of source code must retain the above copyright notice,
+       this list of conditions and the following disclaimer.
+     * Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+     * Neither the name of Digital Bazaar, Inc. nor the names of its
+       contributors may be used to endorse or promote products derived from
+       this software without specific prior written permission.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL DIGITAL BAZAAR BE LIABLE FOR ANY DIRECT,
+   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+   (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+   SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+   CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+   LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+   OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+   SUCH DAMAGE.
+
+================================================================================
+
+4. json-schema (https://github.com/kriszyp/json-schema)
+
+   Version: 0.4.0
+   Scope: server (transitive dependency)
+   Available licenses: (AFL-2.1 OR BSD-3-Clause)
+   Elected license: BSD-3-Clause
+
+   Copyright (c) 2005-2015, The Dojo Foundation
+   All rights reserved.
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions are met:
+
+     * Redistributions of source code must retain the above copyright notice,
+       this list of conditions and the following disclaimer.
+     * Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+     * Neither the name of the Dojo Foundation nor the names of its
+       contributors may be used to endorse or promote products derived from
+       this software without specific prior written permission.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
+
+================================================================================

cypress-tests/.gitignore

@@ -5,4 +5,6 @@
 /cypress/downloads
 /cypress/videos
 /coverage
-/.nyc_output
+/.nyc_output
+/cypress/.webpack_cache
+/.claude

cypress-tests/cypress-ee-platform.config.js

@@ -1,116 +1,62 @@
 const { defineConfig } = require("cypress");
-const { rmdir } = require("fs");
-const fs = require("fs");
-const XLSX = require("node-xlsx");
-const pg = require("pg");
-const path = require("path");
-const pdf = require("pdf-parse");
-
-const environments = {
-    'run-cypress-platform': {
-        baseUrl: "http://localhost:3000",
-        configFile: "cypress-platform.config.js"
-    },
-    'run-cypress-platform-subpath': {
-        baseUrl: "http://localhost:3000/apps",
-        configFile: "cypress-platform.config.js"
-    },
-    'run-cypress-platform-proxy': {
-        baseUrl: "http://localhost:4001",
-        configFile: "cypress-platform.config.js"
-    },
-    'run-cypress-platform-proxy-subpath': {
-        baseUrl: "http://localhost:4001/apps",
-        configFile: "cypress-platform.config.js"
-    }
-};
-
-const githubLabel = process.env.GITHUB_LABEL || 'run-cypress-platform';
-const environment = environments[githubLabel];
 
 module.exports = defineConfig({
-    execTimeout: 1800000,
-    defaultCommandTimeout: 30000,
-    requestTimeout: 30000,
-    pageLoadTimeout: 30000,
-    responseTimeout: 30000,
-    viewportWidth: 1440,
-    viewportHeight: 960,
-    chromeWebSecurity: false,
-    trashAssetsBeforeRuns: true,
-    e2e: {
-        setupNodeEvents (on, config) {
-            config.baseUrl = environment.baseUrl;
+  execTimeout: 1800000,
+  defaultCommandTimeout: 30000,
+  requestTimeout: 30000,
+  pageLoadTimeout: 30000,
+  responseTimeout: 30000,
+  viewportWidth: 1440,
+  viewportHeight: 960,
+  chromeWebSecurity: false,
+  projectId: "sk3oji",
 
-            on("task", {
-                readPdf (pathToPdf) {
-                    return new Promise((resolve) => {
-                        const pdfPath = path.resolve(pathToPdf);
-                        let dataBuffer = fs.readFileSync(pdfPath);
-                        pdf(dataBuffer).then(function ({ text }) {
-                            resolve(text);
-                        });
-                    });
-                },
-            });
+  e2e: {
+    setupNodeEvents (on, config) {
+      require("./cypress/config/tasks")(on);
+      require("./cypress/config/browserConfig")(on);
 
-            on("task", {
-                readXlsx (filePath) {
-                    return new Promise((resolve, reject) => {
-                        try {
-                            let dataBuffer = fs.readFileSync(filePath);
-                            const jsonData = XLSX.parse(dataBuffer);
-                            resolve(jsonData[0]["data"].toString());
-                        } catch (e) {
-                            reject(e);
-                        }
-                    });
-                },
-            });
-
-            on("task", {
-                deleteFolder (folderName) {
-                    return new Promise((resolve, reject) => {
-                        rmdir(folderName, { maxRetries: 10, recursive: true }, (err) => {
-                            if (err) {
-                                console.error(err);
-                                return reject(err);
-                            }
-                            resolve(null);
-                        });
-                    });
-                },
-            });
-
-            on("task", {
-                dbConnection ({ dbconfig, sql }) {
-                    const client = new pg.Pool(dbconfig);
-                    return client.query(sql);
-                },
-            });
-
-            return require("./cypress/plugins/index.js")(on, config);
-        },
-        downloadsFolder: "cypress/downloads",
-        experimentalRunAllSpecs: true,
-        experimentalModfyObstructiveThirdPartyCode: true,
-        baseUrl: environment.baseUrl,
-        configFile: environment.configFile,
-        specPattern: [
-            "cypress/e2e/happyPath/platform/firstUser/firstUserOnboarding.cy.js",
-            "cypress/e2e/happyPath/platform/ceTestcases/apps/appSlug.cy.js",
-            "cypress/e2e/happyPath/platform/ceTestcases/apps/!(*appSlug).cy.js",
-            "cypress/e2e/happyPath/platform/commonTestcases/userManagment/*.cy.js",
-            "cypress/e2e/happyPath/platform/eeTestcases/workspace/*.cy.js",
-        ],
-        numTestsKeptInMemory: 1,
-        redirectionLimit: 15,
-        experimentalMemoryManagement: true,
-        video: false,
-        videoUploadOnPasses: false,
-        retries: {
-            runMode: 2,
-            openMode: 0,
-        },
+      return require("./cypress/plugins/index.js")(on, config);
     },
-});
+
+    baseUrl: "http://localhost:3000", // Default for local development (GitHub workflow overrides this)
+    specPattern: [
+      "cypress/e2e/happyPath/platform/firstUser/firstUserOnboarding.cy.js",
+      "cypress/e2e/happyPath/platform/eeTestcases/licensing/basicPlanTestcases/**/*.cy.js",
+      "cypress/e2e/happyPath/platform/eeTestcases/licensing/paidPlanTestcases/**/*.cy.js",
+      "cypress/e2e/happyPath/platform/eeTestcases/licensing/updateLicense.cy.js",
+      "cypress/e2e/happyPath/platform/eeTestcases/sso/**/*.cy.js",
+      "cypress/e2e/happyPath/platform/eeTestcases/settings/**/*.cy.js",
+      "cypress/e2e/happyPath/platform/eeTestcases/multi-env/**/*.cy.js",
+      "cypress/e2e/happyPath/platform/eeTestcases/externalApi/**/*.cy.js",
+      "cypress/e2e/happyPath/platform/eeTestcases/userMetadata/**/*.cy.js",
+      "cypress/e2e/happyPath/platform/eeTestcases/superAdmin/**/*.cy.js",
+      "cypress/e2e/happyPath/platform/ceTestcases/**/*.cy.js",
+      "cypress/e2e/happyPath/platform/commonTestcases/**/*.cy.js",
+    ],
+
+    testIsolation: true,
+    retries: {
+      runMode: 2,
+      openMode: 0,
+    },
+    redirectionLimit: 10,
+
+    numTestsKeptInMemory: 0,
+    experimentalMemoryManagement: true,
+
+    experimentalRunAllSpecs: true,
+    experimentalModifyObstructiveThirdPartyCode: true,
+    experimentalOriginDependencies: true,
+
+    downloadsFolder: "cypress/downloads",
+    trashAssetsBeforeRuns: true,
+    video: false,
+    videoUploadOnPasses: false,
+    screenshotOnRunFailure: true,
+    screenshotsFolder: "cypress/screenshots",
+
+    coverage: false,
+    codeCoverageTasksRegistered: false,
+  },
+});

cypress-tests/cypress-lts.Dockerfile

@@ -0,0 +1,163 @@
+FROM node:22.15.1 AS builder
+
+# Fix for JS heap limit allocation issue
+ENV NODE_OPTIONS="--max-old-space-size=4096"
+
+RUN npm i -g npm@10.9.2 && npm cache clean --force
+
+RUN mkdir -p /app
+WORKDIR /app
+
+# Set GitHub token and branch as build arguments
+ARG CUSTOM_GITHUB_TOKEN
+ARG BRANCH_NAME
+
+# Clone and checkout the frontend repository
+RUN git config --global url."https://x-access-token:${CUSTOM_GITHUB_TOKEN}@github.com/".insteadOf "https://github.com/"
+
+RUN git config --global http.version HTTP/1.1
+RUN git config --global http.postBuffer 524288000
+RUN git clone https://github.com/ToolJet/ToolJet.git .
+
+# The branch name needs to be changed the branch with modularisation in CE repo
+RUN git checkout ${BRANCH_NAME}
+
+RUN git submodule update --init --recursive
+
+# Checkout the same branch in submodules if it exists, otherwise fallback to main
+RUN git submodule foreach " \
+  if git show-ref --verify --quiet refs/heads/${BRANCH_NAME} || \
+     git ls-remote --exit-code --heads origin ${BRANCH_NAME}; then \
+    git checkout ${BRANCH_NAME}; \
+  else \
+    echo 'Branch ${BRANCH_NAME} not found in submodule \$name, falling back to main'; \
+    git checkout main; \
+  fi"
+
+# Scripts for building
+COPY ./package.json ./package.json
+
+# Build plugins
+COPY ./plugins/package.json ./plugins/package-lock.json ./plugins/
+RUN npm --prefix plugins install
+COPY ./plugins/ ./plugins/
+RUN NODE_ENV=production npm --prefix plugins run build
+RUN npm --prefix plugins prune --production 
+
+ENV TOOLJET_EDITION=ee
+
+# Build frontend
+COPY ./frontend/package.json ./frontend/package-lock.json ./frontend/
+RUN npm --prefix frontend install
+COPY ./frontend/ ./frontend/
+RUN npm --prefix frontend run build --production && npm --prefix frontend prune --production
+
+ENV NODE_ENV=production
+ENV TOOLJET_EDITION=ee
+
+# Build server
+COPY ./server/package.json ./server/package-lock.json ./server/
+RUN npm --prefix server ci --omit=dev
+COPY ./server/ ./server/
+RUN npm install -g @nestjs/cli && npm install -g copyfiles
+RUN npm --prefix server run build && npm prune --production --prefix server
+
+# Install dependencies for PostgREST, curl, tar, etc.
+RUN apt-get update && apt-get install -y \
+    curl ca-certificates tar \
+    && rm -rf /var/lib/apt/lists/*
+
+ENV POSTGREST_VERSION=v12.2.0
+
+RUN curl -Lo postgrest.tar.xz https://github.com/PostgREST/postgrest/releases/download/${POSTGREST_VERSION}/postgrest-v12.2.0-linux-static-x64.tar.xz && \
+    tar -xf postgrest.tar.xz && \
+    mv postgrest /postgrest && \
+    rm postgrest.tar.xz && \
+    chmod +x /postgrest
+
+FROM debian:12-slim
+
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends \
+        curl \
+        wget \
+        gnupg \
+        unzip \
+        ca-certificates \
+        xz-utils \
+        tar \
+        postgresql-client \
+        redis \
+        libaio1 \
+        git \
+        openssh-client \
+        freetds-dev \
+    && apt-get upgrade -y -o Dpkg::Options::="--force-confold" \
+    && apt-get autoremove -y \
+    && apt-get clean && rm -rf /var/lib/apt/lists/*
+
+
+RUN curl -O https://nodejs.org/dist/v22.15.1/node-v22.15.1-linux-x64.tar.xz \
+    && tar -xf node-v22.15.1-linux-x64.tar.xz \
+    && mv node-v22.15.1-linux-x64 /usr/local/lib/nodejs \
+    && echo 'export PATH="/usr/local/lib/nodejs/bin:$PATH"' >> /etc/profile.d/nodejs.sh \
+    && /bin/bash -c "source /etc/profile.d/nodejs.sh" \
+    && rm node-v22.15.1-linux-x64.tar.xz
+ENV PATH=/usr/local/lib/nodejs/bin:$PATH
+
+ENV NODE_ENV=production
+ENV TOOLJET_EDITION=ee
+ENV NODE_OPTIONS="--max-old-space-size=4096"
+
+# Install Instantclient Basic Light Oracle and Dependencies
+WORKDIR /opt/oracle
+
+RUN wget https://tooljet-plugins-production.s3.us-east-2.amazonaws.com/marketplace-assets/oracledb/instantclients/instantclient-basiclite-linuxx64.zip && \
+    wget https://tooljet-plugins-production.s3.us-east-2.amazonaws.com/marketplace-assets/oracledb/instantclients/instantclient-basiclite-linux.x64-11.2.0.4.0.zip && \
+    unzip instantclient-basiclite-linuxx64.zip && rm -f instantclient-basiclite-linuxx64.zip && \
+    unzip instantclient-basiclite-linux.x64-11.2.0.4.0.zip && rm -f instantclient-basiclite-linux.x64-11.2.0.4.0.zip && \
+    cd /opt/oracle/instantclient_21_10 && rm -f *jdbc* *occi* *mysql* *mql1* *ipc1* *jar uidrvci genezi adrci && \
+    cd /opt/oracle/instantclient_11_2 && rm -f *jdbc* *occi* *mysql* *mql1* *ipc1* *jar uidrvci genezi adrci && \
+    echo /opt/oracle/instantclient* > /etc/ld.so.conf.d/oracle-instantclient.conf && ldconfig
+# Set the Instant Client library paths
+ENV LD_LIBRARY_PATH="/opt/oracle/instantclient_11_2:/opt/oracle/instantclient_21_10:${LD_LIBRARY_PATH}"
+
+RUN rm -f *.zip *.key && apt-get clean && rm -rf /var/lib/apt/lists/*
+
+WORKDIR /
+
+RUN mkdir -p /app
+
+RUN useradd --create-home --home-dir /home/appuser appuser
+
+# Use the PostgREST binary from the builder stage
+COPY --from=builder --chown=appuser:0 /postgrest /usr/local/bin/postgrest
+
+RUN mv /usr/local/bin/postgrest /usr/local/bin/postgrest-original && \
+    echo '#!/bin/bash\nexec /usr/local/bin/postgrest-original "$@" 2>&1 | sed "s/^/[PostgREST] /"' > /usr/local/bin/postgrest && \
+    chmod +x /usr/local/bin/postgrest
+
+
+# Copy application with ownership set directly to avoid chown -R
+COPY --from=builder /app/package.json ./app/package.json
+COPY --from=builder /app/plugins/dist ./app/plugins/dist
+COPY --from=builder /app/plugins/client.js ./app/plugins/client.js
+COPY --from=builder /app/plugins/node_modules ./app/plugins/node_modules
+COPY --from=builder /app/plugins/packages/common ./app/plugins/packages/common
+COPY --from=builder /app/plugins/package.json ./app/plugins/package.json
+COPY --from=builder /app/frontend/build ./app/frontend/build
+COPY --from=builder /app/server/package.json ./app/server/package.json
+COPY --from=builder /app/server/.version ./app/server/.version
+COPY --from=builder /app/server/ee/keys ./app/server/ee/keys
+COPY --from=builder /app/server/node_modules ./app/server/node_modules
+COPY --from=builder /app/server/templates ./app/server/templates
+COPY --from=builder /app/server/scripts ./app/server/scripts
+COPY --from=builder /app/server/dist ./app/server/dist
+COPY --from=builder /app/server/ee/ai/assets ./app/server/ee/ai/assets
+COPY ./docker/LTS/ee/ee-entrypoint.sh ./app/server/ee-entrypoint.sh
+
+WORKDIR /app
+
+RUN npm install --prefix server --no-save dotenv@10.0.0 joi@17.4.1 && npm cache clean --force
+
+ENTRYPOINT ["./server/ee-entrypoint.sh"]

cypress-tests/cypress-main.Dockerfile

@@ -0,0 +1,217 @@
+FROM node:22.15.1 AS builder
+
+# Fix for JS heap limit allocation issue
+ENV NODE_OPTIONS="--max-old-space-size=4096"
+
+RUN npm i -g npm@10.9.2 && npm cache clean --force
+
+RUN mkdir -p /app
+WORKDIR /app
+
+# Set GitHub token and branch as build arguments
+ARG CUSTOM_GITHUB_TOKEN
+ARG BRANCH_NAME
+
+# Clone and checkout the frontend repository
+RUN git config --global url."https://x-access-token:${CUSTOM_GITHUB_TOKEN}@github.com/".insteadOf "https://github.com/"
+
+RUN git config --global http.version HTTP/1.1
+RUN git config --global http.postBuffer 524288000
+RUN git clone https://github.com/ToolJet/ToolJet.git .
+
+# The branch name needs to be changed the branch with modularisation in CE repo
+RUN git checkout ${BRANCH_NAME}
+
+RUN git submodule update --init --recursive
+
+# Checkout the same branch in submodules if it exists, otherwise fallback to lts-3.16
+RUN git submodule foreach " \
+  if git show-ref --verify --quiet refs/heads/${BRANCH_NAME} || \
+     git ls-remote --exit-code --heads origin ${BRANCH_NAME}; then \
+    git checkout ${BRANCH_NAME}; \
+  else \
+    echo 'Branch ${BRANCH_NAME} not found in submodule \$name, falling back to main'; \
+    git checkout main; \
+  fi"
+
+# Scripts for building
+COPY ./package.json ./package.json
+
+# Build plugins
+COPY ./plugins/package.json ./plugins/package-lock.json ./plugins/
+RUN npm --prefix plugins ci --omit=dev
+COPY ./plugins/ ./plugins/
+RUN NODE_ENV=production npm --prefix plugins run build && npm --prefix plugins prune --omit=dev
+
+ENV TOOLJET_EDITION=ee
+
+# Build frontend
+COPY ./frontend/package.json ./frontend/package-lock.json ./frontend/
+RUN npm --prefix frontend install
+COPY ./frontend/ ./frontend/
+RUN npm --prefix frontend run build --production && npm --prefix frontend prune --production
+
+ENV NODE_ENV=production
+ENV TOOLJET_EDITION=ee
+
+# Build server
+COPY ./server/package.json ./server/package-lock.json ./server/
+RUN npm --prefix server ci --omit=dev
+COPY ./server/ ./server/
+RUN npm install -g @nestjs/cli && npm install -g copyfiles
+RUN npm --prefix server run build && npm prune --production --prefix server
+
+# Install dependencies for PostgREST, curl, tar, etc.
+RUN apt-get update && apt-get install -y \
+    curl ca-certificates tar \
+    && rm -rf /var/lib/apt/lists/*
+
+ENV POSTGREST_VERSION=v12.2.0
+
+RUN curl -Lo postgrest.tar.xz https://github.com/PostgREST/postgrest/releases/download/${POSTGREST_VERSION}/postgrest-v12.2.0-linux-static-x64.tar.xz && \
+    tar -xf postgrest.tar.xz && \
+    mv postgrest /postgrest && \
+    rm postgrest.tar.xz && \
+    chmod +x /postgrest
+
+FROM debian:12-slim
+
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends \
+        curl \
+        wget \
+        gnupg \
+        unzip \
+        ca-certificates \
+        xz-utils \
+        tar \
+        postgresql-client \
+        redis \
+        libaio1 \
+        git \
+        openssh-client \
+        freetds-dev \
+    && apt-get upgrade -y -o Dpkg::Options::="--force-confold" \
+    && apt-get autoremove -y \
+    && apt-get clean && rm -rf /var/lib/apt/lists/*
+
+
+RUN curl -O https://nodejs.org/dist/v22.15.1/node-v22.15.1-linux-x64.tar.xz \
+    && tar -xf node-v22.15.1-linux-x64.tar.xz \
+    && mv node-v22.15.1-linux-x64 /usr/local/lib/nodejs \
+    && echo 'export PATH="/usr/local/lib/nodejs/bin:$PATH"' >> /etc/profile.d/nodejs.sh \
+    && /bin/bash -c "source /etc/profile.d/nodejs.sh" \
+    && rm node-v22.15.1-linux-x64.tar.xz
+ENV PATH=/usr/local/lib/nodejs/bin:$PATH
+
+ENV NODE_ENV=production
+ENV TOOLJET_EDITION=ee
+ENV NODE_OPTIONS="--max-old-space-size=4096"
+
+# Install Neo4j + APOC
+RUN wget -O - https://debian.neo4j.com/neotechnology.gpg.key | apt-key add - && \
+    echo "deb https://debian.neo4j.com stable 5" > /etc/apt/sources.list.d/neo4j.list && \
+    apt-get update && apt-get install -y neo4j=1:5.26.6 && apt-mark hold neo4j && \
+    mkdir -p /var/lib/neo4j/plugins && \
+    wget -P /var/lib/neo4j/plugins https://github.com/neo4j/apoc/releases/download/5.26.6/apoc-5.26.6-core.jar && \
+    echo "dbms.security.procedures.unrestricted=apoc.*" >> /etc/neo4j/neo4j.conf && \
+    echo "dbms.security.procedures.allowlist=apoc.*,algo.*,gds.*" >> /etc/neo4j/neo4j.conf && \
+    echo "dbms.directories.plugins=/var/lib/neo4j/plugins" >> /etc/neo4j/neo4j.conf && \
+    echo "dbms.security.auth_enabled=true" >> /etc/neo4j/neo4j.conf && \
+    apt-get clean && rm -rf /var/lib/apt/lists/*
+
+# Install Instantclient Basic Light Oracle and Dependencies
+WORKDIR /opt/oracle
+
+RUN wget https://tooljet-plugins-production.s3.us-east-2.amazonaws.com/marketplace-assets/oracledb/instantclients/instantclient-basiclite-linuxx64.zip && \
+    wget https://tooljet-plugins-production.s3.us-east-2.amazonaws.com/marketplace-assets/oracledb/instantclients/instantclient-basiclite-linux.x64-11.2.0.4.0.zip && \
+    unzip instantclient-basiclite-linuxx64.zip && rm -f instantclient-basiclite-linuxx64.zip && \
+    unzip instantclient-basiclite-linux.x64-11.2.0.4.0.zip && rm -f instantclient-basiclite-linux.x64-11.2.0.4.0.zip && \
+    cd /opt/oracle/instantclient_21_10 && rm -f *jdbc* *occi* *mysql* *mql1* *ipc1* *jar uidrvci genezi adrci && \
+    cd /opt/oracle/instantclient_11_2 && rm -f *jdbc* *occi* *mysql* *mql1* *ipc1* *jar uidrvci genezi adrci && \
+    echo /opt/oracle/instantclient* > /etc/ld.so.conf.d/oracle-instantclient.conf && ldconfig
+# Set the Instant Client library paths
+ENV LD_LIBRARY_PATH="/opt/oracle/instantclient_11_2:/opt/oracle/instantclient_21_10:${LD_LIBRARY_PATH}"
+
+RUN rm -f *.zip *.key && apt-get clean && rm -rf /var/lib/apt/lists/*
+
+WORKDIR /
+
+RUN mkdir -p /app
+
+RUN useradd --create-home --home-dir /home/appuser appuser
+
+# Use the PostgREST binary from the builder stage
+COPY --from=builder --chown=appuser:0 /postgrest /usr/local/bin/postgrest
+
+RUN mv /usr/local/bin/postgrest /usr/local/bin/postgrest-original && \
+    echo '#!/bin/bash\nexec /usr/local/bin/postgrest-original "$@" 2>&1 | sed "s/^/[PostgREST] /"' > /usr/local/bin/postgrest && \
+    chmod +x /usr/local/bin/postgrest
+
+
+# Copy application with ownership set directly to avoid chown -R
+COPY --from=builder --chown=appuser:0 /app/package.json ./app/package.json
+COPY --from=builder --chown=appuser:0 /app/plugins/dist ./app/plugins/dist
+COPY --from=builder --chown=appuser:0 /app/plugins/client.js ./app/plugins/client.js
+COPY --from=builder --chown=appuser:0 /app/plugins/node_modules ./app/plugins/node_modules
+COPY --from=builder --chown=appuser:0 /app/plugins/packages/common ./app/plugins/packages/common
+COPY --from=builder --chown=appuser:0 /app/plugins/package.json ./app/plugins/package.json
+COPY --from=builder --chown=appuser:0 /app/frontend/build ./app/frontend/build
+COPY --from=builder --chown=appuser:0 /app/server/package.json ./app/server/package.json
+COPY --from=builder --chown=appuser:0 /app/server/.version ./app/server/.version
+COPY --from=builder --chown=appuser:0 /app/server/ee/keys ./app/server/ee/keys
+COPY --from=builder --chown=appuser:0 /app/server/node_modules ./app/server/node_modules
+COPY --from=builder --chown=appuser:0 /app/server/templates ./app/server/templates
+COPY --from=builder --chown=appuser:0 /app/server/scripts ./app/server/scripts
+COPY --from=builder --chown=appuser:0 /app/server/dist ./app/server/dist
+COPY --from=builder --chown=appuser:0 /app/server/ee/ai/assets ./app/server/ee/ai/assets
+COPY ./docker/LTS/ee/ee-entrypoint.sh ./app/server/ee-entrypoint.sh
+
+# Set group write permissions for frontend build files to support RedHat arbitrary user assignment
+RUN chmod -R g+w /app/frontend/build
+
+RUN mkdir -p /var/lib/neo4j/data/databases /var/lib/neo4j/data/transactions /var/log/neo4j /opt/neo4j/run && \
+    chown -R appuser:0 /var/lib/neo4j /var/log/neo4j /etc/neo4j /opt/neo4j/run && \
+    chmod -R 770 /var/lib/neo4j /var/log/neo4j /etc/neo4j /opt/neo4j/run && \
+    chmod -R 644 /var/lib/neo4j/plugins/*.jar && \
+    chown -R appuser:0 /var/lib/neo4j/plugins && \
+    chmod 755 /var/lib/neo4j/plugins
+
+# Create directory /home/appuser and set ownership to appuser
+RUN mkdir -p /home/appuser \
+    && chown -R appuser:0 /home/appuser \
+    && chmod g+s /home/appuser \
+    && chmod -R g=u /home/appuser \
+    && npm cache clean --force
+
+# Create directory /tmp/.npm/npm-cache/ and set ownership to appuser
+RUN mkdir -p /tmp/.npm/npm-cache/ \
+    && chown -R appuser:0 /tmp/.npm/npm-cache/ \
+    && chmod g+s /tmp/.npm/npm-cache/ \
+    && chmod -R g=u /tmp/.npm/npm-cache \
+    && npm cache clean --force
+
+# Set npm cache directory globally
+RUN npm config set cache /tmp/.npm/npm-cache/ --global
+ENV npm_config_cache /tmp/.npm/npm-cache/
+
+# Create directory /tmp/.npm/npm-cache/_logs and set ownership to appuser
+RUN mkdir -p /tmp/.npm/npm-cache/_logs \
+    && chown -R appuser:0 /tmp/.npm/npm-cache/_logs \
+    && chmod g+s /tmp/.npm/npm-cache/_logs \
+    && chmod -R g=u /tmp/.npm/npm-cache/_logs
+
+# Create Redis data, log, and configuration directories
+RUN mkdir -p /var/lib/redis /var/log/redis /etc/redis \
+    && chown -R appuser:0 /var/lib/redis /var/log/redis /etc/redis \
+    && chmod g+s /var/lib/redis /var/log/redis /etc/redis \
+    && chmod -R g=u /var/lib/redis /var/log/redis /etc/redis
+
+ENV HOME=/home/appuser
+# Switch back to appuser
+USER appuser
+WORKDIR /app
+
+RUN npm install --prefix server --no-save dotenv@10.0.0 joi@17.4.1 && npm cache clean --force
+
+ENTRYPOINT ["./server/ee-entrypoint.sh"]

cypress-tests/cypress-marketplace.config.js

@@ -1,11 +1,4 @@
 const { defineConfig } = require("cypress");
-const { rmdir } = require("fs");
-const fs = require("fs");
-const XLSX = require("node-xlsx");
-
-const pg = require("pg");
-const path = require("path");
-const pdf = require("pdf-parse");
 
 module.exports = defineConfig({
   execTimeout: 1800000,
@@ -16,77 +9,41 @@ module.exports = defineConfig({
   viewportWidth: 1440,
   viewportHeight: 960,
   chromeWebSecurity: false,
-  trashAssetsBeforeRuns: true,
 
   e2e: {
-    setupNodeEvents (on, config) {
-      on("task", {
-        readPdf (pathToPdf) {
-          return new Promise((resolve) => {
-            const pdfPath = path.resolve(pathToPdf);
-            let dataBuffer = fs.readFileSync(pdfPath);
-            pdf(dataBuffer).then(function ({ text }) {
-              resolve(text);
-            });
-          });
-        },
-      });
-
-      on("task", {
-        readXlsx (filePath) {
-          return new Promise((resolve, reject) => {
-            try {
-              let dataBuffer = fs.readFileSync(filePath);
-              const jsonData = XLSX.parse(dataBuffer);
-              // jsonData= jsonData[0].data
-              resolve(jsonData[0]["data"].toString());
-            } catch (e) {
-              reject(e);
-            }
-          });
-        },
-      });
-
-      on("task", {
-        deleteFolder (folderName) {
-          return new Promise((resolve, reject) => {
-            rmdir(folderName, { maxRetries: 10, recursive: true }, (err) => {
-              if (err) {
-                console.error(err);
-                return reject(err);
-              }
-              resolve(null);
-            });
-          });
-        },
-      });
-
-      on("task", {
-        dbConnection ({ dbconfig, sql }) {
-          const client = new pg.Pool(dbconfig);
-          return client.query(sql);
-        },
-      });
+    setupNodeEvents(on, config) {
+      require("./cypress/config/tasks")(on);
+      require("./cypress/config/browserConfig")(on);
 
       return require("./cypress/plugins/index.js")(on, config);
     },
-    downloadsFolder: "cypress/downloads",
-    experimentalRunAllSpecs: true,
-    experimentalModfyObstructiveThirdPartyCode: true,
-    experimentalRunAllSpecs: true,
-    baseUrl: "http://localhost:8082",
+
+    baseUrl: "http://localhost:8082/",
     specPattern: [
-      "cypress/e2e/happyPath/marketplace/commonTestcases/**/*.cy.js",
-    ]
-    numTestsKeptInMemory: 1,
-    redirectionLimit: 7,
-    experimentalRunAllSpecs: true,
-    experimentalMemoryManagement: true,
-    video: false,
-    videoUploadOnPasses: false,
+      "cypress/e2e/happyPath/platform/eeTestcases/licensing/updateLicense.cy.js",
+      "cypress/e2e/happyPath/marketplace/commonTestcases/datasources/*.cy.js",
+    ],
+
+    testIsolation: true,
     retries: {
-      runMode: 2,
+      runMode: 0,
       openMode: 0,
     },
+    redirectionLimit: 7,
+
+    numTestsKeptInMemory: 1,
+    experimentalMemoryManagement: true,
+
+    experimentalModifyObstructiveThirdPartyCode: true,
+
+    downloadsFolder: "cypress/downloads",
+    trashAssetsBeforeRuns: true,
+    video: false,
+    videoUploadOnPasses: false,
+    screenshotOnRunFailure: true,
+    screenshotsFolder: 'cypress/screenshots',
+
+    coverage: false,
+    codeCoverageTasksRegistered: false,
   },
 });

cypress-tests/cypress-platform.config.js

@@ -6,28 +6,6 @@ const pg = require("pg");
 const path = require("path");
 const pdf = require("pdf-parse");
 
-const environments = {
-    'run-cypress-platform': {
-        baseUrl: "http://localhost:3000",
-        configFile: "cypress-platform.config.js"
-    },
-    'run-cypress-platform-subpath': {
-        baseUrl: "http://localhost:3000/apps",
-        configFile: "cypress-platform.config.js"
-    },
-    'run-cypress-platform-proxy': {
-        baseUrl: "http://localhost:4001",
-        configFile: "cypress-platform.config.js"
-    },
-    'run-cypress-platform-proxy-subpath': {
-        baseUrl: "http://localhost:4001/apps",
-        configFile: "cypress-platform.config.js"
-    }
-};
-
-const githubLabel = process.env.GITHUB_LABEL || 'run-cypress-platform';
-const environment = environments[githubLabel];
-
 module.exports = defineConfig({
     execTimeout: 1800000,
     defaultCommandTimeout: 30000,
@@ -40,7 +18,6 @@ module.exports = defineConfig({
     trashAssetsBeforeRuns: true,
     e2e: {
         setupNodeEvents (on, config) {
-            config.baseUrl = environment.baseUrl;
 
             on("task", {
                 readPdf (pathToPdf) {
@@ -94,8 +71,7 @@ module.exports = defineConfig({
         downloadsFolder: "cypress/downloads",
         experimentalRunAllSpecs: true,
         experimentalModfyObstructiveThirdPartyCode: true,
-        baseUrl: environment.baseUrl,
-        configFile: environment.configFile,
+        baseUrl: "http://localhost:3000", // Default for local development (GitHub workflow overrides this)
         specPattern: [
             "cypress/e2e/happyPath/platform/firstUser/firstUserOnboarding.cy.js",
             "cypress/e2e/happyPath/platform/ceTestcases/apps/appSlug.cy.js",

cypress-tests/cypress-run.config.js

@@ -19,9 +19,9 @@ module.exports = defineConfig({
   trashAssetsBeforeRuns: true,
 
   e2e: {
-    setupNodeEvents (on, config) {
+    setupNodeEvents(on, config) {
       on("task", {
-        readPdf (pathToPdf) {
+        readPdf(pathToPdf) {
           return new Promise((resolve) => {
             const pdfPath = path.resolve(pathToPdf);
             let dataBuffer = fs.readFileSync(pdfPath);
@@ -33,7 +33,7 @@ module.exports = defineConfig({
       });
 
       on("task", {
-        readXlsx (filePath) {
+        readXlsx(filePath) {
           return new Promise((resolve, reject) => {
             try {
               let dataBuffer = fs.readFileSync(filePath);
@@ -48,7 +48,7 @@ module.exports = defineConfig({
       });
 
       on("task", {
-        deleteFolder (folderName) {
+        deleteFolder(folderName) {
           return new Promise((resolve, reject) => {
             rmdir(folderName, { maxRetries: 10, recursive: true }, (err) => {
               if (err) {
@@ -62,7 +62,7 @@ module.exports = defineConfig({
       });
 
       on("task", {
-        dbConnection ({ dbconfig, sql }) {
+        dbConnection({ dbconfig, sql }) {
           const client = new pg.Pool(dbconfig);
           return client.query(sql);
         },
@@ -83,7 +83,7 @@ module.exports = defineConfig({
     video: false,
     videoUploadOnPasses: false,
     retries: {
-      runMode: 2,
+      runMode: 1,
       openMode: 0,
     },
   },

cypress-tests/cypress.Dockerfile

@@ -1,198 +0,0 @@
-FROM node:22.15.1 AS builder
-# Fix for JS heap limit allocation issue
-ENV NODE_OPTIONS="--max-old-space-size=4096"
-
-RUN mkdir -p /app
-
-WORKDIR /app
-
-# Set GitHub token and branch as build arguments
-ARG CUSTOM_GITHUB_TOKEN
-ARG BRANCH_NAME
-
-# Clone and checkout the frontend repository
-RUN git config --global url."https://x-access-token:${CUSTOM_GITHUB_TOKEN}@github.com/".insteadOf "https://github.com/"
-
-RUN git config --global http.version HTTP/1.1
-RUN git config --global http.postBuffer 524288000
-RUN git clone https://github.com/ToolJet/ToolJet.git .
-
-# The branch name needs to be changed the branch with modularisation in CE repo
-RUN git checkout ${BRANCH_NAME}
-
-RUN git submodule update --init --recursive
-
-# Checkout the same branch in submodules if it exists, otherwise fallback to main
-RUN git submodule foreach " \
-  if git show-ref --verify --quiet refs/heads/${BRANCH_NAME} || \
-     git ls-remote --exit-code --heads origin ${BRANCH_NAME}; then \
-    git checkout ${BRANCH_NAME}; \
-  else \
-    echo 'Branch ${BRANCH_NAME} not found in submodule \$name, falling back to main'; \
-    git checkout main; \
-  fi"
-
-# Scripts for building
-COPY ./package.json ./package.json
-
-# Build plugins
-COPY ./plugins/package.json ./plugins/package-lock.json ./plugins/
-RUN npm --prefix plugins install
-COPY ./plugins/ ./plugins/
-RUN NODE_ENV=production npm --prefix plugins run build
-RUN npm --prefix plugins prune --production
-
-ENV TOOLJET_EDITION=ee
-
-# Build frontend
-COPY ./frontend/package.json ./frontend/package-lock.json ./frontend/
-RUN npm --prefix frontend install
-COPY ./frontend/ ./frontend/
-RUN npm --prefix frontend run build --production
-RUN npm --prefix frontend prune --production
-
-ENV NODE_ENV=production
-ENV TOOLJET_EDITION=ee
-
-# Build server
-COPY ./server/package.json ./server/package-lock.json ./server/
-RUN npm --prefix server install
-COPY ./server/ ./server/
-RUN npm install -g @nestjs/cli
-RUN npm install -g copyfiles
-RUN npm --prefix server run build
-
-FROM node:22.15.1-bullseye
-
-RUN apt-get update -yq \
-    && apt-get install curl wget gnupg zip -yq \
-    && apt-get install -yq build-essential \
-    && apt -y install redis \
-    && apt-get clean -y
-
-# copy postgrest executable
-COPY --from=postgrest/postgrest:v12.2.0 /bin/postgrest /bin
-
-ENV NODE_ENV=production
-ENV TOOLJET_EDITION=ee
-ENV NODE_OPTIONS="--max-old-space-size=4096"
-RUN apt-get update && apt-get install -y freetds-dev libaio1 wget supervisor
-
-# Install Instantclient Basic Light Oracle and Dependencies
-WORKDIR /opt/oracle
-RUN wget https://tooljet-plugins-production.s3.us-east-2.amazonaws.com/marketplace-assets/oracledb/instantclients/instantclient-basiclite-linuxx64.zip && \
-    wget https://tooljet-plugins-production.s3.us-east-2.amazonaws.com/marketplace-assets/oracledb/instantclients/instantclient-basiclite-linux.x64-11.2.0.4.0.zip && \
-    unzip instantclient-basiclite-linuxx64.zip && rm -f instantclient-basiclite-linuxx64.zip && \
-    unzip instantclient-basiclite-linux.x64-11.2.0.4.0.zip && rm -f instantclient-basiclite-linux.x64-11.2.0.4.0.zip && \
-    cd /opt/oracle/instantclient_21_10 && rm -f *jdbc* *occi* *mysql* *mql1* *ipc1* *jar uidrvci genezi adrci && \
-    cd /opt/oracle/instantclient_11_2 && rm -f *jdbc* *occi* *mysql* *mql1* *ipc1* *jar uidrvci genezi adrci && \
-    echo /opt/oracle/instantclient* > /etc/ld.so.conf.d/oracle-instantclient.conf && ldconfig
-# Set the Instant Client library paths
-ENV LD_LIBRARY_PATH="/opt/oracle/instantclient_11_2:/opt/oracle/instantclient_21_10:${LD_LIBRARY_PATH}"
-
-WORKDIR /
-
-# copy npm scripts
-COPY --from=builder /app/package.json ./app/package.json
-# copy plugins dependencies
-COPY --from=builder /app/plugins/dist ./app/plugins/dist
-COPY --from=builder /app/plugins/client.js ./app/plugins/client.js
-COPY --from=builder /app/plugins/node_modules ./app/plugins/node_modules
-COPY --from=builder /app/plugins/packages/common ./app/plugins/packages/common
-COPY --from=builder /app/plugins/package.json ./app/plugins/package.json
-# copy frontend build
-COPY --from=builder /app/frontend/build ./app/frontend/build
-# copy server build
-COPY --from=builder /app/server/package.json ./app/server/package.json
-COPY --from=builder /app/server/.version ./app/server/.version
-COPY --from=builder /app/server/ee/keys ./app/server/ee/keys
-COPY --from=builder /app/server/node_modules ./app/server/node_modules
-COPY --from=builder /app/server/templates ./app/server/templates
-COPY --from=builder /app/server/scripts ./app/server/scripts
-COPY --from=builder /app/server/dist ./app/server/dist
-
-WORKDIR /app
-
-# Install PostgreSQL
-USER root
-RUN wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -
-RUN echo "deb http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main" | tee /etc/apt/sources.list.d/pgdg.list
-RUN apt update && apt -y install postgresql-13 postgresql-client-13 supervisor --fix-missing
-
-
-# Explicitly create PG main directory with correct ownership
-RUN mkdir -p /var/lib/postgresql/13/main && \
-    chown -R postgres:postgres /var/lib/postgresql
-
-RUN mkdir -p /var/log/supervisor /var/run/postgresql && \
-    chown -R postgres:postgres /var/run/postgresql /var/log/supervisor
-
-# Remove existing data and create directory with proper ownership
-RUN rm -rf /var/lib/postgresql/13/main && \
-    mkdir -p /var/lib/postgresql/13/main && \
-    chown -R postgres:postgres /var/lib/postgresql
-
-# Initialize PostgreSQL
-RUN su - postgres -c "/usr/lib/postgresql/13/bin/initdb -D /var/lib/postgresql/13/main"
-
-# Configure Supervisor to manage PostgREST, ToolJet, and Redis
-RUN echo "[supervisord] \n" \
-    "nodaemon=true \n" \
-    "user=root \n" \
-    "\n" \
-    "[program:redis] \n" \
-    "command=redis-server /etc/redis/redis.conf \n" \
-    "user=redis \n" \
-    "autostart=true \n" \
-    "autorestart=true \n" \
-    "stderr_logfile=/var/log/redis/redis-server.log \n" \
-    "stdout_logfile=/var/log/redis/redis-server.log \n" \
-    "\n" \
-    "[program:postgrest] \n" \
-    "command=/bin/postgrest \n" \
-    "autostart=true \n" \
-    "autorestart=true \n" \
-    "\n" \
-    "[program:tooljet] \n" \
-    "user=root \n" \
-    "command=/bin/bash -c '/app/server/scripts/boot.sh' \n" \
-    "autostart=true \n" \
-    "autorestart=true \n" \
-    "stderr_logfile=/dev/stdout \n" \
-    "stderr_logfile_maxbytes=0 \n" \
-    "stdout_logfile=/dev/stdout \n" \
-    "stdout_logfile_maxbytes=0 \n" | sed 's/ //' > /etc/supervisor/conf.d/supervisord.conf
-
-# ENV defaults
-ENV TOOLJET_HOST=http://localhost \
-    PORT=3000 \
-    NODE_ENV=production \
-    LOCKBOX_MASTER_KEY=replace_with_lockbox_master_key \
-    SECRET_KEY_BASE=replace_with_secret_key_base \
-    PG_DB=tooljet_production \
-    PG_USER=postgres \
-    PG_PASS=postgres \
-    PG_HOST=localhost \
-    ENABLE_TOOLJET_DB=true \
-    TOOLJET_DB_HOST=localhost \
-    TOOLJET_DB_USER=postgres \
-    TOOLJET_DB_PASS=postgres \
-    TOOLJET_DB=tooljet_db \
-    PGRST_HOST=http://localhost:3001 \
-    PGRST_SERVER_PORT=3001 \
-    PGRST_DB_URI=postgres://postgres:postgres@localhost/tooljet_db \
-    PGRST_JWT_SECRET=r9iMKoe5CRMgvJBBtp4HrqN7QiPpUToj \
-    PGRST_DB_PRE_CONFIG=postgrest.pre_config \
-    REDIS_HOST=localhost \
-    REDIS_PORT=6379 \
-    REDIS_USER= \
-    REDIS_PASSWORD= \
-    ORM_LOGGING=true \
-    DEPLOYMENT_PLATFORM=docker:local \
-    HOME=/home/appuser \
-    TERM=xterm
-
-
-RUN chmod +x ./server/scripts/preview.sh
-# Set the entrypoint
-ENTRYPOINT ["./server/scripts/preview.sh"]

cypress-tests/cypress.config.js

@@ -1,11 +1,4 @@
 const { defineConfig } = require("cypress");
-const { rmdir } = require("fs");
-const fs = require("fs");
-const XLSX = require("node-xlsx");
-
-const pg = require("pg");
-const path = require("path");
-const pdf = require("pdf-parse");
 
 module.exports = defineConfig({
   execTimeout: 1800000,
@@ -16,93 +9,42 @@ module.exports = defineConfig({
   viewportWidth: 1440,
   viewportHeight: 960,
   chromeWebSecurity: false,
-  trashAssetsBeforeRuns: true,
 
   e2e: {
     setupNodeEvents (on, config) {
-      on("task", {
-        readPdf (pathToPdf) {
-          return new Promise((resolve) => {
-            const pdfPath = path.resolve(pathToPdf);
-            let dataBuffer = fs.readFileSync(pdfPath);
-            pdf(dataBuffer).then(function ({ text }) {
-              resolve(text);
-            });
-          });
-        },
-      });
-
-      on("task", {
-        readXlsx (filePath) {
-          return new Promise((resolve, reject) => {
-            try {
-              let dataBuffer = fs.readFileSync(filePath);
-              const jsonData = XLSX.parse(dataBuffer);
-              // jsonData= jsonData[0].data
-              resolve(jsonData[0]["data"].toString());
-            } catch (e) {
-              reject(e);
-            }
-          });
-        },
-      });
-
-      on("task", {
-        deleteFolder (folderName) {
-          return new Promise((resolve, reject) => {
-            if (fs.existsSync(folderName)) {
-              rmdir(folderName, { maxRetries: 10, recursive: true }, (err) => {
-                if (err) {
-                  console.error(err);
-                  return reject(err);
-                }
-                return resolve(null);
-              });
-            } else {
-              return resolve(null);
-            }
-          });
-        },
-      });
-
-      on("task", {
-        dbConnection ({ dbconfig, sql }) {
-          const client = new pg.Pool(dbconfig);
-          return client.query(sql);
-        },
-      });
-      on('before:browser:launch', (browser = {}, launchOptions) => {
-        if (browser.name === 'chrome' && browser.isHeadless === false) {
-          launchOptions.args.push(
-            '--disable-features=AutofillAccountStorage,PasswordManager',
-            '--disable-save-password-bubble',
-            '--disable-password-generation',
-            '--disable-password-manager-reauthentication'
-          );
-        }
-        return launchOptions;
-      });
+      require("./cypress/config/tasks")(on);
+      require("./cypress/config/browserConfig")(on);
       require("@cypress/code-coverage/task")(on, config);
-      // return config;
-
       require("./cypress/plugins/index.js")(on, config);
       return config;
     },
-    experimentalRunAllSpecs: true,
-    experimentalModfyObstructiveThirdPartyCode: true,
-    experimentalRunAllSpecs: true,
+
     baseUrl: "http://localhost:8082",
     specPattern: "cypress/e2e/happyPath/**/*.cy.js",
-    downloadsFolder: "cypress/downloads",
-    numTestsKeptInMemory: 0,
-    redirectionLimit: 10,
-    experimentalRunAllSpecs: true,
-    trashAssetsBeforeRuns: true,
+
+    testIsolation: true,
+    retries: {
+      runMode: 2,
+      openMode: 0
+    },
+    redirectionLimit: 3,
+
+    numTestsKeptInMemory: 1,
     experimentalMemoryManagement: true,
-    coverage: true,
-    codeCoverageTasksRegistered: true,
+
+    experimentalRunAllSpecs: true,
+    experimentalOriginDependencies: true,
+
+    downloadsFolder: "cypress/downloads",
+    trashAssetsBeforeRuns: true,
     video: false,
     videoUploadOnPasses: false,
-    experimentalStudio: true,
+    screenshotOnRunFailure: true,
+    screenshotsFolder: 'cypress/screenshots',
+
+    coverage: false,
+    codeCoverageTasksRegistered: false,
+
+    projectId: "ca6324a0-4210-4f7e-846a-71ca2766ca4",
   },
 });

cypress-tests/cypress/commands/apiCommands.js

@@ -1,93 +1,5 @@
 const envVar = Cypress.env("environment");
 
-Cypress.Commands.add(
-  "apiLogin",
-  (
-    userEmail = "dev@tooljet.io",
-    userPassword = "password",
-    workspaceId = "",
-    redirection = "/"
-  ) => {
-    cy.request({
-      url: `${Cypress.env("server_host")}/api/authenticate/${workspaceId}`,
-      method: "POST",
-      body: {
-        email: userEmail,
-        password: userPassword,
-        redirectTo: redirection,
-      },
-    })
-      .its("body")
-      .then((res) => {
-        Cypress.env("workspaceId", res.current_organization_id);
-        Cypress.log({
-          name: "Api login",
-          displayName: "LOGIN: ",
-          message: `: Success`,
-        });
-      });
-  }
-);
-
-Cypress.Commands.add("apiCreateGDS", (url, name, kind, options) => {
-  cy.getCookie("tj_auth_token").then((cookie) => {
-    cy.request(
-      {
-        method: "POST",
-        url: url,
-        headers: {
-          "Tj-Workspace-Id": Cypress.env("workspaceId"),
-          Cookie: `tj_auth_token=${cookie.value}`,
-        },
-        body: {
-          name: name,
-          kind: kind,
-          options: options,
-          scope: "global",
-        },
-      },
-      { log: false }
-    ).then((response) => {
-      {
-        log: false;
-      }
-      expect(response.status).to.equal(201);
-      Cypress.env(`${name}`, response.body.id);
-
-      Cypress.log({
-        name: "Create Data Source",
-        displayName: "Data source created",
-        message: `:\nDatasource: '${kind}',\nName: '${name}'`,
-      });
-    });
-  });
-});
-
-Cypress.Commands.add("apiFetchDataSourcesId", () => {
-  cy.getAuthHeaders().then((headers) => {
-    cy.request({
-      method: "GET",
-      url: `${Cypress.env("server_host")}/api/data-sources/${Cypress.env("workspaceId")}/environments/${Cypress.env("environmentId")}/versions/${Cypress.env("editingVersionId")}`,
-      headers,
-    }).then((response) => {
-      expect(response.status).to.equal(200);
-      const dataSources = response.body?.data_sources || [];
-
-      dataSources.forEach((item) => {
-        Cypress.env(`${item.kind}`, `${item.id}`);
-      });
-
-      Cypress.log({
-        name: "DS Fetch",
-        displayName: "Data Sources Fetched",
-        message: dataSources
-          .map((ds) => `\nKind: '${ds.kind}', Name: '${ds.id}'`)
-          .join(","),
-      });
-    });
-  });
-});
-
 Cypress.Commands.add("apiCreateApp", (appName = "testApp") => {
   cy.window({ log: false }).then((win) => {
     win.localStorage.setItem("walkthroughCompleted", "true");
@@ -118,8 +30,13 @@ Cypress.Commands.add("apiCreateApp", (appName = "testApp") => {
       {
         log: false;
       }
+
       expect(response.status).to.equal(201);
       Cypress.env("appId", response.allRequestResponses[0]["Response Body"].id);
+      Cypress.env(
+        "user_id",
+        response.allRequestResponses[0]["Response Body"].user_id
+      );
       Cypress.log({
         name: "App create",
         displayName: "APP CREATED",
@@ -130,22 +47,25 @@ Cypress.Commands.add("apiCreateApp", (appName = "testApp") => {
 });
 
 Cypress.Commands.add("apiDeleteApp", (appId = Cypress.env("appId")) => {
-  cy.request(
-    {
-      method: "DELETE",
-      url: `${Cypress.env("server_host")}/api/apps/${Cypress.env("appId")}`,
-      headers: {
-        "Tj-Workspace-Id": Cypress.env("workspaceId"),
-        Cookie: Cypress.env("authToken"),
+  cy.getCookie("tj_auth_token", { log: false }).then((cookie) => {
+    Cypress.env("authToken", `tj_auth_token=${cookie.value}`);
+    cy.request(
+      {
+        method: "DELETE",
+        url: `${Cypress.env("server_host")}/api/apps/${appId}`,
+        headers: {
+          "Tj-Workspace-Id": Cypress.env("workspaceId"),
+          Cookie: Cypress.env("authToken"),
+        },
       },
-    },
-    { log: false }
-  ).then((response) => {
-    expect(response.status).to.equal(200);
-    Cypress.log({
-      name: "App Delete",
-      displayName: "APP DELETED",
-      message: `: ${Cypress.env("appId")}`,
+      { log: false }
+    ).then((response) => {
+      expect(response.status).to.equal(200);
+      Cypress.log({
+        name: "App Delete",
+        displayName: "APP DELETED",
+        message: `:${appId}`,
+      });
     });
   });
 });
@@ -156,12 +76,14 @@ Cypress.Commands.add(
     slug = "",
     workspaceId = Cypress.env("workspaceId"),
     appId = Cypress.env("appId"),
-    componentSelector = "[data-cy='empty-editor-text']"
+    componentSelector = "[data-cy='drag-and-drop-a-component-label']"
   ) => {
     cy.intercept("GET", "/api/apps/*").as("getAppData");
+
     cy.window({ log: false }).then((win) => {
       win.localStorage.setItem("walkthroughCompleted", "true");
     });
+
     cy.visit(`/${workspaceId}/apps/${appId}/${slug}`);
 
     cy.wait("@getAppData").then((interception) => {
@@ -174,88 +96,6 @@ Cypress.Commands.add(
   }
 );
 
-Cypress.Commands.add("apiCreateWorkspace", (workspaceName, workspaceSlug) => {
-  cy.getCookie("tj_auth_token").then((cookie) => {
-    cy.request(
-      {
-        method: "POST",
-        url: `${Cypress.env("server_host")}/api/organizations`,
-        headers: {
-          "Tj-Workspace-Id": Cypress.env("workspaceId"),
-          Cookie: `tj_auth_token=${cookie.value}`,
-        },
-        body: {
-          name: workspaceName,
-          slug: workspaceSlug,
-        },
-      },
-      { log: false }
-    ).then((response) => {
-      expect(response.status).to.equal(201);
-      return response;
-    });
-  });
-});
-
-Cypress.Commands.add("apiLogout", () => {
-  cy.getCookie("tj_auth_token").then((cookie) => {
-    cy.request(
-      {
-        method: "GET",
-        url: `${Cypress.env("server_host")}/api/session/logout`,
-        headers: {
-          "Tj-Workspace-Id": Cypress.env("workspaceId"),
-          Cookie: `tj_auth_token=${cookie.value}`,
-        },
-      },
-      { log: false }
-    ).then((response) => {
-      expect(response.status).to.equal(200);
-    });
-  });
-});
-
-Cypress.Commands.add(
-  "apiUserInvite",
-  (userName, userEmail, userRole = "end-user", metaData = {}) => {
-    const requestBody =
-      envVar === "Enterprise"
-        ? {
-          email: userEmail,
-          firstName: userName,
-          groups: [],
-          lastName: "",
-          role: userRole,
-          userMetadata: metaData,
-        }
-        : {
-          email: userEmail,
-          firstName: userName,
-          groups: [],
-          lastName: "",
-          role: userRole,
-          userMetadata: metaData,
-        };
-
-    cy.getCookie("tj_auth_token").then((cookie) => {
-      cy.request(
-        {
-          method: "POST",
-          url: `${Cypress.env("server_host")}/api/organization-users`,
-          headers: {
-            "Tj-Workspace-Id": Cypress.env("workspaceId"),
-            Cookie: `tj_auth_token=${cookie.value}`,
-          },
-          body: requestBody,
-        },
-        { log: false }
-      ).then((response) => {
-        expect(response.status).to.equal(201);
-      });
-    });
-  }
-);
-
 Cypress.Commands.add("apiAddQuery", (queryName, query, dataQueryId) => {
   cy.getCookie("tj_auth_token").then((cookie) => {
     const headers = {
@@ -288,50 +128,62 @@ Cypress.Commands.add("apiAddQuery", (queryName, query, dataQueryId) => {
 
 Cypress.Commands.add(
   "apiAddQueryToApp",
-  (queryName, options, dsName, dsKind) => {
-    cy.log(
-      `${Cypress.env("server_host")}/api/data-queries/data-sources/${Cypress.env(dsKind)}/versions/${Cypress.env("editingVersionId")}`
-    );
+  ({ queryName, options, dataSourceName, dsKind }) => {
     cy.getCookie("tj_auth_token", { log: false }).then((cookie) => {
-      const authToken = `tj_auth_token=${cookie.value}`;
+      const authToken = cookie?.value;
       const workspaceId = Cypress.env("workspaceId");
       const appId = Cypress.env("appId");
+      const commonHeaders = {
+        "tj-workspace-id": workspaceId,
+        Cookie: `tj_auth_token=${authToken}; app_id=${appId}`,
+      };
 
       cy.request({
         method: "GET",
         url: `${Cypress.env("server_host")}/api/apps/${appId}`,
-        headers: {
-          "Tj-Workspace-Id": workspaceId,
-          Cookie: `${authToken}; app_id=${appId}`,
-        },
-        body: {},
+        headers: commonHeaders,
       }).then((appResponse) => {
         const editingVersionId = appResponse.body.editing_version.id;
+        const currentEnvironmentId = appResponse.body.editorEnvironment.id;
         Cypress.env("version-id", editingVersionId);
+        Cypress.env("environmentVersion-id", currentEnvironmentId);
 
         cy.request({
-          method: "POST",
-          url: `${Cypress.env("server_host")}/api/data-queries/data-sources/${Cypress.env(dsKind)}/versions/${Cypress.env("editingVersionId")}`,
-          headers: {
-            "Content-Type": "application/json",
-            Cookie: authToken,
-            "tj-workspace-id": workspaceId,
-          },
-          body: {
-            app_id: appId,
-            app_version_id: editingVersionId,
-            name: queryName,
-            kind: dsKind,
-            options: options,
-            data_source_id: dsName != null ? Cypress.env(`${dsName}-id`) : null,
-            plugin_id: null,
-          },
-        }).then((queryResponse) => {
-          expect(queryResponse.status).to.equal(201);
-          Cypress.log({
-            name: "Created queery",
-            displayName: "QUERY CREATED",
-            message: `: ${queryName}: ${dsKind}`,
+          method: "GET",
+          url: `${Cypress.env("server_host")}/api/data-sources/${workspaceId}/environments/${currentEnvironmentId}/versions/${editingVersionId}`,
+          headers: commonHeaders,
+        }).then((dsResponse) => {
+          const dataSource = dsResponse.body.data_sources.find(
+            (ds) => ds.name === dataSourceName
+          );
+          const dataSourceID = dataSource.id;
+          Cypress.env(`${dataSourceName}`, dataSourceID);
+
+          cy.request({
+            method: "POST",
+            url: `${Cypress.env("server_host")}/api/data-queries/data-sources/${dataSourceID}/versions/${editingVersionId}`,
+            headers: {
+              "Content-Type": "application/json",
+              "tj-workspace-id": workspaceId,
+              Cookie: `tj_auth_token=${authToken}; app_id=${appId}`,
+            },
+            body: {
+              app_id: appId,
+              app_version_id: editingVersionId,
+              name: queryName,
+              kind: dsKind,
+              options: options,
+              data_source_id: dataSourceID,
+              plugin_id: null,
+            },
+          }).then((queryResponse) => {
+            expect(queryResponse.status).to.eq(201);
+            Cypress.env("query-id", queryResponse.body.id);
+            Cypress.log({
+              name: "apiAddQueryToApp",
+              displayName: "QUERY CREATED",
+              message: `${queryName} (${dsKind})`,
+            });
           });
         });
       });
@@ -421,48 +273,6 @@ Cypress.Commands.add(
   }
 );
 
-Cypress.Commands.add("apiGetEnvironments", () => {
-  cy.getAuthHeaders().then((headers) => {
-    cy.request({
-      method: "GET",
-      url: `${Cypress.env("server_host")}/api/app-environments`,
-      headers: headers,
-    }).then((response) => {
-      expect(response.status).to.equal(200);
-      return response.body.environments;
-    });
-  });
-});
-
-Cypress.Commands.add(
-  "apiCreateWsConstant",
-  (constantName, value, types = [], environmentNames = []) => {
-    cy.apiGetEnvironments().then((environments) => {
-      const envIds = environmentNames
-        .map((name) => environments.find((env) => env.name === name)?.id)
-        .filter(Boolean);
-
-      cy.getAuthHeaders().then((headers) => {
-        types.forEach((type) => {
-          cy.request({
-            method: "POST",
-            url: `${Cypress.env("server_host")}/api/organization-constants`,
-            headers: headers,
-            body: {
-              constant_name: constantName,
-              value: value,
-              type: type,
-              environments: envIds,
-            },
-          }).then((createResponse) => {
-            expect(createResponse.status).to.equal(201);
-          });
-        });
-      });
-    });
-  }
-);
-
 Cypress.Commands.add("apiMakeAppPublic", (appId = Cypress.env("appId")) => {
   cy.getAuthHeaders().then((headers) => {
     cy.request({
@@ -479,106 +289,6 @@ Cypress.Commands.add("apiMakeAppPublic", (appId = Cypress.env("appId")) => {
   });
 });
 
-Cypress.Commands.add("apiDeleteGranularPermission", (groupName, typesToDelete = []) => {
-  cy.getAuthHeaders().then((headers) => {
-    // Step 1: Get the group by name
-    cy.request({
-      method: "GET",
-      url: `${Cypress.env("server_host")}/api/v2/group-permissions`,
-      headers,
-      log: false,
-    }).then((response) => {
-      expect(response.status).to.equal(200);
-      const group = response.body.groupPermissions.find((g) => g.name === groupName);
-      if (!group) throw new Error(`Group with name ${groupName} not found`);
-
-      const groupId = group.id;
-
-      // Step 2: Get all granular permissions for the group
-      cy.request({
-        method: "GET",
-        url: `${Cypress.env("server_host")}/api/v2/group-permissions/${groupId}/granular-permissions`,
-        headers,
-        log: false,
-      }).then((granularResponse) => {
-        expect(granularResponse.status).to.equal(200);
-        const granularPermissions = granularResponse.body;
-
-        // Step 3: Filter if typesToDelete is specified
-        const permissionsToDelete = typesToDelete.length
-          ? granularPermissions.filter((perm) => typesToDelete.includes(perm.type))
-          : granularPermissions;
-
-        // Step 4: Delete each granular permission
-        permissionsToDelete.forEach((permission) => {
-          cy.request({
-            method: "DELETE",
-            url: `${Cypress.env("server_host")}/api/v2/group-permissions/granular-permissions/app/${permission.id}`,
-            headers,
-            log: false,
-          }).then((deleteResponse) => {
-            expect(deleteResponse.status).to.equal(200);
-            cy.log(`Deleted granular permission: ${permission.name}`);
-          });
-        });
-      });
-    });
-  });
-});
-
-
-Cypress.Commands.add(
-  "apiCreateGranularPermission",
-  (
-    groupName,
-    name,
-    canEdit = false,
-    canView = true,
-    hideFromDashboard = false,
-    resourcesToAdd = []
-  ) => {
-    cy.getAuthHeaders().then((headers) => {
-      // Fetch group permissions
-      cy.request({
-        method: "GET",
-        url: `${Cypress.env("server_host")}/api/v2/group-permissions`,
-        headers: headers,
-        log: false,
-      }).then((response) => {
-        expect(response.status).to.equal(200);
-        const group = response.body.groupPermissions.find(
-          (g) => g.name === groupName
-        );
-        if (!group) throw new Error(`Group with name ${groupName} not found`);
-
-        const groupId = group.id;
-
-        // Create granular permission
-        cy.request({
-          method: "POST",
-          url: `${Cypress.env("server_host")}/api/v2/group-permissions/granular-permissions`,
-          headers: headers,
-          body: {
-            name,
-            type: "app",
-            groupId,
-            isAll: true,
-            createAppsPermissionsObject: {
-              canEdit,
-              canView,
-              hideFromDashboard,
-              resourcesToAdd,
-            },
-          },
-          log: false,
-        }).then((res) => {
-          expect(res.status).to.equal(201);
-        });
-      });
-    });
-  }
-);
-
 Cypress.Commands.add("apiReleaseApp", (appName) => {
   cy.getAppId(appName).then((appId) => {
     cy.getAuthHeaders().then((headers) => {
@@ -626,114 +336,6 @@ Cypress.Commands.add("apiAddAppSlug", (appName, slug) => {
   });
 });
 
-Cypress.Commands.add("apiGetTableIdByName", (tableName) => {
-  cy.getAuthHeaders().then((headers) => {
-    cy.request({
-      method: "GET",
-      url: `${Cypress.env("server_host")}/api/tooljet-db/organizations/${Cypress.env("workspaceId")}/tables`,
-      headers: headers,
-    }).then((response) => {
-      expect(response.status).to.eq(200);
-      const table = response.body.result.find(
-        (t) => t.table_name === tableName
-      );
-      return table.id;
-    });
-  });
-});
-
-Cypress.Commands.add("apiAddDataToTable", (tableName, data) => {
-  cy.apiGetTableIdByName(tableName).then((tableId) => {
-    cy.getAuthHeaders().then((headers) => {
-      cy.request({
-        method: "POST",
-        url: `${Cypress.env("server_host")}/api/tooljet-db/proxy/${tableId}`,
-        headers: headers,
-        body: data,
-      }).then((response) => {
-        expect(response.status).to.eq(201);
-        cy.log("Data added to table successfully");
-      });
-    });
-  });
-});
-
-Cypress.Commands.add("apiGetDataSourceIdByName", (dataSourceName) => {
-  const workspaceId = Cypress.env("workspaceId");
-  cy.getAuthHeaders().then((headers) => {
-    cy.request({
-      method: "GET",
-      url: `${Cypress.env("server_host")}/api/data-sources/${workspaceId}`,
-      headers: headers,
-    }).then((response) => {
-      expect(response.status).to.equal(200);
-      const dataSource = response.body.data_sources.find(
-        (ds) => ds.name === dataSourceName
-      );
-      return dataSource.id;
-    });
-  });
-});
-
-Cypress.Commands.add("getAuthHeaders", () => {
-  cy.getCookie("tj_auth_token").then((cookie) => {
-    return {
-      "Tj-Workspace-Id": Cypress.env("workspaceId"),
-      Cookie: `tj_auth_token=${cookie.value}`,
-    };
-  });
-});
-
-Cypress.Commands.add(
-  "apiUpdateDataSource",
-  (dataSourceName, envName, updateData) => {
-    cy.getAuthHeaders().then((headers) => {
-      cy.apiGetEnvironments().then((environments) => {
-        const environment = environments.find((env) => env.name === envName);
-
-        cy.apiGetDataSourceIdByName(dataSourceName).then((dataSourceId) => {
-          const environmentId = environment.id;
-
-          const defaultData = {
-            name: dataSourceName,
-            options: [
-              { key: "connection_type", value: "manual", encrypted: false },
-              { key: "host", value: "9.234.17.31" },
-              { key: "port", value: 5432 },
-              { key: "database", value: "student" },
-              { key: "username", value: "postgres" },
-              { key: "password", value: "", encrypted: true }, // Default password to be overridden
-              { key: "ssl_enabled", value: false, encrypted: false },
-              { key: "ssl_certificate", value: "none", encrypted: false },
-            ],
-          };
-
-          const mergedData = {
-            ...defaultData,
-            ...updateData,
-            options: defaultData.options.map((option) => {
-              const updatedOption = updateData.options?.find(
-                (o) => o.key === option.key
-              );
-              return updatedOption ? { ...option, ...updatedOption } : option;
-            }),
-          };
-
-          cy.request({
-            method: "PUT",
-            url: `${Cypress.env("server_host")}/api/data-sources/${dataSourceId}?environment_id=${environmentId}`,
-            headers: headers,
-            body: mergedData,
-          }).then((updateResponse) => {
-            expect(updateResponse.status).to.equal(200);
-            cy.log(`Datasource "${dataSourceName}" updated successfully.`);
-          });
-        });
-      });
-    });
-  }
-);
-
 Cypress.Commands.add("apiGetAppData", (appId = Cypress.env("appId")) => {
   cy.getAuthHeaders().then((headers) => {
     cy.request({
@@ -747,53 +349,144 @@ Cypress.Commands.add("apiGetAppData", (appId = Cypress.env("appId")) => {
   });
 });
 
-Cypress.Commands.add("apiDeleteGDS", (name) => {
-  const dataSourceId = Cypress.env(`${name}`);
+Cypress.Commands.add("apiRunQuery", () => {
+  cy.getCookie("tj_auth_token", { log: false }).then((cookie) => {
+    const authToken = cookie?.value;
+    const workspaceId = Cypress.env("workspaceId");
+    const appId = Cypress.env("appId");
+
+    const queryId = Cypress.env("query-id");
+    const versionId = Cypress.env("version-id");
+    const currentEnvironmentId = Cypress.env("environmentVersion-id");
 
-  cy.getCookie("tj_auth_token").then((cookie) => {
     cy.request({
-      method: "DELETE",
-      url: `${Cypress.env("server_host")}/api/data-sources/${dataSourceId}`,
+      method: "POST",
+      url: `${Cypress.env("server_host")}/api/data-queries/${queryId}/versions/${versionId}/run/${currentEnvironmentId}`,
       headers: {
-        "Tj-Workspace-Id": Cypress.env("workspaceId"),
-        Cookie: `tj_auth_token=${cookie.value}`,
+        "Content-Type": "application/json",
+        "tj-workspace-id": workspaceId,
+        Cookie: `tj_auth_token=${authToken}; app_id=${appId}`,
       },
-      failOnStatusCode: false,
-    }).then((response) => {
-      console.log("Delete response:", response);
-
-      expect(response.status, "Delete status code").to.eq(200);
+      body: {},
+    }).then((runResponse) => {
+      expect(runResponse.status).to.eq(201);
 
       Cypress.log({
-        name: "Delete Data Source",
-        displayName: "Data source deleted",
-        message: `Name: '${name}' | ID: '${dataSourceId}'`,
+        name: "apiRunQuery",
+        displayName: "QUERY RUN",
+        message: `Ran query ${queryId} (version ${versionId})`,
       });
     });
   });
 });
 
-Cypress.Commands.add(
-  "apiUpdateGDS",
-  ({ name, options, envName = "development" }) => {
-    cy.getAuthHeaders().then((headers) => {
-      cy.apiGetEnvironments().then((environments) => {
-        const environment = environments.find((env) => env.name === envName);
-        const environmentId = environment.id;
-        const dataSourceId = Cypress.env(`${name}`);
-
-        cy.request({
+Cypress.Commands.add("apiUpdateGlobalSettings", (globalSettings) => {
+  cy.getCookie("tj_auth_token")
+    .should("exist")
+    .then((cookie) => {
+      return cy
+        .request({
           method: "PUT",
-          url: `${Cypress.env("server_host")}/api/data-sources/${dataSourceId}?environment_id=${environmentId}`,
-          headers: headers,
-          body: {
-            name: name,
-            options: options,
+          url: `${Cypress.env("server_host")}/api/v2/apps/${Cypress.env("appId")}/versions/${Cypress.env("editingVersionId")}/global_settings`,
+          body: { globalSettings },
+          headers: {
+            "Content-Type": "application/json",
+            "tj-workspace-id": Cypress.env("workspaceId") || "",
+            Cookie: `tj_auth_token=${cookie.value}`,
           },
-        }).then((response) => {
-          expect(response.status).to.equal(200);
-          cy.log(`Datasource "${name}" updated successfully.`);
+          failOnStatusCode: false,
+        })
+        .then((response) => {
+          expect(response.status, "update global settings status").to.eq(200);
+          return response.body;
         });
+    });
+});
+
+Cypress.Commands.add(
+  "apiPromoteAppVersion",
+  (
+    targetEnvId = Cypress.env("environmentId"),
+    appId = Cypress.env("appId")
+  ) => {
+    cy.getCookie("tj_auth_token").then((cookie) => {
+      cy.request({
+        method: "PUT",
+        url: `${Cypress.env("server_host")}/api/v2/apps/${appId}/versions/${Cypress.env("editingVersionId")}/promote`,
+        body: { currentEnvironmentId: targetEnvId },
+        headers: {
+          "Content-Type": "application/json",
+          "Tj-Workspace-Id": Cypress.env("workspaceId"),
+          Cookie: `tj_auth_token=${cookie.value}`,
+        },
+      }).then((response) => {
+        expect(response.status, "Promote app version status").to.eq(200);
+        const editorEnv = response.body.editorEnvironment;
+
+        if (editorEnv.name === "staging") {
+          Cypress.env("stagingEnvId", editorEnv.id);
+        } else if (editorEnv.name === "production") {
+          Cypress.env("productionEnvId", editorEnv.id);
+        }
+        Cypress.log({
+          name: "App promoted",
+          message: `Environment: ${editorEnv.name} (${editorEnv.id})`,
+        });
+        return response.body;
+      });
+    });
+  }
+);
+
+Cypress.Commands.add("apiGetAppIdByName", (appName) => {
+  return cy.getAuthHeaders().then((headers) => {
+    return cy
+      .request({
+        method: "GET",
+        url: `${Cypress.env("server_host")}/api/apps`,
+        headers: headers,
+        log: false,
+      })
+      .then((response) => {
+        expect(response.status).to.equal(200);
+        const app = response.body.apps.find((app) => app.name === appName);
+        expect(app, `App with name "${appName}" not found`).to.exist;
+        return app.id;
+      });
+  });
+});
+
+Cypress.Commands.add(
+  "apiPublishDraftVersion",
+  (
+    versionName,
+    versionDescription = "",
+    appId = Cypress.env("appId"),
+    editingVersionId = Cypress.env("editingVersionId")
+  ) => {
+    cy.getCookie("tj_auth_token").then((cookie) => {
+      cy.request({
+        method: "PUT",
+        url: `${Cypress.env("server_host")}/api/v2/apps/${appId}/versions/${editingVersionId}`,
+        body: {
+          is_user_switched_version: false,
+          name: versionName,
+          description: versionDescription,
+          status: "PUBLISHED",
+        },
+        headers: {
+          "Content-Type": "application/json",
+          "tj-workspace-id": Cypress.env("workspaceId"),
+          Cookie: `tj_auth_token=${cookie.value}`,
+        },
+      }).then((response) => {
+        expect(response.status, "Publish draft version status").to.eq(200);
+        Cypress.log({
+          name: "Version published",
+          displayName: "VERSION PUBLISHED",
+          message: `Version: ${versionName} (${editingVersionId})`,
+        });
+        return response.body;
       });
     });
   }

cypress-tests/cypress/commands/commands.js

@@ -1,13 +1,11 @@
+import "cypress-mailhog";
 import { commonSelectors, commonWidgetSelector } from "Selectors/common";
-import { dashboardSelector } from "Selectors/dashboard";
-import { ssoSelector } from "Selectors/manageSSO";
-import { commonText, createBackspaceText } from "Texts/common";
-import { passwordInputText } from "Texts/passwordInput";
+import { commonEeSelectors } from "Selectors/eeCommon";
 import { importSelectors } from "Selectors/exportImport";
-import { importText } from "Texts/exportImport";
 import { onboardingSelectors } from "Selectors/onboarding";
 import { selectAppCardOption } from "Support/utils/common";
-
+import { commonText, createBackspaceText } from "Texts/common";
+import { importText } from "Texts/exportImport";
 const API_ENDPOINT =
   Cypress.env("environment") === "Community"
     ? "/api/library_apps"
@@ -15,18 +13,29 @@ const API_ENDPOINT =
 
 Cypress.Commands.add(
   "appUILogin",
-  (email = "dev@tooljet.io", password = "password") => {
+  (
+    email = "dev@tooljet.io",
+    password = "password",
+    status = "success",
+    toast = ""
+  ) => {
+    cy.waitForElement(onboardingSelectors.loginPasswordInput);
+    cy.get(onboardingSelectors.loginPasswordInput, { timeout: 20000 })
+      .should("be.visible")
+      .click();
     cy.clearAndType(onboardingSelectors.loginEmailInput, email);
     cy.clearAndType(onboardingSelectors.loginPasswordInput, password);
     cy.get(onboardingSelectors.signInButton).click();
-    cy.wait(2000);
-    cy.get('[data-cy="main-wrapper"]', { timeout: 10000 }).should("be.visible");
   }
 );
 
 Cypress.Commands.add("clearAndType", (selector, text) => {
-  cy.get(selector, { timeout: 20000 }).clear();
-  cy.get(selector).type(text, { log: false });
+  cy.waitForElement(selector)
+    .scrollIntoView()
+    .should("be.visible", { timeout: 10000 })
+    .click({ force: true })
+    .type(`{selectall}{backspace}`)
+    .type(`{selectall}{backspace}${text}`);
 });
 
 Cypress.Commands.add("forceClickOnCanvas", () => {
@@ -35,13 +44,15 @@ Cypress.Commands.add("forceClickOnCanvas", () => {
 
 Cypress.Commands.add(
   "verifyToastMessage",
-  (selector, message, closeAction = true) => {
-    cy.get(selector).as("toast").should("contain.text", message);
+  (selector, message, closeAction = true, timeout = 15000) => {
+    cy.get(selector, { timeout: timeout })
+      .as("toast")
+      .should("contain.text", message, { timeout: timeout });
     if (closeAction) {
       cy.get("body").then(($body) => {
         if ($body.find(commonSelectors.toastCloseButton).length > 0) {
           cy.closeToastMessage();
-          cy.wait(200);
+          cy.wait(500);
         }
       });
     }
@@ -50,23 +61,24 @@ Cypress.Commands.add(
 
 Cypress.Commands.add("waitForAutoSave", () => {
   cy.wait(200);
-  cy.get(commonSelectors.autoSave, { timeout: 20000 }).should(
-    "have.text",
-    commonText.autoSave,
-    { timeout: 20000 }
-  );
+  cy.get(commonSelectors.autoSave, { timeout: 20000 })
+    .should("have.text", "", { timeout: 20000 })
+    .find("svg")
+    .should("be.visible", { timeout: 20000 });
 });
 
 Cypress.Commands.add("createApp", (appName) => {
   const getAppButtonSelector = ($title) =>
     $title.text().includes(commonText.introductionMessage)
-      ? commonSelectors.emptyAppCreateButton
+      ? commonSelectors.dashboardAppCreateButton
       : commonSelectors.appCreateButton;
 
   cy.get("body").then(($title) => {
-    cy.get(getAppButtonSelector($title)).click();
+    cy.get(getAppButtonSelector($title))
+      .scrollIntoView()
+      .click({ force: true }); //workaround for cypress dashboard click issue
     cy.clearAndType('[data-cy="app-name-input"]', appName);
-    cy.get('[data-cy="+-create-app"]').click();
+    cy.get('[data-cy="create-app"]').click();
   });
   cy.waitForAppLoad();
   cy.skipEditorPopover();
@@ -76,38 +88,93 @@ Cypress.Commands.add(
   "dragAndDropWidget",
   (
     widgetName,
-    positionX = 80,
-    positionY = 80,
+    positionX = 100,
+    positionY = 100,
     widgetName2 = widgetName,
     canvas = commonSelectors.canvas
   ) => {
     const dataTransfer = new DataTransfer();
-    cy.forceClickOnCanvas();
 
-    cy.get("body")
-      .then(($body) => {
-        const isSearchVisible = $body
-          .find(commonSelectors.searchField)
-          .is(":visible");
+    // Open widget panel and search
+    cy.get('[data-cy="right-sidebar-components-button"]').click();
+    cy.get(commonSelectors.searchField)
+      .should("be.visible")
+      .first()
+      .clear()
+      .type(widgetName);
+    cy.get(commonWidgetSelector.widgetBox(widgetName2)).should("be.visible");
 
-        if (!isSearchVisible) {
-          cy.get('[data-cy="right-sidebar-plus-button"]').click();
-        }
-      })
-      .then(() => {
-        cy.clearAndType(commonSelectors.searchField, widgetName);
+    // Get element positions for coordinate calculations
+    cy.get(commonWidgetSelector.widgetBox(widgetName2)).then(($widget) => {
+      cy.get(canvas).then(($canvas) => {
+        const widgetRect = $widget[0].getBoundingClientRect();
+        const canvasRect = $canvas[0].getBoundingClientRect();
+        const dropX = canvasRect.left + positionX;
+        const dropY = canvasRect.top + positionY;
+
+        // Initiate drag from widget center
+        cy.get(commonWidgetSelector.widgetBox(widgetName2))
+          .trigger("mousedown", {
+            which: 1,
+            button: 0,
+            clientX: widgetRect.left + widgetRect.width / 2,
+            clientY: widgetRect.top + widgetRect.height / 2,
+            force: true,
+          })
+          .trigger("dragstart", { dataTransfer, force: true });
+
+        // Drag over canvas with target coordinates
+        cy.get(canvas)
+          .trigger("dragenter", { dataTransfer, force: true })
+          .trigger("dragover", {
+            dataTransfer,
+            clientX: dropX,
+            clientY: dropY,
+            force: true,
+          });
+
+        // Inject ghost position for headless mode
+        // Required because Cypress doesn't create native ghost elements
+        cy.window().then((win) => {
+          if (!win.useGridStore) return;
+
+          const canvasElement = win.document.querySelector(canvas);
+          if (!canvasElement) return;
+
+          const rect = canvasElement.getBoundingClientRect();
+
+          win.useGridStore.getState().actions.setGhostDragPosition({
+            left: positionX,
+            top: positionY,
+            e: {
+              target: {
+                getBoundingClientRect: () => ({
+                  left: rect.left + positionX,
+                  top: rect.top + positionY,
+                  right: rect.left + positionX,
+                  bottom: rect.top + positionY,
+                  width: 0,
+                  height: 0,
+                }),
+                closest: (selector) =>
+                  selector === ".real-canvas" ? canvasElement : null,
+              },
+            },
+          });
+        });
+
+        cy.get(canvas)
+          .trigger("drop", {
+            dataTransfer,
+            clientX: dropX,
+            clientY: dropY,
+            force: true,
+          })
+          .trigger("mouseup", { force: true });
+
+        cy.waitForAutoSave();
       });
-
-    cy.get(commonWidgetSelector.widgetBox(widgetName2)).trigger(
-      "dragstart",
-      { dataTransfer },
-      { force: true }
-    );
-    cy.get(canvas).trigger("drop", positionX, positionY, {
-      dataTransfer,
-      force: true,
     });
-    cy.waitForAutoSave();
   }
 );
 
@@ -127,7 +194,7 @@ Cypress.Commands.add(
       });
 
     const splitIntoFlatArray = (value) => {
-      const regex = /(\{|\}|\(|\)|\[|\]|,|:|;|=>|'[^']*'|[a-zA-Z0-9._]+|\s+)/g;
+      const regex = /(\{|\}|\(|\)|\[|\]|,|:|;|=>|\*|"[^"]*"|'[^']*'|[a-zA-Z0-9._]+|\s+)/g;
       let prefix = "";
       return (
         value.match(regex)?.reduce((acc, part) => {
@@ -153,7 +220,7 @@ Cypress.Commands.add(
     };
 
     if (Array.isArray(value)) {
-      cy.wrap(subject).last().realType(value, {
+      cy.wrap(subject).last().realType(value.join(""), {
         parseSpecialCharSequences: false,
         delay: 0,
         force: true,
@@ -199,9 +266,13 @@ Cypress.Commands.add(
       .and(assertion, value, ...arg);
   }
 );
+Cypress.Commands.add("scrollToElement", (selector) => {
+  cy.get(selector).scrollIntoView()
+    .should("be.visible");
+});
 
 Cypress.Commands.add("openInCurrentTab", (selector) => {
-  cy.get(selector).invoke("removeAttr", "target").click();
+  cy.get(selector).parent().invoke("removeAttr", "target").click({ force: true });
 });
 
 Cypress.Commands.add("modifyCanvasSize", (x, y) => {
@@ -223,8 +294,11 @@ Cypress.Commands.add("renameApp", (appName) => {
     `{selectAll}{backspace}${appName}`,
     { force: true }
   );
-  cy.forceClickOnCanvas();
-  cy.waitForAutoSave();
+  cy.get(commonSelectors.renameAppButton).should("be.enabled").click();
+  cy.verifyToastMessage(
+    commonSelectors.toastMessage,
+    commonText.appRenamedToast
+  );
 });
 
 Cypress.Commands.add(
@@ -250,7 +324,7 @@ Cypress.Commands.add("closeToastMessage", () => {
   cy.get(`${commonSelectors.toastCloseButton}:eq(0)`).click();
 });
 
-Cypress.Commands.add("notVisible", (dataCy) => {
+Cypress.Commands.add("notVisible", (dataCy) => { //Should be removed later
   cy.get("body").then(($body) => {
     if ($body.find(dataCy).length > 0) {
       cy.get(dataCy).should("not.be.visible");
@@ -327,17 +401,6 @@ Cypress.Commands.add("waitForAppLoad", () => {
   cy.wait("@appDs", { timeout: 15000 });
 });
 
-Cypress.Commands.add("visitTheWorkspace", (workspaceName) => {
-  cy.task("dbConnection", {
-    dbconfig: Cypress.env("app_db"),
-    sql: `select id from organizations where name='${workspaceName}';`,
-  }).then((resp) => {
-    let workspaceId = resp.rows[0].id;
-    cy.visit(workspaceId);
-  });
-  cy.wait(2000);
-});
-
 Cypress.Commands.add("hideTooltip", () => {
   cy.get("body").then(($body) => {
     if ($body.find(".tooltip-inner").length > 0) {
@@ -409,69 +472,43 @@ Cypress.Commands.add("getPosition", (componentName) => {
   );
 });
 
-Cypress.Commands.add("defaultWorkspaceLogin", () => {
-  cy.task("dbConnection", {
-    dbconfig: Cypress.env("app_db"),
-    sql: `
-      SELECT id FROM organizations WHERE name = 'My workspace';`,
-  }).then((resp) => {
-    const workspaceId = resp.rows[0].id;
+Cypress.Commands.add("defaultWorkspaceLogin", (workspaceName = 'my-workspace') => {
+  cy.apiLogin("dev@tooljet.io", "password").then(() => {
+    cy.visit(`/${workspaceName}`);
+    cy.wait(2000);
+    cy.get(commonWidgetSelector.homePageLogo, { timeout: 50000 }).should(
+      "be.visible",
+      { timeout: 20000 }
+    );
 
-    cy.apiLogin(
-      "dev@tooljet.io",
-      "password",
-      workspaceId,
-      "/my-workspace"
-    ).then(() => {
-      cy.visit("/");
-      cy.wait(2000);
-      cy.get(commonSelectors.homePageLogo, { timeout: 10000 });
-    });
+    cy.get(commonSelectors.homePageLogo, { timeout: 20000 });
   });
+  cy.apiGetDefaultWorkspace().then((res) => {
+    Cypress.env("workspaceId", res.id);
+    cy.log(Cypress.env("workspaceId"));
+  });
+
 });
 
 Cypress.Commands.add("visitSlug", ({ actualUrl }) => {
   cy.visit(actualUrl);
-  cy.wait(1000);
+  cy.wait(2000);
 
   cy.url().then((currentUrl) => {
     if (currentUrl !== actualUrl) {
       cy.visit(actualUrl);
-      cy.wait(1000);
+      cy.wait(2000);
     }
   });
 });
 
-Cypress.Commands.add("releaseApp", () => {
-  if (Cypress.env("environment") !== "Community") {
-    cy.get(commonEeSelectors.promoteButton).click();
-    cy.get(commonEeSelectors.promoteButton).eq(1).click();
-    cy.waitForAppLoad();
-    cy.wait(3000);
-    cy.get(commonEeSelectors.promoteButton).click();
-    cy.get(commonEeSelectors.promoteButton).eq(1).click();
-    cy.waitForAppLoad();
-    cy.wait(3000);
-  }
-  cy.get(commonSelectors.releaseButton).click();
-  cy.get(commonSelectors.yesButton).click();
-  cy.verifyToastMessage(commonSelectors.toastMessage, "Version v1 released");
-  cy.wait(1000);
-});
-
 Cypress.Commands.add("backToApps", () => {
   cy.get(commonSelectors.editorPageLogo).click();
   cy.get(commonSelectors.backToAppOption).click();
   cy.intercept("GET", API_ENDPOINT).as("library_apps");
-  cy.get(commonSelectors.homePageLogo, { timeout: 10000 });
   cy.wait("@library_apps");
-});
-
-Cypress.Commands.add("removeAssignedApps", () => {
-  cy.task("dbConnection", {
-    dbconfig: Cypress.env("app_db"),
-    sql: `DELETE FROM app_group_permissions;`,
-  });
+  cy.get(commonSelectors.homePageLogo, { timeout: 10000 });
+  cy.wait(2000);
 });
 
 Cypress.Commands.add(
@@ -513,7 +550,7 @@ Cypress.Commands.add("appPrivacy", (appName, isPublic) => {
   });
 });
 
-Cypress.Commands.overwrite(
+Cypress.Commands.overwrite( //update required if using
   "intercept",
   (originalFn, method, endpoint, ...rest) => {
     const isSubpath = Cypress.config("baseUrl")?.includes("/apps");
@@ -526,51 +563,7 @@ Cypress.Commands.overwrite(
   }
 );
 
-Cypress.Commands.add("installMarketplacePlugin", (pluginName) => {
-  const MARKETPLACE_URL = `${Cypress.config("baseUrl")}/integrations/marketplace`;
 
-  cy.visit(MARKETPLACE_URL);
-  cy.wait(1000);
-
-  cy.get('[data-cy="-list-item"]').eq(0).click();
-  cy.wait(1000);
-
-  cy.get("body").then(($body) => {
-    if ($body.find(".plugins-card").length === 0) {
-      cy.log("No plugins found, proceeding to install...");
-      installPlugin(pluginName);
-    } else {
-      cy.get(".plugins-card").then(($cards) => {
-        const isInstalled = $cards.toArray().some((card) => {
-          return (
-            Cypress.$(card)
-              .find(".font-weight-medium.text-capitalize")
-              .text()
-              .trim() === pluginName
-          );
-        });
-
-        if (isInstalled) {
-          cy.log(`${pluginName} is already installed. Skipping installation.`);
-          cy.get(commonSelectors.globalDataSourceIcon).click();
-        } else {
-          installPlugin(pluginName);
-          cy.get(commonSelectors.globalDataSourceIcon).click();
-        }
-      });
-    }
-  });
-
-  function installPlugin (pluginName) {
-    cy.get('[data-cy="-list-item"]').eq(1).click();
-    cy.wait(1000);
-
-    cy.contains(".plugins-card", pluginName).within(() => {
-      cy.get(".marketplace-install").click();
-      cy.wait(1000);
-    });
-  }
-});
 
 Cypress.Commands.add("verifyElement", (selector, text, eqValue) => {
   const element =
@@ -588,54 +581,6 @@ Cypress.Commands.add("getAppId", (appName) => {
   });
 });
 
-Cypress.Commands.add("uninstallMarketplacePlugin", (pluginName) => {
-  const MARKETPLACE_URL = `${Cypress.config("baseUrl")}/integrations/marketplace`;
-
-  cy.visit(MARKETPLACE_URL);
-  cy.wait(1000);
-
-  cy.get('[data-cy="-list-item"]').eq(0).click();
-  cy.wait(1000);
-
-  cy.get(".plugins-card").each(($card) => {
-    cy.wrap($card)
-      .find(".font-weight-medium.text-capitalize")
-      .invoke("text")
-      .then((text) => {
-        if (text.trim() === pluginName) {
-          cy.wrap($card).find(".link-primary").contains("Remove").click();
-          cy.wait(1000);
-
-          cy.get('[data-cy="delete-plugin-title"]').should("be.visible");
-          cy.get('[data-cy="yes-button"]').click();
-          cy.wait(2000);
-
-          cy.log(`${pluginName} has been successfully uninstalled.`);
-        } else {
-          cy.log(`${pluginName} is not installed. Skipping uninstallation.`);
-        }
-      });
-  });
-});
-
-Cypress.Commands.add(
-  "verifyRequiredFieldValidation",
-  (fieldName, expectedColor) => {
-    cy.get(commonSelectors.textField(fieldName)).type("some text").clear();
-    cy.get(commonSelectors.textField(fieldName)).should(
-      "have.css",
-      "border-color",
-      expectedColor
-    );
-    cy.get(commonSelectors.labelFieldValidation(fieldName))
-      .should("be.visible")
-      .and("have.text", `${fieldName} is required`);
-    cy.get(commonSelectors.labelFieldAlert(fieldName))
-      .should("be.visible")
-      .and("have.text", `${fieldName} is required`);
-  }
-);
-
 Cypress.Commands.add("ifEnv", (expectedEnvs, callback) => {
   const actualEnv = Cypress.env("environment");
   const envArray = Array.isArray(expectedEnvs) ? expectedEnvs : [expectedEnvs];
@@ -646,14 +591,72 @@ Cypress.Commands.add("ifEnv", (expectedEnvs, callback) => {
 });
 
 Cypress.Commands.add("openComponentSidebar", (selector, value) => {
-  cy.get("body")
-    .then(($body) => {
-      const isSearchVisible = $body
-        .find(commonSelectors.searchField)
-        .is(":visible");
+  cy.get("body").then(($body) => {
+    const isSearchVisible = $body
+      .find(commonSelectors.searchField)
+      .is(":visible");
 
-      if (!isSearchVisible) {
-        cy.get('[data-cy="right-sidebar-plus-button"]').click();
-      }
+    if (!isSearchVisible) {
+      cy.get('[data-cy="right-sidebar-components-button"]').click();
+    }
+  });
+});
+
+Cypress.Commands.add("runSqlQueryOnDB", (query, db = Cypress.env("app_db")) => {
+  return cy.task("dbConnection", {
+    dbconfig: db,
+    sql: query,
+  });
+});
+
+Cypress.Commands.add(
+  "openWorkflow",
+  (
+    slug = "",
+    workspaceId = Cypress.env("workspaceId"),
+    workflowId = Cypress.env("workflowId")
+  ) => {
+    cy.intercept("GET", "/api/apps/*").as("getWorkflowData");
+    cy.window({ log: false }).then((win) => {
+      win.localStorage.setItem("walkthroughCompleted", "true");
+    });
+    cy.visit(`/${workspaceId}/apps/${workflowId}/${slug}`);
+
+    cy.wait("@getWorkflowData").then((interception) => {
+      const responseData = interception.response.body;
+
+      Cypress.env("editingVersionId", responseData.editing_version.id);
+      Cypress.env("environmentId", responseData.editorEnvironment.id);
+      Cypress.env("workflowId", responseData.id);
+    });
+  }
+);
+
+Cypress.Commands.add("waitForElement", (selector, timeout = 50000) => {
+  return cy.get(selector, { timeout: timeout, log: false })
+    .should("be.visible", { timeout: timeout, log: false })
+    .then(($el) => {
+      Cypress.log({
+        name: "waitForElement",
+        displayName: "WAIT",
+        message: `Waiting for element: ${selector}`,
+        consoleProps: () => {
+          return {
+            Selector: selector,
+            Timeout: timeout,
+          };
+        },
+      });
+      return cy.wrap($el, { log: false });
     })
+    .wait(100, { log: false });
+});
+
+Cypress.Commands.add("verifyFromClipboard", (value, delay = 0) => {
+  cy.wait(delay);
+  cy.window().then((win) => {
+    win.navigator.clipboard.readText().then((text) => {
+      expect(text).to.eq(value);
+    });
+  });
 });

cypress-tests/cypress/commands/marketplace/marketplaceAPICommands.js

@@ -0,0 +1,212 @@
+const envVar = Cypress.env("environment");
+
+Cypress.Commands.add("apiCreateDataSource", (url, name, kind, options, setCredentials = false) => {
+    cy.getAuthHeaders().then((headers) => {
+        cy.request(
+            {
+                method: "POST",
+                url: url,
+                headers: headers,
+                body: {
+                    name: name,
+                    kind: kind,
+                    options: options,
+                    scope: "global",
+                },
+                log: false
+            },
+        ).then((response) => {
+            expect(response.status).to.equal(201);
+            const dataSourceId = response.body.id;
+            Cypress.env(`${name}-dataSource-id`, dataSourceId);
+
+            Cypress.log({
+                name: "Create Data Source",
+                displayName: "Data source created",
+                message: `:\nDatasource: '${kind}',\nName: '${name}'`,
+            });
+
+            // Set credentials for the environment if flag is true
+            if (setCredentials) {
+                cy.apiSetDataSourceCredentials({
+                    dataSourceName: name,
+                    dataSourceId: dataSourceId,
+                    options: options,
+                    envName: "development",
+                });
+            }
+        });
+    });
+});
+
+Cypress.Commands.add("apiSetDataSourceCredentials", ({ dataSourceName, dataSourceId, options, envName = "development" }) => {
+    cy.getAuthHeaders().then((headers) => {
+        cy.apiGetEnvironments().then((environments) => {
+            const environment = environments.find((env) => env.name === envName);
+            if (!environment) {
+                throw new Error(`Environment '${envName}' not found`);
+            }
+
+            // Use provided dataSourceId or fetch it by name
+            const getDataSourceId = dataSourceId
+                ? cy.wrap(dataSourceId)
+                : cy.apiGetDataSourceIdByName(dataSourceName);
+
+            getDataSourceId.then((dsId) => {
+                cy.request({
+                    method: "PUT",
+                    url: `${Cypress.env("server_host")}/api/data-sources/${dsId}?environment_id=${environment.id}`,
+                    headers: headers,
+                    body: {
+                        name: dataSourceName,
+                        options: options,
+                    },
+                    log: false
+                }).then((response) => {
+                    expect(response.status).to.equal(200);
+                    Cypress.log({
+                        name: "Set DS Credentials",
+                        displayName: "Credentials set",
+                        message: `DS: '${dataSourceName}', Env: '${envName}'`,
+                    });
+                });
+            });
+        });
+    });
+});
+
+Cypress.Commands.add("apiFetchDataSourcesIdFromApp", (cachedHeader) => {
+    cy.getAuthHeaders(cachedHeader).then((headers) => {
+        cy.request({
+            method: "GET",
+            url: `${Cypress.env("server_host")}/api/data-sources/${Cypress.env("workspaceId")}/environments/${Cypress.env("environmentId")}/versions/${Cypress.env("editingVersionId")}`,
+            headers,
+            log: false
+        }).then((response) => {
+            expect(response.status).to.equal(200);
+            const dataSources = response.body?.data_sources || [];
+
+            dataSources.forEach((item) => {
+                Cypress.env(`${item.name}-dataSource-id`, `${item.id}`);
+            });
+
+            Cypress.log({
+                name: "DS Fetch",
+                displayName: "Data Sources Fetched",
+                message: dataSources
+                    .map((ds) => `\nKind: '${ds.name}', Name: '${ds.id}'`)
+                    .join(","),
+            });
+        });
+    });
+});
+
+Cypress.Commands.add("apiDeleteDataSource", (name, cachedHeader) => {
+    const dataSourceId = Cypress.env(`${name}-dataSource-id`);
+
+    cy.getAuthHeaders(cachedHeader).then((headers) => {
+        cy.request({
+            method: "DELETE",
+            url: `${Cypress.env("server_host")}/api/data-sources/${dataSourceId}`,
+            headers: headers,
+            failOnStatusCode: false,
+        }).then((response) => {
+            expect(response.status, "Delete status code").to.eq(200);
+
+            Cypress.log({
+                name: "Delete Data Source",
+                displayName: "Data source deleted",
+                message: `Name: '${name}'`,
+            });
+        });
+    });
+});
+
+Cypress.Commands.add(
+    "apiUpdateDataSource",
+    ({ dataSourceName, options, envName = "development", cachedHeader }) => {
+        cy.getAuthHeaders(cachedHeader).then((headers) => {
+
+            cy.apiGetEnvironments().then((environments) => {
+                const environment = environments.find((env) => env.name === envName);
+
+                cy.apiGetDataSourceIdByName(dataSourceName).then((dataSourceId) => {
+                    const environmentId = environment.id;
+
+                    cy.request({
+                        method: "PUT",
+                        url: `${Cypress.env("server_host")}/api/data-sources/${dataSourceId}?environment_id=${environmentId}`,
+                        headers: headers,
+                        body: {
+                            name: dataSourceName,
+                            options: options,
+                        },
+                        log: false
+                    }).then((response) => {
+
+                        expect(response.status).to.equal(200);
+                        Cypress.log({
+                            name: "Update Data Source",
+                            displayName: "Data source updated",
+                            message: `Name: '${dataSourceName}'`,
+                        });
+                    });
+                });
+            });
+        });
+    }
+);
+
+Cypress.Commands.add("apiGetDataSourceIdByName", (dataSourceName, cachedHeader) => {
+    return cy.getAuthHeaders(cachedHeader).then((headers) => {
+        return cy.request({
+            method: "GET",
+            url: `${Cypress.env("server_host")}/api/data-sources/${Cypress.env("workspaceId")}`,
+            headers: headers,
+            log: false
+        }).then((response) => {
+            expect(response.status).to.equal(200);
+            const id = response.body.data_sources.find(
+                (ds) => ds.name === dataSourceName
+            )?.id;
+            Cypress.log({
+                name: "apiGetDataSourceIdByName",
+                displayName: "Data Source ID",
+                message: `Data source ID for '${dataSourceName}': ${id}`,
+            });
+            return id;
+        });
+    });
+});
+
+Cypress.Commands.add("apiGetTableIdByName", (tableName, cachedHeader) => {
+    cy.getAuthHeaders(cachedHeader).then((headers) => {
+        cy.request({
+            method: "GET",
+            url: `${Cypress.env("server_host")}/api/tooljet-db/organizations/${Cypress.env("workspaceId")}/tables`,
+            headers: headers,
+        }).then((response) => {
+            expect(response.status).to.eq(200);
+            const table = response.body.result.find(
+                (t) => t.table_name === tableName
+            );
+            return table.id;
+        });
+    });
+});
+
+Cypress.Commands.add("apiAddDataToTable", (tableName, data, cachedHeader) => {
+    cy.apiGetTableIdByName(tableName, cachedHeader).then((tableId) => {
+        cy.getAuthHeaders(cachedHeader).then((headers) => {
+            cy.request({
+                method: "POST",
+                url: `${Cypress.env("server_host")}/api/tooljet-db/proxy/${tableId}`,
+                headers: headers,
+                body: data,
+            }).then((response) => {
+                expect(response.status).to.eq(201);
+                cy.log("Data added to table successfully");
+            });
+        });
+    });
+});

cypress-tests/cypress/commands/marketplace/marketplaceCommands.js

@@ -0,0 +1,101 @@
+import "cypress-mailhog";
+import { commonSelectors } from "Selectors/common";
+const API_ENDPOINT =
+    Cypress.env("environment") === "Community"
+        ? "/api/library_apps"
+        : "/api/library_apps";
+
+Cypress.Commands.add("installMarketplacePlugin", (pluginName) => {
+    const MARKETPLACE_URL = `${Cypress.config("baseUrl")}/integrations/marketplace`;
+
+    cy.visit(MARKETPLACE_URL);
+    cy.wait(1000);
+
+    cy.get('[data-cy="-list-item"]').eq(0).click();
+    cy.wait(1000);
+
+    cy.get("body").then(($body) => {
+        if ($body.find(".plugins-card").length === 0) {
+            cy.log("No plugins found, proceeding to install...");
+            installPlugin(pluginName);
+        } else {
+            cy.get(".plugins-card").then(($cards) => {
+                const isInstalled = $cards.toArray().some((card) => {
+                    return (
+                        Cypress.$(card)
+                            .find(".font-weight-medium.text-capitalize")
+                            .text()
+                            .trim() === pluginName
+                    );
+                });
+
+                if (isInstalled) {
+                    cy.log(`${pluginName} is already installed. Skipping installation.`);
+                    cy.get(commonSelectors.globalDataSourceIcon).click();
+                } else {
+                    installPlugin(pluginName);
+                    cy.get(commonSelectors.globalDataSourceIcon).click();
+                }
+            });
+        }
+    });
+
+    function installPlugin(pluginName) {
+        cy.get('[data-cy="-list-item"]').eq(1).click();
+        cy.wait(1000);
+
+        cy.contains(".plugins-card", pluginName).within(() => {
+            cy.get(".marketplace-install").click();
+            cy.wait(1000);
+        });
+    }
+});
+
+Cypress.Commands.add("uninstallMarketplacePlugin", (pluginName) => {
+    const MARKETPLACE_URL = `${Cypress.config("baseUrl")}/integrations/marketplace`;
+
+    cy.visit(MARKETPLACE_URL);
+    cy.wait(1000);
+
+    cy.get('[data-cy="-list-item"]').eq(0).click();
+    cy.wait(1000);
+
+    cy.get(".plugins-card").each(($card) => {
+        cy.wrap($card)
+            .find(".font-weight-medium.text-capitalize")
+            .invoke("text")
+            .then((text) => {
+                if (text.trim() === pluginName) {
+                    cy.wrap($card).find(".link-primary").contains("Remove").click();
+                    cy.wait(1000);
+
+                    cy.get('[data-cy="delete-plugin-title"]').should("be.visible");
+                    cy.get('[data-cy="yes-button"]').click();
+                    cy.wait(2000);
+
+                    cy.log(`${pluginName} has been successfully uninstalled.`);
+                } else {
+                    cy.log(`${pluginName} is not installed. Skipping uninstallation.`);
+                }
+            });
+    });
+});
+
+Cypress.Commands.add(
+    "verifyRequiredFieldValidation",
+    (fieldName, expectedColor) => {
+        cy.get(commonSelectors.textField(fieldName)).type("some text").clear();
+        cy.get(commonSelectors.textField(fieldName)).should(
+            "have.css",
+            "border-color",
+            expectedColor
+        );
+        cy.get(commonSelectors.labelFieldValidation(fieldName))
+            .should("be.visible")
+            .and("have.text", `${fieldName} is required`);
+        cy.get(commonSelectors.labelFieldAlert(fieldName))
+            .should("be.visible")
+            .and("have.text", `${fieldName} is required`);
+    }
+);
+

cypress-tests/cypress/commands/workflowCommands.js

@@ -0,0 +1,182 @@
+import { fake } from "Fixtures/fake";
+import { workflowsText } from "Texts/workflows";
+import { workflowSelector } from "Selectors/workflows";
+import { commonSelectors, commonWidgetSelector } from "Selectors/common";
+import { commonText } from "Texts/common";
+import { selectAppCardOption } from "Support/utils/common";
+import { navigateBackToWorkflowsDashboard } from "Support/utils/workFlows";
+
+Cypress.Commands.add("createWorkflowApp", (workflowName) => {
+  cy.get(workflowSelector.globalWorkFlowsIcon).click();
+  cy.get(workflowSelector.workflowsCreateButton).click();
+  cy.get(workflowSelector.workFlowNameInputField).type(workflowName);
+  cy.get(workflowSelector.createWorkFlowsButton).click();
+});
+
+Cypress.Commands.add("connectDataSourceNode", (nodeType) => {
+  cy.get(workflowSelector.startNodeHandleRight).trigger("mousedown", {
+    button: 0,
+    force: true,
+  });
+
+  cy.get(".react-flow__pane")
+    .trigger("mousemove", { clientX: 600, clientY: 300, force: true })
+    .wait(500)
+    .trigger("mouseup", { force: true });
+
+  cy.contains(nodeType, { timeout: 5000 })
+    .scrollIntoView()
+    .click({ force: true });
+});
+
+Cypress.Commands.add("verifyTextInResponseOutput", (expectedText) => {
+  cy.get(workflowSelector.workflowRunButton).click();
+  cy.get(workflowSelector.workflowLogs).should(
+    "have.text",
+    workflowsText.workflowRunhelperText
+  );
+
+  cy.get('[data-cy="response1-node-name"]').click();
+  cy.wait(500);
+  cy.get('[data-cy="tab-output"]').click();
+
+  cy.wait(500);
+  cy.get("body").then(($body) => {
+    if (
+      $body
+        .find("span.node-key")
+        .filter((_, el) => el.innerText === workflowsText.responseNodeKey)
+        .length
+    ) {
+      cy.contains("span.node-key", workflowsText.responseNodeKey, {
+        timeout: 3000,
+      })
+        .click({ force: true })
+        .wait(300);
+    }
+  });
+
+  cy.get("body").then(($body) => {
+    const icons = $body.find("span.json-tree-node-icon");
+    if (icons.length > 0) {
+      cy.wrap(icons).each(($el) => {
+        if ($el[0].style.transform === "rotate(0deg)") {
+          cy.wrap($el).click({ force: true }).wait(200);
+        }
+      });
+    }
+  });
+
+  cy.get(".json-tree-valuetype", { timeout: 3000 }).then(($vals) => {
+    const texts = [...$vals].map((el) => el.innerText.trim());
+    const match = texts.some((txt) => txt.includes(expectedText));
+    expect(
+      match,
+      `Expected some value to include "${expectedText}", but got:\n\n${texts.join("\n")}`
+    ).to.be.true;
+  });
+});
+
+Cypress.Commands.add(
+  "connectNodeToResponseNode",
+  (nodeTitle, returnStatement) => {
+    cy.get(workflowSelector.nodeName(nodeTitle))
+      .should("exist")
+      .parents(".react-flow__node")
+      .as("sourceNode");
+
+    cy.get(workflowSelector.nodeHandleRight(nodeTitle)).trigger("mousedown", {
+      button: 0,
+      force: true,
+    });
+
+    cy.get(".react-flow__pane")
+      .trigger("mousemove", { clientX: 800, clientY: 400, force: true })
+      .trigger("mouseup", { force: true });
+
+    cy.wait(500);
+
+    cy.contains(workflowsText.responseNodeLabel, { timeout: 5000 }).click({
+      force: true,
+    });
+    cy.wait(500);
+
+    cy.get(workflowSelector.nodeName(workflowsText.responseNodeName))
+      .parents(".react-flow__node")
+      .click({ force: true });
+
+    cy.get('.cm-content[contenteditable="true"]')
+      .clearAndTypeOnCodeMirror("")
+      .clearAndTypeOnCodeMirror("")
+      .clearAndTypeOnCodeMirror(returnStatement);
+
+    cy.get("body").click(50, 50);
+    cy.wait(500);
+  }
+);
+
+Cypress.Commands.add("deleteWorkflow", (workflowName) => {
+  cy.intercept("DELETE", "/api/apps/*").as("appDeleted");
+  navigateBackToWorkflowsDashboard();
+  cy.get(commonSelectors.appCard(workflowName))
+    .realHover()
+    .find(commonSelectors.appCardOptionsButton)
+    .realHover()
+    .click();
+  cy.get(workflowSelector.deleteWorkFlowOption).click();
+  cy.get(commonSelectors.buttonSelector(commonText.modalYesButton)).click();
+  cy.wait("@appDeleted");
+});
+
+Cypress.Commands.add("deleteWorkflowfromDashboard", (workflowName) => {
+  cy.intercept("DELETE", "/api/apps/*").as("appDeleted");
+  cy.get(commonSelectors.appCard(workflowName))
+    .realHover()
+    .find(commonSelectors.appCardOptionsButton)
+    .realHover()
+    .click();
+  cy.get(workflowSelector.deleteWorkFlowOption).click();
+  cy.get(commonSelectors.buttonSelector(commonText.modalYesButton)).click();
+  cy.wait("@appDeleted");
+});
+
+Cypress.Commands.add(
+  "exportWorkflowApp",
+  (workflowName, fixtureFile = "cypress/fixtures/exportedApp.json") => {
+    navigateBackToWorkflowsDashboard();
+
+    cy.get(`[data-cy="${workflowName}-card"]`)
+      .trigger('mouseover') 
+      .find('[data-cy="app-card-menu-icon"]')
+      .click({ force: true });
+
+    cy.get(commonSelectors.appCardOptions(workflowsText.exportWFOption))
+      .click();
+
+    cy.wait(2000);
+
+    cy.exec("ls -t ./cypress/downloads/ | head -1").then((result) => {
+      const downloadedAppExportFileName = result.stdout.trim();
+      const filePath = `./cypress/downloads/${downloadedAppExportFileName}`;
+      cy.readFile(filePath, { timeout: 15000 }).then((json) => {
+        cy.writeFile(fixtureFile, json);
+      });
+    });
+    
+    cy.deleteWorkflowfromDashboard(workflowName);
+  }
+);
+
+Cypress.Commands.add("addWorkflowInApp", (workflowName) => {
+  cy.get(workflowSelector.showDSPopoverButton).click();
+  cy.get(workflowSelector.workflowSearchInput).type(
+    workflowsText.workflowLabel
+  );
+  cy.contains(`[id*="react-select-"]`, workflowsText.workflowLabel).click();
+  cy.get(workflowSelector.queryRenameInput).clear().type(workflowName);
+  cy.get(workflowSelector.workflowDropdown).parent()
+  .find('.react-select__control')
+  .click();
+  cy.get(workflowSelector.workflowSelectInput).realType(workflowName);
+  cy.get(workflowSelector.workflowSelectOption).contains(workflowName).click();
+});

cypress-tests/cypress/commands/workflowsApiCommands.js

@@ -0,0 +1,344 @@
+const envVar = Cypress.env("environment");
+
+const optionsFallback = (kind = "runjs", nodeName = "runjs1") => {
+  if (kind === "runjs") {
+    return { code: "return startTrigger.params", parameters: [] };
+  }
+  if (kind === "restapi") {
+    return {
+      method: "GET",
+      path: "/",
+      headers: [],
+      query: [],
+      body: { type: "json", value: {} },
+      pluginId: null,
+    };
+  }
+  return {};
+};
+
+Cypress.Commands.add("apiCreateWorkflow", (workflowName, reuseSession = false) => {
+  cy.getAuthHeaders(reuseSession).then((headers) => {
+    cy.request({
+      method: "POST",
+      url: `${Cypress.env("server_host")}/api/apps`,
+      headers: headers,
+      body: {
+        icon: "sentfast",
+        name: workflowName,
+        type: "workflow",
+      },
+    }).then((response) => {
+      expect(response.status).to.equal(201);
+
+      const workflowId = response.body?.id || response.allRequestResponses?.[0]?.["Response Body"]?.id;
+      const userId = response.body?.user_id || response.allRequestResponses?.[0]?.["Response Body"]?.user_id;
+
+      Cypress.env("workflowId", workflowId);
+      Cypress.env("user_id", userId);
+
+      Cypress.log({
+        name: "Workflow create",
+        displayName: "WORKFLOW CREATED",
+        message: `: ${response.body.name}`,
+      });
+    });
+  });
+});
+
+Cypress.Commands.add(
+  "apiOpenWorkflowByName",
+  (
+    workflowName,
+    workspaceId = Cypress.env("workspaceId"),
+    componentSelector = "[data-cy='workflow-canvas']",
+    reuseSession = false
+  ) => {
+    cy.getAuthHeaders(reuseSession).then((headers) => {
+      cy.request({
+        method: "GET",
+        url: `${Cypress.env("server_host")}/api/apps?page=1&type=workflow&searchKey=${workflowName}`,
+        headers: headers,
+      }, { log: false }).then((response) => {
+        const workflow = response.body.apps?.find(
+          app => app.name === workflowName || app.slug === workflowName
+        );
+
+        if (!workflow) throw new Error(`Workflow "${workflowName}" not found`);
+        Cypress.env("workflowId", workflow.id);
+        cy.openWorkflow(workflow.slug, workspaceId, workflow.id, componentSelector);
+
+        Cypress.log({
+          name: "Workflow Open",
+          displayName: "WORKFLOW OPENED",
+          message: `: ${workflowName}`,
+        });
+      });
+    });
+  }
+);
+
+Cypress.Commands.add("apiDeleteWorkflow", (workflowName, reuseSession = false) => {
+  cy.getAuthHeaders(reuseSession).then((headers) => {
+    cy.request({
+      method: "GET",
+      url: `${Cypress.env("server_host")}/api/apps?page=1&type=workflow&searchKey=${workflowName}`,
+      headers: headers,
+    }, { log: false }).then((response) => {
+      const workflow = response.body.apps?.find(
+        app => app.name === workflowName || app.slug === workflowName
+      );
+
+      if (!workflow) throw new Error(`Workflow "${workflowName}" not found`);
+      cy.request({
+        method: "DELETE",
+        url: `${Cypress.env("server_host")}/api/apps/${workflow.id}`,
+        headers: headers,
+      }, { log: false }).then((deleteResponse) => {
+        expect(deleteResponse.status).to.equal(200);
+        Cypress.log({
+          name: "Workflow Delete",
+          displayName: "WORKFLOW DELETED",
+          message: `: ${workflowName}`,
+        });
+      });
+    });
+  });
+});
+
+Cypress.Commands.add("apiCreateWorkflowApp", (workflowName, reuseSession = false) => {
+  cy.getAuthHeaders(reuseSession).then((headers) => {
+    cy.request({
+      method: "POST",
+      url: `${Cypress.env("server_host")}/api/workflows`,
+      headers,
+      body: { icon: "menuhome", name: workflowName, type: "workflow" },
+    }).then((res) => {
+      expect(res.status).to.equal(201);
+      Cypress.env("workflowId", res.body.id);
+      Cypress.env("user_id", res.body.user_id);
+    });
+  });
+});
+
+Cypress.Commands.add("apiFetchWorkflowContext", (reuseSession = false) => {
+  cy.getAuthHeaders(reuseSession).then((headers) => {
+    const workflowId = Cypress.env("workflowId");
+    if (!workflowId) throw new Error("Missing workflowId in env");
+    cy.request({
+      method: "GET",
+      url: `${Cypress.env("server_host")}/api/apps/${workflowId}`,
+      headers,
+    }).then((appResponse) => {
+      expect(appResponse.status).to.equal(200);
+      Cypress.env("editingVersionId", appResponse.body.editing_version?.id);
+      Cypress.env("environmentId", appResponse.body.editorEnvironment?.id);
+    });
+  });
+});
+
+Cypress.Commands.add("apiGetDataSourceId", (kindOrName = "runjs", reuseSession = false) => {
+  cy.getAuthHeaders(reuseSession).then((headers) => {
+    const versionId = Cypress.env("editingVersionId");
+    const environmentId = Cypress.env("environmentId");
+    if (!versionId || !environmentId) throw new Error("Missing version/environment id in env");
+    cy.request({
+      method: "GET",
+      url: `${Cypress.env("server_host")}/api/data-sources/${Cypress.env("workspaceId")}/environments/${environmentId}/versions/${versionId}`,
+      headers,
+    }).then((dsResponse) => {
+      expect(dsResponse.status).to.equal(200);
+      const ds = dsResponse.body.data_sources?.find(
+        (d) => d.kind === kindOrName || d.name?.toLowerCase() === kindOrName.toLowerCase()
+      );
+      if (!ds) throw new Error(`${kindOrName} data source not found`);
+      Cypress.env("nodeDataSourceId", ds.id);
+    });
+  });
+});
+
+Cypress.Commands.add("apiCreateWorkflowNode", (kind = "runjs", name = "node1", options = {}, reuseSession = false) => {
+  cy.getAuthHeaders(reuseSession).then((headers) => {
+    const workflowId = Cypress.env("workflowId");
+    const versionId = Cypress.env("editingVersionId");
+    const dataSourceId = Cypress.env("nodeDataSourceId");
+    if (!workflowId || !versionId) throw new Error("Missing workflow/version id in env");
+    const body = {
+      app_id: workflowId,
+      app_version_id: versionId,
+      name,
+      kind,
+      options,
+      data_source_id: dataSourceId || null,
+      plugin_id: null,
+    };
+    cy.request({
+      method: "POST",
+      url: `${Cypress.env("server_host")}/api/data-queries/workflow-node`,
+      headers,
+      body,
+    }).then((res) => {
+      expect(res.status).to.equal(201);
+      Cypress.env(`${name}QueryId`, res.body.id);
+      Cypress.env("lastNodeQueryId", res.body.id);
+      Cypress.env("lastNodeName", name);
+    });
+  });
+});
+
+Cypress.Commands.add(
+  "apiWireWorkflowDefinition",
+  (
+    {
+      processingNodeName = Cypress.env("lastNodeName") || "runjs1",
+      processingNodeId = Cypress.env(`${Cypress.env("lastNodeName") || processingNodeName}QueryId`),
+      processingKind = "runjs",
+      defaultParams = '{"dev":"your value"}',
+      responseCode = `return ${processingNodeName}.data`,
+      responseStatus = "200",
+    } = {},
+    reuseSession = false
+  ) => {
+    cy.getAuthHeaders(reuseSession).then((headers) => {
+      const workflowId = Cypress.env("workflowId");
+      const versionId = Cypress.env("editingVersionId");
+      if (!workflowId || !versionId || !processingNodeId) throw new Error("Missing workflow/version/node id");
+      cy.request({
+        method: "PUT",
+        url: `${Cypress.env("server_host")}/api/v2/apps/${workflowId}/versions/${versionId}`,
+        headers: { ...headers, "Content-Type": "application/json" },
+        body: {
+          is_user_switched_version: false,
+          definition: {
+            nodes: [
+              {
+                id: "start-node-1",
+                data: { nodeType: "start", label: "Start trigger" },
+                position: { x: 100, y: 250 },
+                type: "input",
+                sourcePosition: "right",
+                deletable: false,
+                width: 206,
+                height: 42,
+              },
+              {
+                id: `${processingKind}-node-1`,
+                type: "query",
+                sourcePosition: "right",
+                targetPosition: "left",
+                draggable: true,
+                data: {
+                  idOnDefinition: processingNodeId,
+                  kind: processingKind,
+                  options: optionsFallback(processingKind, processingNodeName),
+                },
+                position: { x: 495, y: 146 },
+                deletable: false,
+                width: 206,
+                height: 40,
+              },
+              {
+                id: "response-node-1",
+                data: {
+                  nodeType: "response",
+                  label: "Response",
+                  code: responseCode,
+                  statusCode: { fxActive: false, value: responseStatus },
+                  nodeName: "response1",
+                },
+                position: { x: 723, y: 226 },
+                type: "output",
+                sourcePosition: "right",
+                targetPosition: "left",
+                deletable: false,
+              },
+            ],
+            edges: [
+              { id: "edge-1", source: "start-node-1", target: `${processingKind}-node-1`, sourceHandle: null, type: "custom" },
+              { id: "edge-2", source: `${processingKind}-node-1`, target: "response-node-1", sourceHandle: "success", type: "custom" },
+            ],
+            queries: [{ idOnDefinition: processingNodeId, id: processingNodeId }],
+            webhookParams: [],
+            defaultParams,
+            dependencies: { javascript: { dependencies: {} } },
+            setupScript: { javascript: "" },
+          },
+        },
+      }).then((updateResponse) => {
+        expect(updateResponse.status).to.equal(200);
+      });
+    });
+  }
+);
+
+Cypress.Commands.add("apiExecuteWorkflow", (paramValue = "your value", reuseSession = false) => {
+  cy.getAuthHeaders(reuseSession).then((headers) => {
+    const appVersionId = Cypress.env("editingVersionId");
+    const environmentId = Cypress.env("environmentId");
+    const userId = Cypress.env("user_id");
+    if (!appVersionId || !environmentId || !userId) {
+      throw new Error("Missing required IDs: appVersionId, environmentId, or userId");
+    }
+    cy.request({
+      method: "POST",
+      url: `${Cypress.env("server_host")}/api/workflow_executions`,
+      headers: {
+        ...headers,
+        "Content-Type": "application/json",
+        "tj-workspace-id": Cypress.env("workspaceId"),
+      },
+      body: {
+        environmentId,
+        appVersionId,
+        userId,
+        executeUsing: "version",
+        params: { dev: paramValue },
+        injectedState: {},
+      },
+    }).then((executionRes) => {
+      expect(executionRes.status).to.equal(201);
+      const executionId = executionRes.body?.workflowExecution?.id;
+      if (!executionId) throw new Error("executionId not returned");
+      Cypress.env("executionId", executionId);
+    });
+  });
+});
+
+Cypress.Commands.add("apiValidateLogs", (reuseSession = false) => {
+  cy.getAuthHeaders(reuseSession).then((headers) => {
+    const executionId = Cypress.env("executionId");
+    if (!executionId) throw new Error("Missing executionId in env");
+    cy.request({
+      method: "GET",
+      url: `${Cypress.env("server_host")}/api/workflow_executions/${executionId}`,
+      headers: {
+        ...headers,
+        "tj-workspace-id": Cypress.env("workspaceId"),
+      },
+    }).then((resultRes) => {
+      expect(resultRes.status).to.equal(200);
+      expect(resultRes.body).to.have.property("status", "success");
+      Cypress.env("executionMetadata", resultRes.body);
+    });
+  });
+});
+
+Cypress.Commands.add("apiValidateLogsWithData", (expectedValue, reuseSession = false) => {
+  cy.getAuthHeaders(reuseSession).then((headers) => {
+    const executionId = Cypress.env("executionId");
+    if (!executionId) throw new Error("Missing executionId in env");
+    cy.request({
+      method: "GET",
+      url: `${Cypress.env("server_host")}/api/workflow_executions/${executionId}/nodes?page=1&per_page=20`,
+      headers: {
+        ...headers,
+        "tj-workspace-id": Cypress.env("workspaceId"),
+      },
+    }).then((nodesRes) => {
+      expect(nodesRes.status).to.equal(200);
+      const responseString = JSON.stringify(nodesRes.body);
+      expect(responseString).to.include(expectedValue);
+      Cypress.env("executionNodesResponse", nodesRes.body);
+    });
+  });
+});

cypress-tests/cypress/config/browserConfig.js

@@ -0,0 +1,28 @@
+/**
+ * Browser Launch Configuration
+ * Configures Chrome browser launch arguments for optimal performance and stability
+ */
+
+module.exports = (on) => {
+  on('before:browser:launch', (browser = {}, launchOptions) => {
+    if (browser.name === 'chrome') {
+      // Common args for all Chrome modes
+      launchOptions.args.push(
+        '--disable-features=AutofillAccountStorage,PasswordManager',
+        '--disable-save-password-bubble',
+        '--disable-password-generation',
+        '--disable-password-manager-reauthentication',
+        '--disable-dev-shm-usage',  // Prevents Chrome crashes in CI/Docker
+        '--disable-software-rasterizer',
+        '--disable-extensions',
+        '--js-flags=--max-old-space-size=8192'  // Increase Node.js memory to 8GB
+      );
+
+      // Headless-specific optimizations
+      if (browser.isHeadless) {
+        launchOptions.args.push('--disable-gpu');
+      }
+    }
+    return launchOptions;
+  });
+};

cypress-tests/cypress/config/tasks.js

@@ -0,0 +1,85 @@
+/**
+ * Cypress Custom Tasks
+ * All custom tasks for PDF reading, Excel parsing, file/folder operations, and database queries
+ * Used by config.js
+ */
+
+const fs = require("fs");
+const { rmdir } = require("fs");
+const XLSX = require("node-xlsx");
+const pg = require("pg");
+const path = require("path");
+const pdf = require("pdf-parse");
+
+module.exports = (on) => {
+  on("task", {
+    // Read PDF file and extract text
+    readPdf(pathToPdf) {
+      return new Promise((resolve) => {
+        const pdfPath = path.resolve(pathToPdf);
+        let dataBuffer = fs.readFileSync(pdfPath);
+        pdf(dataBuffer).then(function ({ text }) {
+          resolve(text);
+        });
+      });
+    },
+
+    // Read Excel file and convert to JSON
+    readXlsx(filePath) {
+      return new Promise((resolve, reject) => {
+        try {
+          let dataBuffer = fs.readFileSync(filePath);
+          const jsonData = XLSX.parse(dataBuffer);
+          resolve(jsonData[0]["data"].toString());
+        } catch (e) {
+          reject(e);
+        }
+      });
+    },
+
+    // Delete a single file
+    deleteFile(filePath) {
+      return new Promise((resolve, reject) => {
+        const fullPath = path.resolve(filePath);
+        if (fs.existsSync(fullPath)) {
+          fs.unlink(fullPath, (err) => {
+            if (err) {
+              console.error("Failed to delete file:", fullPath, err);
+              return reject(err);
+            }
+            console.log("Deleted file:", fullPath);
+            resolve(true);
+          });
+        } else {
+          console.log("File not found, skipping delete:", fullPath);
+          resolve(false);
+        }
+      });
+    },
+
+    // Delete folder recursively
+    deleteFolder(folderName) {
+      return new Promise((resolve, reject) => {
+        if (fs.existsSync(folderName)) {
+          rmdir(folderName, { maxRetries: 10, recursive: true }, (err) => {
+            if (err) {
+              console.error(err);
+              return reject(err);
+            }
+            return resolve(null);
+          });
+        } else {
+          return resolve(null);
+        }
+      });
+    },
+
+    // Execute PostgreSQL database queries
+    dbConnection({ dbconfig, sql }) {
+      const client = new pg.Pool(dbconfig);
+      return client.query(sql).then(result => {
+        return result;
+      });
+    },
+  });
+};

cypress-tests/cypress/constants/constants/marketplace/datasources/airtable.js

@@ -0,0 +1,34 @@
+export const airtableUIConfig = {
+    defaultFields: [
+        {
+            type: "encrypted",
+            fieldName: "Personal access token",
+            validations: {
+                isRequired: true,
+                placeholder: "**************",
+                defaultValue: "",
+                disabled: true,
+                hasEditButton: true,
+                showEncrypted: true,
+                hasEyeIcon: false
+            }
+        }
+    ]
+};
+
+export const airtableFormConfig = {
+    valid: [
+        {
+            type: "encrypted",
+            fieldName: "Personal access token",
+            text: `${Cypress.env('airTable_apikey')}`
+        }
+    ],
+    invalidToken: [
+        {
+            type: "encrypted",
+            fieldName: "Personal access token",
+            text: "invalid-token"
+        }
+    ]
+};

cypress-tests/cypress/constants/constants/marketplace/datasources/amazonses.js

@@ -0,0 +1,83 @@
+export const amazonsesUIConfig = {
+    defaultFields: [
+        {
+            type: "dropdown",
+            fieldName: "Authentication",
+            validations: {
+                defaultValue: "Use IAM Access Keys",
+                disabled: false
+            }
+        },
+        {
+            type: "input",
+            fieldName: "Access key",
+            validations: {
+                isRequired: false,
+                placeholder: "Enter access key",
+                defaultValue: "",
+                disabled: false
+            }
+        },
+        {
+            type: "encrypted",
+            fieldName: "Secret key",
+            validations: {
+                isRequired: false,
+                placeholder: "**************",
+                defaultValue: "",
+                disabled: true,
+                hasEditButton: true,
+                showEncrypted: true,
+                hasEyeIcon: false
+            }
+        },
+        {
+            type: "dropdown",
+            fieldName: "Region",
+            validations: {
+                disabled: false
+            }
+        }
+    ]
+};
+
+export const amazonsesFormConfig = {
+    valid: [
+        {
+            type: "input",
+            fieldName: "Access key",
+            text: `${Cypress.env('aws_access')}`
+        },
+        {
+            type: "encrypted",
+            fieldName: "Secret key",
+            text: `${Cypress.env('aws_secret')}`
+        },
+        {
+            type: "dropdown",
+            fieldName: "Region",
+            text: "US East (N. Virginia)"
+        }
+    ],
+    invalidAccessKey: [
+        {
+            type: "input",
+            fieldName: "Access key",
+            text: "invalid-access-key"
+        }
+    ],
+    invalidSecretKey: [
+        {
+            type: "encrypted",
+            fieldName: "Secret key",
+            text: "invalid-secret-key"
+        }
+    ]
+};
+
+export const amazonsesApiOptions = [
+    { key: "instance_metadata_credentials", value: "iam_access_keys", encrypted: false },
+    { key: "access_key", value: "", encrypted: false },
+    { key: "secret_key", value: null, encrypted: true },
+    { key: "region", value: "", encrypted: false }
+];

cypress-tests/cypress/constants/constants/marketplace/datasources/appwrite.js

@@ -0,0 +1,93 @@
+export const appwriteUIConfig = {
+    defaultFields: [
+        {
+            type: "input",
+            fieldName: "Host",
+            validations: {
+                isRequired: false,
+                placeholder: "Appwrite database host/endpoint",
+                defaultValue: "",
+                disabled: false
+            }
+        },
+        {
+            type: "input",
+            fieldName: "Project ID",
+            validations: {
+                isRequired: false,
+                placeholder: "Appwrite project id",
+                defaultValue: "",
+                disabled: false
+            }
+        },
+        {
+            type: "input",
+            fieldName: "Database ID",
+            validations: {
+                isRequired: false,
+                placeholder: "Appwrite Database id",
+                defaultValue: "",
+                disabled: false
+            }
+        },
+        {
+            type: "encrypted",
+            fieldName: "Secret Key",
+            validations: {
+                isRequired: false,
+                placeholder: "**************",
+                defaultValue: "",
+                disabled: true,
+                hasEditButton: true,
+                showEncrypted: true,
+                hasEyeIcon: false
+            }
+        }
+    ]
+};
+
+export const appwriteFormConfig = {
+    valid: [
+        {
+            type: "input",
+            fieldName: "Host",
+            text: `${Cypress.env('appwrite_host')}`
+        },
+        {
+            type: "input",
+            fieldName: "Project ID",
+            text: `${Cypress.env('appwrite_project_id')}`
+        },
+        {
+            type: "input",
+            fieldName: "Database ID",
+            text: `${Cypress.env('appwrite_database_id')}`
+        },
+        {
+            type: "encrypted",
+            fieldName: "Secret Key",
+            text: `${Cypress.env('appwrite_secret_key')}`
+        }
+    ],
+    invalidHost: [
+        {
+            type: "input",
+            fieldName: "Host",
+            text: "invalid-host"
+        }
+    ],
+    invalidProjectId: [
+        {
+            type: "input",
+            fieldName: "Project ID",
+            text: "invalid-project-id"
+        }
+    ],
+    invalidSecretKey: [
+        {
+            type: "encrypted",
+            fieldName: "Secret Key",
+            text: "invalid-secret-key"
+        }
+    ]
+};

cypress-tests/cypress/constants/constants/marketplace/datasources/athena.js

@@ -0,0 +1,93 @@
+export const athenaUIConfig = {
+    defaultFields: [
+        {
+            type: "input",
+            fieldName: "Database",
+            validations: {
+                isRequired: false,
+                placeholder: "Enter database name",
+                defaultValue: "",
+                disabled: false
+            }
+        },
+        {
+            type: "input",
+            fieldName: "S3 output location",
+            validations: {
+                isRequired: false,
+                placeholder: "Enter output location",
+                defaultValue: "",
+                disabled: false
+            }
+        },
+        {
+            type: "input",
+            fieldName: "Access key",
+            validations: {
+                isRequired: false,
+                placeholder: "Enter access key",
+                defaultValue: "",
+                disabled: false
+            }
+        },
+        {
+            type: "encrypted",
+            fieldName: "Secret key",
+            validations: {
+                isRequired: false,
+                placeholder: "**************",
+                defaultValue: "",
+                disabled: true,
+                hasEditButton: true,
+                showEncrypted: true,
+                hasEyeIcon: false
+            }
+        },
+        {
+            type: "dropdown",
+            fieldName: "Region",
+            validations: {
+                disabled: false
+            }
+        }
+    ]
+};
+
+export const athenaFormConfig = {
+    valid: [
+        {
+            type: "input",
+            fieldName: "Database",
+            text: `${Cypress.env('amazonathena_DbName')}`
+        },
+        {
+            type: "input",
+            fieldName: "Access key",
+            text: `${Cypress.env('amazonathena_accessKey')}`
+        },
+        {
+            type: "encrypted",
+            fieldName: "Secret key",
+            text: `${Cypress.env('amazonathena_secretKey')}`
+        },
+        {
+            type: "dropdown",
+            fieldName: "Region",
+            text: "US East (N. Virginia)"
+        }
+    ],
+    invalidAccessKey: [
+        {
+            type: "input",
+            fieldName: "Access key",
+            text: "invalid-access-key"
+        }
+    ],
+    invalidSecretKey: [
+        {
+            type: "encrypted",
+            fieldName: "Secret key",
+            text: "invalid-secret-key"
+        }
+    ]
+};

cypress-tests/cypress/constants/constants/marketplace/datasources/aws-s3.js

@@ -0,0 +1,88 @@
+export const awsS3UIConfig = {
+    defaultFields: [
+        {
+            type: "dropdown",
+            fieldName: "Authentication",
+            validations: {
+                defaultValue: "Use IAM Access Keys",
+                disabled: false
+            }
+        },
+
+        {
+            type: "input",
+            fieldName: "Access key",
+            validations: {
+                isRequired: false,
+                placeholder: "Enter access key",
+                defaultValue: "",
+                disabled: false
+            }
+        },
+
+        {
+            type: "encrypted",
+            fieldName: "Secret key",
+            validations: {
+                isRequired: false,
+                placeholder: "**************",
+                defaultValue: "",
+                disabled: true,
+                hasEditButton: true,
+                showEncrypted: true,
+                hasEyeIcon: false
+            }
+        },
+
+        {
+            type: "toggle",
+            fieldName: "Custom Endpoint",
+            validations: {
+                defaultValue: false,
+                disabled: false
+            }
+        },
+
+        {
+            type: "dropdown",
+            fieldName: "Region",
+            validations: {
+                disabled: false
+            }
+        }
+    ]
+};
+
+export const awsS3FormConfig = {
+    valid: [
+        {
+            type: "input",
+            fieldName: "Access key",
+            text: `${Cypress.env('aws_access')}`
+        },
+        {
+            type: "encrypted",
+            fieldName: "Secret key",
+            text: `${Cypress.env('aws_secret')}`
+        },
+        {
+            type: "dropdown",
+            fieldName: "Region",
+            text: "US East (N. Virginia)"
+        }
+    ],
+    invalidAccessKey: [
+        {
+            type: "input",
+            fieldName: "Access key",
+            text: "invalid-access-key"
+        }
+    ],
+    invalidSecretKey: [
+        {
+            type: "encrypted",
+            fieldName: "Secret key",
+            text: "invalid-secret-key"
+        }
+    ]
+};

cypress-tests/cypress/constants/constants/marketplace/datasources/azureblobstorage.js

@@ -0,0 +1,31 @@
+export const azureblobstorageUIConfig = {
+    defaultFields: [
+        {
+            type: "input",
+            fieldName: "Connection string",
+            validations: {
+                isRequired: false,
+                placeholder: "Enter connection string",
+                defaultValue: "",
+                disabled: false
+            }
+        }
+    ]
+};
+
+export const azureblobstorageFormConfig = {
+    valid: [
+        {
+            type: "input",
+            fieldName: "Connection string",
+            text: `${Cypress.env('azure_blob_storage_connection_string')}`
+        }
+    ],
+    invalidConnectionString: [
+        {
+            type: "input",
+            fieldName: "Connection string",
+            text: "invalid-connection-string"
+        }
+    ]
+};

cypress-tests/cypress/constants/constants/marketplace/datasources/baserow.js

@@ -0,0 +1,41 @@
+export const baserowUIConfig = {
+    defaultFields: [
+        {
+            type: "encrypted",
+            fieldName: "API token",
+            validations: {
+                isRequired: false,
+                placeholder: "**************",
+                defaultValue: "",
+                disabled: true,
+                hasEditButton: true,
+                showEncrypted: true,
+                hasEyeIcon: false
+            }
+        },
+
+        {
+            type: "dropdown",
+            fieldName: "Host",
+            validations: {
+                defaultValue: "Baserow Cloud",
+                disabled: false
+            }
+        }
+    ]
+};
+
+export const baserowFormConfig = {
+    valid: [
+        {
+            type: "encrypted",
+            fieldName: "API token",
+            text: `${Cypress.env('baserow_apikey')}`
+        },
+        {
+            type: "dropdown",
+            fieldName: "Host",
+            text: "Baserow Cloud"
+        }
+    ]
+};

cypress-tests/cypress/constants/constants/marketplace/datasources/bigquery.js

@@ -0,0 +1,49 @@
+export const bigqueryUIConfig = {
+    defaultFields: [
+        {
+            type: "encrypted",
+            fieldName: "Private key",
+            validations: {
+                isRequired: true,
+                placeholder: "**************",
+                defaultValue: "",
+                disabled: true,
+                hasEditButton: true,
+                showEncrypted: true,
+                hasEyeIcon: false
+            }
+        },
+        {
+            type: "input",
+            fieldName: "Scope",
+            validations: {
+                isRequired: false,
+                placeholder: "Enter required scopes",
+                defaultValue: "",
+                disabled: false
+            }
+        }
+    ]
+};
+
+export const bigqueryFormConfig = {
+    valid: [
+        {
+            type: "encrypted",
+            fieldName: "Private key",
+            text: `${JSON.stringify(Cypress.env('bigquery_private_key'))}`
+        },
+        {
+            type: "input",
+            fieldName: "Scope",
+            text: `${Cypress.env('bigquery_scope')}`
+        }
+    ],
+    invalidPrivateKey: [
+        {
+            type: "encrypted",
+            fieldName: "Private key",
+            text: "invalid-private-key"
+        }
+    ]
+};

cypress-tests/cypress/constants/constants/marketplace/datasources/clickhouse.js

@@ -0,0 +1,127 @@
+export const clickhouseUIConfig = {
+    defaultFields: [
+        {
+            type: "input",
+            fieldName: "Username",
+            validations: {
+                isRequired: false,
+                placeholder: "Enter username",
+                defaultValue: "",
+                disabled: false
+            }
+        },
+
+        {
+            type: "encrypted",
+            fieldName: "Password",
+            validations: {
+                isRequired: false,
+                placeholder: "**************",
+                defaultValue: "",
+                disabled: true,
+                hasEditButton: true,
+                showEncrypted: true,
+                hasEyeIcon: false
+            }
+        },
+
+        {
+            type: "input",
+            fieldName: "Host",
+            validations: {
+                isRequired: false,
+                placeholder: "localhost",
+                defaultValue: "",
+                disabled: false
+            }
+        },
+
+        {
+            type: "input",
+            fieldName: "Port",
+            validations: {
+                isRequired: false,
+                placeholder: "8123",
+                defaultValue: "",
+                disabled: false
+            }
+        },
+
+        {
+            type: "input",
+            fieldName: "Database name",
+            validations: {
+                isRequired: false,
+                placeholder: "database name",
+                defaultValue: "",
+                disabled: false
+            }
+        },
+
+        {
+            type: "dropdown",
+            fieldName: "Protocol",
+            validations: {
+                disabled: false
+            }
+        }
+    ]
+};
+
+export const clickhouseFormConfig = {
+    valid: [
+        {
+            type: "input",
+            fieldName: "Host",
+            text: `${Cypress.env('clickhouse_host')}`
+        },
+        {
+            type: "input",
+            fieldName: "Port",
+            text: `${Cypress.env('clickhouse_port')}`
+        },
+        {
+            type: "input",
+            fieldName: "Username",
+            text: `${Cypress.env('clickhouse_user')}`
+        },
+        {
+            type: "encrypted",
+            fieldName: "Password",
+            text: `${Cypress.env('clickhouse_password')}`
+        },
+        {
+            type: "dropdown",
+            fieldName: "Protocol",
+            text: "HTTP"
+        }
+    ],
+    invalidHost: [
+        {
+            type: "input",
+            fieldName: "Host",
+            text: "invalid-host"
+        }
+    ],
+    invalidUsername: [
+        {
+            type: "input",
+            fieldName: "Username",
+            text: "invalid-username"
+        }
+    ],
+    invalidPassword: [
+        {
+            type: "encrypted",
+            fieldName: "Password",
+            text: "invalid-password"
+        }
+    ],
+    invalidPort: [
+        {
+            type: "input",
+            fieldName: "Port",
+            text: "9999"
+        }
+    ],
+};

cypress-tests/cypress/constants/constants/marketplace/datasources/cosmosdb.js

@@ -0,0 +1,49 @@
+export const cosmosdbUIConfig = {
+    defaultFields: [
+        {
+            type: "input",
+            fieldName: "End point",
+            validations: {
+                isRequired: false,
+                placeholder: "https://your-account.documents.azure.com",
+                defaultValue: "",
+                disabled: false
+            }
+        },
+        {
+            type: "encrypted",
+            fieldName: "Key",
+            validations: {
+                isRequired: false,
+                placeholder: "**************",
+                defaultValue: "",
+                disabled: true,
+                hasEditButton: true,
+                showEncrypted: true,
+                hasEyeIcon: false
+            }
+        }
+    ]
+};
+
+export const cosmosdbFormConfig = {
+    valid: [
+        {
+            type: "input",
+            fieldName: "End point",
+            text: `${Cypress.env('cosmosdb_end_point')}`
+        },
+        {
+            type: "encrypted",
+            fieldName: "Key",
+            text: `${Cypress.env('cosmosdb_key')}`
+        }
+    ],
+    invalidEndpoint: [
+        {
+            type: "input",
+            fieldName: "End point",
+            text: "invalid-endpoint"
+        }
+    ]
+};

cypress-tests/cypress/constants/constants/marketplace/datasources/couchdb.js

@@ -0,0 +1,132 @@
+export const couchdbUIConfig = {
+    defaultFields: [
+        {
+            type: "input",
+            fieldName: "Host",
+            validations: {
+                isRequired: false,
+                placeholder: "",
+                defaultValue: "",
+                disabled: false
+            }
+        },
+
+        {
+            type: "input",
+            fieldName: "Port",
+            validations: {
+                isRequired: false,
+                placeholder: "5984 ",
+                defaultValue: "5984",
+                disabled: false
+            }
+        },
+
+        {
+            type: "input",
+            fieldName: "Username",
+            validations: {
+                isRequired: false,
+                placeholder: "username for couchDB",
+                defaultValue: "",
+                disabled: false
+            }
+        },
+
+        {
+            type: "encrypted",
+            fieldName: "Password",
+            validations: {
+                isRequired: false,
+                placeholder: "**************",
+                defaultValue: "",
+                disabled: true,
+                hasEditButton: true,
+                showEncrypted: true
+            }
+        },
+
+        {
+            type: "input",
+            fieldName: "Database name",
+            validations: {
+                isRequired: false,
+                placeholder: "database name",
+                defaultValue: "",
+                disabled: false
+            }
+        },
+
+        {
+            type: "dropdown",
+            fieldName: "Protocol",
+            validations: {
+                defaultValue: "HTTP",
+                disabled: false
+            }
+        }
+    ]
+};
+
+export const couchdbFormConfig = {
+    valid: [
+        {
+            type: "input",
+            fieldName: "Host",
+            text: `${Cypress.env('couchdb_host')}`
+        },
+        {
+            type: "input",
+            fieldName: "Port",
+            text: "5984"
+        },
+        {
+            type: "input",
+            fieldName: "Username",
+            text: `${Cypress.env('couchdb_username')}`
+        },
+        {
+            type: "encrypted",
+            fieldName: "Password",
+            text: `${Cypress.env('couchdb_password')}`
+        },
+        {
+            type: "input",
+            fieldName: "Database name",
+            text: `${Cypress.env('couchdb_database')}`
+        },
+        {
+            type: "dropdown",
+            fieldName: "Protocol",
+            text: "HTTP"
+        }
+    ],
+    invalidHost: [
+        {
+            type: "input",
+            fieldName: "Host",
+            text: "invalid-host"
+        }
+    ],
+    invalidUsername: [
+        {
+            type: "input",
+            fieldName: "Username",
+            text: "invalid-username"
+        }
+    ],
+    invalidPassword: [
+        {
+            type: "encrypted",
+            fieldName: "Password",
+            text: "invalid-password"
+        }
+    ],
+    invalidPort: [
+        {
+            type: "input",
+            fieldName: "Port",
+            text: "9999"
+        }
+    ]
+};

cypress-tests/cypress/constants/constants/marketplace/datasources/dynamodb.js

@@ -0,0 +1,76 @@
+export const dynamodbUIConfig = {
+    defaultFields: [
+        {
+            type: "dropdown",
+            fieldName: "Authentication",
+            validations: {
+                defaultValue: "Use IAM Access Keys",
+                disabled: false
+            }
+        },
+        {
+            type: "input",
+            fieldName: "Access key",
+            validations: {
+                isRequired: false,
+                placeholder: "Enter access key",
+                defaultValue: "",
+                disabled: false
+            }
+        },
+        {
+            type: "encrypted",
+            fieldName: "Secret key",
+            validations: {
+                isRequired: false,
+                placeholder: "**************",
+                defaultValue: "",
+                disabled: true,
+                hasEditButton: true,
+                showEncrypted: true,
+                hasEyeIcon: false
+            }
+        },
+        {
+            type: "dropdown",
+            fieldName: "Region",
+            validations: {
+                disabled: false
+            }
+        }
+    ]
+};
+
+export const dynamodbFormConfig = {
+    valid: [
+        {
+            type: "dropdown",
+            fieldName: "Region",
+            text: "US West (N. California)"
+        },
+        {
+            type: "input",
+            fieldName: "Access key",
+            text: `${Cypress.env('dynamodb_access_key')}`
+        },
+        {
+            type: "encrypted",
+            fieldName: "Secret key",
+            text: `${Cypress.env('dynamodb_secret_key')}`
+        }
+    ],
+    invalidAccessKey: [
+        {
+            type: "input",
+            fieldName: "Access key",
+            text: "invalid-access-key"
+        }
+    ],
+    invalidSecretKey: [
+        {
+            type: "encrypted",
+            fieldName: "Secret key",
+            text: "invalid-secret-key"
+        }
+    ]
+};

cypress-tests/cypress/constants/constants/marketplace/datasources/elasticsearch.js

@@ -0,0 +1,132 @@
+export const elasticsearchUIConfig = {
+    defaultFields: [
+        {
+            type: "input",
+            fieldName: "Host",
+            validations: {
+                isRequired: false,
+                placeholder: "Enter host",
+                defaultValue: "localhost",
+                disabled: false
+            }
+        },
+        {
+            type: "input",
+            fieldName: "Port",
+            validations: {
+                isRequired: false,
+                placeholder: "Enter port",
+                defaultValue: "9200",
+                disabled: false
+            }
+        },
+
+        {
+            type: "toggle",
+            fieldName: "SSL",
+            validations: {
+                defaultValue: true,
+                disabled: false
+            }
+        },
+
+        {
+            type: "input",
+            fieldName: "Username",
+            validations: {
+                isRequired: false,
+                placeholder: "Enter username",
+                defaultValue: "",
+                disabled: false
+            }
+        },
+
+        {
+            type: "encrypted",
+            fieldName: "Password",
+            validations: {
+                isRequired: false,
+                placeholder: "**************",
+                defaultValue: "",
+                disabled: true,
+                hasEditButton: true,
+                showEncrypted: true,
+                hasEyeIcon: false
+            }
+        },
+
+        {
+            type: "dropdown",
+            fieldName: "SSL certificate",
+            validations: {
+                defaultValue: 'None',
+                disabled: false
+            }
+        }
+    ]
+};
+
+export const elasticsearchFormConfig = {
+    valid: [
+        {
+            type: "input",
+            fieldName: "Host",
+            text: `${Cypress.env('elasticsearch_host')}`
+        },
+        {
+            type: "input",
+            fieldName: "Port",
+            text: "9200"
+        },
+        {
+            type: "toggle",
+            fieldName: "SSL",
+            shouldBeChecked: false
+        },
+        {
+            type: "input",
+            fieldName: "Username",
+            text: `${Cypress.env('elasticsearch_user')}`
+        },
+        {
+            type: "encrypted",
+            fieldName: "Password",
+            text: `${Cypress.env('elasticsearch_password')}`
+        }
+    ],
+    invalidSsl: [
+        {
+            type: "toggle",
+            fieldName: "SSL",
+            shouldBeChecked: true
+        }
+    ],
+    invalidHost: [
+        {
+            type: "input",
+            fieldName: "Host",
+            text: "invalid-host"
+        }
+    ],
+    invalidUsername: [
+        {
+            type: "input",
+            fieldName: "Username",
+            text: "invalid-username"
+        }
+    ],
+    invalidPassword: [
+        {
+            type: "encrypted",
+            fieldName: "Password",
+            text: "invalid-password"
+        }
+    ],
+    invalidPort: [
+        {
+            type: "input",
+            fieldName: "Port",
+            text: "9999"
+        }
+    ],
+};

cypress-tests/cypress/constants/constants/marketplace/datasources/firestore.js

@@ -0,0 +1,34 @@
+export const firestoreUIConfig = {
+    defaultFields: [
+        {
+            type: "encrypted",
+            fieldName: "Private key",
+            validations: {
+                isRequired: false,
+                placeholder: "**************",
+                defaultValue: "",
+                disabled: true,
+                hasEditButton: true,
+                showEncrypted: true,
+                hasEyeIcon: false
+            }
+        }
+    ]
+};
+
+export const firestoreFormConfig = {
+    valid: [
+        {
+            type: "encrypted",
+            fieldName: "Private key",
+            text: `${JSON.stringify(Cypress.env('firestore_private_key'))}`
+        }
+    ],
+    invalidPrivateKey: [
+        {
+            type: "encrypted",
+            fieldName: "Private key",
+            text: "invalid-private-key"
+        }
+    ]
+};

cypress-tests/cypress/constants/constants/marketplace/datasources/gcs.js

@@ -0,0 +1,34 @@
+export const gcsUIConfig = {
+    defaultFields: [
+        {
+            type: "encrypted",
+            fieldName: "Private key",
+            validations: {
+                isRequired: false,
+                placeholder: "**************",
+                defaultValue: "",
+                disabled: true,
+                hasEditButton: true,
+                showEncrypted: true,
+                hasEyeIcon: false
+            }
+        }
+    ]
+};
+
+export const gcsFormConfig = {
+    valid: [
+        {
+            type: "encrypted",
+            fieldName: "Private key",
+            text: `${JSON.stringify(Cypress.env('gcs_private_key'))}`
+        }
+    ],
+    invalidPrivateKey: [
+        {
+            type: "encrypted",
+            fieldName: "Private key",
+            text: "invalid-private-key"
+        }
+    ]
+};

cypress-tests/cypress/constants/constants/marketplace/datasources/googlesheets.js

@@ -0,0 +1,59 @@
+export const googlesheetsUIConfig = {
+    defaultFields: [
+        {
+            type: "dropdown",
+            fieldName: "Authentication Type",
+            validations: {
+                defaultValue: "OAuth 2.0",
+                disabled: false
+            }
+        }
+    ],
+    serviceAccountFields: [
+        {
+            type: "dropdown",
+            fieldName: "Authentication Type",
+            validations: {
+                defaultValue: "Service Account",
+                disabled: false
+            }
+        },
+        {
+            type: "encrypted",
+            fieldName: "Service Account Key",
+            validations: {
+                isRequired: false,
+                placeholder: "**************",
+                defaultValue: "",
+                disabled: true,
+                hasEditButton: true,
+                showEncrypted: true,
+                hasEyeIcon: false
+            }
+        }
+    ]
+};
+
+export const googlesheetsFormConfig = {
+    valid: [
+        {
+            type: "encrypted",
+            fieldName: "Service Account Key",
+            text: `${JSON.stringify(Cypress.env('bigquery_private_key'))}`
+        }
+    ]
+};
+
+export const googlesheetsApiOptions = [
+    { key: "authentication_type", value: "oauth2", encrypted: false },
+    { key: "access_type", value: "read", encrypted: false },
+    { key: "api_key", value: null, encrypted: true },
+    { key: "service_account_key", value: null, encrypted: true }
+];
+
+export const googlesheetsApiOptionsServiceAccount = [
+    { key: "authentication_type", value: "service_account", encrypted: false },
+    { key: "access_type", value: "read", encrypted: false },
+    { key: "api_key", value: null, encrypted: true },
+    { key: "service_account_key", value: null, encrypted: true }
+];

cypress-tests/cypress/constants/constants/marketplace/datasources/graphql.js

@@ -0,0 +1,62 @@
+export const graphqlUIConfig = {
+    defaultFields: [
+        {
+            type: "input",
+            fieldName: "Base URL",
+            validations: {
+                isRequired: false,
+                placeholder: "https://api.example.com/v1/graphql",
+                defaultValue: "",
+                disabled: false
+            }
+        },
+
+        {
+            type: "dropdown",
+            fieldName: "SSL certificate",
+            validations: {
+                defaultValue: "None",
+                disabled: false
+            }
+        }
+    ]
+};
+
+export const graphqlFormConfig = {
+    valid: [
+        {
+            type: "input",
+            fieldName: "Base URL",
+            text: `${Cypress.env('GraphQl_Url')}`
+        }
+    ]
+};
+
+export const graphqlApiOptions = [
+    { key: "url", value: "" },
+    { key: "auth_type", value: "none" },
+    { key: "grant_type", value: "authorization_code" },
+    { key: "add_token_to", value: "header" },
+    { key: "header_prefix", value: "Bearer " },
+    { key: "access_token_url", value: "" },
+    { key: "client_id", value: "" },
+    { key: "client_secret", value: "", encrypted: true },
+    { key: "audience", value: "" },
+    { key: "scopes", value: "read, write" },
+    { key: "username", value: "" },
+    { key: "password", value: "", encrypted: true },
+    { key: "bearer_token", value: "", encrypted: true },
+    { key: "auth_url", value: "" },
+    { key: "client_auth", value: "header" },
+    { key: "headers", value: [["", ""]] },
+    { key: "url_params", value: [["", ""]] },
+    { key: "body", value: [["", ""]] },
+    { key: "cookies", value: [["", ""]] },
+    { key: "custom_auth_params", value: [["", ""]] },
+    { key: "access_token_custom_headers", value: [["", ""]] },
+    { key: "multiple_auth_enabled", value: false, encrypted: false },
+    { key: "ssl_certificate", value: "none", encrypted: false },
+    { key: "ca_cert", value: null, encrypted: true },
+    { key: "client_key", value: null, encrypted: true },
+    { key: "client_cert", value: null, encrypted: true },
+];

cypress-tests/cypress/constants/constants/marketplace/datasources/influxdb.js

@@ -0,0 +1,84 @@
+export const influxdbUIConfig = {
+    defaultFields: [
+        {
+            type: "encrypted",
+            fieldName: "API token",
+            validations: {
+                isRequired: false,
+                placeholder: "**************",
+                defaultValue: "",
+                disabled: true,
+                hasEditButton: true,
+                showEncrypted: true,
+                hasEyeIcon: true
+            }
+        },
+        {
+            type: "input",
+            fieldName: "Host",
+            validations: {
+                isRequired: false,
+                placeholder: "",
+                defaultValue: "",
+                disabled: false
+            }
+        },
+        {
+            type: "input",
+            fieldName: "Port",
+            validations: {
+                isRequired: false,
+                placeholder: "8086 ",
+                defaultValue: "8086",
+                disabled: false
+            }
+        },
+        {
+            type: "dropdown",
+            fieldName: "Protocol",
+            validations: {
+                defaultValue: "HTTP",
+                disabled: false
+            }
+        }
+    ]
+};
+
+export const influxdbFormConfig = {
+    valid: [
+        {
+            type: "encrypted",
+            fieldName: "API token",
+            text: `${Cypress.env('influxdb_token')}`
+        },
+        {
+            type: "input",
+            fieldName: "Host",
+            text: `${Cypress.env('influxdb_host')}`
+        },
+        {
+            type: "input",
+            fieldName: "Port",
+            text: `${Cypress.env('influxdb_port')}`
+        },
+        {
+            type: "dropdown",
+            fieldName: "Protocol",
+            text: "HTTP"
+        }
+    ],
+    invalidHost: [
+        {
+            type: "input",
+            fieldName: "Host",
+            text: "invalid-host"
+        }
+    ],
+    invalidApiToken: [
+        {
+            type: "encrypted",
+            fieldName: "API token",
+            text: "invalid-api-token"
+        }
+    ]
+};

cypress-tests/cypress/constants/constants/marketplace/datasources/mariadb.js

@@ -0,0 +1,148 @@
+export const mariadbUIConfig = {
+    defaultFields: [
+        {
+            type: "input",
+            fieldName: "Host",
+            validations: {
+                isRequired: false,
+                placeholder: "Enter host",
+                defaultValue: "",
+                disabled: false
+            }
+        },
+        {
+            type: "input",
+            fieldName: "Username",
+            validations: {
+                isRequired: false,
+                placeholder: "Enter username",
+                defaultValue: "",
+                disabled: false
+            }
+        },
+        {
+            type: "encrypted",
+            fieldName: "Password",
+            validations: {
+                isRequired: false,
+                placeholder: "**************",
+                defaultValue: "",
+                disabled: true,
+                hasEditButton: true,
+                showEncrypted: true,
+                hasEyeIcon: true
+            }
+        },
+        {
+            type: "input",
+            fieldName: "Connection limit",
+            validations: {
+                isRequired: false,
+                placeholder: "Enter connection limit",
+                defaultValue: "10",
+                disabled: false
+            }
+        },
+        {
+            type: "input",
+            fieldName: "Port",
+            validations: {
+                isRequired: false,
+                placeholder: "Enter port",
+                defaultValue: "",
+                disabled: false
+            }
+        },
+        {
+            type: "input",
+            fieldName: "Database",
+            validations: {
+                isRequired: false,
+                placeholder: "Enter name of the database",
+                defaultValue: "",
+                disabled: false
+            }
+        },
+        {
+            type: "toggle",
+            fieldName: "SSL",
+            validations: {
+                defaultValue: false,
+                disabled: false
+            }
+        },
+        {
+            type: "dropdown",
+            fieldName: "SSL certificate",
+            validations: {
+                defaultValue: "None",
+                disabled: false
+            }
+        }
+    ]
+};
+
+export const mariadbFormConfig = {
+    valid: [
+        {
+            type: "input",
+            fieldName: "Host",
+            text: `${Cypress.env('mariadb_host')}`
+        },
+        {
+            type: "input",
+            fieldName: "Port",
+            text: `${Cypress.env('mariadb_port')}`
+        },
+        {
+            type: "input",
+            fieldName: "Database",
+            text: `${Cypress.env('mariadb_database')}`
+        },
+        {
+            type: "input",
+            fieldName: "Username",
+            text: `${Cypress.env('mariadb_user')}`
+        },
+        {
+            type: "encrypted",
+            fieldName: "Password",
+            text: `${Cypress.env('mariadb_password')}`
+        }
+    ],
+    invalidHost: [
+        {
+            type: "input",
+            fieldName: "Host",
+            text: "invalid-host"
+        }
+    ],
+    invalidUsername: [
+        {
+            type: "input",
+            fieldName: "Username",
+            text: "invalid-username"
+        }
+    ],
+    invalidPassword: [
+        {
+            type: "encrypted",
+            fieldName: "Password",
+            text: "invalid-password"
+        }
+    ],
+    invalidPort: [
+        {
+            type: "input",
+            fieldName: "Port",
+            text: "9999"
+        }
+    ],
+    invalidDatabase: [
+        {
+            type: "input",
+            fieldName: "Database",
+            text: "nonexistent_database"
+        }
+    ]
+};

cypress-tests/cypress/constants/constants/marketplace/datasources/minio.js

@@ -0,0 +1,106 @@
+export const minioUIConfig = {
+    defaultFields: [
+        {
+            type: "input",
+            fieldName: "Host",
+            validations: {
+                isRequired: false,
+                placeholder: "Enter host",
+                defaultValue: "play.min.io",
+                disabled: false
+            }
+        },
+        {
+            type: "input",
+            fieldName: "Port",
+            validations: {
+                isRequired: false,
+                placeholder: "Enter port",
+                defaultValue: "9000",
+                disabled: false
+            }
+        },
+        {
+            type: "toggle",
+            fieldName: "SSL",
+            validations: {
+                defaultValue: true,
+                disabled: false
+            }
+        },
+        {
+            type: "input",
+            fieldName: "Access key",
+            validations: {
+                isRequired: false,
+                placeholder: "Enter access key",
+                defaultValue: "",
+                disabled: false
+            }
+        },
+        {
+            type: "encrypted",
+            fieldName: "Secret key",
+            validations: {
+                isRequired: false,
+                placeholder: "**************",
+                defaultValue: "",
+                disabled: true,
+                hasEditButton: true,
+                showEncrypted: true,
+                hasEyeIcon: false
+            }
+        }
+    ]
+};
+
+export const minioFormConfig = {
+    valid: [
+        {
+            type: "input",
+            fieldName: "Host",
+            text: `${Cypress.env('minio_host')}`
+        },
+        {
+            type: "input",
+            fieldName: "Port",
+            text: `${Cypress.env('minio_port')}`
+        },
+        {
+            type: "toggle",
+            fieldName: "SSL",
+            shouldBeChecked: false
+        },
+        {
+            type: "input",
+            fieldName: "Access key",
+            text: `${Cypress.env('minio_accesskey')}`
+        },
+        {
+            type: "encrypted",
+            fieldName: "Secret key",
+            text: `${Cypress.env('minio_secretkey')}`
+        }
+    ],
+    invalidHost: [
+        {
+            type: "input",
+            fieldName: "Host",
+            text: "invalid-host"
+        }
+    ],
+    invalidAccessKey: [
+        {
+            type: "input",
+            fieldName: "Access key",
+            text: "invalid-access-key"
+        }
+    ],
+    invalidSecretKey: [
+        {
+            type: "encrypted",
+            fieldName: "Secret key",
+            text: "invalid-secret-key"
+        }
+    ]
+};

cypress-tests/cypress/constants/constants/marketplace/datasources/mongodb.js

@@ -0,0 +1,320 @@
+export const mongodbUIConfig = {
+    defaultFieldsManual: [
+        {
+            type: "dropdown",
+            fieldName: "Connection type",
+            validations: {
+                defaultValue: 'Manual connection',
+                disabled: false
+            }
+        },
+        {
+            type: "dropdown",
+            fieldName: "Connection format",
+            validations: {
+                defaultValue: 'Standard (mongodb)',
+                disabled: false
+            }
+        },
+
+        {
+            type: "input",
+            fieldName: "Host",
+            validations: {
+                isRequired: true,
+                placeholder: "Enter host",
+                defaultValue: "",
+                disabled: false
+            }
+        },
+        {
+            type: "input",
+            fieldName: "Port",
+            validations: {
+                isRequired: true,
+                placeholder: "Enter port",
+                defaultValue: "",
+                disabled: false
+            }
+        },
+        {
+            type: "input",
+            fieldName: "Database",
+            validations: {
+                isRequired: false,
+                placeholder: "Enter name of the database",
+                defaultValue: "",
+                disabled: false
+            }
+        },
+
+        {
+            type: "input",
+            fieldName: "Username",
+            validations: {
+                isRequired: false,
+                placeholder: "Enter username",
+                defaultValue: "",
+                disabled: false
+            }
+        },
+
+        {
+            type: "encrypted",
+            fieldName: "Password",
+            validations: {
+                isRequired: false,
+                placeholder: "**************",
+                defaultValue: "",
+                disabled: true,
+                hasEditButton: true,
+                showEncrypted: true
+            }
+        },
+
+        {
+            type: "keyValue",
+            fieldName: "Connection options",
+            validations: {
+                hasAddButton: true,
+                rows: [
+                    {
+                        key: "",
+                        value: "",
+                        keyPlaceholder: "Key",
+                        valuePlaceholder: "Value",
+                        hasDeleteButton: true
+                    }
+                ]
+            }
+        },
+
+        {
+            type: "toggle",
+            fieldName: "SSL/TLS",
+            validations: {
+                defaultValue: false,
+                disabled: false
+            }
+        },
+
+        {
+            type: "toggle",
+            fieldName: "SSH tunnel",
+            validations: {
+                defaultValue: false,
+                disabled: false
+            }
+        },
+
+    ],
+
+    defaultFieldsConnectionString: [
+        {
+            type: "dropdown",
+            fieldName: "Connection type",
+            validations: {
+                defaultValue: 'Connect using connection string',
+                disabled: false
+            }
+        },
+        {
+            type: "encrypted",
+            fieldName: "Connection string",
+            validations: {
+                isRequired: true,
+                placeholder: "**************",
+                defaultValue: "",
+                disabled: true,
+                hasEditButton: true,
+                showEncrypted: true
+            }
+        },
+        {
+            type: "dropdown",
+            fieldName: "Connection format",
+            validations: {
+                defaultValue: 'Standard (mongodb)',
+                disabled: false
+            }
+        },
+
+        {
+            type: "input",
+            fieldName: "Host",
+            validations: {
+                isRequired: false,
+                placeholder: "Enter host",
+                defaultValue: "",
+                disabled: false
+            }
+        },
+        {
+            type: "input",
+            fieldName: "Port",
+            validations: {
+                isRequired: false,
+                placeholder: "Enter port",
+                defaultValue: "",
+                disabled: false
+            }
+        },
+        {
+            type: "input",
+            fieldName: "Database",
+            validations: {
+                isRequired: false,
+                placeholder: "Name of the database",
+                defaultValue: "",
+                disabled: false
+            }
+        },
+
+        {
+            type: "input",
+            fieldName: "Username",
+            validations: {
+                isRequired: false,
+                placeholder: "Enter username",
+                defaultValue: "",
+                disabled: false
+            }
+        },
+
+        {
+            type: "encrypted",
+            fieldName: "Password",
+            validations: {
+                isRequired: false,
+                placeholder: "**************",
+                defaultValue: "",
+                disabled: true,
+                hasEditButton: true,
+                showEncrypted: true
+            }
+        },
+
+        {
+            type: "keyValue",
+            fieldName: "Connection options",
+            validations: {
+                hasAddButton: true,
+                rows: [
+                    {
+                        key: "",
+                        value: "",
+                        keyPlaceholder: "Key",
+                        valuePlaceholder: "Value",
+                        hasDeleteButton: true
+                    }
+                ]
+            }
+        },
+
+        {
+            type: "toggle",
+            fieldName: "SSL/TLS",
+            validations: {
+                defaultValue: false,
+                disabled: false
+            }
+        },
+
+        {
+            type: "toggle",
+            fieldName: "SSH tunnel",
+            validations: {
+                defaultValue: false,
+                disabled: false
+            }
+        },
+
+    ]
+};
+
+export const mongodbFormConfig = {
+    valid: [
+        {
+            type: "dropdown",
+            fieldName: "Connection type",
+            text: "Manual connection"
+        },
+        {
+            type: "input",
+            fieldName: "Host",
+            text: `${Cypress.env('mongodb_host')}`
+        },
+        {
+            type: "input",
+            fieldName: "Port",
+            text: `${Cypress.env('mongodb_port')}`
+        },
+        {
+            type: "input",
+            fieldName: "Database",
+            text: `${Cypress.env('mongodb_database')}`
+        },
+        {
+            type: "input",
+            fieldName: "Username",
+            text: `${Cypress.env('mongodb_user')}`
+        },
+        {
+            type: "encrypted",
+            fieldName: "Password",
+            text: `${Cypress.env('mongodb_password')}`
+        }
+    ],
+    validConnectionString: [
+        {
+            type: "dropdown",
+            fieldName: "Connection type",
+            text: "Connect using connection string"
+        },
+        {
+            type: "encrypted",
+            fieldName: "Connection string",
+            text: `${Cypress.env('mongodb_connString')}`
+        }
+    ],
+    invalidHost: [
+        {
+            type: "input",
+            fieldName: "Host",
+            text: "invalid-host"
+        }
+    ],
+    invalidUsername: [
+        {
+            type: "input",
+            fieldName: "Username",
+            text: "invalid-username"
+        }
+    ],
+    invalidPassword: [
+        {
+            type: "encrypted",
+            fieldName: "Password",
+            text: "invalid-password"
+        }
+    ],
+    invalidPort: [
+        {
+            type: "input",
+            fieldName: "Port",
+            text: "9999"
+        }
+    ],
+    invalidConnectionString: [
+        {
+            type: "dropdown",
+            fieldName: "Connection type",
+            text: "Connect using connection string"
+        },
+        {
+            type: "encrypted",
+            fieldName: "Connection string",
+            text: "mongodb://invalid-host:27017/test"
+        }
+    ],
+};

cypress-tests/cypress/constants/constants/marketplace/datasources/mssql.js

@@ -0,0 +1,197 @@
+export const mssqlUIConfig = {
+    defaultFields: [
+        {
+            type: "toggle",
+            fieldName: "Allow dynamic connection parameters",
+            validations: {
+                defaultValue: false,
+                disabled: false
+            }
+        },
+
+        {
+            type: "dropdown",
+            fieldName: "Connection type",
+            validations: {
+                defaultValue: 'Manual connection',
+                disabled: false
+            }
+        },
+
+        {
+            type: "input",
+            fieldName: "Host",
+            validations: {
+                isRequired: true,
+                placeholder: "localhost",
+                defaultValue: "localhost",
+                disabled: false
+            }
+        },
+        {
+            type: "input",
+            fieldName: "Port",
+            validations: {
+                isRequired: true,
+                placeholder: "1433",
+                defaultValue: "1433",
+                disabled: false
+            }
+        },
+        {
+            type: "input",
+            fieldName: "Instance",
+            validations: {
+                isRequired: false,
+                placeholder: "Enter the name of the database instance",
+                defaultValue: "",
+                disabled: false
+            }
+        },
+        {
+            type: "input",
+            fieldName: "Database",
+            validations: {
+                isRequired: false,
+                placeholder: "Enter name of the database",
+                defaultValue: "",
+                disabled: false
+            }
+        },
+
+        {
+            type: "input",
+            fieldName: "Username",
+            validations: {
+                isRequired: false,
+                placeholder: "Enter username",
+                defaultValue: "",
+                disabled: false
+            }
+        },
+
+        {
+            type: "encrypted",
+            fieldName: "Password",
+            validations: {
+                isRequired: false,
+                placeholder: "**************",
+                defaultValue: "",
+                disabled: true,
+                hasEditButton: true,
+                showEncrypted: true,
+                hasEyeIcon: true
+            }
+        },
+
+        {
+            type: "keyValue",
+            fieldName: "Connection options",
+            validations: {
+                hasAddButton: true,
+                rows: [
+                    {
+                        key: "",
+                        value: "",
+                        keyPlaceholder: "Key",
+                        valuePlaceholder: "Value",
+                        hasDeleteButton: true
+                    }
+                ]
+            }
+        },
+
+        {
+            type: "toggle",
+            fieldName: "SSL/TLS",
+            validations: {
+                defaultValue: false,
+                disabled: false
+            }
+        },
+
+        {
+            type: "toggle",
+            fieldName: "Azure encrypt connection",
+            validations: {
+                defaultValue: false,
+                disabled: false
+            }
+        }
+    ]
+};
+
+export const mssqlFormConfig = {
+    valid: [
+        {
+            type: "input",
+            fieldName: "Host",
+            text: `${Cypress.env('sqlserver_host')}`
+        },
+        {
+            type: "input",
+            fieldName: "Port",
+            text: "1433"
+        },
+        {
+            type: "input",
+            fieldName: "Instance",
+            text: `${Cypress.env('sqlserver_instance')}`
+        },
+        {
+            type: "input",
+            fieldName: "Database",
+            text: `${Cypress.env('sqlserver_db')}`
+        },
+        {
+            type: "input",
+            fieldName: "Username",
+            text: `${Cypress.env('sqlserver_user')}`
+        },
+        {
+            type: "encrypted",
+            fieldName: "Password",
+            text: `${Cypress.env('sqlserver_password')}`
+        },
+        {
+            type: "toggle",
+            fieldName: "Azure encrypt connection",
+            shouldBeChecked: false
+        }
+    ],
+    invalidHost: [
+        {
+            type: "input",
+            fieldName: "Host",
+            text: "invalid-host"
+        }
+    ],
+    invalidUsername: [
+        {
+            type: "input",
+            fieldName: "Username",
+            text: "invalid-username"
+        }
+    ],
+    invalidPassword: [
+        {
+            type: "encrypted",
+            fieldName: "Password",
+            text: "invalid-password"
+        }
+    ],
+    invalidPort: [
+        {
+            type: "input",
+            fieldName: "Port",
+            text: "9999"
+        }
+    ],
+    invalidDatabase: [
+        {
+            type: "input",
+            fieldName: "Database",
+            text: "nonexistent_database"
+        }
+    ],
+};

cypress-tests/cypress/constants/constants/marketplace/datasources/mysql.js

@@ -0,0 +1,163 @@
+export const mysqlUIConfig = {
+    defaultFields: [
+        {
+            type: "toggle",
+            fieldName: "Allow dynamic connection parameters",
+            validations: {
+                defaultValue: false,
+                disabled: false
+            }
+        },
+
+        {
+            type: "dropdown",
+            fieldName: "Connection type",
+            validations: {
+                defaultValue: 'Manual connection',
+                disabled: false
+            }
+        },
+
+        {
+            type: "input",
+            fieldName: "Host",
+            validations: {
+                isRequired: true,
+                placeholder: "localhost",
+                defaultValue: "localhost",
+                disabled: false
+            }
+        },
+        {
+            type: "input",
+            fieldName: "Port",
+            validations: {
+                isRequired: true,
+                placeholder: "3306",
+                defaultValue: "3306",
+                disabled: false
+            }
+        },
+        {
+            type: "input",
+            fieldName: "Database",
+            validations: {
+                isRequired: false,
+                placeholder: "Enter name of the database",
+                defaultValue: "",
+                disabled: false
+            }
+        },
+
+        {
+            type: "input",
+            fieldName: "Username",
+            validations: {
+                isRequired: false,
+                placeholder: "Enter username",
+                defaultValue: "",
+                disabled: false
+            }
+        },
+
+        {
+            type: "toggle",
+            fieldName: "SSL/TLS",
+            validations: {
+                defaultValue: false,
+                disabled: false
+            }
+        },
+
+        {
+            type: "encrypted",
+            fieldName: "Password",
+            validations: {
+                isRequired: false,
+                placeholder: "**************",
+                defaultValue: "",
+                disabled: true,
+                hasEditButton: true,
+                showEncrypted: true,
+                hasEyeIcon: true
+            }
+        }
+    ]
+};
+
+export const mysqlFormConfig = {
+    valid: [
+        {
+            type: "input",
+            fieldName: "Host",
+            text: `${Cypress.env('mysql_host')}`
+        },
+        {
+            type: "input",
+            fieldName: "Port",
+            text: `${Cypress.env('mysql_port')}`
+        },
+        {
+            type: "input",
+            fieldName: "Database",
+            text: 'test_db'
+        },
+        {
+            type: "toggle",
+            fieldName: "SSL/TLS",
+            shouldBeChecked: false
+        },
+        {
+            type: "input",
+            fieldName: "Username",
+            text: `${Cypress.env('mysql_user')}`
+        },
+        {
+            type: "encrypted",
+            fieldName: "Password",
+            text: `${Cypress.env('mysql_password')}`
+        }
+    ],
+    invalidHost: [
+        {
+            type: "input",
+            fieldName: "Host",
+            text: "invalid-host"
+        }
+    ],
+    invalidUsername: [
+        {
+            type: "input",
+            fieldName: "Username",
+            text: "invalid-username"
+        }
+    ],
+    invalidPassword: [
+        {
+            type: "encrypted",
+            fieldName: "Password",
+            text: "invalid-password"
+        }
+    ],
+    invalidPort: [
+        {
+            type: "input",
+            fieldName: "Port",
+            text: "9999"
+        }
+    ],
+    invalidDatabase: [
+        {
+            type: "input",
+            fieldName: "Database",
+            text: "nonexistent_database"
+        }
+    ],
+    invalidSsl: [
+        {
+            type: "toggle",
+            fieldName: "SSL/TLS",
+            shouldBeChecked: true
+        }
+    ],
+};

cypress-tests/cypress/constants/constants/marketplace/datasources/n8n.js

@@ -0,0 +1,39 @@
+export const n8nUIConfig = {
+    defaultFields: [
+        {
+            type: "dropdown",
+            fieldName: "Authentication type",
+            validations: {
+                defaultValue: "None",
+                disabled: false
+            }
+        }
+    ]
+};
+
+export const n8nFormConfig = {
+    valid: [
+        {
+            type: "dropdown",
+            fieldName: "Authentication type",
+            text: "Basic Auth"
+        },
+        {
+            type: "input",
+            fieldName: "Username",
+            text: `${Cypress.env('n8n_username')}`
+        },
+        {
+            type: "encrypted",
+            fieldName: "Password",
+            text: `${Cypress.env('n8n_password')}`
+        }
+    ]
+};
+
+export const n8nApiOptions = [
+    { key: "auth_type", value: "none", encrypted: false },
+    { key: "password", value: null, encrypted: true },
+    { key: "name", value: null, encrypted: true },
+    { key: "value", value: null, encrypted: true }
+];

cypress-tests/cypress/constants/constants/marketplace/datasources/nocodb.js

@@ -0,0 +1,40 @@
+export const nocodbUIConfig = {
+    defaultFields: [
+        {
+            type: "dropdown",
+            fieldName: "Host",
+            validations: {
+                defaultValue: "Nocodb Cloud",
+                disabled: false
+            }
+        },
+        {
+            type: "encrypted",
+            fieldName: "API token",
+            validations: {
+                isRequired: false,
+                placeholder: "**************",
+                defaultValue: "",
+                disabled: true,
+                hasEditButton: true,
+                showEncrypted: true,
+                hasEyeIcon: false
+            }
+        }
+    ]
+};
+
+export const nocodbFormConfig = {
+    valid: [
+        {
+            type: "encrypted",
+            fieldName: "API token",
+            text: `${Cypress.env('nocodb_api_key')}`
+        }
+    ]
+};
+
+export const nocodbApiOptions = [
+    { key: "nocodb_host", value: "nocodb_cloud", encrypted: false },
+    { key: "api_token", value: null, encrypted: true }
+];

cypress-tests/cypress/constants/constants/marketplace/datasources/notion.js

@@ -0,0 +1,34 @@
+export const notionUIConfig = {
+    defaultFields: [
+        {
+            type: "encrypted",
+            fieldName: "Token",
+            validations: {
+                isRequired: false,
+                placeholder: "**************",
+                defaultValue: "",
+                disabled: true,
+                hasEditButton: true,
+                showEncrypted: true,
+                hasEyeIcon: false
+            }
+        }
+    ]
+};
+
+export const notionFormConfig = {
+    valid: [
+        {
+            type: "encrypted",
+            fieldName: "Token",
+            text: `${Cypress.env('notion_api_key')}`
+        }
+    ],
+    invalidToken: [
+        {
+            type: "encrypted",
+            fieldName: "Token",
+            text: "invalid-token"
+        }
+    ]
+};

cypress-tests/cypress/constants/constants/marketplace/datasources/openapi.js

@@ -0,0 +1,33 @@
+export const openapiUIConfig = {
+    defaultFields: [
+        {
+            type: "input",
+            fieldName: "Host",
+            validations: {
+                isRequired: false,
+                placeholder: "Enter host",
+                defaultValue: "",
+                disabled: false
+            }
+        }
+    ]
+};
+
+export const openapiFormConfig = {
+    valid: [
+        {
+            type: "input",
+            fieldName: "Host",
+            text: `${Cypress.env('openapi_host')}`
+        }
+    ]
+};
+
+export const openapiApiOptions = [
+    { key: "host", value: "", encrypted: false },
+    { key: "format", value: "json", encrypted: false },
+    { key: "definition", value: "", encrypted: false },
+    { key: "password", value: null, encrypted: true },
+    { key: "bearer_token", value: null, encrypted: true },
+    { key: "client_secret", value: null, encrypted: true }
+];

cypress-tests/cypress/constants/constants/marketplace/datasources/oracledb.js

@@ -0,0 +1,166 @@
+export const oracledbUIConfig = {
+    defaultFields: [
+        {
+            type: "input",
+            fieldName: "Host",
+            validations: {
+                isRequired: false,
+                placeholder: "Enter host",
+                defaultValue: "localhost",
+                disabled: false
+            }
+        },
+
+        {
+            type: "input",
+            fieldName: "Port",
+            validations: {
+                isRequired: false,
+                placeholder: "Enter port",
+                defaultValue: "1521",
+                disabled: false
+            }
+        },
+
+        {
+            type: "dropdown",
+            fieldName: "SID / Service name",
+            validations: {
+                defaultValue: "SID",
+                disabled: false
+            }
+        },
+
+        {
+            type: "input",
+            fieldName: "Database name",
+            validations: {
+                isRequired: false,
+                placeholder: "Name of the database",
+                defaultValue: "",
+                disabled: false
+            }
+        },
+
+        {
+            type: "toggle",
+            fieldName: "SSL",
+            validations: {
+                defaultValue: true,
+                disabled: false
+            }
+        },
+
+        {
+            type: "input",
+            fieldName: "Username",
+            validations: {
+                isRequired: false,
+                placeholder: "Enter username",
+                defaultValue: "",
+                disabled: false
+            }
+        },
+
+        {
+            type: "encrypted",
+            fieldName: "Password",
+            validations: {
+                isRequired: false,
+                placeholder: "**************",
+                defaultValue: "",
+                disabled: true,
+                hasEditButton: true,
+                showEncrypted: true
+            }
+        },
+
+        {
+            type: "dropdown",
+            fieldName: "Client library location",
+            validations: {
+                defaultValue: "Default",
+                disabled: false
+            }
+        },
+
+        {
+            type: "dropdown",
+            fieldName: "Instant client version",
+            validations: {
+                defaultValue: "21.10",
+                disabled: false
+            }
+        }
+    ]
+};
+
+export const oracledbFormConfig = {
+    valid: [
+        {
+            type: "input",
+            fieldName: "Host",
+            text: `${Cypress.env('oracledb_host')}`
+        },
+        {
+            type: "input",
+            fieldName: "Port",
+            text: `${Cypress.env('oracledb_port')}`
+        },
+        {
+            type: "input",
+            fieldName: "Database name",
+            text: `${Cypress.env('oracledb_database')}`
+        },
+        {
+            type: "toggle",
+            fieldName: "SSL",
+            shouldBeChecked: false
+        },
+        {
+            type: "input",
+            fieldName: "Username",
+            text: `${Cypress.env('oracledb_user')}`
+        },
+        {
+            type: "encrypted",
+            fieldName: "Password",
+            text: `${Cypress.env('oracledb_password')}`
+        }
+    ],
+    invalidHost: [
+        {
+            type: "input",
+            fieldName: "Host",
+            text: "invalid-host"
+        }
+    ],
+    invalidUsername: [
+        {
+            type: "input",
+            fieldName: "Username",
+            text: "invalid-username"
+        }
+    ],
+    invalidPassword: [
+        {
+            type: "encrypted",
+            fieldName: "Password",
+            text: "invalid-password"
+        }
+    ],
+    invalidPort: [
+        {
+            type: "input",
+            fieldName: "Port",
+            text: "9999"
+        }
+    ],
+    invalidDatabase: [
+        {
+            type: "input",
+            fieldName: "Database name",
+            text: "nonexistent_database"
+        }
+    ]
+};

cypress-tests/cypress/constants/constants/marketplace/datasources/postgres.js

@@ -0,0 +1,307 @@
+export const postgresUIConfig = {
+    defaultFields: [
+        {
+            type: "toggle",
+            fieldName: "Allow dynamic connection parameters",
+            validations: {
+                defaultValue: false,
+                disabled: false
+            }
+        },
+
+        {
+            type: "dropdown",
+            fieldName: "Connection type",
+            validations: {
+                defaultValue: 'Manual connection',
+                disabled: false
+            }
+        },
+
+        {
+            type: "input",
+            fieldName: "Host",
+            validations: {
+                isRequired: true,
+                placeholder: "Enter host",
+                defaultValue: "localhost",
+                disabled: false
+            }
+        },
+
+        {
+            type: "input",
+            fieldName: "Port",
+            validations: {
+                isRequired: true,
+                placeholder: "Enter port",
+                defaultValue: "5432",
+                disabled: false
+            }
+        },
+
+        {
+            type: "input",
+            fieldName: "Database",
+            validations: {
+                isRequired: false,
+                placeholder: "Enter name of the database",
+                defaultValue: "",
+                disabled: false
+            }
+        },
+
+        {
+            type: "input",
+            fieldName: "Username",
+            validations: {
+                isRequired: true,
+                placeholder: "Enter username",
+                defaultValue: "",
+                disabled: false
+            }
+        },
+
+        {
+            type: "toggle",
+            fieldName: "SSL/TLS",
+            validations: {
+                defaultValue: true,
+                disabled: false
+            }
+        },
+
+        {
+            type: "encrypted",
+            fieldName: "Password",
+            validations: {
+                isRequired: true,
+                placeholder: "**************",
+                defaultValue: "",
+                disabled: true,
+                hasEditButton: true,
+                showEncrypted: true,
+                hasEyeIcon: true
+            }
+        },
+
+        {
+            type: "keyValue",
+            fieldName: "Connection options",
+            validations: {
+                hasAddButton: true,
+                rows: [
+                    {
+                        key: "",
+                        value: "",
+                        keyPlaceholder: "Key",
+                        valuePlaceholder: "Value",
+                        hasDeleteButton: true
+                    }
+                ]
+            }
+        }
+    ]
+};
+
+export const postgresFormConfig = {
+    valid: [
+        {
+            type: "input",
+            fieldName: "Host",
+            text: `${Cypress.env('pg_host')}`
+        },
+        {
+            type: "input",
+            fieldName: "Port",
+            text: "5432"
+        },
+        {
+            type: "toggle",
+            fieldName: "SSL/TLS",
+            shouldBeChecked: false
+        },
+        {
+            type: "input",
+            fieldName: "Username",
+            text: `${Cypress.env('pg_user')}`
+        },
+        {
+            type: "encrypted",
+            fieldName: "Password",
+            text: `${Cypress.env('pg_password')}`
+        },
+        {
+            type: "keyValue",
+            fieldName: "Connection options",
+            keyValueData: [
+                { key: "test", value: "value123" }
+            ]
+        }
+    ],
+    invalidHost: [
+        {
+            type: "input",
+            fieldName: "Host",
+            text: "invalid-host"
+        }
+    ],
+    invalidUsername: [
+        {
+            type: "input",
+            fieldName: "Username",
+            text: "invalid-username"
+        }
+    ],
+    invalidPassword: [
+        {
+            type: "encrypted",
+            fieldName: "Password",
+            text: "invalid-password"
+        }
+    ],
+    invalidPort: [
+        {
+            type: "input",
+            fieldName: "Port",
+            text: "9999"
+        }
+    ],
+    invalidSsl: [
+        {
+            type: "toggle",
+            fieldName: "SSL/TLS",
+            shouldBeChecked: true
+        }
+    ],
+};
+
+export const postgresQueryConfig = {
+    defaultFields: [
+        {
+            type: "dropdown",
+            fieldName: "",
+            validations: {
+                defaultValue: "SQL mode",
+                disabled: false,
+            },
+        },
+        {
+            type: "codeMirror",
+            fieldName: "Query",
+            assertion: "contain.text",
+            data: "SELECT * FROM users",
+        },
+        {
+            type: "label",
+            fieldName: "SQL Parameters",
+        },
+        {
+            type: "keyValue",
+            fieldName: null,
+            validations: {
+                rows: [
+                    {
+                        key: "Key",
+                        keyAssertion: "contain.text",
+                        value: "Value",
+                        valueAssertion: "contain.text",
+                        hasDeleteButton: true,
+                    },
+                ],
+            },
+        },
+        {
+            type: "button",
+            fieldName: "Add SQL parameter",
+            validations: {
+                disabled: false,
+            },
+        },
+    ],
+    guiModeDefault: [
+        {
+            type: "dropdown",
+            fieldName: "Operation",
+            validations: {
+                defaultValue: "Select..",
+                disabled: false,
+            },
+        },
+    ],
+    bulkUpdateUsingPrimaryKey: [
+        {
+            type: "codeMirror",
+            fieldName: "Primary key column-s",
+            assertion: "contain.text",
+            data: "e.g.",
+        },
+        {
+            type: "codeMirror",
+            fieldName: "Records to update",
+            assertion: "contain.text",
+            data: "id: 1",
+        },
+    ],
+};
+
+export const postgresQueryFillConfig = {
+    switchToGuiMode: [
+        {
+            type: "dropdown",
+            fieldName: "",
+            text: "GUI mode",
+        },
+    ],
+    switchToSqlMode: [
+        {
+            type: "dropdown",
+            fieldName: "",
+            text: "SQL mode",
+        },
+    ],
+    selectBulkUpdateOperation: [
+        {
+            type: "dropdown",
+            fieldName: "Operation",
+            text: "Bulk update using primary key",
+        },
+    ],
+    bulkUpdateUsingPrimaryKey: [
+        {
+            type: "dynamicSelectorFx",
+            fieldName: "Schema",
+            text: "public",
+        },
+        {
+            type: "dynamicSelectorFx",
+            fieldName: "Table",
+            text: "student_data",
+        },
+        {
+            type: "codeMirrorInput",
+            fieldName: "Primary key column-s",
+            text: ["id"],
+        },
+        {
+            type: "codeMirrorInput",
+            fieldName: "Records to update",
+            text: '{{ [{"id": 2, "name": "Bob Smith Updated"}] }}',
+        },
+    ],
+    selectWithParams: [
+        {
+            type: "codeMirrorInput",
+            fieldName: "query",
+            text: ["select name from student_data where id=:id"],
+        },
+        {
+            type: "codeMirrorKeyValue",
+            fieldName: null,
+            addButtonFieldName: "add-sql-parameter",
+            keyValueData: [
+                { key: "id", value: "2" },
+            ],
+        },
+    ],
+};

cypress-tests/cypress/constants/constants/marketplace/datasources/redis.js

@@ -0,0 +1,147 @@
+export const redisUIConfig = {
+    defaultFields: [
+        {
+            type: "input",
+            fieldName: "Host",
+            validations: {
+                isRequired: false,
+                placeholder: "Enter host",
+                defaultValue: "localhost",
+                disabled: false
+            }
+        },
+        {
+            type: "input",
+            fieldName: "Port",
+            validations: {
+                isRequired: false,
+                placeholder: "Enter port",
+                defaultValue: "6379",
+                disabled: false
+            }
+        },
+        {
+            type: "input",
+            fieldName: "Database",
+            validations: {
+                isRequired: false,
+                placeholder: "Enter database name",
+                defaultValue: "",
+                disabled: false
+            }
+        },
+
+        {
+            type: "input",
+            fieldName: "Username",
+            validations: {
+                isRequired: false,
+                placeholder: "Enter username",
+                defaultValue: "",
+                disabled: false
+            }
+        },
+
+        {
+            type: "encrypted",
+            fieldName: "Password",
+            validations: {
+                isRequired: false,
+                placeholder: "**************",
+                defaultValue: "",
+                disabled: true,
+                hasEditButton: true,
+                showEncrypted: true,
+                hasEyeIcon: true
+            }
+        },
+
+        {
+            type: "toggle",
+            fieldName: "TLS",
+            validations: {
+                defaultValue: false,
+                disabled: false
+            }
+        },
+
+        {
+            type: "dropdown",
+            fieldName: "TLS certificate",
+            validations: {
+                defaultValue: 'None',
+                disabled: false
+            }
+        }
+    ]
+};
+
+export const redisFormConfig = {
+    valid: [
+        {
+            type: "input",
+            fieldName: "Host",
+            text: `${Cypress.env('redis_host')}`
+        },
+        {
+            type: "input",
+            fieldName: "Port",
+            text: `${Cypress.env('redis_port')}`
+        },
+        {
+            type: "input",
+            fieldName: "Database",
+            text: `${Cypress.env('redis_database')}`
+        },
+        {
+            type: "input",
+            fieldName: "Username",
+            text: `${Cypress.env('redis_user')}`
+        },
+        {
+            type: "encrypted",
+            fieldName: "Password",
+            text: `${Cypress.env('redis_password')}`
+        },
+        {
+            type: "toggle",
+            fieldName: "TLS",
+            shouldBeChecked: false
+        }
+    ],
+    invalidHost: [
+        {
+            type: "input",
+            fieldName: "Host",
+            text: "invalid-host"
+        }
+    ],
+    invalidUsername: [
+        {
+            type: "input",
+            fieldName: "Username",
+            text: "invalid-username"
+        }
+    ],
+    invalidPassword: [
+        {
+            type: "encrypted",
+            fieldName: "Password",
+            text: "invalid-password"
+        }
+    ],
+    invalidPort: [
+        {
+            type: "input",
+            fieldName: "Port",
+            text: "9999"
+        }
+    ],
+    invalidDatabase: [
+        {
+            type: "input",
+            fieldName: "Database",
+            text: "999"
+        }
+    ],
+};

cypress-tests/cypress/constants/constants/marketplace/datasources/rethinkdb.js

@@ -0,0 +1,115 @@
+export const rethinkdbUIConfig = {
+    defaultFields: [
+        {
+            type: "input",
+            fieldName: "Database",
+            validations: {
+                isRequired: false,
+                placeholder: "database name",
+                defaultValue: "",
+                disabled: false
+            }
+        },
+        {
+            type: "input",
+            fieldName: "Host",
+            validations: {
+                isRequired: false,
+                placeholder: "",
+                defaultValue: "",
+                disabled: false
+            }
+        },
+        {
+            type: "input",
+            fieldName: "Username",
+            validations: {
+                isRequired: false,
+                placeholder: "",
+                defaultValue: "",
+                disabled: false
+            }
+        },
+        {
+            type: "encrypted",
+            fieldName: "Password",
+            validations: {
+                isRequired: false,
+                placeholder: "**************",
+                defaultValue: "",
+                disabled: true,
+                hasEditButton: true,
+                showEncrypted: true,
+                hasEyeIcon: false
+            }
+        },
+        {
+            type: "input",
+            fieldName: "Port",
+            validations: {
+                isRequired: false,
+                placeholder: "28015",
+                defaultValue: "28015",
+                disabled: false
+            }
+        }
+    ]
+};
+
+export const rethinkdbFormConfig = {
+    valid: [
+        {
+            type: "input",
+            fieldName: "Host",
+            text: `${Cypress.env('rethinkdb_host')}`
+        },
+        {
+            type: "input",
+            fieldName: "Port",
+            text: `${Cypress.env('rethinkdb_port')}`
+        },
+        {
+            type: "input",
+            fieldName: "Database",
+            text: `${Cypress.env('rethinkdb_database')}`
+        },
+        {
+            type: "input",
+            fieldName: "Username",
+            text: `${Cypress.env('rethinkdb_username')}`
+        },
+        {
+            type: "encrypted",
+            fieldName: "Password",
+            text: `${Cypress.env('rethinkdb_password')}`
+        }
+    ],
+    invalidHost: [
+        {
+            type: "input",
+            fieldName: "Host",
+            text: "invalid-host"
+        }
+    ],
+    invalidUsername: [
+        {
+            type: "input",
+            fieldName: "Username",
+            text: "invalid-username"
+        }
+    ],
+    invalidPassword: [
+        {
+            type: "encrypted",
+            fieldName: "Password",
+            text: "invalid-password"
+        }
+    ],
+    invalidPort: [
+        {
+            type: "input",
+            fieldName: "Port",
+            text: "9999"
+        }
+    ]
+};

cypress-tests/cypress/constants/constants/marketplace/datasources/s3.js

@@ -0,0 +1,84 @@
+export const s3UIConfig = {
+    defaultFields: [
+        {
+            type: "dropdown",
+            fieldName: "Authentication",
+            validations: {
+                defaultValue: "Use IAM Access Keys",
+                disabled: false
+            }
+        },
+        {
+            type: "input",
+            fieldName: "Access key",
+            validations: {
+                isRequired: false,
+                placeholder: "Enter access key",
+                defaultValue: "",
+                disabled: false
+            }
+        },
+        {
+            type: "encrypted",
+            fieldName: "Secret key",
+            validations: {
+                isRequired: false,
+                placeholder: "**************",
+                defaultValue: "",
+                disabled: true,
+                hasEditButton: true,
+                showEncrypted: true,
+                hasEyeIcon: false
+            }
+        },
+        {
+            type: "toggle",
+            fieldName: "Custom Endpoint",
+            validations: {
+                defaultValue: false,
+                disabled: false
+            }
+        },
+        {
+            type: "dropdown",
+            fieldName: "Region",
+            validations: {
+                disabled: false
+            }
+        }
+    ]
+};
+
+export const s3FormConfig = {
+    valid: [
+        {
+            type: "input",
+            fieldName: "Access key",
+            text: `${Cypress.env('aws_access')}`
+        },
+        {
+            type: "encrypted",
+            fieldName: "Secret key",
+            text: `${Cypress.env('aws_secret')}`
+        },
+        {
+            type: "dropdown",
+            fieldName: "Region",
+            text: "US East (N. Virginia)"
+        }
+    ],
+    invalidAccessKey: [
+        {
+            type: "input",
+            fieldName: "Access key",
+            text: "invalid-access-key"
+        }
+    ],
+    invalidSecretKey: [
+        {
+            type: "encrypted",
+            fieldName: "Secret key",
+            text: "invalid-secret-key"
+        }
+    ]
+};

cypress-tests/cypress/constants/constants/marketplace/datasources/saphana.js

@@ -0,0 +1,115 @@
+export const saphanaUIConfig = {
+    defaultFields: [
+        {
+            type: "input",
+            fieldName: "Host",
+            validations: {
+                isRequired: false,
+                placeholder: "Enter host",
+                defaultValue: "localhost",
+                disabled: false
+            }
+        },
+        {
+            type: "input",
+            fieldName: "Port",
+            validations: {
+                isRequired: false,
+                placeholder: "Enter port",
+                defaultValue: "443",
+                disabled: false
+            }
+        },
+        {
+            type: "input",
+            fieldName: "Database name",
+            validations: {
+                isRequired: false,
+                placeholder: "Name of the database",
+                defaultValue: "",
+                disabled: false
+            }
+        },
+        {
+            type: "input",
+            fieldName: "Username",
+            validations: {
+                isRequired: false,
+                placeholder: "Enter username",
+                defaultValue: "",
+                disabled: false
+            }
+        },
+        {
+            type: "encrypted",
+            fieldName: "Password",
+            validations: {
+                isRequired: false,
+                placeholder: "**************",
+                defaultValue: "",
+                disabled: true,
+                hasEditButton: true,
+                showEncrypted: true,
+                hasEyeIcon: false
+            }
+        }
+    ]
+};
+
+export const saphanaFormConfig = {
+    valid: [
+        {
+            type: "input",
+            fieldName: "Host",
+            text: `${Cypress.env('saphana_host')}`
+        },
+        {
+            type: "input",
+            fieldName: "Port",
+            text: `${Cypress.env('saphana_port')}`
+        },
+        {
+            type: "input",
+            fieldName: "Database name",
+            text: `${Cypress.env('saphana_database')}`
+        },
+        {
+            type: "input",
+            fieldName: "Username",
+            text: `${Cypress.env('saphana_user')}`
+        },
+        {
+            type: "encrypted",
+            fieldName: "Password",
+            text: `${Cypress.env('saphana_password')}`
+        }
+    ],
+    invalidHost: [
+        {
+            type: "input",
+            fieldName: "Host",
+            text: "invalid-host"
+        }
+    ],
+    invalidUsername: [
+        {
+            type: "input",
+            fieldName: "Username",
+            text: "invalid-username"
+        }
+    ],
+    invalidPassword: [
+        {
+            type: "encrypted",
+            fieldName: "Password",
+            text: "invalid-password"
+        }
+    ],
+    invalidPort: [
+        {
+            type: "input",
+            fieldName: "Port",
+            text: "9999"
+        }
+    ]
+};

cypress-tests/cypress/constants/constants/marketplace/datasources/sendgrid.js

@@ -0,0 +1,38 @@
+export const sendgridUIConfig = {
+    defaultFields: [
+        {
+            type: "encrypted",
+            fieldName: "API key",
+            validations: {
+                isRequired: false,
+                placeholder: "**************",
+                defaultValue: "",
+                disabled: true,
+                hasEditButton: true,
+                showEncrypted: true,
+                hasEyeIcon: false
+            }
+        }
+    ]
+};
+
+export const sendgridFormConfig = {
+    valid: [
+        {
+            type: "encrypted",
+            fieldName: "API key",
+            text: `${Cypress.env('sendgrid_api_key')}`
+        }
+    ],
+    invalidApiKey: [
+        {
+            type: "encrypted",
+            fieldName: "API key",
+            text: "invalid-api-key"
+        }
+    ]
+};
+
+export const sendgridApiOptions = [
+    { key: "api_key", value: null, encrypted: true }
+];

cypress-tests/cypress/constants/constants/marketplace/datasources/slack.js

@@ -0,0 +1,50 @@
+export const slackApiOptions = [
+    { key: "provider", value: "slack", encrypted: false },
+    { key: "oauth2", value: false, encrypted: false },
+    { key: "access_type", value: "read", encrypted: false },
+    { key: "client_id", value: "", encrypted: false },
+    { key: "client_secret", value: null, encrypted: true },
+    { key: "credential_source", value: "from_datasource_configuration", encrypted: false },
+    { key: "code", value: null, encrypted: true },
+    { key: "api_key", value: null, encrypted: true }
+];
+
+export const slackFormConfig = {
+    valid: [
+        {
+            type: "input",
+            label: "Client ID",
+            text: `${Cypress.env('slack_client_id')}`
+        },
+        {
+            type: "input",
+            label: "Client Secret",
+            text: `${Cypress.env('slack_client_secret')}`
+        }
+    ]
+};
+
+export const slackUIConfig = {
+    labels: [
+        "Authorize",
+        "Slack app",
+        "Client ID",
+        "Client Secret",
+        "Redirect URI"
+    ],
+    defaultScopes: [
+        "users:read",
+        "channels:read",
+        "groups:read",
+        "im:read",
+        "mpim:read",
+        "channels:history",
+        "groups:history",
+        "im:history",
+        "mpim:history"
+    ],
+    dropdownOptions: [
+        "Use environment variables",
+        "Custom slack app"
+    ]
+};

cypress-tests/cypress/constants/constants/marketplace/datasources/smtp.js

@@ -0,0 +1,93 @@
+export const smtpUIConfig = {
+    defaultFields: [
+        {
+            type: "input",
+            fieldName: "Host",
+            validations: {
+                isRequired: false,
+                placeholder: "Enter host",
+                defaultValue: "localhost",
+                disabled: false
+            }
+        },
+        {
+            type: "input",
+            fieldName: "Port",
+            validations: {
+                isRequired: false,
+                placeholder: "Recommended port 465 (Secured)",
+                defaultValue: "465",
+                disabled: false
+            }
+        },
+        {
+            type: "input",
+            fieldName: "User",
+            validations: {
+                isRequired: false,
+                placeholder: "Enter username",
+                defaultValue: "",
+                disabled: false
+            }
+        },
+        {
+            type: "encrypted",
+            fieldName: "Password",
+            validations: {
+                isRequired: false,
+                placeholder: "**************",
+                defaultValue: "",
+                disabled: true,
+                hasEditButton: true,
+                showEncrypted: true,
+                hasEyeIcon: false
+            }
+        }
+    ]
+};
+
+export const smtpFormConfig = {
+    valid: [
+        {
+            type: "input",
+            fieldName: "Host",
+            text: `${Cypress.env('smtp_host')}`
+        },
+        {
+            type: "input",
+            fieldName: "Port",
+            text: `${Cypress.env('smtp_port')}`
+        },
+        {
+            type: "input",
+            fieldName: "User",
+            text: `${Cypress.env('smtp_user')}`
+        },
+        {
+            type: "encrypted",
+            fieldName: "Password",
+            text: `${Cypress.env('smtp_password')}`
+        }
+    ],
+    invalidHost: [
+        {
+            type: "input",
+            fieldName: "Host",
+            text: "invalid-host"
+        }
+    ],
+    invalidUser: [
+        {
+            type: "input",
+            fieldName: "User",
+            text: "invalid-user"
+        }
+    ],
+    invalidPassword: [
+        {
+            type: "encrypted",
+            fieldName: "Password",
+            text: "invalid-password"
+        }
+    ]
+};

cypress-tests/cypress/constants/constants/marketplace/datasources/snowflake.js

@@ -0,0 +1,76 @@
+export const snowflakeUIConfig = {
+    defaultFields: [
+        {
+            type: "input",
+            fieldName: "Account",
+            validations: {
+                isRequired: false,
+                placeholder: "Enter account",
+                defaultValue: "",
+                disabled: false
+            }
+        },
+        {
+            type: "input",
+            fieldName: "Database",
+            validations: {
+                isRequired: false,
+                placeholder: "Enter database",
+                defaultValue: "",
+                disabled: false
+            }
+        },
+        {
+            type: "input",
+            fieldName: "Schema",
+            validations: {
+                isRequired: false,
+                placeholder: "Enter schema",
+                defaultValue: "",
+                disabled: false
+            }
+        },
+        {
+            type: "input",
+            fieldName: "Warehouse",
+            validations: {
+                isRequired: false,
+                placeholder: "Enter warehouse",
+                defaultValue: "",
+                disabled: false
+            }
+        },
+        {
+            type: "input",
+            fieldName: "Role",
+            validations: {
+                isRequired: false,
+                placeholder: "Enter role",
+                defaultValue: "",
+                disabled: false
+            }
+        }
+    ]
+};
+
+export const snowflakeFormConfig = {
+    valid: [
+        {
+            type: "input",
+            fieldName: "Account",
+            text: `${Cypress.env('snowflake_account')}`
+        },
+        {
+            type: "input",
+            fieldName: "Database",
+            text: `${Cypress.env('snowflake_database')}`
+        }
+    ],
+    invalidAccount: [
+        {
+            type: "input",
+            fieldName: "Account",
+            text: "invalid-account"
+        }
+    ]
+};

cypress-tests/cypress/constants/constants/marketplace/datasources/stripe.js

@@ -0,0 +1,38 @@
+export const stripeUIConfig = {
+    defaultFields: [
+        {
+            type: "encrypted",
+            fieldName: "API key",
+            validations: {
+                isRequired: false,
+                placeholder: "**************",
+                defaultValue: "",
+                disabled: true,
+                hasEditButton: true,
+                showEncrypted: true,
+                hasEyeIcon: false
+            }
+        }
+    ]
+};
+
+export const stripeFormConfig = {
+    valid: [
+        {
+            type: "encrypted",
+            fieldName: "API key",
+            text: `${Cypress.env('stripe_api_key')}`
+        }
+    ],
+    invalidApiKey: [
+        {
+            type: "encrypted",
+            fieldName: "API key",
+            text: "invalid-api-key"
+        }
+    ]
+};
+
+export const stripeApiOptions = [
+    { key: "api_key", value: null, encrypted: true }
+];

cypress-tests/cypress/constants/constants/marketplace/datasources/twilio.js

@@ -0,0 +1,54 @@
+export const twilioUIConfig = {
+    defaultFields: [
+        {
+            type: "encrypted",
+            fieldName: "Auth token",
+            validations: {
+                isRequired: false,
+                placeholder: "**************",
+                defaultValue: "",
+                disabled: true,
+                hasEditButton: false,
+                showEncrypted: false,
+                hasEyeIcon: true
+            }
+        },
+
+        {
+            type: "input",
+            fieldName: "Account SID",
+            validations: {
+                isRequired: false,
+                placeholder: "Account SID for Twilio",
+                defaultValue: "",
+                disabled: false
+            }
+        },
+
+        {
+            type: "input",
+            fieldName: "Messaging service SID",
+            validations: {
+                isRequired: false,
+                placeholder: "Messaging Service SID for Twilio",
+                defaultValue: "",
+                disabled: false
+            }
+        }
+    ]
+};
+
+export const twilioFormConfig = {
+    valid: [
+        {
+            type: "input",
+            fieldName: "Account SID",
+            text: `${Cypress.env('twilio_account_sid')}`
+        },
+        {
+            type: "input",
+            fieldName: "Messaging service SID",
+            text: `${Cypress.env('twilio_messaging_service_sid')}`
+        }
+    ]
+};