diff --git a/app/client/cypress/fixtures/addWidgetTable-mock.json b/app/client/cypress/fixtures/addWidgetTable-mock.json index 7668852c78..38241194e1 100644 --- a/app/client/cypress/fixtures/addWidgetTable-mock.json +++ b/app/client/cypress/fixtures/addWidgetTable-mock.json @@ -45,7 +45,7 @@ ], "suggestedWidgets": [ { - "type": "TABLE_WIDGET", + "type": "TABLE_WIDGET_V2", "bindingQuery": "data" } ] diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Binding/Bind_JSObject_Postgress_Table_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Binding/Bind_JSObject_Postgress_Table_spec.js index 4ec54dfb01..a8ea2ace1b 100644 --- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Binding/Bind_JSObject_Postgress_Table_spec.js +++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Binding/Bind_JSObject_Postgress_Table_spec.js @@ -39,7 +39,7 @@ describe("Addwidget from Query and bind with other widgets", function() { .click({ force: true }); cy.testJsontext("tabledata", "{{JSObject1.myFun1()}}"); cy.isSelectRow(1); - cy.readTabledataPublish("1", "0").then((tabData) => { + cy.readTableV2dataPublish("1", "0").then((tabData) => { let tabValue = tabData; cy.log("the value is" + tabValue); expect(tabValue).to.be.equal("5"); @@ -86,7 +86,7 @@ describe("Addwidget from Query and bind with other widgets", function() { ).then(() => cy.wait(500)); cy.isSelectRow(1); - cy.readTabledataPublish("1", "0").then((tabData) => { + cy.readTableV2dataPublish("1", "0").then((tabData) => { let tabValue = tabData; cy.log("Value in public viewing: " + tabValue); expect(tabValue).to.be.equal("5"); diff --git a/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/QueryPane/AddWidgetTableAndBind_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/QueryPane/AddWidgetTableAndBind_spec.js index a5b64a4ea6..fe8e8ec3a0 100644 --- a/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/QueryPane/AddWidgetTableAndBind_spec.js +++ b/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/QueryPane/AddWidgetTableAndBind_spec.js @@ -46,7 +46,7 @@ describe("Addwidget from Query and bind with other widgets", function() { cy.get(queryEditor.suggestedTableWidget).click(); cy.SearchEntityandOpen("Table1"); cy.isSelectRow(1); - cy.readTabledataPublish("1", "0").then((tabData) => { + cy.readTableV2dataPublish("1", "0").then((tabData) => { const tabValue = tabData; cy.log("the value is" + tabValue); expect(tabValue).to.be.equal("5"); @@ -70,7 +70,7 @@ describe("Addwidget from Query and bind with other widgets", function() { it("4. validation of data displayed in input widget based on row data selected", function() { cy.isSelectRow(1); - cy.readTabledataPublish("1", "0").then((tabData) => { + cy.readTableV2dataPublish("1", "0").then((tabData) => { const tabValue = tabData; cy.log("the value is" + tabValue); expect(tabValue).to.be.equal("5"); @@ -83,7 +83,7 @@ describe("Addwidget from Query and bind with other widgets", function() { }); it("5. Input widget test with default value from table widget[Bug#4136]", () => { - cy.openPropertyPane("tablewidget"); + cy.openPropertyPane("tablewidgetv2"); cy.get(".t--property-pane-title").click({ force: true }); cy.get(".t--property-pane-title") .type("TableUpdated", { delay: 300 }) diff --git a/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/QueryPane/AddWidget_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/QueryPane/AddWidget_spec.js index 7c82c45422..121135d114 100644 --- a/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/QueryPane/AddWidget_spec.js +++ b/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/QueryPane/AddWidget_spec.js @@ -26,7 +26,7 @@ describe("Add widget - Postgress DataSource", function() { cy.CheckAndUnfoldEntityItem("WIDGETS"); cy.selectEntityByName("Table1"); cy.isSelectRow(1); - cy.readTabledataPublish("1", "0").then((tabData) => { + cy.readTableV2dataPublish("1", "0").then((tabData) => { cy.log("the value is " + tabData); expect(tabData).to.be.equal("5"); }); diff --git a/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/QueryPane/S3_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/QueryPane/S3_spec.js index 9ae09057ad..69f6bf961e 100644 --- a/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/QueryPane/S3_spec.js +++ b/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/QueryPane/S3_spec.js @@ -679,7 +679,7 @@ describe("Validate CRUD queries for Amazon S3 along with UI flow verifications", cy.get(queryLocators.suggestedTableWidget) .click() .wait(1000); - cy.get(commonlocators.TableRow).validateWidgetExists(); + cy.get(commonlocators.TableV2Row).validateWidgetExists(); cy.get("@entity").then((entityN) => cy.selectEntityByName(entityN)); cy.xpath(queryLocators.suggestedWidgetText) diff --git a/app/client/cypress/locators/QueryEditor.json b/app/client/cypress/locators/QueryEditor.json index 8b44bc351d..43cd511a53 100644 --- a/app/client/cypress/locators/QueryEditor.json +++ b/app/client/cypress/locators/QueryEditor.json @@ -15,7 +15,7 @@ "settings": "li:contains('Settings')", "query": "li:contains('Query')", "switch": ".t--form-control-SWITCH input", - "suggestedTableWidget": ".t--suggested-widget-TABLE_WIDGET", + "suggestedTableWidget": ".t--suggested-widget-TABLE_WIDGET_V2", "queryResponse": "(//div[@class='table']//div[@class='tr'])[3]//div[@class='td']", "querySelect": "//div[contains(@class, 't--template-menu')]//div[text()='Select']", "queryCreate": "//div[contains(@class, 't--template-menu')]//div[text()='Create']", diff --git a/app/client/src/widgets/TableWidgetV2/widget/propertyConfig/General.ts b/app/client/src/widgets/TableWidgetV2/widget/propertyConfig/General.ts index 44db00f120..7d7e42fe73 100644 --- a/app/client/src/widgets/TableWidgetV2/widget/propertyConfig/General.ts +++ b/app/client/src/widgets/TableWidgetV2/widget/propertyConfig/General.ts @@ -71,7 +71,7 @@ export default { }, { propertyName: "inlineEditingSaveOption", - helpText: "choose the save experience to save the edited cell", + helpText: "Choose the save experience to save the edited cell", label: "Update Mode", controlType: "DROP_DOWN", isBindProperty: true, diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/WidgetType.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/WidgetType.java index 3cdade7ff8..c33116aa44 100644 --- a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/WidgetType.java +++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/WidgetType.java @@ -7,7 +7,7 @@ public enum WidgetType { TEXT_WIDGET("data"), SELECT_WIDGET("data.map( (obj) =>{ return {'label': obj.%s, 'value': obj.%s } })"), CHART_WIDGET("data.map( (obj) =>{ return {'x': obj.%s, 'y': obj.%s } })"), - TABLE_WIDGET("data"), + TABLE_WIDGET_V2("data"), INPUT_WIDGET("data"); public final String query; diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/WidgetSuggestionHelper.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/WidgetSuggestionHelper.java index 0872ebfbaf..97acb907f8 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/WidgetSuggestionHelper.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/WidgetSuggestionHelper.java @@ -131,7 +131,7 @@ public class WidgetSuggestionHelper { } return getWidgetsForTypeArray(fields, numericFields); } - return List.of(getWidget(WidgetType.TABLE_WIDGET), getWidget(WidgetType.TEXT_WIDGET)); + return List.of(getWidget(WidgetType.TABLE_WIDGET_V2), getWidget(WidgetType.TEXT_WIDGET)); } /* @@ -186,7 +186,7 @@ public class WidgetSuggestionHelper { widgetTypeList.add(getWidget(WidgetType.CHART_WIDGET, fields.get(0), numericFields.get(0))); } } - widgetTypeList.add(getWidget(WidgetType.TABLE_WIDGET)); + widgetTypeList.add(getWidget(WidgetType.TABLE_WIDGET_V2)); widgetTypeList.add(getWidget(WidgetType.TEXT_WIDGET)); return widgetTypeList; } @@ -222,7 +222,7 @@ public class WidgetSuggestionHelper { widgetTypeList.add(getWidgetNestedData(WidgetType.CHART_WIDGET, nestedFieldName, fields.get(0), numericFields.get(0))); } } - widgetTypeList.add(getWidgetNestedData(WidgetType.TABLE_WIDGET, nestedFieldName)); + widgetTypeList.add(getWidgetNestedData(WidgetType.TABLE_WIDGET_V2, nestedFieldName)); widgetTypeList.add(getWidgetNestedData(WidgetType.TEXT_WIDGET, nestedFieldName)); return widgetTypeList; } diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/ActionServiceCE_Test.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/ActionServiceCE_Test.java index 9871e9e6e0..b2a7f321a7 100644 --- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/ActionServiceCE_Test.java +++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/ActionServiceCE_Test.java @@ -1656,7 +1656,7 @@ public class ActionServiceCE_Test { List widgetTypeList = new ArrayList<>(); widgetTypeList.add(WidgetSuggestionHelper.getWidget(WidgetType.CHART_WIDGET, "x", "y")); widgetTypeList.add(WidgetSuggestionHelper.getWidget(WidgetType.SELECT_WIDGET, "x", "x")); - widgetTypeList.add(WidgetSuggestionHelper.getWidget(WidgetType.TABLE_WIDGET)); + widgetTypeList.add(WidgetSuggestionHelper.getWidget(WidgetType.TABLE_WIDGET_V2)); widgetTypeList.add(WidgetSuggestionHelper.getWidget(WidgetType.TEXT_WIDGET)); mockResult.setSuggestedWidgets(widgetTypeList); @@ -1769,7 +1769,7 @@ public class ActionServiceCE_Test { List widgetTypeList = new ArrayList<>(); widgetTypeList.add(WidgetSuggestionHelper.getWidget(WidgetType.CHART_WIDGET, "id", "ppu")); widgetTypeList.add(WidgetSuggestionHelper.getWidget(WidgetType.SELECT_WIDGET, "id", "type")); - widgetTypeList.add(WidgetSuggestionHelper.getWidget(WidgetType.TABLE_WIDGET)); + widgetTypeList.add(WidgetSuggestionHelper.getWidget(WidgetType.TABLE_WIDGET_V2)); widgetTypeList.add(WidgetSuggestionHelper.getWidget(WidgetType.TEXT_WIDGET)); mockResult.setSuggestedWidgets(widgetTypeList); @@ -1874,7 +1874,7 @@ public class ActionServiceCE_Test { List widgetTypeList = new ArrayList<>(); widgetTypeList.add(WidgetSuggestionHelper.getWidget(WidgetType.CHART_WIDGET, "url", "width")); widgetTypeList.add(WidgetSuggestionHelper.getWidget(WidgetType.SELECT_WIDGET, "url", "url")); - widgetTypeList.add(WidgetSuggestionHelper.getWidget(WidgetType.TABLE_WIDGET)); + widgetTypeList.add(WidgetSuggestionHelper.getWidget(WidgetType.TABLE_WIDGET_V2)); widgetTypeList.add(WidgetSuggestionHelper.getWidget(WidgetType.TEXT_WIDGET)); mockResult.setSuggestedWidgets(widgetTypeList); @@ -1934,7 +1934,7 @@ public class ActionServiceCE_Test { List widgetTypeList = new ArrayList<>(); widgetTypeList.add(WidgetSuggestionHelper.getWidget(WidgetType.SELECT_WIDGET, "CarType", "carID")); - widgetTypeList.add(WidgetSuggestionHelper.getWidget(WidgetType.TABLE_WIDGET)); + widgetTypeList.add(WidgetSuggestionHelper.getWidget(WidgetType.TABLE_WIDGET_V2)); widgetTypeList.add(WidgetSuggestionHelper.getWidget(WidgetType.TEXT_WIDGET)); mockResult.setSuggestedWidgets(widgetTypeList); @@ -2019,7 +2019,7 @@ public class ActionServiceCE_Test { mockResult.setDataTypes(List.of(new ParsedDataType(DisplayDataType.RAW))); List widgetTypeList = new ArrayList<>(); - widgetTypeList.add(WidgetSuggestionHelper.getWidget(WidgetType.TABLE_WIDGET)); + widgetTypeList.add(WidgetSuggestionHelper.getWidget(WidgetType.TABLE_WIDGET_V2)); widgetTypeList.add(WidgetSuggestionHelper.getWidget(WidgetType.TEXT_WIDGET)); mockResult.setSuggestedWidgets(widgetTypeList); @@ -2172,7 +2172,7 @@ public class ActionServiceCE_Test { List widgetTypeList = new ArrayList<>(); widgetTypeList.add(WidgetSuggestionHelper.getWidgetNestedData(WidgetType.TEXT_WIDGET,"users")); widgetTypeList.add(WidgetSuggestionHelper.getWidgetNestedData(WidgetType.CHART_WIDGET,"users","name","id")); - widgetTypeList.add(WidgetSuggestionHelper.getWidgetNestedData(WidgetType.TABLE_WIDGET,"users")); + widgetTypeList.add(WidgetSuggestionHelper.getWidgetNestedData(WidgetType.TABLE_WIDGET_V2,"users")); widgetTypeList.add(WidgetSuggestionHelper.getWidgetNestedData(WidgetType.SELECT_WIDGET,"users","name", "status")); mockResult.setSuggestedWidgets(widgetTypeList); @@ -2379,7 +2379,7 @@ public class ActionServiceCE_Test { List widgetTypeList = new ArrayList<>(); widgetTypeList.add(WidgetSuggestionHelper.getWidget(WidgetType.CHART_WIDGET, "url", "width")); widgetTypeList.add(WidgetSuggestionHelper.getWidget(WidgetType.SELECT_WIDGET, "url", "url")); - widgetTypeList.add(WidgetSuggestionHelper.getWidget(WidgetType.TABLE_WIDGET)); + widgetTypeList.add(WidgetSuggestionHelper.getWidget(WidgetType.TABLE_WIDGET_V2)); widgetTypeList.add(WidgetSuggestionHelper.getWidget(WidgetType.TEXT_WIDGET)); mockResult.setSuggestedWidgets(widgetTypeList); @@ -2427,7 +2427,7 @@ public class ActionServiceCE_Test { List widgetTypeList = new ArrayList<>(); widgetTypeList.add(WidgetSuggestionHelper.getWidget(WidgetType.SELECT_WIDGET, "url", "width")); - widgetTypeList.add(WidgetSuggestionHelper.getWidget(WidgetType.TABLE_WIDGET)); + widgetTypeList.add(WidgetSuggestionHelper.getWidget(WidgetType.TABLE_WIDGET_V2)); widgetTypeList.add(WidgetSuggestionHelper.getWidget(WidgetType.TEXT_WIDGET)); mockResult.setSuggestedWidgets(widgetTypeList);