12/08 Daily Promotion

.github/workflows/build-client-server-count.yml

@@ -1,9 +1,10 @@
-name: Build Client, Server & Run only Cypress
+name: Build Client, Server & Run only Cypress with count
 
 on:
   repository_dispatch:
     types: [ci-test-limit-count-command]
 
+
 jobs:
   file-check:
     runs-on: ubuntu-latest
@@ -14,6 +15,7 @@ jobs:
       pr: ${{steps.args.outputs.pr}}
       runId: ${{steps.args.outputs.runId}}
       matrix_count: ${{steps.matrix.outputs.matrix_count}}
+      run_count: ${{ steps.countArgs.outputs.run_count }}
     steps:
       - name: Checkout the head commit of the branch
         uses: actions/checkout@v4
@@ -27,11 +29,23 @@ jobs:
         id: args
         run: |
           echo "pr=${{ github.event.client_payload.pull_request.number }}" >> $GITHUB_OUTPUT
-          checkArg=`echo '${{toJSON(github.event.client_payload.slash_command.args.named)}}' | jq 'has("runId")'`
-          if [[ $checkArg == 'true' ]]; then
-            echo "runId=${{ github.event.client_payload.slash_command.args.named.runId }}" >> $GITHUB_OUTPUT
+          checkArg=${{ github.event.client_payload.slash_command.args.named.runId }}
+          if [[ -z "$checkArg" ]]; then
+              echo "runId=0" >> $GITHUB_OUTPUT
+          else
+              runId=$((checkArg + 0))
+              echo "runId=$runId" >> $GITHUB_OUTPUT
+          fi
+
+      - name: Set run count
+        id: countArgs
+        run: |    
+          checkRunCount=${{ github.event.client_payload.slash_command.args.named.run_count }}
+          if [[ -z "$checkRunCount" ]]; then
+              echo "run_count=1" >> $GITHUB_OUTPUT  # Set default to 1 if empty
           else
-            echo "runId=0" >> $GITHUB_OUTPUT
+              run_count=$((checkRunCount + 0))
+              echo "run_count=$run_count" >> $GITHUB_OUTPUT
           fi
 
       - name: Get the diff from base branch
@@ -131,6 +145,7 @@ jobs:
     secrets: inherit
     with:
       pr: ${{fromJson(needs.file-check.outputs.pr)}}
+      run_count: ${{fromJson(needs.file-check.outputs.run_count)}}
 
   ci-test-limited-existing-docker-image:
     needs: [file-check]
@@ -142,6 +157,7 @@ jobs:
     with:
       pr: ${{fromJson(needs.file-check.outputs.pr)}}
       previous-workflow-run-id: ${{ fromJson(needs.file-check.outputs.runId) }}
+      run_count: ${{fromJson(needs.file-check.outputs.run_count)}}
 
   ci-test-limited-result:
     needs: [file-check, ci-test-limited]

.github/workflows/ci-test-limited-with-count.yml

@@ -209,14 +209,14 @@ jobs:
       # actions/setup-node@v4 doesn’t work properly with Yarn 3
       # when the project lives in a subdirectory: https://github.com/actions/setup-node/issues/488
       # Restoring the cache manually instead
-      - name: Restore Yarn cache
-        if: steps.run_result.outputs.run_result != 'success'
-        uses: actions/cache@v4
-        with:
-          path: |
-            app/client/.yarn/cache
-            app/client/node_modules/.cache/webpack/
-          key: v1-yarn3-${{ hashFiles('app/client/yarn.lock') }}
+      # - name: Restore Yarn cache
+      #   if: steps.run_result.outputs.run_result != 'success'
+      #   uses: actions/cache@v4
+      #   with:
+      #     path: |
+      #       app/client/.yarn/cache
+      #       app/client/node_modules/.cache/webpack/
+      #     key: v1-yarn3-${{ hashFiles('app/client/yarn.lock') }}
 
       # Install all the dependencies
       - name: Install dependencies
@@ -346,7 +346,7 @@ jobs:
             NODE_ENV: development
         run: |
             cd app/client
-            npx cypress-repeat run -n ${{ github.event.inputs.run_count }} --force \
+            npx cypress-repeat run -n ${{ inputs.run_count }} --force \
                 --spec ${{ env.specs_to_run }} \
                 --config-file "cypress_ci_custom.config.ts"   
 

