From 33f9e4d1d392a88a8ffb08b8d4d8d736b808adce Mon Sep 17 00:00:00 2001 From: carinanfonseca <121817440+carinanfonseca@users.noreply.github.com> Date: Fri, 28 Jun 2024 17:16:51 +0100 Subject: [PATCH 1/7] Turn off Allow filtering property on Table widget https://github.com/appsmithorg/appsmith/issues/34591 --- .../src/widgets/wds/WDSTableWidget/config/defaultsConfig.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/client/src/widgets/wds/WDSTableWidget/config/defaultsConfig.ts b/app/client/src/widgets/wds/WDSTableWidget/config/defaultsConfig.ts index 1467514b073b..179791262fdc 100644 --- a/app/client/src/widgets/wds/WDSTableWidget/config/defaultsConfig.ts +++ b/app/client/src/widgets/wds/WDSTableWidget/config/defaultsConfig.ts @@ -31,7 +31,7 @@ export const defaultsConfig = { columnOrder: [], enableClientSideSearch: true, isVisibleSearch: true, - isVisibleFilters: true, + isVisibleFilters: false, isVisibleDownload: true, isVisiblePagination: true, isSortable: true, From 8037bad6f0fdd02ceb5e49e007b68730e94708c9 Mon Sep 17 00:00:00 2001 From: carinanfonseca <121817440+carinanfonseca@users.noreply.github.com> Date: Sat, 29 Jun 2024 01:14:11 +0100 Subject: [PATCH 2/7] Update table widget index.tsx --- app/client/src/widgets/TableWidgetV2/widget/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/client/src/widgets/TableWidgetV2/widget/index.tsx b/app/client/src/widgets/TableWidgetV2/widget/index.tsx index 919d90b22a46..e11857893a57 100644 --- a/app/client/src/widgets/TableWidgetV2/widget/index.tsx +++ b/app/client/src/widgets/TableWidgetV2/widget/index.tsx @@ -210,7 +210,7 @@ class TableWidgetV2 extends BaseWidget { columnOrder: [], enableClientSideSearch: true, isVisibleSearch: true, - isVisibleFilters: true, + isVisibleFilters: false, isVisibleDownload: true, isVisiblePagination: true, isSortable: true, From 17bd8a2eddb2b194cf09ced2231ca4907d70820f Mon Sep 17 00:00:00 2001 From: carinanfonseca <121817440+carinanfonseca@users.noreply.github.com> Date: Sat, 29 Jun 2024 01:17:05 +0100 Subject: [PATCH 3/7] Revert initial change --- .../src/widgets/wds/WDSTableWidget/config/defaultsConfig.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/client/src/widgets/wds/WDSTableWidget/config/defaultsConfig.ts b/app/client/src/widgets/wds/WDSTableWidget/config/defaultsConfig.ts index 179791262fdc..1467514b073b 100644 --- a/app/client/src/widgets/wds/WDSTableWidget/config/defaultsConfig.ts +++ b/app/client/src/widgets/wds/WDSTableWidget/config/defaultsConfig.ts @@ -31,7 +31,7 @@ export const defaultsConfig = { columnOrder: [], enableClientSideSearch: true, isVisibleSearch: true, - isVisibleFilters: false, + isVisibleFilters: true, isVisibleDownload: true, isVisiblePagination: true, isSortable: true, From cc58fef2ca76c2a4b1e87729e0d05b9712dcaf1c Mon Sep 17 00:00:00 2001 From: Jacques Ikot Date: Wed, 3 Jul 2024 08:47:43 +0100 Subject: [PATCH 4/7] turn on filtering in TableV2Filter1_1_Spec --- .../ClientSide/Widgets/TableV2/TableV2Filter1_1_Spec.ts | 3 +++ 1 file changed, 3 insertions(+) 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 index ce19b18f9dd3..d5e0741608be 100644 --- 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 @@ -6,6 +6,7 @@ import { assertHelper, locators, draggableWidgets, + agHelper, } from "../../../../../support/Objects/ObjectsCore"; describe( @@ -15,6 +16,8 @@ describe( it("1. Adding Data to Table Widget", function () { 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) + agHelper.GetNClick(".t--property-control-allowfiltering input"); table.AddSampleTableData(); //propPane.EnterJSContext("Table Data", JSON.stringify(this.dataSet.TableInput)); propPane.UpdatePropertyFieldValue( From 29fc6496e37f801432dd1afcf7865a7af7b781a6 Mon Sep 17 00:00:00 2001 From: Jacques Ikot Date: Wed, 3 Jul 2024 15:34:15 +0100 Subject: [PATCH 5/7] turn on filtering for failing tests --- .../ClientSide/Widgets/TableV2/TableV2Filter1_2_Spec.ts | 2 ++ .../ClientSide/Widgets/TableV2/TableV2Filter2_1_Spec.ts | 2 ++ .../ClientSide/Widgets/TableV2/TableV2Filter2_2_Spec.ts | 2 ++ .../ClientSide/Widgets/TableV2/TableV2_DisplayText_spec.ts | 2 ++ .../Widgets/TableV2/columnTypes/checkboxCell_spec.js | 2 ++ .../ClientSide/Widgets/TableV2/columnTypes/switchCell_spec.js | 2 ++ .../ClientSide/Widgets/TableV2/server_side_filtering_spec_1.ts | 3 +++ 7 files changed, 15 insertions(+) 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 index 8d2172b17f66..c9a9ea98b721 100644 --- 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 @@ -15,6 +15,8 @@ describe( function () { 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) + agHelper.GetNClick(".t--property-control-allowfiltering input"); table.AddSampleTableData(); propPane.UpdatePropertyFieldValue( "Table data", 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 index 5ac4c3eea7b1..1c733733fd7e 100644 --- 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 @@ -16,6 +16,8 @@ describe( it("1. Adding Data to Table Widget", function () { 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) + agHelper.GetNClick(".t--property-control-allowfiltering input"); table.AddSampleTableData(); //propPane.EnterJSContext("Table Data", JSON.stringify(this.dataSet.TableInput)); propPane.UpdatePropertyFieldValue( 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 index 037945c01b8d..2c4260e04d8b 100644 --- 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 @@ -16,6 +16,8 @@ describe( function () { 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) + agHelper.GetNClick(".t--property-control-allowfiltering input"); table.AddSampleTableData(); propPane.UpdatePropertyFieldValue( "Table data", 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 index 62a355db1550..4bd11a80cd2e 100644 --- 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 @@ -27,6 +27,8 @@ describe( () => { before(() => { entityExplorer.DragDropWidgetNVerify("tablewidgetv2", 650, 250); + // turn on filtering for the table - it is disabled by default in this PR(#34593) + 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/columnTypes/checkboxCell_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/columnTypes/checkboxCell_spec.js index 3c47fe842f85..e574d48b984b 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/columnTypes/checkboxCell_spec.js +++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/columnTypes/checkboxCell_spec.js @@ -34,6 +34,8 @@ describe( () => { before(() => { _.entityExplorer.DragDropWidgetNVerify(_.draggableWidgets.TABLE); + // turn on filtering for the table - it is disabled by default in this PR(#34593) + agHelper.GetNClick(".t--property-control-allowfiltering input"); _.propPane.EnterJSContext("Table data", tableData); cy.editColumn("completed"); cy.changeColumnType("Checkbox"); diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/columnTypes/switchCell_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/columnTypes/switchCell_spec.js index 91c0382b1d76..56a0f6cf12e9 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/columnTypes/switchCell_spec.js +++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/columnTypes/switchCell_spec.js @@ -40,6 +40,8 @@ describe( () => { before(() => { entityExplorer.DragDropWidgetNVerify(draggableWidgets.TABLE); + // turn on filtering for the table - it is disabled by default in this PR(#34593) + agHelper.GetNClick(".t--property-control-allowfiltering input"); propPane.EnterJSContext("Table data", tableData); cy.editColumn("completed"); cy.changeColumnType("Switch"); diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/server_side_filtering_spec_1.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/server_side_filtering_spec_1.ts index f80ce4d342c5..674f56e06e32 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/server_side_filtering_spec_1.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/server_side_filtering_spec_1.ts @@ -34,6 +34,9 @@ describe( }); entityExplorer.DragDropWidgetNVerify(draggableWidgets.TABLE, 300, 300); + // turn on filtering for the table - it is disabled by default in this PR(#34593) + agHelper.GetNClick(".t--property-control-allowfiltering input"); + // Create SQL data-source agHelper.GetNClick(oneClickBindingLocator.datasourceDropdownSelector); agHelper.AssertElementExist(oneClickBindingLocator.otherActionSelector()); From 89b29e5d2856556c873e1200f40afaddddac4e1c Mon Sep 17 00:00:00 2001 From: Jacques Ikot Date: Wed, 3 Jul 2024 16:48:17 +0100 Subject: [PATCH 6/7] remove change made for filter from checkboxCell_spec --- .../ClientSide/Widgets/TableV2/columnTypes/checkboxCell_spec.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/columnTypes/checkboxCell_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/columnTypes/checkboxCell_spec.js index e574d48b984b..3c47fe842f85 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/columnTypes/checkboxCell_spec.js +++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/columnTypes/checkboxCell_spec.js @@ -34,8 +34,6 @@ describe( () => { before(() => { _.entityExplorer.DragDropWidgetNVerify(_.draggableWidgets.TABLE); - // turn on filtering for the table - it is disabled by default in this PR(#34593) - agHelper.GetNClick(".t--property-control-allowfiltering input"); _.propPane.EnterJSContext("Table data", tableData); cy.editColumn("completed"); cy.changeColumnType("Checkbox"); From e0c1e8376b702f13b9640c880cf5606af070a420 Mon Sep 17 00:00:00 2001 From: Jacques Ikot Date: Thu, 4 Jul 2024 09:24:36 +0100 Subject: [PATCH 7/7] enable filter in checkboxCell_spec.js --- .../ClientSide/Widgets/TableV2/columnTypes/checkboxCell_spec.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/columnTypes/checkboxCell_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/columnTypes/checkboxCell_spec.js index 3c47fe842f85..252617d0ab5a 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/columnTypes/checkboxCell_spec.js +++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/columnTypes/checkboxCell_spec.js @@ -34,6 +34,8 @@ describe( () => { before(() => { _.entityExplorer.DragDropWidgetNVerify(_.draggableWidgets.TABLE); + // turn on filtering for the table - it is disabled by default in this PR(#34593) + _.agHelper.GetNClick(".t--property-control-allowfiltering input"); _.propPane.EnterJSContext("Table data", tableData); cy.editColumn("completed"); cy.changeColumnType("Checkbox");