Merge branch 'release' into feat/32440-editable-ide-tabs

appsmithorg · Oct 10, 2024 · 14a6c75 · 14a6c75
2 parents b1f6a7c + 5fadce5
commit 14a6c75
Show file tree

Hide file tree

Showing 378 changed files with 6,073 additions and 4,173 deletions.
diff --git a/.github/workflows/ci-test-custom-script.yml b/.github/workflows/ci-test-custom-script.yml
@@ -204,7 +204,6 @@ jobs:
           db_url=$(grep -oP 'APPSMITH_DB_URL=\K[^ ]+' cicontainerlocal/stacks/configuration/docker.env || echo "")
           if [[ -z "$db_url" ]]; then
             echo "::error::APPSMITH_DB_URL not found in the environment file"
-            exit 1
           fi
           if [[ $db_url == "postgresql"* ]]; then
             echo "Database type: Postgres. Ensure PostgreSQL-specific configurations are in place."

diff --git a/.github/workflows/test-build-docker-image.yml b/.github/workflows/test-build-docker-image.yml
@@ -499,3 +499,32 @@ jobs:
             --header 'Authorization: Bearer ${{ secrets.SLACK_APPSMITH_ALERTS_TOKEN }}' \
             --header 'Content-Type: application/json; charset=utf-8' \
             --data-raw "$body"
+
+
+  notify-slack-for-pg:
+    needs: ci-test-result
+    runs-on: ubuntu-latest
+
+    if: ( failure() && github.ref == 'refs/heads/pg' )
+
+    steps:
+      - name: Notify failure on workflow run and on Slack
+        run: |
+          set -o errexit
+          set -o nounset
+          set -o xtrace
+
+          run_url='${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}/attempts/${{ github.run_attempt }}'
+          slack_message="🚨 TBP workflow failed in <$run_url|${{ vars.EDITION }} attempt ${{ github.run_attempt }} (run ${{ github.run_id }})>."
+
+          # This is the ChannelId of the proj-postgres-sync channel.
+          body="$(jq -nc \
+            --arg channel C07JMLWEXDJ \
+            --arg text "$slack_message" \
+            '$ARGS.named'
+          )"
+          curl -v https://slack.com/api/chat.postMessage \
+            --fail-with-body \
+            --header 'Authorization: Bearer ${{ secrets.SLACK_APPSMITH_ALERTS_TOKEN }}' \
+            --header 'Content-Type: application/json; charset=utf-8' \
+            --data-raw "$body"
diff --git a/CODEOWNERS b/CODEOWNERS
@@ -190,7 +190,7 @@ app/client/src/ce/JSFunctionExecutionSaga.ts @ApekshaBhosale
 app/client/src/ee/JSFunctionExecutionSaga.ts @ApekshaBhosale
 
 # Enterprise Success
-app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/**/* @sharat87 @abhvsn
+app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/**/* @sharat87 @abhvsn @AnaghHegde
 
 # DevOps & Shri
 deploy/**/* @sharat87 @pratapaprasanna