.github/workflows/pr-automation.yml

@@ -1,17 +1,68 @@
 name: PR Automation test suite
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 on:
   pull_request:
     branches:
       - release
       - pg
-    types:
-      - labeled
+    types: [ labeled, synchronize ]
 
 jobs:
+  checkTestLabel:
+    runs-on: ubuntu-latest
+    outputs:
+      ok_to_test: ${{ steps.checkLabel.outputs.ok_to_test }}
+    steps:
+
+      - name: Check PR Label
+        id: checkLabel
+        uses: actions/github-script@v7
+        with:
+          # This script will check if the PR has ok-to-test label.
+          # To avoid being dependent on the event which triggered this workflow,
+          # we will always get the pull request labels directly from the context
+          # It will later set the output to be "true" or "false".
+          script: |
+            const labels = context.payload.pull_request.labels.map(label => label.name);
+            if (labels.includes("ok-to-test")) {
+              console.log("Label 'ok-to-test' is present");
+              core.setOutput("ok_to_test", "true");
+            } else {
+              console.log("Label 'ok-to-test' is not present");
+              core.setOutput("ok_to_test", "false");
+            }
+
+  mark-stale:
+    needs: [ checkTestLabel ]
+    if: needs.checkTestLabel.outputs.ok_to_test == 'false'
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+    defaults:
+      run:
+        shell: bash
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+      # In case of a no label present, mark the Cypress status to be stale
+      - name: Mark the Cypress response to be stale
+        uses: actions/github-script@v7
+        env:
+          NODE_PATH: "${{ github.workspace }}/.github/workflows/scripts"
+          BODY: |
+            Tests have not run on the HEAD ${{ github.event.pull_request.head.sha }} yet
+        with:
+          script: |
+            require("write-cypress-status.js")({core, context, github}, "warning", process.env.BODY)
+
   parse-tags:
+    needs: [ checkTestLabel ]
+    if: needs.checkTestLabel.outputs.ok_to_test == 'true'
     runs-on: ubuntu-latest
-    if: github.event.label.name == 'ok-to-test'
     permissions:
       pull-requests: write
     defaults:
@@ -27,7 +78,7 @@ jobs:
       - name: Checkout the head commit of the branch
         uses: actions/checkout@v4
         with:
-            repository: appsmithorg/appsmith
+          repository: appsmithorg/appsmith
 
       # Reads the PR description to retrieve the /ok-to-test or, if that's absent, the /test command
       - name: Read tags from PR description
@@ -72,7 +123,7 @@ jobs:
 
   # Call the workflow to run Cypress tests
   perform-test:
-    needs: [parse-tags]
+    needs: [ parse-tags ]
     if: success()
     uses: ./.github/workflows/pr-cypress.yml
     secrets: inherit

.github/workflows/test-storybook.yml

@@ -38,18 +38,12 @@ jobs:
 
       - name: Install Dependencies
         working-directory: ./app/client/packages/storybook
-        run: yarn install --immutable
+        run: |
+          yarn install --immutable
+          npx playwright install --with-deps
 
       - name: Storybook Tests
-        id: Test Storybook
-        uses: actions/setup-node@v4
-        with:
-          node-version-file: app/client/package.json
-
-      - name: Install Playwright
-        run: npx playwright install --with-deps
-
-      - name: Serve Storybook and run tests
-        with:
-          workingDir: ./app/client/packages/storybook
-          buildScriptName: "test-storybook:ci"
+        working-directory: ./app/client/packages/storybook
+        run: |
+          yarn build-storybook
+          yarn test-storybook:ci

app/client/.babelrc

@@ -13,8 +13,7 @@
         "actions":"./src/actions/",
         "api": "./src/api/",
         "assets": "./src/assets/",
-        "sagas": "./src/sagas/",
-        "@appsmith": "./src/ee"
+        "sagas": "./src/sagas/"
       }
     }, "babel-plugin-styled-components"]
   ]

app/client/.eslintrc.base.json

