diff --git a/app/client/cypress/e2e/Regression/ClientSide/Binding/Input_NavigateTo_validation_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Binding/Input_NavigateTo_validation_spec.js index d9dc2b6aafe5..e630ec182197 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Binding/Input_NavigateTo_validation_spec.js +++ b/app/client/cypress/e2e/Regression/ClientSide/Binding/Input_NavigateTo_validation_spec.js @@ -10,7 +10,11 @@ const widgetsPage = require("../../../../locators/Widgets.json"); const publish = require("../../../../locators/publishWidgetspage.json"); const testdata = require("../../../../fixtures/testdata.json"); const pageid = "MyPage"; -import { agHelper, propPane } from "../../../../support/Objects/ObjectsCore"; +import { + agHelper, + propPane, + table, +} from "../../../../support/Objects/ObjectsCore"; import PageList from "../../../../support/Pages/PageList"; describe( @@ -52,7 +56,7 @@ describe( it("3. Validate NavigateTo Page functionality ", function () { cy.wait(4000); - cy.isSelectRow(1); + table.SelectTableRow(1); cy.readTabledataPublish("1", "0").then((tabData) => { const tabValue = tabData; expect(tabValue).to.be.equal("2736212"); diff --git a/app/client/cypress/e2e/Regression/ClientSide/Binding/JSObject_Postgress_Table_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Binding/JSObject_Postgress_Table_spec.js index 16fe89c8c6e5..7e75ad2fa706 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Binding/JSObject_Postgress_Table_spec.js +++ b/app/client/cypress/e2e/Regression/ClientSide/Binding/JSObject_Postgress_Table_spec.js @@ -38,7 +38,7 @@ describe( _.jsEditor.CreateJSObject("return Query1.data;"); EditorNavigation.SelectEntityByName("Table1", EntityType.Widget); _.propPane.EnterJSContext("Table data", "{{JSObject1.myFun1()}}"); - cy.isSelectRow(1); + _.table.SelectTableRow(1, 0, true, "v2"); cy.readTableV2dataPublish("1", "0").then((tabData) => { let tabValue = tabData; cy.log("the value is" + tabValue); @@ -83,7 +83,7 @@ describe( }, ).then(() => cy.wait(500)); - cy.isSelectRow(1); + _.table.SelectTableRow(1, 0, true, "v2"); cy.readTableV2dataPublish("1", "0").then((tabData) => { let tabValue = tabData; cy.log("Value in public viewing: " + tabValue); diff --git a/app/client/cypress/e2e/Regression/ClientSide/Binding/NavigateToFeatureValidation_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Binding/NavigateToFeatureValidation_spec.js index 2b4fcc10625f..98d9f9cb644c 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Binding/NavigateToFeatureValidation_spec.js +++ b/app/client/cypress/e2e/Regression/ClientSide/Binding/NavigateToFeatureValidation_spec.js @@ -10,6 +10,7 @@ import { entityExplorer, agHelper, deployMode, + table, } from "../../../../support/Objects/ObjectsCore"; describe( @@ -43,7 +44,7 @@ describe( cy.readTabledataPublish("1", "0").then((tabDataP) => { const tabValueP = tabDataP; cy.log(tabValueP); - cy.isSelectRow(1); + table.SelectTableRow(1); cy.get("input").should("be.visible"); cy.get(publish.inputWidget + " " + "input") .first() diff --git a/app/client/cypress/e2e/Regression/ClientSide/Binding/TableV2Widgets_NavigateTo_Validation_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Binding/TableV2Widgets_NavigateTo_Validation_spec.js index 3e1fd59a7e87..ce017566f0ca 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Binding/TableV2Widgets_NavigateTo_Validation_spec.js +++ b/app/client/cypress/e2e/Regression/ClientSide/Binding/TableV2Widgets_NavigateTo_Validation_spec.js @@ -11,6 +11,7 @@ import { agHelper, propPane, deployMode, + table, } from "../../../../support/Objects/ObjectsCore"; import PageList from "../../../../support/Pages/PageList"; @@ -61,7 +62,7 @@ describe( cy.wait(2000); deployMode.DeployApp(); cy.get(widgetsPage.chartWidget).should("not.exist"); - cy.isSelectRow(1); + table.SelectTableRow(1, 0, true, "v2"); cy.get(widgetsPage.chartWidget).should("be.visible"); }); }, 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 index 4aef78360d75..457593fec0f3 100644 --- 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 @@ -31,7 +31,8 @@ describe( force: true, }); cy.testJsontext("defaultsearchtext", "2736212"); - cy.wait("@updateLayout").isSelectRow(0); + cy.wait("@updateLayout"); + _.table.SelectTableRow(0, 0, true, "v2"); cy.readTableV2dataPublish("0", "0").then((tabData) => { const tabValue = tabData; expect(tabValue).to.be.equal("2736212"); diff --git a/app/client/cypress/e2e/Regression/ClientSide/Binding/TableWidgets_NavigateTo_Validation_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Binding/TableWidgets_NavigateTo_Validation_spec.js index 38b9f4cf989e..88e2a87c8c67 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Binding/TableWidgets_NavigateTo_Validation_spec.js +++ b/app/client/cypress/e2e/Regression/ClientSide/Binding/TableWidgets_NavigateTo_Validation_spec.js @@ -11,6 +11,7 @@ import { agHelper, propPane, deployMode, + table, } from "../../../../support/Objects/ObjectsCore"; describe( @@ -55,7 +56,7 @@ describe( cy.wait(2000); deployMode.DeployApp(); cy.get(widgetsPage.chartWidget).should("not.exist"); - cy.isSelectRow(1); + table.SelectTableRow(1); cy.get(widgetsPage.chartWidget).should("be.visible"); }); }, diff --git a/app/client/cypress/e2e/Regression/ClientSide/Binding/Table_DefaultSearch_Input_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Binding/Table_DefaultSearch_Input_spec.js index 2090685b54bd..5538cc750ae9 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Binding/Table_DefaultSearch_Input_spec.js +++ b/app/client/cypress/e2e/Regression/ClientSide/Binding/Table_DefaultSearch_Input_spec.js @@ -29,7 +29,8 @@ describe( EditorNavigation.SelectEntityByName("Table1", EntityType.Widget); cy.testJsontext("defaultsearchtext", "2736212"); - cy.wait("@updateLayout").isSelectRow(0); + cy.wait("@updateLayout"); + _.table.SelectTableRow(0); cy.readTabledataPublish("0", "0").then((tabData) => { const tabValue = tabData; expect(tabValue).to.be.equal("2736212"); diff --git a/app/client/cypress/e2e/Regression/ClientSide/Binding/TextTableV2_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Binding/TextTableV2_spec.js index 53579a4cc909..e30b11a03156 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Binding/TextTableV2_spec.js +++ b/app/client/cypress/e2e/Regression/ClientSide/Binding/TextTableV2_spec.js @@ -9,6 +9,7 @@ import { agHelper, deployMode, propPane, + table, } from "../../../../support/Objects/ObjectsCore"; describe( @@ -35,7 +36,7 @@ describe( /** * @param(Index) Provide index value to select the row. */ - cy.isSelectRow(1); + table.SelectTableRow(1, 0, true, "v2"); EditorNavigation.SelectEntityByName("Text4", EntityType.Widget, {}, [ "Container1", ]); @@ -51,7 +52,7 @@ describe( cy.EvaluateDataType("string"); cy.validateEvaluatedValue(tabValue); deployMode.DeployApp(); - cy.isSelectRow(1); + table.SelectTableRow(1, 0, true, "v2"); cy.readTableV2dataPublish("1", "0").then((tabDataP) => { const tabValueP = tabDataP; cy.get(commonlocators.TextInside).should("have.text", tabValueP); @@ -60,7 +61,7 @@ describe( }); it("2. Text-Table Binding Functionality For Email", function () { - cy.isSelectRow(2); + table.SelectTableRow(2, 0, true, "v2"); EditorNavigation.SelectEntityByName("Text4", EntityType.Widget, {}, [ "Container1", ]); @@ -76,7 +77,7 @@ describe( cy.EvaluateDataType("string"); cy.validateEvaluatedValue(tabValue); deployMode.DeployApp(); - cy.isSelectRow(2); + table.SelectTableRow(2, 0, true, "v2"); cy.readTableV2dataPublish("2", "1").then((tabDataP) => { const tabValueP = tabDataP; cy.get(commonlocators.TextInside).should("have.text", tabValueP); @@ -135,7 +136,7 @@ describe( /** * @param(Index) Provide index value to select the row. */ - cy.isSelectRow(1); + table.SelectTableRow(1, 0, true, "v2"); EditorNavigation.SelectEntityByName("Text4", EntityType.Widget, {}, [ "Container1", ]); @@ -154,7 +155,7 @@ describe( cy.EvaluateDataType("string"); cy.validateEvaluatedValue(tabValue); deployMode.DeployApp(); - cy.isSelectRow(1); + table.SelectTableRow(1, 0, true, "v2"); cy.readTableV2dataPublish("1", "2").then((tabDataP) => { const tabValueP = `\"${tabDataP}\"`; cy.get(commonlocators.TextInside).contains(tabValueP); diff --git a/app/client/cypress/e2e/Regression/ClientSide/Binding/TextTable_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Binding/TextTable_spec.js index 7be4538ba943..b4dcdcaf4544 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Binding/TextTable_spec.js +++ b/app/client/cypress/e2e/Regression/ClientSide/Binding/TextTable_spec.js @@ -9,6 +9,7 @@ import { agHelper, deployMode, propPane, + table, } from "../../../../support/Objects/ObjectsCore"; describe( @@ -31,7 +32,7 @@ describe( /** * @param(Index) Provide index value to select the row. */ - cy.isSelectRow(1); + table.SelectTableRow(1); EditorNavigation.SelectEntityByName("Text4", EntityType.Widget, {}, [ "Container1", ]); @@ -47,7 +48,7 @@ describe( cy.EvaluateDataType("string"); cy.validateEvaluatedValue(tabValue); deployMode.DeployApp(); - cy.isSelectRow(1); + table.SelectTableRow(1); cy.readTabledataPublish("1", "0").then((tabDataP) => { const tabValueP = tabDataP; cy.get(commonlocators.TextInside).should("have.text", tabValueP); @@ -57,7 +58,7 @@ describe( }); it("2. Text-Table Binding Functionality For Email", function () { - cy.isSelectRow(2); + table.SelectTableRow(2); EditorNavigation.SelectEntityByName("Text4", EntityType.Widget, {}, [ "Container1", ]); @@ -73,7 +74,7 @@ describe( cy.EvaluateDataType("string"); cy.validateEvaluatedValue(tabValue); deployMode.DeployApp(); - cy.isSelectRow(2); + table.SelectTableRow(2); cy.readTabledataPublish("2", "1").then((tabDataP) => { const tabValueP = tabDataP; cy.get(commonlocators.TextInside).should("have.text", tabValueP); @@ -134,7 +135,7 @@ describe( /** * @param(Index) Provide index value to select the row. */ - cy.isSelectRow(1); + table.SelectTableRow(1); EditorNavigation.SelectEntityByName("Text4", EntityType.Widget, {}, [ "Container1", ]); @@ -154,7 +155,7 @@ describe( cy.EvaluateDataType("string"); cy.validateEvaluatedValue(tabValue); deployMode.DeployApp(); - cy.isSelectRow(1); + table.SelectTableRow(1); cy.readTabledataPublish("1", "2").then((tabDataP) => { const tabValueP = `\"${tabDataP}\"`; cy.get(commonlocators.TextInside).contains(tabValueP); diff --git a/app/client/cypress/e2e/Regression/ClientSide/Binding/Widgets_Default_data_validation_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Binding/Widgets_Default_data_validation_spec.js index 7e065c61b5cd..27888c9536e2 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Binding/Widgets_Default_data_validation_spec.js +++ b/app/client/cypress/e2e/Regression/ClientSide/Binding/Widgets_Default_data_validation_spec.js @@ -9,6 +9,7 @@ import { entityExplorer, agHelper, propPane, + table, } from "../../../../support/Objects/ObjectsCore"; describe( @@ -35,7 +36,7 @@ describe( }); it("2. validation of default data displayed in all widgets based on row selected", function () { - cy.isSelectRow(1); + table.SelectTableRow(1); cy.readTabledataPublish("1", "0").then((tabData) => { const tabValue = tabData; expect(tabValue).to.be.equal("2736212"); diff --git a/app/client/cypress/e2e/Regression/ClientSide/Binding/Widgets_form_input_tableV2_default_validation_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Binding/Widgets_form_input_tableV2_default_validation_spec.js index 12cf990a842a..21a121b792f5 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Binding/Widgets_form_input_tableV2_default_validation_spec.js +++ b/app/client/cypress/e2e/Regression/ClientSide/Binding/Widgets_form_input_tableV2_default_validation_spec.js @@ -27,7 +27,7 @@ describe( 200, ); // Validation of data displayed in all widgets based on row selected - cy.isSelectRow(1); + _.table.SelectTableRow(1, 0, true, "v2"); cy.readTableV2dataPublish("1", "0").then((tabData) => { const tabValue = tabData; expect(tabValue).to.be.equal("2736212"); diff --git a/app/client/cypress/e2e/Regression/ClientSide/Binding/Widgets_form_input_table_default_validation_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Binding/Widgets_form_input_table_default_validation_spec.js index 6d4c935d881a..15ca3f08ad5f 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Binding/Widgets_form_input_table_default_validation_spec.js +++ b/app/client/cypress/e2e/Regression/ClientSide/Binding/Widgets_form_input_table_default_validation_spec.js @@ -28,7 +28,7 @@ describe( 200, ); // Validation of data displayed in all widgets based on row selected - cy.isSelectRow(1); + _.table.SelectTableRow(1); cy.readTabledataPublish("1", "0").then((tabData) => { const tabValue = tabData; expect(tabValue).to.be.equal("2736212"); @@ -38,10 +38,6 @@ describe( .first() .invoke("attr", "value") .should("contain", tabValue); - // cy.get(publish.inputWidget + " " + "input") - // .last() - // .invoke("attr", "value") - // .should("contain", tabValue); }); }); }, diff --git a/app/client/cypress/e2e/Regression/ClientSide/MobileResponsiveTests/Snipping_mode_Basic_test.js b/app/client/cypress/e2e/Regression/ClientSide/MobileResponsiveTests/Snipping_mode_Basic_test.js index fac90cf340d5..5e719a6c343d 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/MobileResponsiveTests/Snipping_mode_Basic_test.js +++ b/app/client/cypress/e2e/Regression/ClientSide/MobileResponsiveTests/Snipping_mode_Basic_test.js @@ -28,7 +28,7 @@ describe( cy.WaitAutoSave(); cy.runQuery(); _.dataSources.AddSuggestedWidget(Widgets.Table); - cy.isSelectRow(1); + _.table.SelectTableRow(1, 0, true, "v2"); cy.readTableV2dataPublish("1", "0").then((tabData) => { cy.log("the value is " + tabData); expect(tabData).to.be.equal("5"); diff --git a/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/TriggerErrors_spec.js b/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/TriggerErrors_spec.js index 6f74eb2210c4..3c52713e8916 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/TriggerErrors_spec.js +++ b/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/TriggerErrors_spec.js @@ -12,13 +12,12 @@ describe("Trigger errors in the debugger", function () { cy.EnableAllCodeEditors(); cy.testJsontext("onrowselected", "{{console.logs('test')}}"); // Click on a row of the table widget - cy.isSelectRow(1); - cy.wait(5000); + _.table.SelectTableRow(1); //should be 2 if we decide to show trigger errors in the debugger. _.debuggerHelper.AssertErrorCount(1); // Fix code cy.testJsontext("onrowselected", "{{console.log('test')}}"); - cy.isSelectRow(1); + _.table.SelectTableRow(1); _.debuggerHelper.AssertErrorCount(1); }); }); diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Migration_Spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Migration_Spec.js index ec4c4e075845..f9958c77a292 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Migration_Spec.js +++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Migration_Spec.js @@ -9,6 +9,7 @@ import homePage from "../../../../locators/HomePage"; import { agHelper, homePage as homePageHelpers, + table, } from "../../../../support/Objects/ObjectsCore"; describe("Migration Validate", { tags: ["@tag.ImportExport"] }, function () { @@ -119,7 +120,7 @@ describe("Migration Validate", { tags: ["@tag.ImportExport"] }, function () { }); //Card Number mapping to text widget! - cy.isSelectRow(2); + table.SelectTableRow(2); cy.wait(2500); //time for table row select to reflect! cy.readTabledataPublish("2", "0").then((cardNumber) => { cy.xpath("//div[contains(@class, ' t--widget-textwidget')][1]") @@ -206,7 +207,7 @@ describe("Migration Validate", { tags: ["@tag.ImportExport"] }, function () { interval: 2000, }).then(() => cy.wait(1000)); //wait for page load! - cy.isSelectRow(2); //as aft refresh row selection is also gone + table.SelectTableRow(2); cy.getTableDataSelector("2", "18").then((selector) => { cy.get(selector + " button") .click() diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_Button_Icon_validation_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_Button_Icon_validation_spec.js index 94d87c2eba5e..e42974f76d31 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_Button_Icon_validation_spec.js +++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_Button_Icon_validation_spec.js @@ -21,9 +21,9 @@ describe( widgetsPage.widgetNameSpan, ); cy.createModal("Modal", "onRowSelected"); - cy.isSelectRow(1); + _.table.SelectTableRow(1); cy.get(".bp3-overlay-backdrop").click({ force: true }); - cy.isSelectRow(2); + _.table.SelectTableRow(2); cy.get(".bp3-overlay-backdrop").click({ force: true }); }); diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_PropertyPane_2_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_PropertyPane_2_spec.js index 017d59eb003c..3baf77db5d8a 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_PropertyPane_2_spec.js +++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_PropertyPane_2_spec.js @@ -26,7 +26,7 @@ describe( deployMode.DeployApp(locators._widgetInDeployed("tablewidget")); table.WaitUntilTableLoad(0, 0, "v1"); // Select 1st row - cy.isSelectRow(2); + table.SelectTableRow(1); // Verify Row is selected by showing the message agHelper.ValidateToastMessage("Row is selected"); deployMode.NavigateBacktoEditor(); diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_Property_JsonUpdate_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_Property_JsonUpdate_spec.js index b9a74ddd5e92..fcf836a308c3 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_Property_JsonUpdate_spec.js +++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_Property_JsonUpdate_spec.js @@ -84,7 +84,7 @@ describe( it("4. Check Selected Row(s) Resets When Table data Changes", function () { // Select 1st row - cy.isSelectRow(1); + _.table.SelectTableRow(1); cy.openPropertyPane("tablewidget"); // Empty first row cy.testJsontext("tabledata", "[]"); diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_spec.js index 15f3bacee40f..24f8d40cef57 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_spec.js +++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_spec.js @@ -55,7 +55,7 @@ describe( cy.openPropertyPane("tablewidget"); cy.editColumn("image"); cy.changeColumnType("Image", false); - cy.isSelectRow(1); + _.table.SelectTableRow(1); const index = 1; const imageVal = this.dataSet.TableInput[index].image; @@ -134,7 +134,7 @@ describe( it("Table Widget Functionality To Verify The Visiblity mode functionality", function() { _.deployMode.NavigateBacktoEditor(); - cy.isSelectRow(1); + _.table.SelectTableRow(1); cy.readTabledataPublish("1", "3").then(tabData => { const tabValue = tabData; expect(tabValue).to.be.equal("Lindsay Ferguson"); diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/table_with_text_selRowIndices_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/table_with_text_selRowIndices_spec.js index 7091f49776c0..c7f153bd5be1 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/table_with_text_selRowIndices_spec.js +++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/table_with_text_selRowIndices_spec.js @@ -34,9 +34,9 @@ describe( ); //Select the 1st, 2nd and 3rd row - cy.isSelectRow("0"); - cy.isSelectRow("1"); - cy.isSelectRow("2"); + _.table.SelectTableRow(0); + _.table.SelectTableRow(1); + _.table.SelectTableRow(2); //Check the value present in the textfield which is selectedRowIndices is [0,1,2] cy.get(`${widgetsPage.textWidget} .bp3-ui-text`).should( diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Custom_column_alias_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Custom_column_alias_spec.js index 660a129607f8..f7e579b36499 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Custom_column_alias_spec.js +++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Custom_column_alias_spec.js @@ -46,7 +46,7 @@ describe( "contain", `{ "普通话 [普通話] ": "", "français": "", "español": "", "日本語": "", "हिन्दी": "", "columnAlias": ""}`, ); - cy.isSelectRow(0); + _.table.SelectTableRow(0, 0, true, "v2"); cy.get(".t--widget-textwidget .bp3-ui-text").should( "contain", `{ "普通话 [普通話] ": "mandarin", "français": "french", "español": "spanish", "日本語": "japnese", "हिन्दी": "hindi", "columnAlias": ""}`, diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_Button_Icon_validation_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_Button_Icon_validation_spec.js index 83ba744fa215..67dc52209533 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_Button_Icon_validation_spec.js +++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_Button_Icon_validation_spec.js @@ -22,9 +22,9 @@ describe( ); //cy.createModal("Modal", this.dataSet.ModalName); cy.createModal("Modal", "onRowSelected"); - cy.isSelectRow(1); + _.table.SelectTableRow(1, 0, true, "v2"); cy.get(".bp3-overlay-backdrop").last().click({ force: true }); - cy.isSelectRow(2); + _.table.SelectTableRow(2, 0, true, "v2"); cy.get(".bp3-overlay-backdrop").last().click({ force: true }); }); diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_PropertyPane_1_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_PropertyPane_1_spec.js index 6c57db3bebf6..62ebf0ce61ee 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_PropertyPane_1_spec.js +++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_PropertyPane_1_spec.js @@ -68,7 +68,7 @@ describe( deployMode.DeployApp(locators._widgetInDeployed(draggableWidgets.TABLE)); table.WaitUntilTableLoad(0, 0, "v2"); // Select 1st row - cy.isSelectRow(2); + table.SelectTableRow(2, 0, true, "v2"); // Verify Row is selected by showing the message agHelper.ValidateToastMessage("Row is selected"); deployMode.NavigateBacktoEditor(); diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_Property_JsonUpdate_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_Property_JsonUpdate_spec.js index f5f422de85f3..1ca0b4bcc39b 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_Property_JsonUpdate_spec.js +++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_Property_JsonUpdate_spec.js @@ -84,7 +84,7 @@ describe( it("4. Check Selected Row(s) Resets When Table data Changes", function () { // Select 1st row - cy.isSelectRow(1); + _.table.SelectTableRow(1, 0, true, "v2"); cy.openPropertyPane("tablewidgetv2"); // Empty first row cy.testJsontext("tabledata", "[]"); diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_spec.js index e2abcebd2ca8..879c9a4dc6a8 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_spec.js +++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_spec.js @@ -40,7 +40,7 @@ describe( cy.openPropertyPane("tablewidgetv2"); cy.editColumn("image"); cy.changeColumnType("Image"); - cy.isSelectRow(1); + _.table.SelectTableRow(1, 0, true, "v2"); const index = 1; const imageVal = this.dataSet.TableInput[index].image; diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/non_ascii_column_name_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/non_ascii_column_name_spec.js index 5aa755e49719..dd913d961659 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/non_ascii_column_name_spec.js +++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/non_ascii_column_name_spec.js @@ -38,7 +38,7 @@ describe( "contain", `{ "普通话 [普通話] ": "", "français": "", "español": "", "日本語": "", "हिन्दी": ""}`, ); - cy.isSelectRow(0); + _.table.SelectTableRow(0, 0, true, "v2"); cy.get(".t--widget-textwidget .bp3-ui-text").should( "contain", `{ "普通话 [普通話] ": "mandarin", "français": "french", "español": "spanish", "日本語": "japnese", "हिन्दी": "hindi"}`, diff --git a/app/client/cypress/e2e/Regression/ServerSide/QueryPane/AddWidgetTableAndBind_spec.js b/app/client/cypress/e2e/Regression/ServerSide/QueryPane/AddWidgetTableAndBind_spec.js index db112e9af8c0..cd7fc2c74086 100644 --- a/app/client/cypress/e2e/Regression/ServerSide/QueryPane/AddWidgetTableAndBind_spec.js +++ b/app/client/cypress/e2e/Regression/ServerSide/QueryPane/AddWidgetTableAndBind_spec.js @@ -10,6 +10,7 @@ import { entityExplorer, agHelper, dataSources, + table, } from "../../../../support/Objects/ObjectsCore"; import { Widgets } from "../../../../support/Pages/DataSources"; @@ -42,7 +43,7 @@ describe( const tableRowTxt = text; dataSources.AddSuggestedWidget(Widgets.Table); EditorNavigation.SelectEntityByName("Table1", EntityType.Widget); - cy.isSelectRow(1); + table.SelectTableRow(1, 0, true, "v2"); cy.readTableV2dataPublish("1", "0").then((tabData) => { const tabValue = tabData; cy.log("the value is" + tabValue); @@ -61,12 +62,12 @@ describe( 200, ); //validation of data displayed in input widget based on row data selected - cy.isSelectRow(1); + table.SelectTableRow(1, 0, true, "v2"); cy.readTableV2dataPublish("1", "0").then((tabData) => { const tabValue = tabData; cy.log("the value is" + tabValue); expect(tabValue).to.be.equal("5"); - cy.isSelectRow(1); + table.SelectTableRow(1, 0, true, "v2"); cy.get(publish.inputWidget + " " + "input") .first() .invoke("attr", "value") diff --git a/app/client/cypress/e2e/Regression/ServerSide/QueryPane/AddWidget_spec.js b/app/client/cypress/e2e/Regression/ServerSide/QueryPane/AddWidget_spec.js index bd9f2a07afcb..5fae39d4fe6d 100644 --- a/app/client/cypress/e2e/Regression/ServerSide/QueryPane/AddWidget_spec.js +++ b/app/client/cypress/e2e/Regression/ServerSide/QueryPane/AddWidget_spec.js @@ -1,7 +1,7 @@ import EditorNavigation, { EntityType, } from "../../../../support/Pages/EditorNavigation"; -import { dataSources } from "../../../../support/Objects/ObjectsCore"; +import { dataSources, table } from "../../../../support/Objects/ObjectsCore"; import { Widgets } from "../../../../support/Pages/DataSources"; let datasourceName; @@ -27,7 +27,7 @@ describe( cy.runQuery(); dataSources.AddSuggestedWidget(Widgets.Table); EditorNavigation.SelectEntityByName("Table1", EntityType.Widget); - cy.isSelectRow(1); + table.SelectTableRow(1, 0, true, "v2"); cy.readTableV2dataPublish("1", "0").then((tabData) => { cy.log("the value is " + tabData); expect(tabData).to.be.equal("5"); diff --git a/app/client/cypress/support/commands.js b/app/client/cypress/support/commands.js index daa944b198fc..0550e7282248 100644 --- a/app/client/cypress/support/commands.js +++ b/app/client/cypress/support/commands.js @@ -48,6 +48,7 @@ const apiPage = ObjectsRegistry.ApiPage; const deployMode = ObjectsRegistry.DeployMode; const assertHelper = ObjectsRegistry.AssertHelper; const homePageTS = ObjectsRegistry.HomePage; +const table = ObjectsRegistry.Table; let pageidcopy = " "; const chainStart = Symbol(); @@ -576,13 +577,6 @@ Cypress.Commands.add( }, ); -Cypress.Commands.add("isSelectRow", (index) => { - cy.get('.tbody .td[data-rowindex="' + index + '"][data-colindex="' + 0 + '"]') - .first() - .click({ force: true }); - cy.wait(500); //for selection to show! -}); - Cypress.Commands.add("getDate", (date, dateFormate) => { const eDate = dayjs().add(date, "days").format(dateFormate); return eDate; @@ -877,7 +871,7 @@ Cypress.Commands.add("ValidatePaginateResponseUrlData", (runTestCss) => { // eslint-disable-next-line cypress/no-unnecessary-waiting cy.get(ApiEditor.ApiRunBtn).should("not.be.disabled"); EditorNavigation.SelectEntityByName("Table1", EntityType.Widget); - cy.isSelectRow(0); + table.SelectTableRow(0); cy.readTabledata("0", "5").then((tabData) => { const tableData = tabData; expect(valueToTest).contains(tableData); @@ -903,7 +897,7 @@ Cypress.Commands.add("ValidatePaginateResponseUrlDataV2", (runTestCss) => { cy.get(ApiEditor.ApiRunBtn).should("not.be.disabled"); EditorNavigation.SelectEntityByName("Table1", EntityType.Widget); cy.wait(2000); - cy.isSelectRow(0); + table.SelectTableRow(0, 0, true, "v2"); cy.readTableV2data("0", "5").then((tabData) => { const tableData = tabData; cy.log(valueToTest);