Merge branch 'release' of https://github.com/appsmithorg/appsmith int…

…o refactor/selected-widget-selector

.github/ISSUE_TEMPLATE/--bug-report.yaml

@@ -62,7 +62,7 @@ body:
     label: Severity
     description: "The impact of the issue"
     options:
-        - Low (Inconsistent UI/UX)
+        - Low (Cosmetic UI issues)
         - Medium (Frustrating UX)
         - High (Blocker to building or releasing)
         - Critical (Broken Production apps)

.github/workflows/github-release.yml

@@ -1,8 +1,7 @@
 name: Appsmith Github Release Workflow
 
 # This workflow builds Docker images for server and client, and then pushes them to Docker Hub.
-# The docker-tag with which this push happens is the release tag (e.g., v1.2.3 etc.).
-# In addition to the above tag, unless the git-tag matches `*beta*`, we also push to the `latest` docker-tag.
+# The docker-tag with which this push happens is `latest` and the release tag (e.g., v1.2.3 etc.).
 # This workflow does NOT run tests.
 # This workflow is automatically triggered when a release is created on GitHub.
 
@@ -19,7 +18,6 @@ jobs:
 
     outputs:
       tag: ${{ steps.get_version.outputs.tag }}
-      is_beta: ${{ steps.get_version.outputs.is_beta }}
 
     steps:
       - name: Environment details
@@ -32,13 +30,11 @@ jobs:
       - name: Get the version
         id: get_version
         run: |
-          tag="${GITHUB_REF#refs/tags/}"
-          echo "tag=$tag" >> $GITHUB_OUTPUT
-          if [[ $tag == *"beta"* ]]; then
-            echo "is_beta=true" >> $GITHUB_OUTPUT
-          else
-            echo "is_beta=false" >> $GITHUB_OUTPUT
+          if ! [[ ${GITHUB_REF-} =~ ^refs/tags/v[[:digit:]]\.[[:digit:]]+(\.[[:digit:]]+)?$ ]]; then
+            echo "Invalid tag: '${GITHUB_REF-}'. Has to be like `v1.22`, `v1.22.33` only."
+            exit 1
           fi
+          echo "tag=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
 
   client-build:
     needs:
@@ -246,9 +242,7 @@ jobs:
 
       - name: Generate info.json
         run: |
-          if [[ -f scripts/generate_info_json.sh ]]; then
-            scripts/generate_info_json.sh
-          fi
+          scripts/generate_info_json.sh
 
       - name: Login to DockerHub
         uses: docker/login-action@v1
@@ -267,17 +261,4 @@ jobs:
             BASE=${{ vars.DOCKER_HUB_ORGANIZATION }}/base-${{ vars.EDITION }}:nightly
           tags: |
             ${{ vars.DOCKER_HUB_ORGANIZATION }}/appsmith-${{ vars.EDITION }}:${{needs.prelude.outputs.tag}}
-
-      # Only build & tag with latest if the tag doesn't contain beta
-      - name: Build and push fat image latest
-        if: needs.prelude.outputs.is_beta == 'false'
-        uses: depot/build-push-action@v1
-        with:
-          context: .
-          push: true
-          platforms: linux/arm64,linux/amd64
-          build-args: |
-            APPSMITH_SEGMENT_CE_KEY=${{ secrets.APPSMITH_SEGMENT_CE_KEY }}
-            BASE=${{ vars.DOCKER_HUB_ORGANIZATION }}/base-${{ vars.EDITION }}:nightly
-          tags: |
             ${{ vars.DOCKER_HUB_ORGANIZATION }}/appsmith-${{ vars.EDITION }}:latest

app/client/cypress/e2e/Regression/ClientSide/ActionExecution/ActionSelector_JsToNonJSMode_1_spec.ts

