Skip to content

chore: Turn off Allow filtering property on Table widget #34593

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jacquesikot merged 8 commits into from
Jul 5, 2024
Merged

chore: Turn off Allow filtering property on Table widget #34593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
33f9e4d
Turn off Allow filtering property on Table widget
carinanfonseca Jun 28, 2024
8037bad
Update table widget index.tsx
carinanfonseca Jun 29, 2024
17bd8a2
Revert initial change
carinanfonseca Jun 29, 2024
4c59758
Merge branch 'release' of https://github.com/appsmithorg/appsmith int…
jacquesikot Jul 3, 2024
cc58fef
turn on filtering in TableV2Filter1_1_Spec
jacquesikot Jul 3, 2024
29fc649
turn on filtering for failing tests
jacquesikot Jul 3, 2024
89b29e5
remove change made for filter from checkboxCell_spec
jacquesikot Jul 3, 2024
e0c1e83
enable filter in checkboxCell_spec.js
jacquesikot Jul 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2Filter1_1_Spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import {
assertHelper,
locators,
draggableWidgets,
agHelper,
} from "../../../../../support/Objects/ObjectsCore";

describe(
Expand All @@ -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(
Expand Down
2 changes: 2 additions & 0 deletions app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2Filter1_2_Spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 2 additions & 0 deletions app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2Filter2_1_Spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 2 additions & 0 deletions app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2Filter2_2_Spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 2 additions & 0 deletions app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_DisplayText_spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
});
Expand Down
2 changes: 2 additions & 0 deletions ...client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/columnTypes/checkboxCell_spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
2 changes: 2 additions & 0 deletions app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/columnTypes/switchCell_spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
3 changes: 3 additions & 0 deletions app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/server_side_filtering_spec_1.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down
2 changes: 1 addition & 1 deletion app/client/src/widgets/TableWidgetV2/widget/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ class TableWidgetV2 extends BaseWidget<TableWidgetProps, WidgetState> {
columnOrder: [],
enableClientSideSearch: true,
isVisibleSearch: true,
isVisibleFilters: true,
isVisibleFilters: false,
isVisibleDownload: true,
isVisiblePagination: true,
isSortable: true,
Expand Down