@@ -76,11 +76,11 @@
           {
             "group": ["*.svg"],
             "importNames": ["ReactComponent"],
-            "message": "Reason: Please don’t import SVG icons statically. (They won’t always be needed, but they *will* always be present in the bundle and will increase the bundle size.) Instead, please either import them as SVG paths (e.g. import starIconUrl from './star.svg'), or use the importSvg wrapper from design-system-old (e.g. const StarIcon = importSvg(() => import('./star.svg')))."
+            "message": "Reason: Please don’t import SVG icons statically. (They won’t always be needed, but they *will* always be present in the bundle and will increase the bundle size.) Instead, please either import them as SVG paths (e.g. import starIconUrl from './star.svg'), or use the importSvg wrapper from @appsmith/ads-old (e.g. const StarIcon = importSvg(() => import('./star.svg')))."
           },
           {
             "group": ["remixicon-react/*"],
-            "message": "Reason: Please don’t import Remix icons statically. (They won’t always be needed, but they *will* always be present in the bundle and will increase the bundle size.) Instead, please use the importRemixIcon wrapper from design-system-old (e.g. const StarIcon = importRemixIcon(() => import('remixicon-react/Star')))."
+            "message": "Reason: Please don’t import Remix icons statically. (They won’t always be needed, but they *will* always be present in the bundle and will increase the bundle size.) Instead, please use the importRemixIcon wrapper from @appsmith/ads-old (e.g. const StarIcon = importRemixIcon(() => import('remixicon-react/Star')))."
           }
         ]
       }

app/client/.eslintrc.js

@@ -56,7 +56,7 @@ const eslintConfig = {
           ...(baseNoRestrictedImports.patterns ?? []),
           {
             group: ["**/ce/*"],
-            message: "Reason: Please use @appsmith import instead.",
+            message: "Reason: Please use ee/ import instead.",
           },
         ],
       },

app/client/cypress/e2e/Regression/ClientSide/Fork/ForkApplication_spec.ts