diff --git a/app/client/cypress/e2e/Regression/Apps/CommunityIssues_Spec.ts b/app/client/cypress/e2e/Regression/Apps/CommunityIssues_Spec.ts
@@ -74,8 +74,10 @@ describe(
 
     it("2. Validate table navigation with Server Side pagination enabled with Default selected row", () => {
       EditorNavigation.SelectEntityByName("Table1", EntityType.Widget);
+      propPane.ExpandIfCollapsedSection("pagination");
       agHelper.AssertExistingToggleState("Server side pagination", "true");
 
+      propPane.ExpandIfCollapsedSection("rowselection");
       propPane
         .ValidatePropertyFieldValue("Default selected row", "0")
         .then(($selectedRow: any) => {
@@ -114,6 +116,7 @@ describe(
       deployMode.NavigateBacktoEditor();
       table.WaitUntilTableLoad(0, 0, "v2");
       EditorNavigation.SelectEntityByName("Table1", EntityType.Widget);
+      propPane.ExpandIfCollapsedSection("pagination");
       propPane.TogglePropertyState("Server side pagination", "Off");
       deployMode.DeployApp();
       table.WaitUntilTableLoad(0, 0, "v2");
@@ -122,10 +125,12 @@ describe(
       deployMode.NavigateBacktoEditor();
       table.WaitUntilTableLoad(0, 0, "v2");
       EditorNavigation.SelectEntityByName("Table1", EntityType.Widget);
+      propPane.ExpandIfCollapsedSection("pagination");
       propPane.TogglePropertyState("Server side pagination", "On");
     });
 
     it("4. Change Default selected row in table and verify", () => {
+      propPane.ExpandIfCollapsedSection("rowselection");
       propPane.UpdatePropertyFieldValue("Default selected row", "1");
       deployMode.DeployApp();
       table.WaitUntilTableLoad(0, 0, "v2");
@@ -140,6 +145,7 @@ describe(
 
     it("5. Verify Default search text in table as per 'Default search text' property set + Bug 12228", () => {
       EditorNavigation.SelectEntityByName("Table1", EntityType.Widget);
+      propPane.ExpandIfCollapsedSection("search\\&filters");
       propPane.TypeTextIntoField("Default search text", "Bug");
       deployMode.DeployApp();
       table.AssertSearchText("Bug");
@@ -148,6 +154,7 @@ describe(
       deployMode.NavigateBacktoEditor();
 
       EditorNavigation.SelectEntityByName("Table1", EntityType.Widget);
+      propPane.ExpandIfCollapsedSection("search\\&filters");
       propPane.TypeTextIntoField("Default search text", "Quest", true, false);
 
       deployMode.DeployApp();
@@ -157,20 +164,23 @@ describe(
       table.WaitUntilTableLoad(0, 0, "v2");
 
       EditorNavigation.SelectEntityByName("Table1", EntityType.Widget);
+      propPane.ExpandIfCollapsedSection("search\\&filters");
       propPane.TypeTextIntoField("Default search text", "Epic"); //Bug 12228 - Searching based on hidden column value should not be allowed
       deployMode.DeployApp();
       table.AssertSearchText("Epic");
       table.WaitForTableEmpty("v2");
       deployMode.NavigateBacktoEditor();
 
       EditorNavigation.SelectEntityByName("Table1", EntityType.Widget);
+      propPane.ExpandIfCollapsedSection("search\\&filters");
       propPane.RemoveText("defaultsearchtext");
       agHelper.GetNClick(dataSources._refreshIcon, 0, true);
       table.WaitUntilTableLoad(0, 0, "v2");
     });
 
     it("6. Validate Search table with Client Side Search enabled & disabled & onSearchTextChanged is set", () => {
       EditorNavigation.SelectEntityByName("Table1", EntityType.Widget);
+      propPane.ExpandIfCollapsedSection("search\\&filters");
       agHelper.AssertExistingToggleState("Client side search", "true");
 
       deployMode.DeployApp(locators._widgetInDeployed(draggableWidgets.TABLE));
@@ -188,6 +198,7 @@ describe(
       table.WaitUntilTableLoad(0, 1, "v2");
 
       EditorNavigation.SelectEntityByName("Table1", EntityType.Widget);
+      propPane.ExpandIfCollapsedSection("search\\&filters");
       propPane.TogglePropertyState("Client side search", "Off");
 
       deployMode.DeployApp(locators._widgetInDeployed(draggableWidgets.TABLE));
@@ -205,6 +216,7 @@ describe(
       deployMode.NavigateBacktoEditor();
       table.WaitUntilTableLoad(0, 1, "v2");
       EditorNavigation.SelectEntityByName("Table1", EntityType.Widget);
+      propPane.ExpandIfCollapsedSection("search\\&filters");
       propPane.TogglePropertyState("Client side search", "On");
       propPane.EnterJSContext("onSearchTextChanged", "");
       propPane.ToggleJSMode("onSearchTextChanged", false);
@@ -224,6 +236,7 @@ describe(
       deployMode.NavigateBacktoEditor();
       table.WaitUntilTableLoad(0, 1, "v2");
       EditorNavigation.SelectEntityByName("Table1", EntityType.Widget);
+      propPane.ExpandIfCollapsedSection("search\\&filters");
       propPane.TogglePropertyState("Client side search", "Off");
 
       deployMode.DeployApp(locators._widgetInDeployed(draggableWidgets.TABLE));

diff --git a/app/client/cypress/e2e/Regression/ClientSide/Autocomplete/PropertyPaneSlashCommand_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Autocomplete/PropertyPaneSlashCommand_spec.ts
@@ -1,12 +1,7 @@
-import { featureFlagIntercept } from "../../../../support/Objects/FeatureFlags";
 import {
   agHelper,
   locators,
-  entityExplorer,
   propPane,
-  draggableWidgets,
-  apiPage,
-  entityItems,
   homePage,
   assertHelper,
 } from "../../../../support/Objects/ObjectsCore";
@@ -15,12 +10,6 @@ import EditorNavigation, {
 } from "../../../../support/Pages/EditorNavigation";
 
 describe("Property Pane Suggestions", { tags: ["@tag.JS"] }, () => {
-  before(() => {
-    featureFlagIntercept({
-      ab_learnability_ease_of_initial_use_enabled: true,
-    });
-  });
-
   before(function () {
     agHelper.ClearLocalStorageCache();
   });

diff --git a/app/client/cypress/e2e/Regression/ClientSide/Binding/InputWidget_TableV2_Sorting_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Binding/InputWidget_TableV2_Sorting_spec.js
@@ -4,10 +4,7 @@ import EditorNavigation, {
 
 const publish = require("../../../../locators/publishWidgetspage.json");
 const testdata = require("../../../../fixtures/testdata.json");
-import {
-  agHelper,
-  entityExplorer,
-} from "../../../../support/Objects/ObjectsCore";
+import { agHelper, propPane } from "../../../../support/Objects/ObjectsCore";
 
 describe(
   "Binding the Table and input Widget",
@@ -32,7 +29,7 @@ describe(
 
     it("2. validation of data displayed in input widgets based on sorting", function () {
       EditorNavigation.SelectEntityByName("Table1", EntityType.Widget);
-
+      propPane.ExpandIfCollapsedSection("rowselection");
       cy.testJsontext("defaultselectedrow", "0");
       cy.get(".draggable-header").contains("id").click({ force: true });
       cy.wait(1000);

diff --git a/app/client/cypress/e2e/Regression/ClientSide/Binding/TableV2TextPagination_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Binding/TableV2TextPagination_spec.js
@@ -6,7 +6,6 @@ const commonlocators = require("../../../../locators/commonlocators.json");
 const testdata = require("../../../../fixtures/testdata.json");
 import apiPageLocators from "../../../../locators/ApiEditor";
 import {
-  entityExplorer,
   apiPage,
   deployMode,
   propPane,
@@ -91,6 +90,7 @@ describe(
     it("3. Table-Text, Validate Server Side Pagination of Paginate with Total v2 Records Count", function () {
       deployMode.NavigateBacktoEditor();
       EditorNavigation.SelectEntityByName("Table1", EntityType.Widget);
+      propPane.ExpandIfCollapsedSection("pagination");
       propPane.UpdatePropertyFieldValue("Total Records", "20");
       deployMode.DeployApp();
       cy.wait("@postExecute");

diff --git a/.../cypress/e2e/Regression/ClientSide/Binding/TableV2Widget_selectedRow_Input_widget_spec.js b/.../cypress/e2e/Regression/ClientSide/Binding/TableV2Widget_selectedRow_Input_widget_spec.js
@@ -30,6 +30,7 @@ describe(
 
     it("2. validation of data displayed in input widgets based on selected row", function () {
       EditorNavigation.SelectEntityByName("Table1", EntityType.Widget);
+      _.propPane.ExpandIfCollapsedSection("rowselection");
       cy.testJsontext("defaultselectedrow", "2");
       cy.readTableV2dataPublish("2", "0").then((tabData) => {
         const tabValue = tabData;

diff --git a/app/client/cypress/e2e/Regression/ClientSide/Binding/TableV2_ClientSide_Search_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Binding/TableV2_ClientSide_Search_spec.js
@@ -20,6 +20,7 @@ describe(
       cy.readTableV2dataPublish("0", "0").then((tabData) => {
         expect(tabData).to.eq("#2");
       });
+      _.propPane.ExpandIfCollapsedSection("search\\&filters");
       // Input onsearchtextchanged control
       cy.get(".t--property-control-onsearchtextchanged .t--js-toggle")
         .first()

diff --git a/app/client/cypress/e2e/Regression/ClientSide/Binding/TableV2_DefaultSearch_Input_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Binding/TableV2_DefaultSearch_Input_spec.js
@@ -27,6 +27,7 @@ describe(
       );
       // validation of data displayed in input widgets based on search value set
       EditorNavigation.SelectEntityByName("Table1", EntityType.Widget);
+      _.propPane.ExpandIfCollapsedSection("search\\&filters");
       cy.get(".t--property-control-allowsearching input").click({
         force: true,
       });

diff --git a/app/client/cypress/e2e/Regression/ClientSide/Binding/TableV2_Widget_API_Pagination_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Binding/TableV2_Widget_API_Pagination_spec.js
@@ -30,6 +30,7 @@ describe(
       //Validate Table V2 with API data and then add a column
       EditorNavigation.SelectEntityByName("Table1", EntityType.Widget);
       propPane.UpdatePropertyFieldValue("Table data", "{{Api1.data}}");
+      propPane.ExpandIfCollapsedSection("pagination");
       cy.CheckWidgetProperties(commonlocators.serverSidePaginationCheckbox);
       cy.get(`.t--widget-tablewidgetv2 .page-item`)
         .first()

diff --git a/app/client/cypress/e2e/Regression/ClientSide/Binding/TextTableV2_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Binding/TextTableV2_spec.js
@@ -5,7 +5,6 @@ import EditorNavigation, {
 const commonlocators = require("../../../../locators/commonlocators.json");
 const publish = require("../../../../locators/publishWidgetspage.json");
 import {
-  entityExplorer,
   agHelper,
   deployMode,
   propPane,
@@ -113,6 +112,7 @@ describe(
       EditorNavigation.SelectEntityByName("Table1", EntityType.Widget, {}, [
         "Container3",
       ]);
+      propPane.ExpandIfCollapsedSection("rowselection");
       cy.testJsontext("defaultselectedrow", "2");
       cy.wait("@updateLayout");
       cy.get(commonlocators.TableV2Row)

diff --git a/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/JsonForm_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/JsonForm_spec.ts
@@ -1,5 +1,4 @@
 import {
-  entityExplorer,
   locators,
   agHelper,
   propPane,
@@ -17,6 +16,7 @@ describe(
       agHelper.AddDsl("jsonFormDynamicHeightDsl");
 
       EditorNavigation.SelectEntityByName("JSONForm1", EntityType.Widget);
+      propPane.ExpandIfCollapsedSection("general");
       agHelper
         .GetWidgetCSSHeight(
           locators._widgetInDeployed(draggableWidgets.JSONFORM),