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

fix: Update the widget from drop down to select widget in suggested widget list (#13944)

Browse Source 
* Update the widget from drop down to select widget
This commit is contained in:
Anagh Hegde 2022-06-03 13:19:56 +05:30 committed by GitHub
parent acf3e0c6fd
commit 4c6c109edf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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)

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

@ -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");

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

@ -165,7 +165,7 @@ public class WidgetSuggestionHelper {
private static List<WidgetSuggestionDTO> getWidgetsForTypeString(List<String> fields, int length) {
List<WidgetSuggestionDTO> 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<WidgetSuggestionDTO> 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)));

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

@ -1645,7 +1645,7 @@ public class ActionServiceCE_Test {
List<WidgetSuggestionDTO> 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<WidgetSuggestionDTO> 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<WidgetSuggestionDTO> 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<WidgetSuggestionDTO> 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<WidgetSuggestionDTO> 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<WidgetSuggestionDTO> 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);