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

JS functions can now be stored to an action.

Browse Source
This commit is contained in:
Trisha Anand 2019-12-05 09:19:45 +00:00
parent c5ce086ace
commit b16909de61
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,6 +48,10 @@ public class ActionConfiguration {
*/
Map<String, Object> query;
// JS action fields
String jsFunction;
/*
* Future plugins could require more fields that are not covered above.
* They will have to represented in a key-value format where the plugin

2
app/server/appsmith-server/src/main/java/com/appsmith/server/domains/PluginType.java
View File

@ -1,5 +1,5 @@
package com.appsmith.server.domains;
public enum PluginType {
DB, API
DB, API, JS
}

12
app/server/appsmith-server/src/main/java/com/appsmith/server/services/ActionServiceImpl.java
View File

@ -10,6 +10,7 @@ import com.appsmith.server.constants.FieldName;
import com.appsmith.server.domains.Action;
import com.appsmith.server.domains.Datasource;
import com.appsmith.server.domains.Plugin;
import com.appsmith.server.domains.PluginType;
import com.appsmith.server.dtos.ExecuteActionDTO;
import com.appsmith.server.exceptions.AppsmithError;
import com.appsmith.server.exceptions.AppsmithException;
@ -185,8 +186,12 @@ public class ActionServiceImpl extends BaseService<ActionRepository, Action, Str
}
if (action.getDatasource() == null) {
action.setIsValid(false);
invalids.add(AppsmithError.DATASOURCE_NOT_GIVEN.getMessage());
if (action.getPluginType() != PluginType.JS) {
// This action isn't of type JS functions which requires that the pluginType be set by the client. Hence,
// datasource is very much required for such an action.
action.setIsValid(false);
invalids.add(AppsmithError.DATASOURCE_NOT_GIVEN.getMessage());
}
action.setInvalids(invalids);
return super.create(action);
}
@ -303,6 +308,9 @@ public class ActionServiceImpl extends BaseService<ActionRepository, Action, Str
Mono<Datasource> datasourceMono = actionMono
.flatMap(action -> {
if (action.getPluginType() == PluginType.JS) {
return Mono.error(new AppsmithException(AppsmithError.UNSUPPORTED_OPERATION));
}
if (action.getDatasourceId() != null) {
return datasourceService.findById(action.getDatasourceId());
} else if (action.getDatasource() != null && action.getDatasource().getId() != null) {