@@ -14,6 +14,7 @@ import {
   fakerHelper,
   homePage,
   inviteModal,
+  dataSources,
 } from "../../../../support/Objects/ObjectsCore";
 import EditorNavigation, {
   AppSidebar,
@@ -110,6 +111,7 @@ describe(
         cy.log("isPartialImport : ", isPartialImport);
         if (isPartialImport) {
           agHelper.WaitUntilEleAppear(reconnectDatasourceModal.SkipToAppBtn);
+          agHelper.WaitUntilEleAppear(dataSources._saveDs);
           agHelper.GetNClick(reconnectDatasourceModal.SkipToAppBtn, 0, true);
           agHelper.WaitUntilEleDisappear(reconnectDatasourceModal.SkipToAppBtn);
         }

app/client/cypress/e2e/Regression/ClientSide/OneClickBinding/TableWidget/mysql_spec.ts

@@ -14,88 +14,78 @@ import EditorNavigation, {
 
 const oneClickBinding = new OneClickBinding();
 
-// TODO: Adds two rows on click of save row will debug and fix this in a different PR - Sangeeth
-describe.skip("Table widget one click binding feature", () => {
-  it("1.should check that queries are created and bound to table widget properly", () => {
-    entityExplorer.DragDropWidgetNVerify(draggableWidgets.TABLE, 400);
+describe(
+  "Table widget one click binding feature",
+  { tags: ["@tag.Widget"] },
+  () => {
+    it("1.should check that queries are created and bound to table widget properly", () => {
+      entityExplorer.DragDropWidgetNVerify(draggableWidgets.TABLE, 400);
 
-    dataSources.CreateDataSource("MySql");
+      dataSources.CreateDataSource("MySql");
 
-    cy.get("@dsName").then((dsName) => {
-      EditorNavigation.SelectEntityByName("Table1", EntityType.Widget);
+      cy.get("@dsName").then((dsName) => {
+        EditorNavigation.SelectEntityByName("Table1", EntityType.Widget);
 
-      oneClickBinding.ChooseAndAssertForm(`${dsName}`, dsName, "configs", {
-        searchableColumn: "configName",
+        oneClickBinding.ChooseAndAssertForm(`${dsName}`, dsName, "configs", {
+          searchableColumn: "configName",
+        });
       });
-    });
-
-    agHelper.GetNClick(oneClickBindingLocator.connectData);
-
-    assertHelper.AssertNetworkStatus("@postExecute");
-
-    agHelper.Sleep(2000);
-
-    [
-      "id",
-      "configName",
-      "configJson",
-      "configVersion",
-      "updatedAt",
-      "updatedBy",
-    ].forEach((column) => {
-      agHelper.AssertElementExist(table._headerCell(column));
-    });
-
-    agHelper.GetNClick(table._addNewRow, 0, true);
-
-    table.EditTableCell(0, 1, "One Click Config", false);
 
-    table.UpdateTableCell(0, 2, `{{}"key":"oneClick"}`);
-    table.UpdateTableCell(0, 3, 36);
-    table.UpdateTableCell(0, 4, "2023-07-03 15:30:00", false, true);
+      agHelper.GetNClick(oneClickBindingLocator.connectData);
 
-    agHelper.Sleep(2000);
+      assertHelper.AssertNetworkStatus("@postExecute");
 
-    agHelper.GetNClick(table._saveNewRow, 0, true);
+      [
+        "id",
+        "configName",
+        "configJson",
+        "configVersion",
+        "updatedAt",
+        "updatedBy",
+      ].forEach((column) => {
+        agHelper.AssertElementExist(table._headerCell(column));
+      });
 
-    assertHelper.AssertNetworkStatus("@postExecute");
+      agHelper.GetNClick(table._addNewRow, 0, true);
 
-    agHelper.TypeText(table._searchInput, "One Click Config");
+      table.EditTableCell(0, 1, "One Click Config", false);
 
-    assertHelper.AssertNetworkStatus("@postExecute");
+      table.UpdateTableCell(0, 2, `{{}"key":"oneClick"}`);
+      table.UpdateTableCell(0, 3, 36);
+      table.UpdateTableCell(0, 4, "2023-07-03 15:30:00", false, true);
 
-    agHelper.AssertElementExist(table._bodyCell("One Click Config"));
+      agHelper.GetNClick(table._saveNewRow, 0, true);
 
-    agHelper.Sleep(1000);
+      assertHelper.AssertNetworkStatus("@postExecute");
 
-    table.EditTableCell(0, 1, "Bindings", false);
-    table.EditTableCell(0, 4, "2023-07-03 15:30:00", false);
+      agHelper.TypeText(table._searchInput, "One Click Config");
 
-    agHelper.Sleep(1000);
+      assertHelper.AssertNetworkStatus("@postExecute");
 
-    (cy as any).AssertTableRowSavable(6, 0);
+      agHelper.AssertElementExist(table._bodyCell("One Click Config"));
 
-    (cy as any).saveTableRow(6, 0);
+      table.EditTableCell(0, 1, "Bindings", false);
+      table.EditTableCell(0, 4, "2023-07-03 15:30:00", false);
 
-    assertHelper.AssertNetworkStatus("@postExecute");
+      (cy as any).AssertTableRowSavable(6, 0);
 
-    assertHelper.AssertNetworkStatus("@postExecute");
+      (cy as any).saveTableRow(6, 0);
 
-    agHelper.Sleep(500);
-    agHelper.ClearNType(table._searchInput, "Bindings");
+      assertHelper.AssertNetworkStatus("@postExecute");
 
-    assertHelper.AssertNetworkStatus("@postExecute");
+      assertHelper.AssertNetworkStatus("@postExecute");
 
-    agHelper.Sleep(2000);
+      agHelper.ClearNType(table._searchInput, "Bindings");
 
-    agHelper.AssertElementExist(table._bodyCell("Bindings"));
+      assertHelper.AssertNetworkStatus("@postExecute");
 
-    agHelper.ClearNType(table._searchInput, "One Click Config");
+      agHelper.AssertElementExist(table._bodyCell("Bindings"));
 
-    assertHelper.AssertNetworkStatus("@postExecute");
+      agHelper.ClearNType(table._searchInput, "One Click Config");
 
-    agHelper.Sleep(2000);
+      assertHelper.AssertNetworkStatus("@postExecute");
 
-    agHelper.AssertElementAbsence(table._bodyCell("One Click Config"));
-  });
-});
+      agHelper.AssertElementAbsence(table._bodyCell("One Click Config"));
+    });
+  },
+);