Merge branch 'release' of github.com:appsmithorg/appsmith into fix/37…

…713-setting-pane
appsmithorg · Nov 26, 2024 · fa10866 · fa10866
2 parents 060b4f5 + f41cf12
commit fa10866
Show file tree

Hide file tree

Showing 243 changed files with 7,010 additions and 12,715 deletions.
diff --git a/.env.example b/.env.example
@@ -21,11 +21,6 @@ APPSMITH_SIGNUP_DISABLED=
 # Segment
 APPSMITH_SEGMENT_KEY=
 
-# Algolia Search (Docs)
-APPSMITH_ALGOLIA_API_ID=
-APPSMITH_ALGOLIA_API_KEY=
-APPSMITH_ALGOLIA_SEARCH_INDEX_NAME=
-
 #Client log level (debug | error)
 APPSMITH_CLIENT_LOG_LEVEL=
 

diff --git a/.github/workflows/appsmithctl.yml b/.github/workflows/appsmithctl.yml
diff --git a/.github/workflows/client-build.yml b/.github/workflows/client-build.yml
@@ -206,6 +206,7 @@ jobs:
           git config --global user.name "$gituser"
           git clone https://[email protected]/appsmithorg/cibuildcache.git
           git lfs install
+          git lfs migrate import --everything --yes
           if [ "$reponame" = "appsmith" ]; then export repodir="CE"; fi
           if [ "$reponame" = "appsmith-ee" ]; then export repodir="EE"; fi
           cd cibuildcache/$repodir/release/client

diff --git a/.github/workflows/docs/integration-tests-command.md b/.github/workflows/docs/integration-tests-command.md
@@ -22,10 +22,6 @@ The `client-build` job builds the client-side codebase. It uses the configuratio
 
 The `rts-build` job builds the "rts" (real-time suggestions) package of the client-side codebase. It uses the configuration defined in the `.github/workflows/rts-build.yml` file.
 
-### `test-appsmithctl`
-
-The `test-appsmithctl` job runs tests for the `appsmithctl` utility. It uses the configuration from the `.github/workflows/appsmithctl.yml` file.
-
 ### `build-docker-image`
 
 The `build-docker-image` job builds and pushes the Docker image for the application. It depends on the successful completion of the `client-build`, `server-build`, and `rts-build` jobs. The Docker image is built with support for both `linux/arm64` and `linux/amd64` platforms.

diff --git a/.github/workflows/pr-cypress.yml b/.github/workflows/pr-cypress.yml
@@ -45,14 +45,6 @@ jobs:
     with:
       pr: ${{ github.event.number }}
 
-  test-appsmithctl:
-    if: success()
-    name: appsmithctl
-    uses: ./.github/workflows/appsmithctl.yml
-    secrets: inherit
-    with:
-      pr: ${{ github.event.number }}
-
   build-docker-image:
     needs: [client-build, server-build, rts-build]
     # Only run if the build step is successful

diff --git a/.github/workflows/server-build.yml b/.github/workflows/server-build.yml
@@ -100,19 +100,23 @@ jobs:
       - name: Print the Github event
         run: echo ${{ github.event_name }}
 
-      - name: Get changed files in the server folder
+      # - name: Get changed files in the server folder
+      #   id: changed-files-specific
+      #   uses: tj-actions/changed-files@v44
+      #   with:
+      #     files: "app/server/**"
+      #     write_output_files: true
+
+      - name: Updating the server changed file variable
         id: changed-files-specific
-        uses: tj-actions/changed-files@v44
-        with:
-          files: "app/server/**"
-          write_output_files: true
+        run: echo "any_changed=true" >> "$GITHUB_OUTPUT"
 
-      - name: Run step if any file(s) in the server folder change
-        if: steps.changed-files-specific.outputs.any_changed == 'true'
-        run: |
-          echo "One or more files in the server folder has changed."
-          echo "List all the files that have changed:"
-          cat "${{ github.workspace }}/.github/outputs/all_changed_files.txt"
+      # - name: Run step if any file(s) in the server folder change
+      #   if: steps.changed-files-specific.outputs.any_changed == 'true'
+      #   run: |
+      #     echo "One or more files in the server folder has changed."
+      #     echo "List all the files that have changed:"
+      #     cat "${{ github.workspace }}/.github/outputs/all_changed_files.txt"
 
       # In case this is second attempt try restoring status of the prior attempt from cache
       - name: Restore the previous run result
