Merge pull request #32673 from appsmithorg/release

15/04 Daily Promotion

app/client/cypress/e2e/Regression/ClientSide/Anvil/AnvilAppNavigation_spec.ts

@@ -17,7 +17,6 @@ describe(
       // intercept features call for Anvil + WDS tests
       featureFlagIntercept({
         release_anvil_enabled: true,
-        ab_wds_enabled: true,
       });
       // Cleanup the canvas before each test
       agHelper.SelectAllWidgets();

app/client/cypress/e2e/Regression/ClientSide/Anvil/AnvilDnD_spec.ts

@@ -17,7 +17,6 @@ describe(
       // intercept features call for Anvil + WDS tests
       featureFlagIntercept({
         release_anvil_enabled: true,
-        ab_wds_enabled: true,
       });
       // Cleanup the canvas before each test
       agHelper.SelectAllWidgets();

app/client/cypress/e2e/Regression/ClientSide/Anvil/AnvilSuggestedWidgets_spec.ts

@@ -11,7 +11,6 @@ describe(
       // intercept features call for Anvil + WDS tests
       featureFlagIntercept({
         release_anvil_enabled: true,
-        ab_wds_enabled: true,
       });
     });
     it("1. Suggested wds widgets for anvil layout", () => {

app/client/cypress/e2e/Regression/ClientSide/Anvil/AnvilWidgetClicking_spec.ts

@@ -18,7 +18,6 @@ describe(
       // intercept features call for Anvil + WDS tests
       featureFlagIntercept({
         release_anvil_enabled: true,
-        ab_wds_enabled: true,
       });
       // Cleanup the canvas before each test
       agHelper.SelectAllWidgets();

app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_GeneralProperty_spec.js

@@ -181,7 +181,7 @@ describe(
       cy.get("[data-value='SHORT']").click({ force: true });
       cy.wait(2000);
       deployMode.DeployApp();
-      cy.readTableV2dataValidateCSS("0", "1", "height", "29px", true);
+      cy.readTableV2dataValidateCSS("0", "1", "height", "30px", true);
     });
   },
 );

app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/scrollbar_spec.ts

@@ -0,0 +1,32 @@
+import {
+  entityExplorer,
+  propPane,
+  agHelper,
+  draggableWidgets,
+  deployMode,
+  table,
+  locators,
+} from "../../../../../support/Objects/ObjectsCore";
+
+describe(
+  "Table widget v2: tableData change test",
+  { tags: ["@tag.Widget", "@tag.Table"] },
+  function () {
+    before(() => {
+      agHelper.AddDsl("Table/ScrollbarDSL");
+    });
+
+    it("1. Table body should not have the scrollbar", function () {
+      let tableHeight = 0;
+
+      cy.get(".t--draggable-tablewidgetv2 .table").then(($table) => {
+        tableHeight = $table[0].clientHeight;
+      });
+
+      cy.get(".t--draggable-tablewidgetv2 .table .simplebar-content").then(
+        ($scrollBox) =>
+          expect($scrollBox[0].clientHeight).to.be.equal(tableHeight),
+      );
+    });
+  },
+);

app/client/cypress/e2e/Regression/ServerSide/Datasources/Oracle_Spec.ts

@@ -10,7 +10,6 @@ import {
   table,
   entityItems,
   apiPage,
-  jsEditor,
 } from "../../../../support/Objects/ObjectsCore";
 import { Widgets } from "../../../../support/Pages/DataSources";
 import EditorNavigation, {
@@ -446,11 +445,7 @@ WHERE aircraft_type = 'Passenger Plane'`;
     propPane.EnterJSContext("onClick", `{{Query1.run()}}`);
     deployMode.DeployApp(locators._widgetInDeployed(draggableWidgets.TABLE));
     agHelper.ClickButton("Submit");
-    jsEditor.ConfirmationClick("No"); //Handling both No & Yes from confirmation dialog
-    agHelper.AssertContains("cancelled");
-    agHelper.WaitUntilAllToastsDisappear();
-    agHelper.ClickButton("Submit");
-    jsEditor.ConfirmationClick("Yes");
+
     table.WaitUntilTableLoad(0, 0, "v2");
     deployMode.NavigateBacktoEditor();
   });

app/client/cypress/e2e/Regression/ServerSide/JsFunctionExecution/JSFunctionExecution_spec.ts

@@ -411,12 +411,6 @@ describe("JS Function Execution", { tags: ["@tag.JS"] }, function () {
 
     agHelper.RefreshPage();
     agHelper.Sleep(2000); //for confirmatiom modal to appear before clicking on "Yes" button for CI runs
-    // click "Yes" button for all onPageload && ConfirmExecute functions
-    for (let i = 0; i <= onPageLoadAndConfirmExecuteFunctionsLength - 1; i++) {
-      //agHelper.AssertElementPresence(jsEditor._dialog("Confirmation Dialog")); // Not working in edit mode
-      jsEditor.ConfirmationClick("Yes");
-      agHelper.Sleep(2000);
-    }
     // Switch to settings tab and assert order
     agHelper.GetNClick(jsEditor._settingsTab);
     assertAsyncFunctionsOrder(FUNCTIONS_SETTINGS_DEFAULT_DATA);
@@ -461,12 +455,7 @@ describe("JS Function Execution", { tags: ["@tag.JS"] }, function () {
     agHelper.Sleep();
     agHelper.WaitUntilAllToastsDisappear();
     agHelper.Sleep();
-    // click "Yes" button for all onPageload && ConfirmExecute functions
-    for (let i = 0; i <= onPageLoadAndConfirmExecuteFunctionsLength - 1; i++) {
-      //agHelper.AssertElementPresence(jsEditor._dialog("Confirmation Dialog")); // Not working in edit mode
-      jsEditor.ConfirmationClick("Yes");
-      agHelper.Sleep(2000); //for current pop up to close & next to appear!
-    }
+
     EditorNavigation.SelectEntityByName(jsObj, EntityType.JSObject);
     agHelper.GetNClick(jsEditor._settingsTab);
     assertAsyncFunctionsOrder(FUNCTIONS_SETTINGS_DEFAULT_DATA);