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

Handling the empty object set for where clause in new actions (#8017)

Browse Source
This commit is contained in:
Trisha Anand 2021-09-30 20:28:32 +05:30 committed by GitHub
parent 713ed76676
commit d8dec82565
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,6 +2,8 @@ package com.appsmith.external.models;
import com.appsmith.external.constants.ConditionalOperator; import com.appsmith.external.constants.ConditionalOperator;
import com.appsmith.external.constants.DataType; import com.appsmith.external.constants.DataType;
import com.appsmith.external.exceptions.pluginExceptions.AppsmithPluginError;
import com.appsmith.external.exceptions.pluginExceptions.AppsmithPluginException;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;
@ -12,6 +14,7 @@ import org.apache.commons.lang3.StringUtils;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static com.appsmith.external.helpers.DataTypeStringUtils.stringToKnownDataTypeConverter; import static com.appsmith.external.helpers.DataTypeStringUtils.stringToKnownDataTypeConverter;
@ -66,6 +69,12 @@ public class Condition {
for(Object config : configurationList) { for(Object config : configurationList) {
Map<String, String> condition = (Map<String, String>) config; Map<String, String> condition = (Map<String, String>) config;
if (condition.entrySet().isEmpty()) {
// Its an empty object set by the client for UX. Ignore the same
continue;
} else if (!condition.keySet().containsAll(Set.of("path", "operator", "value"))) {
throw new AppsmithPluginException(AppsmithPluginError.PLUGIN_EXECUTE_ARGUMENT_ERROR, "Filtering Condition not configured properly");
}
conditionList.add(new Condition( conditionList.add(new Condition(
condition.get("path"), condition.get("path"),
condition.get("operator"), condition.get("operator"),

17
app/server/appsmith-plugins/googleSheetsPlugin/src/main/java/com/external/config/MethodConfig.java vendored
View File

@ -12,6 +12,7 @@ import lombok.ToString;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
@ -41,8 +42,9 @@ public class MethodConfig {
public MethodConfig(List<Property> propertyList) { public MethodConfig(List<Property> propertyList) {
propertyList.stream().parallel().forEach(property -> { propertyList.stream().parallel().forEach(property -> {
if (property.getValue() != null) { Object value = property.getValue();
String propertyValue = String.valueOf(property.getValue()); if (value != null) {
String propertyValue = String.valueOf(value);
switch (property.getKey()) { switch (property.getKey()) {
case "sheetUrl": case "sheetUrl":
this.spreadsheetUrl = propertyValue; this.spreadsheetUrl = propertyValue;
@ -89,8 +91,15 @@ public class MethodConfig {
this.rowObjects = propertyValue; this.rowObjects = propertyValue;
break; break;
case "where": case "where":
if (property.getValue() != null && !((List<Object>) property.getValue()).isEmpty()) { if (value != null && value instanceof List) {
this.whereConditions = Condition.generateFromConfiguration((List<Object>) property.getValue()); // Check if all values in the where condition are null.
boolean allValuesNull = ((List) value).stream()
.allMatch(valueMap -> valueMap == null ||
((Map) valueMap).entrySet().stream().allMatch(e -> ((Map.Entry) e).getValue() == null));
if (!allValuesNull) {
this.whereConditions = Condition.generateFromConfiguration((List<Object>) value);
}
} }
break; break;
} }