@@ -338,6 +342,7 @@ jobs:
           git config --global user.name "$gituser"
           git clone https://[email protected]/appsmithorg/cibuildcache.git
           git lfs install
+          git lfs migrate import --everything --yes
           if [ "$reponame" = "appsmith" ]; then export repodir="CE"; fi
           if [ "$reponame" = "appsmith-ee" ]; then export repodir="EE"; fi
           cd cibuildcache/$repodir/release/server

diff --git a/.github/workflows/test-vulnerabilities-data.yml b/.github/workflows/test-vulnerabilities-data.yml
@@ -1,4 +1,7 @@
-name: Run Vulnerability Data Script with Parameters and Update PR
+name: Run Vulnerability 
+
+run-name: >
+  On Branch: ${{ github.ref_name }} with Image: ${{ inputs.image_name || 'appsmith/appsmith-ce:release' }}
 
 on:
   workflow_dispatch:

diff --git a/CODEOWNERS b/CODEOWNERS
@@ -27,12 +27,12 @@ app/client/src/widgets/wds/* @appsmithorg/wds-team @appsmithorg/anvil-team
 app/client/src/layoutSystems/anvil/* @appsmithorg/anvil-team
 
 # App viewers pod
-app/client/src/widgets/* @appsmithorg/app-viewers
-app/client/src/components/propertyControls/* @appsmithorg/app-viewers
-app/client/src/sagas/OneClickBindingSaga.ts @appsmithorg/app-viewers
-app/client/src/WidgetQueryGenerators/* @appsmithorg/app-viewers
-app/client/src/components/editorComponents/WidgetQueryGeneratorForm/* @appsmithorg/app-viewers
-app/client/src/pages/AppViewer/* @appsmithorg/app-viewers
+app/client/src/widgets/* @appsmithorg/widgets-blocks
+app/client/src/components/propertyControls/* @appsmithorg/widgets-blocks
+app/client/src/sagas/OneClickBindingSaga.ts @appsmithorg/widgets-blocks
+app/client/src/WidgetQueryGenerators/* @appsmithorg/widgets-blocks
+app/client/src/components/editorComponents/WidgetQueryGeneratorForm/* @appsmithorg/widgets-blocks
+app/client/src/pages/AppViewer/* @appsmithorg/widgets-blocks
 
 # New Developers Pod
 app/server/appsmith-server/src/main/java/com/appsmith/server/featureflags/* @nilanshbansal
@@ -195,6 +195,7 @@ app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/**/* @sh
 # DevOps & Shri
 deploy/**/* @sharat87 @pratapaprasanna
 .github/workflows/*.yml @sharat87
+app/client/packages/ctl/**/* @sharat87 @pratapaprasanna
 app/server/**/pom.xml @sharat87
 app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/BaseAppsmithRepositoryCEImpl.java @sharat87
 app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/params/QueryAllParams.java @sharat87

diff --git a/Dockerfile b/Dockerfile
@@ -29,17 +29,11 @@ COPY ./app/client/build editor/
 # Add RTS - Application Layer
 COPY ./app/client/packages/rts/dist rts/
 
-ENV PATH /opt/bin:/opt/appsmith/utils/node_modules/.bin:/opt/java/bin:/opt/node/bin:$PATH
+ENV PATH /opt/bin:/opt/java/bin:/opt/node/bin:$PATH
 
 RUN <<END
   set -o errexit
 
-  cd ./utils
-  npm install --only=prod
-  npm install --only=prod -g .
-  rm -rf utils/node_modules/resolve/test
-  cd -
-
   # Make all `*.sh` files executable, excluding `node_modules`.
   find . \( -name node_modules -prune \) -o \( -type f -name '*.sh' \) -exec chmod +x '{}' +
 

diff --git a/README.md b/README.md
@@ -15,6 +15,12 @@
 <a href="https://docs.appsmith.com/getting-started/setup/installation-guides/docker?utm_source=github&utm_medium=organic&utm_campaign=readme&utm_content=badge">
 <img src="https://img.shields.io/docker/pulls/appsmith/appsmith-ce?color=4591df&style=for-the-badge">
 </a>
