Protei/PromucFlow_constructor
2
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

feat: Update the table widget to v2 in suggested widget list (#15277)

Browse Source 
Co-authored-by: balajisoundar <balaji@appsmith.com>
(cherry picked from commit dbf0b94973)
This commit is contained in:
Anagh Hegde 2022-07-20 12:28:50 +05:30 committed by Ashit Rath
parent 64c693b9cd
commit 956af45683
10 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/client/cypress/fixtures/addWidgetTable-mock.json
View File

@ -45,7 +45,7 @@
], ],
"suggestedWidgets": [ "suggestedWidgets": [
{ {
"type": "TABLE_WIDGET", "type": "TABLE_WIDGET_V2",
"bindingQuery": "data" "bindingQuery": "data"
} }
] ]

4
app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Binding/Bind_JSObject_Postgress_Table_spec.js
View File

@ -39,7 +39,7 @@ describe("Addwidget from Query and bind with other widgets", function() {
.click({ force: true }); .click({ force: true });
cy.testJsontext("tabledata", "{{JSObject1.myFun1()}}"); cy.testJsontext("tabledata", "{{JSObject1.myFun1()}}");
cy.isSelectRow(1); cy.isSelectRow(1);
cy.readTabledataPublish("1", "0").then((tabData) => { cy.readTableV2dataPublish("1", "0").then((tabData) => {
let tabValue = tabData; let tabValue = tabData;
cy.log("the value is" + tabValue); cy.log("the value is" + tabValue);
expect(tabValue).to.be.equal("5"); expect(tabValue).to.be.equal("5");
@ -86,7 +86,7 @@ describe("Addwidget from Query and bind with other widgets", function() {
).then(() => cy.wait(500)); ).then(() => cy.wait(500));
cy.isSelectRow(1); cy.isSelectRow(1);
cy.readTabledataPublish("1", "0").then((tabData) => { cy.readTableV2dataPublish("1", "0").then((tabData) => {
let tabValue = tabData; let tabValue = tabData;
cy.log("Value in public viewing: " + tabValue); cy.log("Value in public viewing: " + tabValue);
expect(tabValue).to.be.equal("5"); expect(tabValue).to.be.equal("5");

6
app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/QueryPane/AddWidgetTableAndBind_spec.js
View File

@ -46,7 +46,7 @@ describe("Addwidget from Query and bind with other widgets", function() {
cy.get(queryEditor.suggestedTableWidget).click(); cy.get(queryEditor.suggestedTableWidget).click();
cy.SearchEntityandOpen("Table1"); cy.SearchEntityandOpen("Table1");
cy.isSelectRow(1); cy.isSelectRow(1);
cy.readTabledataPublish("1", "0").then((tabData) => { cy.readTableV2dataPublish("1", "0").then((tabData) => {
const tabValue = tabData; const tabValue = tabData;
cy.log("the value is" + tabValue); cy.log("the value is" + tabValue);
expect(tabValue).to.be.equal("5"); 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() { it("4. validation of data displayed in input widget based on row data selected", function() {
cy.isSelectRow(1); cy.isSelectRow(1);
cy.readTabledataPublish("1", "0").then((tabData) => { cy.readTableV2dataPublish("1", "0").then((tabData) => {
const tabValue = tabData; const tabValue = tabData;
cy.log("the value is" + tabValue); cy.log("the value is" + tabValue);
expect(tabValue).to.be.equal("5"); 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]", () => { 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").click({ force: true });
cy.get(".t--property-pane-title") cy.get(".t--property-pane-title")
.type("TableUpdated", { delay: 300 }) .type("TableUpdated", { delay: 300 })

2
app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/QueryPane/AddWidget_spec.js
View File

@ -26,7 +26,7 @@ describe("Add widget - Postgress DataSource", function() {
cy.CheckAndUnfoldEntityItem("WIDGETS"); cy.CheckAndUnfoldEntityItem("WIDGETS");
cy.selectEntityByName("Table1"); cy.selectEntityByName("Table1");
cy.isSelectRow(1); cy.isSelectRow(1);
cy.readTabledataPublish("1", "0").then((tabData) => { cy.readTableV2dataPublish("1", "0").then((tabData) => {
cy.log("the value is " + tabData); cy.log("the value is " + tabData);
expect(tabData).to.be.equal("5"); expect(tabData).to.be.equal("5");
}); });

2
app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/QueryPane/S3_spec.js
View File

@ -679,7 +679,7 @@ describe("Validate CRUD queries for Amazon S3 along with UI flow verifications",
cy.get(queryLocators.suggestedTableWidget) cy.get(queryLocators.suggestedTableWidget)
.click() .click()
.wait(1000); .wait(1000);
cy.get(commonlocators.TableRow).validateWidgetExists(); cy.get(commonlocators.TableV2Row).validateWidgetExists();
cy.get("@entity").then((entityN) => cy.selectEntityByName(entityN)); cy.get("@entity").then((entityN) => cy.selectEntityByName(entityN));
cy.xpath(queryLocators.suggestedWidgetText) cy.xpath(queryLocators.suggestedWidgetText)

2
app/client/cypress/locators/QueryEditor.json
View File

@ -15,7 +15,7 @@
"settings": "li:contains('Settings')", "settings": "li:contains('Settings')",
"query": "li:contains('Query')", "query": "li:contains('Query')",
"switch": ".t--form-control-SWITCH input", "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']", "queryResponse": "(//div[@class='table']//div[@class='tr'])[3]//div[@class='td']",
"querySelect": "//div[contains(@class, 't--template-menu')]//div[text()='Select']", "querySelect": "//div[contains(@class, 't--template-menu')]//div[text()='Select']",
"queryCreate": "//div[contains(@class, 't--template-menu')]//div[text()='Create']", "queryCreate": "//div[contains(@class, 't--template-menu')]//div[text()='Create']",

2
app/client/src/widgets/TableWidgetV2/widget/propertyConfig/General.ts
View File

@ -71,7 +71,7 @@ export default {
}, },
{ {
propertyName: "inlineEditingSaveOption", 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", label: "Update Mode",
controlType: "DROP_DOWN", controlType: "DROP_DOWN",
isBindProperty: true, isBindProperty: true,

2
app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/WidgetType.java vendored
View File

@ -7,7 +7,7 @@ public enum WidgetType {
TEXT_WIDGET("data"), TEXT_WIDGET("data"),
SELECT_WIDGET("data.map( (obj) =>{ return {'label': obj.%s, 'value': obj.%s } })"), SELECT_WIDGET("data.map( (obj) =>{ return {'label': obj.%s, 'value': obj.%s } })"),
CHART_WIDGET("data.map( (obj) =>{ return {'x': obj.%s, 'y': obj.%s } })"), CHART_WIDGET("data.map( (obj) =>{ return {'x': obj.%s, 'y': obj.%s } })"),
TABLE_WIDGET("data"), TABLE_WIDGET_V2("data"),
INPUT_WIDGET("data"); INPUT_WIDGET("data");
public final String query; public final String query;

6
app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/WidgetSuggestionHelper.java
View File

@ -131,7 +131,7 @@ public class WidgetSuggestionHelper {
} }
return getWidgetsForTypeArray(fields, numericFields); 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.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)); widgetTypeList.add(getWidget(WidgetType.TEXT_WIDGET));
return widgetTypeList; 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.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)); widgetTypeList.add(getWidgetNestedData(WidgetType.TEXT_WIDGET, nestedFieldName));
return widgetTypeList; return widgetTypeList;
} }

16
app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/ActionServiceCE_Test.java
View File

@ -1656,7 +1656,7 @@ public class ActionServiceCE_Test {
List<WidgetSuggestionDTO> widgetTypeList = new ArrayList<>(); List<WidgetSuggestionDTO> widgetTypeList = new ArrayList<>();
widgetTypeList.add(WidgetSuggestionHelper.getWidget(WidgetType.CHART_WIDGET, "x", "y")); widgetTypeList.add(WidgetSuggestionHelper.getWidget(WidgetType.CHART_WIDGET, "x", "y"));
widgetTypeList.add(WidgetSuggestionHelper.getWidget(WidgetType.SELECT_WIDGET, "x", "x")); 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)); widgetTypeList.add(WidgetSuggestionHelper.getWidget(WidgetType.TEXT_WIDGET));
mockResult.setSuggestedWidgets(widgetTypeList); mockResult.setSuggestedWidgets(widgetTypeList);
@ -1769,7 +1769,7 @@ public class ActionServiceCE_Test {
List<WidgetSuggestionDTO> widgetTypeList = new ArrayList<>(); List<WidgetSuggestionDTO> widgetTypeList = new ArrayList<>();
widgetTypeList.add(WidgetSuggestionHelper.getWidget(WidgetType.CHART_WIDGET, "id", "ppu")); widgetTypeList.add(WidgetSuggestionHelper.getWidget(WidgetType.CHART_WIDGET, "id", "ppu"));
widgetTypeList.add(WidgetSuggestionHelper.getWidget(WidgetType.SELECT_WIDGET, "id", "type")); 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)); widgetTypeList.add(WidgetSuggestionHelper.getWidget(WidgetType.TEXT_WIDGET));
mockResult.setSuggestedWidgets(widgetTypeList); mockResult.setSuggestedWidgets(widgetTypeList);
@ -1874,7 +1874,7 @@ public class ActionServiceCE_Test {
List<WidgetSuggestionDTO> widgetTypeList = new ArrayList<>(); List<WidgetSuggestionDTO> widgetTypeList = new ArrayList<>();
widgetTypeList.add(WidgetSuggestionHelper.getWidget(WidgetType.CHART_WIDGET, "url", "width")); widgetTypeList.add(WidgetSuggestionHelper.getWidget(WidgetType.CHART_WIDGET, "url", "width"));
widgetTypeList.add(WidgetSuggestionHelper.getWidget(WidgetType.SELECT_WIDGET, "url", "url")); 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)); widgetTypeList.add(WidgetSuggestionHelper.getWidget(WidgetType.TEXT_WIDGET));
mockResult.setSuggestedWidgets(widgetTypeList); mockResult.setSuggestedWidgets(widgetTypeList);
@ -1934,7 +1934,7 @@ public class ActionServiceCE_Test {
List<WidgetSuggestionDTO> widgetTypeList = new ArrayList<>(); List<WidgetSuggestionDTO> widgetTypeList = new ArrayList<>();
widgetTypeList.add(WidgetSuggestionHelper.getWidget(WidgetType.SELECT_WIDGET, "CarType", "carID")); 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)); widgetTypeList.add(WidgetSuggestionHelper.getWidget(WidgetType.TEXT_WIDGET));
mockResult.setSuggestedWidgets(widgetTypeList); mockResult.setSuggestedWidgets(widgetTypeList);
@ -2019,7 +2019,7 @@ public class ActionServiceCE_Test {
mockResult.setDataTypes(List.of(new ParsedDataType(DisplayDataType.RAW))); mockResult.setDataTypes(List.of(new ParsedDataType(DisplayDataType.RAW)));
List<WidgetSuggestionDTO> widgetTypeList = new ArrayList<>(); List<WidgetSuggestionDTO> 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)); widgetTypeList.add(WidgetSuggestionHelper.getWidget(WidgetType.TEXT_WIDGET));
mockResult.setSuggestedWidgets(widgetTypeList); mockResult.setSuggestedWidgets(widgetTypeList);
@ -2172,7 +2172,7 @@ public class ActionServiceCE_Test {
List<WidgetSuggestionDTO> widgetTypeList = new ArrayList<>(); List<WidgetSuggestionDTO> widgetTypeList = new ArrayList<>();
widgetTypeList.add(WidgetSuggestionHelper.getWidgetNestedData(WidgetType.TEXT_WIDGET,"users")); widgetTypeList.add(WidgetSuggestionHelper.getWidgetNestedData(WidgetType.TEXT_WIDGET,"users"));
widgetTypeList.add(WidgetSuggestionHelper.getWidgetNestedData(WidgetType.CHART_WIDGET,"users","name","id")); 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")); widgetTypeList.add(WidgetSuggestionHelper.getWidgetNestedData(WidgetType.SELECT_WIDGET,"users","name", "status"));
mockResult.setSuggestedWidgets(widgetTypeList); mockResult.setSuggestedWidgets(widgetTypeList);
@ -2379,7 +2379,7 @@ public class ActionServiceCE_Test {
List<WidgetSuggestionDTO> widgetTypeList = new ArrayList<>(); List<WidgetSuggestionDTO> widgetTypeList = new ArrayList<>();
widgetTypeList.add(WidgetSuggestionHelper.getWidget(WidgetType.CHART_WIDGET, "url", "width")); widgetTypeList.add(WidgetSuggestionHelper.getWidget(WidgetType.CHART_WIDGET, "url", "width"));
widgetTypeList.add(WidgetSuggestionHelper.getWidget(WidgetType.SELECT_WIDGET, "url", "url")); 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)); widgetTypeList.add(WidgetSuggestionHelper.getWidget(WidgetType.TEXT_WIDGET));
mockResult.setSuggestedWidgets(widgetTypeList); mockResult.setSuggestedWidgets(widgetTypeList);
@ -2427,7 +2427,7 @@ public class ActionServiceCE_Test {
List<WidgetSuggestionDTO> widgetTypeList = new ArrayList<>(); List<WidgetSuggestionDTO> widgetTypeList = new ArrayList<>();
widgetTypeList.add(WidgetSuggestionHelper.getWidget(WidgetType.SELECT_WIDGET, "url", "width")); 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)); widgetTypeList.add(WidgetSuggestionHelper.getWidget(WidgetType.TEXT_WIDGET));
mockResult.setSuggestedWidgets(widgetTypeList); mockResult.setSuggestedWidgets(widgetTypeList);