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

…o action-redesign/graphql-zone-section
appsmithorg · Oct 7, 2024 · c2496b5 · c2496b5
2 parents 0a88c13 + d15eea3
commit c2496b5
Show file tree

Hide file tree

Showing 50 changed files with 164 additions and 154 deletions.
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),

diff --git a/...nt/cypress/e2e/Regression/ClientSide/OneClickBinding/JSEnabledByDefaultExperiment_spec.ts b/...nt/cypress/e2e/Regression/ClientSide/OneClickBinding/JSEnabledByDefaultExperiment_spec.ts
@@ -1,5 +1,4 @@
 import OneClickBindingLocator from "../../../../locators/OneClickBindingLocator";
-import { featureFlagIntercept } from "../../../../support/Objects/FeatureFlags";
 import {
   agHelper,
   apiPage,
@@ -23,10 +22,6 @@ describe(
   () => {
     let datasourceName: string;
     before(() => {
-      featureFlagIntercept({
-        rollout_js_enabled_one_click_binding_enabled: true,
-      });
-
       dataSources.CreateDataSource("Postgres");
 
       cy.get("@dsName").then((dsName) => {

diff --git a/app/client/cypress/e2e/Regression/ClientSide/OneClickBinding/spec_utility.ts b/app/client/cypress/e2e/Regression/ClientSide/OneClickBinding/spec_utility.ts
@@ -12,7 +12,22 @@ export class OneClickBinding {
     column: Record<string, string> = {},
   ) {
     agHelper.GetNClick(oneClickBindingLocator.datasourceDropdownSelector);
-
+    agHelper.GetElement("[role='menu']").then(($menu) => {
+      if (
+        $menu.find(oneClickBindingLocator.datasourceQuerySelector()).length > 0
+      ) {
+        cy.wrap($menu)
+          .find(oneClickBindingLocator.datasourceQuerySelector())
+          .should("have.length.greaterThan", 0)
+          .each(($item) => {
+            cy.wrap($item)
+              .find("img")
+              .should(($img) => {
+                expect($img).to.have.attr("src").and.not.be.empty;
+              });
+          });
+      }
+    });
     expandLoadMoreOptions();
 
     agHelper.AssertElementAbsence(oneClickBindingLocator.connectData);

diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/AddNewRow1_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/AddNewRow1_spec.js
@@ -3,6 +3,9 @@ import {
   propPane,
   table,
 } from "../../../../../support/Objects/ObjectsCore";
+import EditorNavigation, {
+  EntityType,
+} from "../../../../../support/Pages/EditorNavigation";
 const commonlocators = require("../../../../../locators/commonlocators.json");
 
 describe(
@@ -16,6 +19,7 @@ describe(
 
     it("1.1. should test that allow Add new row property is present", () => {
       cy.openPropertyPane("tablewidgetv2");
+      propPane.ExpandIfCollapsedSection("addingarow");
       cy.get(".t--property-control-allowaddingarow").should("exist");
       cy.get(".t--property-control-allowaddingarow input").should("exist");
       cy.get(".t--add-new-row").should("not.exist");
@@ -150,7 +154,12 @@ describe(
 
     it("1.7. should not hide the header section when add new row button is enabled and another header element is disabled", () => {
       cy.get(".t--discard-new-row").click({ force: true });
+      EditorNavigation.SelectEntityByName("Table1", EntityType.Widget);
       //disable all header widgets for the table
+      propPane.ExpandIfCollapsedSection("general");
+      propPane.ExpandIfCollapsedSection("addingarow");
+      propPane.ExpandIfCollapsedSection("search\\&filters");
+      propPane.ExpandIfCollapsedSection("pagination");
       [
         "Show pagination",
         "Allow searching",

diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Edge_case_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Edge_case_spec.js
@@ -6,7 +6,6 @@ const widgetsPage = require("../../../../../locators/Widgets.json");
 const commonlocators = require("../../../../../locators/commonlocators.json");
 import {
   agHelper,
-  entityExplorer,
   propPane,
   table,
 } from "../../../../../support/Objects/ObjectsCore";
@@ -26,6 +25,7 @@ describe(
 
     it("1. Check if the selectedRowIndices does not contain 2d array", function () {
       EditorNavigation.SelectEntityByName("Table1", EntityType.Widget);
+      propPane.ExpandIfCollapsedSection("rowselection");
       propPane.TogglePropertyState("Enable multi-row selection", "On"); //Enable Multi row select
 
       propPane.UpdatePropertyFieldValue("Default selected rows", "[1]"); //Change the value of default selected row

diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Inline_editing_3_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Inline_editing_3_spec.js
@@ -4,6 +4,7 @@ import {
   agHelper,
   table as tableHelper,
   propPane,
+  locators,
 } from "../../../../../support/Objects/ObjectsCore";
 import { PROPERTY_SELECTOR } from "../../../../../locators/WidgetLocators";
 
@@ -148,10 +149,16 @@ describe(
       cy.editTableCell(0, 0);
       cy.enterTableCellValue(0, 0, "newValue");
       cy.saveTableCellValue(0, 0);
-      cy.get(".t--widget-textwidget .bp3-ui-text").should(
-        "contain",
-        `[  {    "index": 0,    "updatedFields": {      "step": "newValue"    },    "allFields": {      "step": "newValue",      "task": "Drop a table",      "status": "✅"    }  }]`,
-      );
+      const exected = [
+        {
+          index: 0,
+          updatedFields: { step: "newValue" },
+          allFields: { step: "newValue", task: "Drop a table", status: "✅" },
+        },
+      ];
+      agHelper
+        .GetText(locators._textWidget, "text")
+        .should((text) => expect(JSON.parse(text)).to.deep.equal(exected));
       cy.openPropertyPane("textwidget");
       cy.updateCodeInput(
         ".t--property-control-text",

diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2Filter1_1_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2Filter1_1_Spec.ts
@@ -22,6 +22,7 @@ describe(
       entityExplorer.DragDropWidgetNVerify("tablewidgetv2", 650, 250);
       //propPane.EnterJSContext("Table data", JSON.stringify(this.dataSet.TableInput));
       // turn on filtering for the table - it is disabled by default in this PR(#34593)
+      propPane.ExpandIfCollapsedSection("search\\&filters");
       agHelper.GetNClick(".t--property-control-allowfiltering input");
       table.AddSampleTableData();
       //propPane.EnterJSContext("Table Data", JSON.stringify(this.dataSet.TableInput));

diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2Filter1_2_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2Filter1_2_Spec.ts
@@ -16,6 +16,7 @@ describe(
     it("1. Verify Table Filter for 'empty'", function () {
       entityExplorer.DragDropWidgetNVerify("tablewidgetv2", 650, 250);
       // turn on filtering for the table - it is disabled by default in this PR(#34593)
+      propPane.ExpandIfCollapsedSection("search\\&filters");
       agHelper.GetNClick(".t--property-control-allowfiltering input");
       table.AddSampleTableData();
       propPane.UpdatePropertyFieldValue(

diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2Filter2_1_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2Filter2_1_Spec.ts
@@ -17,6 +17,7 @@ describe(
       entityExplorer.DragDropWidgetNVerify("tablewidgetv2", 650, 250);
       //propPane.EnterJSContext("Table data", JSON.stringify(this.dataSet.TableInput));
       // turn on filtering for the table - it is disabled by default in this PR(#34593)
+      propPane.ExpandIfCollapsedSection("search\\&filters");
       agHelper.GetNClick(".t--property-control-allowfiltering input");
       table.AddSampleTableData();
       //propPane.EnterJSContext("Table Data", JSON.stringify(this.dataSet.TableInput));

diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2Filter2_2_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2Filter2_2_Spec.ts
@@ -17,6 +17,7 @@ describe(
     it("1. Verify Full table data - download csv and download Excel", function () {
       entityExplorer.DragDropWidgetNVerify("tablewidgetv2", 650, 250);
       // turn on filtering for the table - it is disabled by default in this PR(#34593)
+      propPane.ExpandIfCollapsedSection("search\\&filters");
       agHelper.GetNClick(".t--property-control-allowfiltering input");
       table.AddSampleTableData();
       propPane.UpdatePropertyFieldValue(

diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_DisplayText_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_DisplayText_spec.ts
@@ -28,6 +28,7 @@ describe(
     before(() => {
       entityExplorer.DragDropWidgetNVerify("tablewidgetv2", 650, 250);
       // turn on filtering for the table - it is disabled by default in this PR(#34593)
+      propPane.ExpandIfCollapsedSection("search\\&filters");
       agHelper.GetNClick(".t--property-control-allowfiltering input");
       propPane.EnterJSContext("Table data", JSON.stringify(data));
       assertHelper.AssertNetworkStatus("@updateLayout");

diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_MultiRowSelect_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_MultiRowSelect_spec.js
@@ -12,6 +12,7 @@ describe(
 
     it("1. Test multi select column shows when enable Multirowselection is true", function () {
       cy.openPropertyPane("tablewidgetv2");
+      _.propPane.ExpandIfCollapsedSection("rowselection");
       cy.get(widgetsPage.toggleEnableMultirowselection)
         .first()
         .click({ force: true });

diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_PropertyPane_2_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_PropertyPane_2_spec.js
@@ -62,6 +62,7 @@ describe(
       cy.moveToContentTab();
       // Chage deat search text value to "data"
       cy.backFromPropertyPanel();
+      propPane.ExpandIfCollapsedSection("search\\&filters");
       cy.testJsontext("defaultsearchtext", "data");
       deployMode.DeployApp(locators._widgetInDeployed(draggableWidgets.TABLE));
       table.WaitForTableEmpty("v2");