+<a href="https://www.youtube.com/@appsmith/?sub_confirmation=1" target="_blank">
+    <img alt="YouTube Channel Subscribers" src="https://img.shields.io/youtube/channel/subscribers/UCMYwzPG2txS8nR5ZbNY6T5g?color=00FF0&style=for-the-badge">
+</a>
+<a href="https://www.youtube.com/@appsmith/?sub_confirmation=1" target="_blank">
+    <img alt="YouTube Channel Views" src="https://img.shields.io/youtube/channel/views/UCMYwzPG2txS8nR5ZbNY6T5g?color=00FF0&style=for-the-badge">
+</a>
 </p>
 
 ---

diff --git a/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/uiToCode_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/uiToCode_spec.ts
@@ -49,12 +49,12 @@ describe("UI to Code", { tags: ["@tag.JS", "@tag.Binding"] }, () => {
     agHelper.GetNClick(propPane._navigateToType("URL"));
     agHelper.TypeText(
       propPane._actionSelectorFieldByLabel("Enter URL"),
-      "https://www.appsmith.com",
+      "https://www.google.com",
     );
     agHelper.GetNClick(propPane._actionSelectorPopupClose);
     propPane.ValidateJSFieldValue(
       "onClick",
-      `{{showAlert('Hello!', '');navigateTo('https://www.appsmith.com', {}, 'SAME_WINDOW');}}`,
+      `{{showAlert('Hello!', '');navigateTo('https://www.google.com', {}, 'SAME_WINDOW');}}`,
     );
 
     // Add third action
@@ -80,7 +80,7 @@ describe("UI to Code", { tags: ["@tag.JS", "@tag.Binding"] }, () => {
     // Validate the code
     propPane.ValidateJSFieldValue(
       "onClick",
-      `{{showAlert('Hello!', '');navigateTo('https://www.appsmith.com', {}, 'SAME_WINDOW');storeValue('secret-key', 'secret-value');copyToClipboard('text to copy');}}`,
+      `{{showAlert('Hello!', '');navigateTo('https://www.google.com', {}, 'SAME_WINDOW');storeValue('secret-key', 'secret-value');copyToClipboard('text to copy');}}`,
     );
 
     // Delete the third action
@@ -97,7 +97,7 @@ describe("UI to Code", { tags: ["@tag.JS", "@tag.Binding"] }, () => {
     // Assert the code for the remaining actions
     propPane.ValidateJSFieldValue(
       "onClick",
-      `{{showAlert('Hello!', '');navigateTo('https://www.appsmith.com', {}, 'SAME_WINDOW');copyToClipboard('text to copy');}}`,
+      `{{showAlert('Hello!', '');navigateTo('https://www.google.com', {}, 'SAME_WINDOW');copyToClipboard('text to copy');}}`,
     );
 
     // Delete the first action
@@ -113,7 +113,7 @@ describe("UI to Code", { tags: ["@tag.JS", "@tag.Binding"] }, () => {
     // Assert the code for the remaining actions
     propPane.ValidateJSFieldValue(
       "onClick",
-      `{{navigateTo('https://www.appsmith.com', {}, 'SAME_WINDOW');copyToClipboard('text to copy');}}`,
+      `{{navigateTo('https://www.google.com', {}, 'SAME_WINDOW');copyToClipboard('text to copy');}}`,
     );
   });
 
@@ -132,13 +132,13 @@ describe("UI to Code", { tags: ["@tag.JS", "@tag.Binding"] }, () => {
     agHelper.GetNClick(propPane._navigateToType("URL"));
     agHelper.TypeText(
       propPane._actionSelectorFieldByLabel("Enter URL"),
-      "https://www.appsmith.com",
+      "https://www.google.com",
     );
     agHelper.GetNClick(propPane._actionSelectorPopupClose);
 
     propPane.ValidateJSFieldValue(
       "onClick",
-      `{{showAlert('Hello!', '');navigateTo('https://www.appsmith.com', {}, 'SAME_WINDOW');}}`,
+      `{{showAlert('Hello!', '');navigateTo('https://www.google.com', {}, 'SAME_WINDOW');}}`,
     );
 
     // Add third action
@@ -165,7 +165,7 @@ describe("UI to Code", { tags: ["@tag.JS", "@tag.Binding"] }, () => {
 
     propPane.ValidateJSFieldValue(
       "onClick",
-      `{{showAlert('Hello!', '');navigateTo('https://www.appsmith.com', {}, 'SAME_WINDOW');storeValue('secret-key', 'secret-value');copyToClipboard('text to copy');}}`,
+      `{{showAlert('Hello!', '');navigateTo('https://www.google.com', {}, 'SAME_WINDOW');storeValue('secret-key', 'secret-value');copyToClipboard('text to copy');}}`,
     );
 
     // Delete the third action
@@ -197,7 +197,7 @@ describe("UI to Code", { tags: ["@tag.JS", "@tag.Binding"] }, () => {
 
     propPane.ValidateJSFieldValue(
       "onClick",
-      `{{showAlert('Hello!', '');navigateTo('https://www.appsmith.com', {}, 'SAME_WINDOW');storeValue('secret-key', 'secret-value');copyToClipboard('text to copy');}}`,
+      `{{showAlert('Hello!', '');navigateTo('https://www.google.com', {}, 'SAME_WINDOW');storeValue('secret-key', 'secret-value');copyToClipboard('text to copy');}}`,
     );
   });
 
@@ -216,13 +216,13 @@ describe("UI to Code", { tags: ["@tag.JS", "@tag.Binding"] }, () => {
     agHelper.GetNClick(propPane._navigateToType("URL"));
     agHelper.TypeText(
       propPane._actionSelectorFieldByLabel("Enter URL"),
-      "https://www.appsmith.com",
+      "https://www.google.com",
     );
     agHelper.GetNClick(propPane._actionSelectorPopupClose);
 
     propPane.ValidateJSFieldValue(
       "onClick",
-      `{{showAlert('Hello!', '');navigateTo('https://www.appsmith.com', {}, 'SAME_WINDOW');}}`,
+      `{{showAlert('Hello!', '');navigateTo('https://www.google.com', {}, 'SAME_WINDOW');}}`,
     );
 
     // Add third action
@@ -249,7 +249,7 @@ describe("UI to Code", { tags: ["@tag.JS", "@tag.Binding"] }, () => {
 
     propPane.ValidateJSFieldValue(
       "onClick",
-      `{{showAlert('Hello!', '');navigateTo('https://www.appsmith.com', {}, 'SAME_WINDOW');storeValue('secret-key', 'secret-value');copyToClipboard('text to copy');}}`,
+      `{{showAlert('Hello!', '');navigateTo('https://www.google.com', {}, 'SAME_WINDOW');storeValue('secret-key', 'secret-value');copyToClipboard('text to copy');}}`,
     );
 
     // Delete the third action
@@ -286,7 +286,7 @@ describe("UI to Code", { tags: ["@tag.JS", "@tag.Binding"] }, () => {
 
     propPane.ValidateJSFieldValue(
       "onClick",
-      `{{navigateTo('https://www.appsmith.com', {}, 'SAME_WINDOW');copyToClipboard('text to copy');}}`,
+      `{{navigateTo('https://www.google.com', {}, 'SAME_WINDOW');copyToClipboard('text to copy');}}`,
     );
   });
 

diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/DatasourceSchema_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/DatasourceSchema_spec.ts
@@ -79,7 +79,7 @@ describe(
           "public.users",
         );
         dataSources.SelectTableFromPreviewSchemaList("public.users");
-        dataSources.VerifyColumnSchemaOnQueryEditor("id", 1);
+        dataSources.VerifyColumnSchemaOnQueryEditor("id", 0);
       },
     );
 

diff --git a/app/client/cypress/e2e/Regression/ClientSide/OneClickBinding/PropertyControl_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/OneClickBinding/PropertyControl_spec.ts
@@ -149,7 +149,7 @@ describe(
       propPane.MoveToTab("Content");
 
       [1, 2, 3, 4, 5].forEach(() => {
-        apiPage.CreateAndFillApi("https://www.appsmith.com/");
+        apiPage.CreateAndFillApi("https://www.google.com/");
       });
 
       EditorNavigation.SelectEntityByName("Table1", EntityType.Widget);