@@ -92,7 +92,7 @@ describe("JS to non-JS mode in Action Selector", { tags: ["@tag.JS"] }, () => {
     EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
     propPane.EnterJSContext(
       "onClick",
-      `{{Api1.run().then(() => { showAlert('Hello world!', 'info'); storeValue('a', 18); }).catch(() => { showModal('Modal1'); });}}`,
+      `{{Api1.run().then(() => { showAlert('Hello world!', 'info'); storeValue('a', 18); }).catch(() => { showModal(Modal1.name); });}}`,
       true,
       false,
     );

app/client/cypress/e2e/Regression/ClientSide/ActionExecution/ActionSelector_JsToNonJSMode_2_spec.ts

@@ -212,7 +212,12 @@ describe("JS to non-JS mode in Action Selector", { tags: ["@tag.JS"] }, () => {
       0,
     );
 
-    propPane.EnterJSContext("onClick", "{{showModal('Modal1')}}", true, false);
+    propPane.EnterJSContext(
+      "onClick",
+      "{{showModal(Modal1.name)}}",
+      true,
+      false,
+    );
     propPane.ToggleJSMode("onClick", false);
 
     agHelper.GetNAssertElementText(
@@ -253,7 +258,12 @@ describe("JS to non-JS mode in Action Selector", { tags: ["@tag.JS"] }, () => {
       0,
     );
 
-    propPane.EnterJSContext("onClick", "{{closeModal('Modal1')}}", true, false);
+    propPane.EnterJSContext(
+      "onClick",
+      "{{closeModal(Modal1.name)}}",
+      true,
+      false,
+    );
     propPane.ToggleJSMode("onClick", false);
 
     agHelper.GetNAssertElementText(

app/client/cypress/e2e/Regression/ClientSide/ActionExecution/NavigateTo1_spec.ts → app/client/cypress/e2e/Regression/ClientSide/ActionExecution/NavigateTo_spec.ts

@@ -11,6 +11,7 @@ import {
 import EditorNavigation, {
   EntityType,
 } from "../../../../support/Pages/EditorNavigation";
+import PageList from "../../../../support/Pages/PageList";
 
 describe("Navigate To feature", { tags: ["@tag.JS"] }, () => {
   it("1. Navigates to page name clicked from the page name tab of navigate to", () => {
@@ -50,5 +51,35 @@ describe("Navigate To feature", { tags: ["@tag.JS"] }, () => {
       cy.log("deploy url is" + $url);
       expect($url).to.contain("test=123");
     });
+    deployMode.NavigateBacktoEditor();
+    propPane.DeleteWidgetFromPropertyPane("Button1");
+  });
+
+  it("2. Gives error message when invalid word is entered in the url tab of navigate to", () => {
+    entityExplorer.DragDropWidgetNVerify(draggableWidgets.BUTTON, 300, 300);
+    EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
+    propPane.SelectPlatformFunction("onClick", "Navigate to");
+    agHelper.GetNClick(propPane._navigateToType("URL"));
+    agHelper.TypeText(
+      propPane._actionSelectorFieldByLabel("Enter URL"),
+      "wrongPage",
+    );
+    agHelper.ClickButton("Submit");
+    agHelper.ValidateToastMessage("Enter a valid URL or page name");
+    propPane.DeleteWidgetFromPropertyPane("Button1");
+  });
+
+  it("3. Navigates to url entered from the url tab of navigate to", () => {
+    entityExplorer.DragDropWidgetNVerify(draggableWidgets.BUTTON, 300, 300);
+    EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
+    propPane.SelectPlatformFunction("onClick", "Navigate to");
+    agHelper.GetNClick(propPane._navigateToType("URL"));
+    agHelper.TypeText(
+      propPane._actionSelectorFieldByLabel("Enter URL"),
+      "www.google.com",
+    );
+    deployMode.DeployApp();
+    agHelper.ClickButton("Submit");
+    cy.url().should("include", "google.com");
   });
 });

app/client/cypress/e2e/Regression/ClientSide/BugTests/DSDiscardBugs_spec.ts

@@ -141,7 +141,7 @@ describe(
         // Edit datasource, change connection string uri param and click on back button
         _.dataSources.EditDatasource();
 
-        _.agHelper.UpdateInputValue(_.dataSources._host(), "jargons");
+        _.agHelper.ClearNType(_.dataSources._host(), "jargons");
 
         // Assert that popup is visible
         _.dataSources.cancelDSEditAndAssertModalPopUp(true, false);

app/client/cypress/e2e/Regression/ClientSide/CommunityTemplate/PublishCommunityTemplatesFlow_spec.ts

@@ -53,18 +53,18 @@ describe(
         communityForm.preview.name,
       );
       //Empty name should disable publish
-      agHelper.UpdateInputValue(communityForm.inputs.name, "");
+      agHelper.ClearNType(communityForm.inputs.name, "");
       communityTemplates.AssertPublishButtonState(true);
       //Update name input, updates preview
       const testName = "My first template";
-      agHelper.UpdateInputValue(communityForm.inputs.name, testName);
+      agHelper.ClearNType(communityForm.inputs.name, testName);
       communityTemplates.AssertInputValueToEqualPreviewValue(
         communityForm.inputs.name,
         communityForm.preview.name,
       );
       //Update excerpt input, updates preview
       const testExcerpt = "Small description of my template";
-      agHelper.UpdateInputValue(communityForm.inputs.excerpt, testExcerpt);
+      agHelper.ClearNType(communityForm.inputs.excerpt, testExcerpt);
       communityTemplates.AssertInputValueToEqualPreviewValue(
         communityForm.inputs.excerpt,
         communityForm.preview.excerpt,

app/client/cypress/e2e/Regression/ClientSide/JSObject/JSObjectMutation_spec.ts

@@ -1,8 +1,10 @@
 import { getWidgetSelector } from "../../../../locators/WidgetLocators";
+import { locators } from "../../../../support/Objects/ObjectsCore";
 import * as _ from "../../../../support/Objects/ObjectsCore";
 import EditorNavigation, {
   EntityType,
 } from "../../../../support/Pages/EditorNavigation";
+const commonlocators = require("../../../../locators/commonlocators.json");
 
 describe("JSObject testing", { tags: ["@tag.JS"] }, () => {
   before(() => {
@@ -128,6 +130,7 @@ describe("JSObject testing", { tags: ["@tag.JS"] }, () => {
       toRun: false,
       shouldCreateNewJSObj: true,
     });
+    _.agHelper.GetNAssertContains(locators._selectionItem, "getData");
     _.jsEditor.SelectFunctionDropdown("myFun1");
     _.jsEditor.RunJSObj();
     EditorNavigation.SelectEntityByName("Text2", EntityType.Widget);