Merge pull request #32340 from appsmithorg/release

02/04 Daily Promotion
appsmithorg · Apr 2, 2024 · 24bcef9 · 24bcef9
2 parents 010c1b6 + 9448ffb
commit 24bcef9
Show file tree

Hide file tree

Showing 100 changed files with 991 additions and 735 deletions.
diff --git a/.github/config.json b/.github/config.json
diff --git a/.github/workflows/ci-test-custom-script.yml b/.github/workflows/ci-test-custom-script.yml
@@ -61,7 +61,7 @@ jobs:
         uses: depot/setup-action@v1
 
       - name: Login to DockerHub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_HUB_USERNAME }}
           password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}

diff --git a/.github/workflows/ci-test-limited.yml b/.github/workflows/ci-test-limited.yml
@@ -72,7 +72,7 @@ jobs:
         uses: depot/setup-action@v1
 
       - name: Login to DockerHub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_HUB_USERNAME }}
           password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}

diff --git a/.github/workflows/ci-test-with-documentdb.yml b/.github/workflows/ci-test-with-documentdb.yml
@@ -107,7 +107,7 @@ jobs:
         uses: depot/setup-action@v1
 
       - name: Login to DockerHub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_HUB_USERNAME }}
           password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}

diff --git a/.github/workflows/ci-test.yml b/.github/workflows/ci-test.yml
@@ -45,7 +45,7 @@ jobs:
         uses: depot/setup-action@v1
 
       - name: Login to DockerHub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_HUB_USERNAME }}
           password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}

diff --git a/.github/workflows/client-build.yml b/.github/workflows/client-build.yml
@@ -78,7 +78,7 @@ jobs:
         id: changed-files-specific
         uses: tj-actions/changed-files@v41
         with:
-          files: 'app/client/**'
+          files: "app/client/**"
 
       - name: Run step if any file(s) in the client folder change
         if: steps.changed-files-specific.outputs.any_changed == 'true'

diff --git a/.github/workflows/github-release.yml b/.github/workflows/github-release.yml
@@ -113,7 +113,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: "temurin"
           java-version: "17"

diff --git a/.github/workflows/pr-cypress.yml b/.github/workflows/pr-cypress.yml
@@ -67,7 +67,6 @@ jobs:
       tags: ${{ inputs.tags }}
       matrix: ${{ inputs.matrix }}
 
-
   ci-test-result:
     needs: [ci-test]
     # Only run if the ci-test with matrices step is successful
@@ -177,57 +176,57 @@ jobs:
         if: needs.ci-test.result != 'success' && steps.combine_ci.outputs.specs_failed == '1'
         uses: nefrob/[email protected]
         with:
-            content: |
-              <!-- This is an auto-generated comment: Cypress test results  -->
-              > [!CAUTION]
-              > Workflow run: <${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}>
-              > Commit: `${{ github.event.pull_request.head.sha }}`
-              > Cypress dashboard: <a href="https://internal.appsmith.com/app/cypress-dashboard/rundetails-65890b3c81d7400d08fa9ee5?branch=master&workflowId=${{ github.run_id }}&attempt=${{ github.run_attempt }}&selectiontype=test&testsstatus=failed&specsstatus=fail" target="_blank"> Click here!</a>
-              > The following are new failures, please fix them before merging the PR: <ol>
-              ${{env.new_failed_spec_env}} </ol>
-              > To know the list of identified flaky tests - <a href="https://internal.appsmith.com/app/cypress-dashboard/identified-flaky-tests-65890b3c81d7400d08fa9ee3?branch=master" target="_blank">Refer here</a>
-
-              <!-- end of auto-generated comment: Cypress test results  -->
-
-            regex: "<!-- This is an auto-generated comment: Cypress test results  -->.*?<!-- end of auto-generated comment: Cypress test results  -->"
-            regexFlags: ims
-            token: ${{ secrets.GITHUB_TOKEN }}
+          content: |
+            <!-- This is an auto-generated comment: Cypress test results  -->
+            > [!CAUTION]  
+            > Workflow run: <${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}>
+            > Commit: `${{ github.event.pull_request.head.sha }}`
+            > Cypress dashboard: <a href="https://internal.appsmith.com/app/cypress-dashboard/rundetails-65890b3c81d7400d08fa9ee5?branch=master&workflowId=${{ github.run_id }}&attempt=${{ github.run_attempt }}&selectiontype=test&testsstatus=failed&specsstatus=fail" target="_blank"> Click here!</a>
+            > The following are new failures, please fix them before merging the PR: <ol>
+            ${{env.new_failed_spec_env}} </ol>
+            > To know the list of identified flaky tests - <a href="https://internal.appsmith.com/app/cypress-dashboard/identified-flaky-tests-65890b3c81d7400d08fa9ee3?branch=master" target="_blank">Refer here</a>
+
+            <!-- end of auto-generated comment: Cypress test results  -->
+
+          regex: "<!-- This is an auto-generated comment: Cypress test results  -->.*?<!-- end of auto-generated comment: Cypress test results  -->"
+          regexFlags: ims
+          token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Modify test response in the PR when ci-test is failed but no specs found
         if: needs.ci-test.result != 'success' && steps.combine_ci.outputs.specs_failed == '0'
         uses: nefrob/[email protected]
         with:
-            content: |
-              <!-- This is an auto-generated comment: Cypress test results  -->
-              > [!WARNING]
-              > Workflow run: <${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}>
-              > Commit: `${{ github.event.pull_request.head.sha }}`
-              > Cypress dashboard url: <a href="https://internal.appsmith.com/app/cypress-dashboard/rundetails-65890b3c81d7400d08fa9ee5?branch=master&workflowId=${{ github.run_id }}&attempt=${{ github.run_attempt }}" target="_blank">Click here!</a>
-              > It seems like **no tests ran** 😔. We are not able to recognize it, please check workflow <a href="${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" target="_blank">here.</a>
+          content: |
+            <!-- This is an auto-generated comment: Cypress test results  -->
+            > [!WARNING]  
+            > Workflow run: <${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}>
+            > Commit: `${{ github.event.pull_request.head.sha }}`
+            > Cypress dashboard url: <a href="https://internal.appsmith.com/app/cypress-dashboard/rundetails-65890b3c81d7400d08fa9ee5?branch=master&workflowId=${{ github.run_id }}&attempt=${{ github.run_attempt }}" target="_blank">Click here!</a>
+            > It seems like **no tests ran** 😔. We are not able to recognize it, please check workflow <a href="${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" target="_blank">here.</a>
 
-              <!-- end of auto-generated comment: Cypress test results  -->
+            <!-- end of auto-generated comment: Cypress test results  -->
 
-            regex: "<!-- This is an auto-generated comment: Cypress test results  -->.*?<!-- end of auto-generated comment: Cypress test results  -->"
-            regexFlags: ims
-            token: ${{ secrets.GITHUB_TOKEN }}
+          regex: "<!-- This is an auto-generated comment: Cypress test results  -->.*?<!-- end of auto-generated comment: Cypress test results  -->"
+          regexFlags: ims
+          token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Modify test response in the PR when ci-test is success
         if: needs.ci-test.result == 'success' && steps.combine_ci.outputs.specs_failed == '0'
         uses: nefrob/[email protected]
         with:
-            content: |
-              <!-- This is an auto-generated comment: Cypress test results  -->
-              > [!IMPORTANT]
-              > Workflow run: <${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}>
-              > Commit: `${{ github.event.pull_request.head.sha }}`
-              > Cypress dashboard url: <a href="https://internal.appsmith.com/app/cypress-dashboard/rundetails-65890b3c81d7400d08fa9ee5?branch=master&workflowId=${{ github.run_id }}&attempt=${{ github.run_attempt }}" target="_blank">Click here!</a>
-              > All cypress tests have passed 🎉🎉🎉
-
-              <!-- end of auto-generated comment: Cypress test results  -->
-
-            regex: "<!-- This is an auto-generated comment: Cypress test results  -->.*?<!-- end of auto-generated comment: Cypress test results  -->"
-            regexFlags: ims
-            token: ${{ secrets.GITHUB_TOKEN }}
+          content: |
+            <!-- This is an auto-generated comment: Cypress test results  -->
+            > [!IMPORTANT]  
+            > Workflow run: <${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}>
+            > Commit: `${{ github.event.pull_request.head.sha }}`
+            > Cypress dashboard url: <a href="https://internal.appsmith.com/app/cypress-dashboard/rundetails-65890b3c81d7400d08fa9ee5?branch=master&workflowId=${{ github.run_id }}&attempt=${{ github.run_attempt }}" target="_blank">Click here!</a>
+            > All cypress tests have passed 🎉🎉🎉
+
+            <!-- end of auto-generated comment: Cypress test results  -->
+
+          regex: "<!-- This is an auto-generated comment: Cypress test results  -->.*?<!-- end of auto-generated comment: Cypress test results  -->"
+          regexFlags: ims
+          token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Check ci-test set status
         if: needs.ci-test.result != 'success'

diff --git a/.github/workflows/server-build.yml b/.github/workflows/server-build.yml
@@ -75,7 +75,7 @@ jobs:
         id: changed-files-specific
         uses: tj-actions/changed-files@v41
         with:
-          files: 'app/server/**'
+          files: "app/server/**"
 
       - name: Run step if any file(s) in the server folder change
         if: steps.changed-files-specific.outputs.any_changed == 'true'
@@ -128,7 +128,7 @@ jobs:
       # Setup Java
       - name: Set up JDK 17
         if: steps.run_result.outputs.run_result != 'success'  && (steps.changed-files-specific.outputs.any_changed == 'true' ||  github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule')
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: "temurin"
           java-version: "17"

diff --git a/.github/workflows/server-spotless.yml b/.github/workflows/server-spotless.yml
@@ -26,7 +26,7 @@ jobs:
 
       # Setup Java
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: "temurin"
           java-version: "17"

diff --git a/.github/workflows/test-build-docker-image.yml b/.github/workflows/test-build-docker-image.yml
@@ -1,9 +1,9 @@
 name: Test, build and push Docker Image
 
 on:
-  # This workflow will run everyday at 7:00AM, 10:00AM, 1:00PM, 4:00PM IST on weekdays
+  # This workflow will run everyday at 7:00AM, 1:00PM IST on weekdays
   schedule:
-    - cron: "30 1-12/3 * * 1-5"
+    - cron: "30 1-12/6 * * 1-5"
   # This line enables manual triggering of this workflow.
   workflow_dispatch:
     inputs:
@@ -211,28 +211,28 @@ jobs:
       - name: Dump GitHub context
         env:
           GITHUB_CONTEXT: ${{ toJSON(github) }}
-        run:  |
+        run: |
           echo "$GITHUB_CONTEXT"
           echo ${{ github.repository }}
-          
+
       # This step triggers an external workflow for automated analysis of Cypress test runs.
       - name: Invoke Automated analysis workflow
         run: |
-         curl --location --request POST ${{secrets.CYPRESS_WORKFLOW_API}}    \
-         --header 'x-appsmith-key: ${{ secrets.CYPRESS_WORKFLOW_KEY }}'      \
-         --header 'Content-Type: application/json' \
-         --data-raw '{ "workflow_id" : ${{ github.run_id }} , 
-                       "commit_id" : "${{ github.sha }}" , 
-                       "repo" : "${{  github.event.repository.full_name }}" , 
-                       "task" : "${{  github.job }}" ,   
-                       "workflow_type" : "${{ github.event_name }}",  
-                       "workflow_name" : "${{ github.workflow }}", 
-                       "job_id" : "",     
-                       "job_data": { 
-                           "ci_test_result_sample_data" : "sample_data" 
-                        }  
-          }'
-          
+          curl --location --request POST ${{secrets.CYPRESS_WORKFLOW_API}}    \
+          --header 'x-appsmith-key: ${{ secrets.CYPRESS_WORKFLOW_KEY }}'      \
+          --header 'Content-Type: application/json' \
+          --data-raw '{ "workflow_id" : ${{ github.run_id }} , 
+                        "commit_id" : "${{ github.sha }}" , 
+                        "repo" : "${{  github.event.repository.full_name }}" , 
+                        "task" : "${{  github.job }}" ,   
+                        "workflow_type" : "${{ github.event_name }}",  
+                        "workflow_name" : "${{ github.workflow }}", 
+                        "job_id" : "",     
+                        "job_data": { 
+                            "ci_test_result_sample_data" : "sample_data" 
+                         }  
+           }'
+
       # Force save the CI failed spec list into a cache
       - name: Store the combined run result for CI
         if: needs.ci-test.result != 'success'
