From 4c6c109edfcae2014ed1623399d86da7cb0d5b54 Mon Sep 17 00:00:00 2001 From: Anagh Hegde Date: Fri, 3 Jun 2022 13:19:56 +0530 Subject: [PATCH] fix: Update the widget from drop down to select widget in suggested widget list (#13944) * Update the widget from drop down to select widget --- .../ServerSideTests/QueryPane/S3_spec.js | 8 ++++---- .../com/appsmith/external/models/WidgetType.java | 2 +- .../server/helpers/WidgetSuggestionHelper.java | 10 +++++----- .../server/services/ce/ActionServiceCE_Test.java | 14 +++++++------- 4 files changed, 17 insertions(+), 17 deletions(-) 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 390c9d2947..b250e5488d 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 @@ -624,10 +624,10 @@ describe("Validate CRUD queries for Amazon S3 along with UI flow verifications", cy.wrap(entity).as("entity"); }); cy.runQuery(); - cy.xpath(queryLocators.suggestedWidgetDropdown) - .click() - .wait(1000); - cy.get(".t--draggable-dropdownwidget").validateWidgetExists(); + // cy.xpath(queryLocators.suggestedWidgetDropdown) + // .click() + // .wait(1000); + // cy.get(".t--draggable-dropdownwidget").validateWidgetExists(); cy.get("@entity").then((entityN) => cy.selectEntityByName(entityN)); cy.get(queryLocators.suggestedTableWidget) 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 b995ccb1e3..3cdade7ff8 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 @@ -5,7 +5,7 @@ import lombok.Getter; @Getter public enum WidgetType { TEXT_WIDGET("data"), - DROP_DOWN_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 } })"), TABLE_WIDGET("data"), INPUT_WIDGET("data"); 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 9e6f929000..0872ebfbaf 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 @@ -165,7 +165,7 @@ public class WidgetSuggestionHelper { private static List getWidgetsForTypeString(List fields, int length) { List widgetTypeList = new ArrayList<>(); if (length > 1 && !fields.isEmpty()) { - widgetTypeList.add(getWidget(WidgetType.DROP_DOWN_WIDGET, fields.get(0), fields.get(0))); + widgetTypeList.add(getWidget(WidgetType.SELECT_WIDGET, fields.get(0), fields.get(0))); } else { widgetTypeList.add(getWidget(WidgetType.TEXT_WIDGET)); @@ -178,9 +178,9 @@ public class WidgetSuggestionHelper { List widgetTypeList = new ArrayList<>(); if(!fields.isEmpty()) { if(fields.size() < 2) { - widgetTypeList.add(getWidget(WidgetType.DROP_DOWN_WIDGET, fields.get(0), fields.get(0))); + widgetTypeList.add(getWidget(WidgetType.SELECT_WIDGET, fields.get(0), fields.get(0))); } else { - widgetTypeList.add(getWidget(WidgetType.DROP_DOWN_WIDGET, fields.get(0), fields.get(0))); + widgetTypeList.add(getWidget(WidgetType.SELECT_WIDGET, fields.get(0), fields.get(1))); } if(!numericFields.isEmpty()) { widgetTypeList.add(getWidget(WidgetType.CHART_WIDGET, fields.get(0), numericFields.get(0))); @@ -214,9 +214,9 @@ public class WidgetSuggestionHelper { * */ if(!fields.isEmpty()) { if(fields.size() < 2) { - widgetTypeList.add(getWidgetNestedData(WidgetType.DROP_DOWN_WIDGET, nestedFieldName, fields.get(0), fields.get(0))); + widgetTypeList.add(getWidgetNestedData(WidgetType.SELECT_WIDGET, nestedFieldName, fields.get(0), fields.get(0))); } else { - widgetTypeList.add(getWidgetNestedData(WidgetType.DROP_DOWN_WIDGET, nestedFieldName, fields.get(0), fields.get(1))); + widgetTypeList.add(getWidgetNestedData(WidgetType.SELECT_WIDGET, nestedFieldName, fields.get(0), fields.get(1))); } if(!numericFields.isEmpty()) { widgetTypeList.add(getWidgetNestedData(WidgetType.CHART_WIDGET, nestedFieldName, fields.get(0), numericFields.get(0))); 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 f0612b1311..625032b941 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 @@ -1645,7 +1645,7 @@ public class ActionServiceCE_Test { List widgetTypeList = new ArrayList<>(); widgetTypeList.add(WidgetSuggestionHelper.getWidget(WidgetType.CHART_WIDGET, "x", "y")); - widgetTypeList.add(WidgetSuggestionHelper.getWidget(WidgetType.DROP_DOWN_WIDGET, "x", "x")); + widgetTypeList.add(WidgetSuggestionHelper.getWidget(WidgetType.SELECT_WIDGET, "x", "x")); widgetTypeList.add(WidgetSuggestionHelper.getWidget(WidgetType.TABLE_WIDGET)); widgetTypeList.add(WidgetSuggestionHelper.getWidget(WidgetType.TEXT_WIDGET)); mockResult.setSuggestedWidgets(widgetTypeList); @@ -1758,7 +1758,7 @@ public class ActionServiceCE_Test { List widgetTypeList = new ArrayList<>(); widgetTypeList.add(WidgetSuggestionHelper.getWidget(WidgetType.CHART_WIDGET, "id", "ppu")); - widgetTypeList.add(WidgetSuggestionHelper.getWidget(WidgetType.DROP_DOWN_WIDGET, "id", "type")); + widgetTypeList.add(WidgetSuggestionHelper.getWidget(WidgetType.SELECT_WIDGET, "id", "type")); widgetTypeList.add(WidgetSuggestionHelper.getWidget(WidgetType.TABLE_WIDGET)); widgetTypeList.add(WidgetSuggestionHelper.getWidget(WidgetType.TEXT_WIDGET)); mockResult.setSuggestedWidgets(widgetTypeList); @@ -1863,7 +1863,7 @@ public class ActionServiceCE_Test { List widgetTypeList = new ArrayList<>(); widgetTypeList.add(WidgetSuggestionHelper.getWidget(WidgetType.CHART_WIDGET, "url", "width")); - widgetTypeList.add(WidgetSuggestionHelper.getWidget(WidgetType.DROP_DOWN_WIDGET, "url", "url")); + widgetTypeList.add(WidgetSuggestionHelper.getWidget(WidgetType.SELECT_WIDGET, "url", "url")); widgetTypeList.add(WidgetSuggestionHelper.getWidget(WidgetType.TABLE_WIDGET)); widgetTypeList.add(WidgetSuggestionHelper.getWidget(WidgetType.TEXT_WIDGET)); mockResult.setSuggestedWidgets(widgetTypeList); @@ -1923,7 +1923,7 @@ public class ActionServiceCE_Test { mockResult.setDataTypes(List.of(new ParsedDataType(DisplayDataType.RAW))); List widgetTypeList = new ArrayList<>(); - widgetTypeList.add(WidgetSuggestionHelper.getWidget(WidgetType.DROP_DOWN_WIDGET, "CarType", "carID")); + widgetTypeList.add(WidgetSuggestionHelper.getWidget(WidgetType.SELECT_WIDGET, "CarType", "carID")); widgetTypeList.add(WidgetSuggestionHelper.getWidget(WidgetType.TABLE_WIDGET)); widgetTypeList.add(WidgetSuggestionHelper.getWidget(WidgetType.TEXT_WIDGET)); mockResult.setSuggestedWidgets(widgetTypeList); @@ -2163,7 +2163,7 @@ public class ActionServiceCE_Test { 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.DROP_DOWN_WIDGET,"users","name", "status")); + widgetTypeList.add(WidgetSuggestionHelper.getWidgetNestedData(WidgetType.SELECT_WIDGET,"users","name", "status")); mockResult.setSuggestedWidgets(widgetTypeList); ActionDTO action = new ActionDTO(); @@ -2368,7 +2368,7 @@ public class ActionServiceCE_Test { List widgetTypeList = new ArrayList<>(); widgetTypeList.add(WidgetSuggestionHelper.getWidget(WidgetType.CHART_WIDGET, "url", "width")); - widgetTypeList.add(WidgetSuggestionHelper.getWidget(WidgetType.DROP_DOWN_WIDGET, "url", "url")); + widgetTypeList.add(WidgetSuggestionHelper.getWidget(WidgetType.SELECT_WIDGET, "url", "url")); widgetTypeList.add(WidgetSuggestionHelper.getWidget(WidgetType.TABLE_WIDGET)); widgetTypeList.add(WidgetSuggestionHelper.getWidget(WidgetType.TEXT_WIDGET)); mockResult.setSuggestedWidgets(widgetTypeList); @@ -2416,7 +2416,7 @@ public class ActionServiceCE_Test { mockResult.setDataTypes(List.of(new ParsedDataType(DisplayDataType.RAW))); List widgetTypeList = new ArrayList<>(); - widgetTypeList.add(WidgetSuggestionHelper.getWidget(WidgetType.DROP_DOWN_WIDGET, "url", "width")); + widgetTypeList.add(WidgetSuggestionHelper.getWidget(WidgetType.SELECT_WIDGET, "url", "width")); widgetTypeList.add(WidgetSuggestionHelper.getWidget(WidgetType.TABLE_WIDGET)); widgetTypeList.add(WidgetSuggestionHelper.getWidget(WidgetType.TEXT_WIDGET)); mockResult.setSuggestedWidgets(widgetTypeList);