From a2f2f795c8a7aabf623c69c01c98ea7c417fba4a Mon Sep 17 00:00:00 2001 From: carinanfonseca <121817440+carinanfonseca@users.noreply.github.com> Date: Fri, 5 Jul 2024 08:46:11 +0100 Subject: [PATCH] chore: Turn off Allow filtering property on Table widget (#34593) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/appsmithorg/appsmith/issues/34591 ## Description Making _Allow filtering_ option false by default. Allow filtering off Fixes #34591 _or_ Fixes `Issue URL` > [!WARNING] > _If no issue exists, please create an issue first, and check with the maintainers if the issue is valid._ ## Automation /ok-to-test tags="@tag.Table, @tag.Widget, @tag.Binding, @tag.Sanity" ### :mag: Cypress test results > [!TIP] > 🟢 🟢 🟢 All cypress tests have passed! 🎉 🎉 🎉 > Workflow run: > Commit: e0c1e8376b702f13b9640c880cf5606af070a420 > Cypress dashboard. > Tags: `@tag.Table, @tag.Widget, @tag.Binding, @tag.Sanity` ## Communication Should the DevRel and Marketing teams inform users about this change? - [ ] Yes - [x] No ## Summary by CodeRabbit - **Bug Fixes** - Filtering is now disabled by default for the `TableWidgetV2`. - **Tests** - Updated test scripts to enable filtering for `TableWidgetV2` in multiple scenarios. --------- Co-authored-by: Jacques Ikot --- .../ClientSide/Widgets/TableV2/TableV2Filter1_1_Spec.ts | 3 +++ .../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 +++ app/client/src/widgets/TableWidgetV2/widget/index.tsx | 2 +- 9 files changed, 19 insertions(+), 1 deletion(-) 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 ce19b18f9d..d5e0741608 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( 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 8d2172b17f..c9a9ea98b7 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 5ac4c3eea7..1c733733fd 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 037945c01b..2c4260e04d 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 62a355db15..4bd11a80cd 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 3c47fe842f..252617d0ab 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 91c0382b1d..56a0f6cf12 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 f80ce4d342..674f56e06e 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()); diff --git a/app/client/src/widgets/TableWidgetV2/widget/index.tsx b/app/client/src/widgets/TableWidgetV2/widget/index.tsx index 919d90b22a..e11857893a 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,