@@ -322,7 +322,7 @@ jobs:
         uses: depot/setup-action@v1
 
       - name: Login to DockerHub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_HUB_USERNAME }}
           password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
@@ -397,7 +397,7 @@ jobs:
         uses: depot/setup-action@v1
 
       - name: Login to DockerHub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_HUB_USERNAME }}
           password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}

diff --git a/CODEOWNERS b/CODEOWNERS
@@ -2,17 +2,13 @@
 # Each line is a file pattern followed by one or more owners.
 # https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners
 
-# WDS team
-app/client/packages/design-system/* @appsmithorg/wds
-app/client/packages/storybook/* @appsmithorg/wds
-
 app/client/.husky @KelvinOm
 app/client/.yarn @KelvinOm
 app/client/.editorconfig @KelvinOm
 app/client/.eslintrc.base.json @KelvinOm
 app/client/.eslintrc.js @KelvinOm
 app/client/.gitignore @KelvinOm
-app/client/.lintstagedrc @KelvinOm
+app/client/.lintstagedrc.json @KelvinOm
 app/client/.nvmrc @KelvinOm
 app/client/.prettierignore @KelvinOm
 app/client/.prettierrc @KelvinOm
@@ -22,6 +18,15 @@ app/client/package.json @KelvinOm
 app/client/tsconfig.json @KelvinOm
 app/client/tsconfig.path.json @KelvinOm
 
+# WDS team
+app/client/packages/design-system/* @appsmithorg/wds-team
+app/client/packages/storybook/* @appsmithorg/wds-team
+app/client/src/widgets/wds/* @appsmithorg/wds-team
+
+# Anvil-team
+app/client/src/layoutSystems/anvil/* @appsmithorg/anvil-team
+app/client/src/widgets/anvil/* @appsmithorg/anvil-team
+
 # App viewers pod
 app/client/src/widgets/* @appsmithorg/app-viewers
 app/client/src/components/propertyControls/* @appsmithorg/app-viewers
@@ -56,13 +61,12 @@ app/client/src/actions/reflowActions.ts @appsmithorg/ui-builders
 app/client/src/actions/widgetSelectionActions.ts @appsmithorg/ui-builders
 app/client/src/components/propertyControls/* @appsmithorg/ui-builders
 app/client/src/layoutSystems/* @appsmithorg/ui-builders
-app/client/src/normalizers/CanvasWidgetsNormalizer.tsx @appsmithorg/ui-builders
 app/client/src/pages/Editor/Canvas.tsx @appsmithorg/ui-builders
 app/client/src/pages/Editor/CanvasLayoutConversion/* @appsmithorg/ui-builders
 app/client/src/pages/Editor/PropertyPane/* @appsmithorg/ui-builders
+app/client/src/pages/Editor/WidgetsEditor/* @appsmithorg/ui-builders
 app/client/src/reducers/entityReducers/autoHeightReducers/* @appsmithorg/ui-builders
 app/client/src/reducers/entityReducers/canvasWidgetsReducer.ts @appsmithorg/ui-builders
-app/client/src/reducers/entityReducers/widgetConfigReducer.ts @appsmithorg/ui-builders
 app/client/src/reflow/* @appsmithorg/ui-builders
 app/client/src/sagas/AutoLayoutUpdateSagas.tsx @appsmithorg/ui-builders
 app/client/src/sagas/CanvasSagas/* @appsmithorg/ui-builders
@@ -81,7 +85,6 @@ app/client/src/selectors/autoHeightSelectors.ts @appsmithorg/ui-builders
 app/client/src/selectors/autoLayoutSelectors.tsx @appsmithorg/ui-builders
 app/client/src/selectors/canvasSelectors.ts @appsmithorg/ui-builders
 app/client/src/selectors/widgetSelectors.ts @appsmithorg/ui-builders
-app/client/src/utils/DSLConversions/* @appsmithorg/ui-builders
 app/client/src/utils/autoHeight/* @appsmithorg/ui-builders
 app/client/src/utils/hooks/autoHeightUIHooks.ts @appsmithorg/ui-builders
 app/client/src/utils/hooks/useAllowEditorDragToSelect.ts @appsmithorg/ui-builders

diff --git a/app/client/cypress/e2e/Regression/ClientSide/Anvil/AnvilAppNavigation_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Anvil/AnvilAppNavigation_spec.ts
@@ -7,8 +7,6 @@ import {
   appSettings,
   anvilLayout,
 } from "../../../../support/Objects/ObjectsCore";
-import { MAIN_CONTAINER_WIDGET_ID } from "../../../../../src/constants/WidgetConstants";
-import { getAnvilCanvasId } from "../../../../../src/layoutSystems/anvil/canvas/utils";
 import { featureFlagIntercept } from "../../../../support/Objects/FeatureFlags";
 
 describe(

diff --git a/app/client/cypress/e2e/Regression/ClientSide/Anvil/AnvilWidgetClicking_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Anvil/AnvilWidgetClicking_spec.ts
@@ -61,33 +61,7 @@ describe(
       );
       agHelper.AssertElementLength(locators._selectedWidget, 2);
     });
-    it("3. Click on widgets like Switch, Checkbox to toggle selection", () => {
-      // deselect all widgets
-      agHelper.PressEscape();
-      agHelper
-        .GetNClick(wdsWidgets._switchWidgetTargetSelector("Switch1"))
-        .then(() => {
-          wdsWidgets.verifySwitchWidgetState("Switch1", "checked");
-        });
-      agHelper
-        .GetNClick(wdsWidgets._switchWidgetTargetSelector("Switch1"))
-        .then(() => {
-          wdsWidgets.verifySwitchWidgetState("Switch1", "unchecked");
-        });
-      anvilLayout.DragDropAnvilWidgetNVerify(WIDGET.WDSCHECKBOX, 5, 20, {
-        skipWidgetSearch: true,
-        dropTargetDetails: {
-          name: "Zone1",
-        },
-      });
-      wdsWidgets.verifyCheckboxWidgetState("Checkbox1", "checked");
-      agHelper
-        .GetNClick(wdsWidgets._checkboxWidgetTargetSelector("Checkbox1"))
-        .then(() => {
-          wdsWidgets.verifyCheckboxWidgetState("Checkbox1", "unchecked");
-        });
-    });
-    it("4. Click on Canvas to deselect all widgets", () => {
+    it("3. Click on Canvas to deselect all widgets", () => {
       // Find the layout component that is the main canvas
       cy.get(".anvil-canvas > div").click();
       // Find all widgets within the main canvas