diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/constants/spans/ce/LayoutSpanCE.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/constants/spans/ce/LayoutSpanCE.java index f8fb95a6a2d0..7f9c590b2123 100644 --- a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/constants/spans/ce/LayoutSpanCE.java +++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/constants/spans/ce/LayoutSpanCE.java @@ -11,8 +11,8 @@ public class LayoutSpanCE { public static final String FIND_ALL_ON_LOAD_EXECUTABLES = APPSMITH_SPAN_PREFIX + "onLoadExecutablesUtil.findAllOnLoadExecutables"; - public static final String UPDATE_EXECUTABLES_EXECUTE_ONLOAD = - APPSMITH_SPAN_PREFIX + "onLoadExecutablesUtil.updateExecutablesExecuteOnLoad"; + public static final String UPDATE_EXECUTABLES_RUN_BEHAVIOUR = + APPSMITH_SPAN_PREFIX + "onLoadExecutablesUtil.updateExecutablesRunBehaviour"; public static final String FIND_AND_UPDATE_LAYOUT = APPSMITH_SPAN_PREFIX + "onLoadExecutablesUtil.findAndUpdateLayout"; public static final String UNESCAPE_MONGO_SPECIAL_CHARS = APPSMITH_SPAN_PREFIX + "unescapeMongoSpecialCharacters"; diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/dtos/LayoutExecutableUpdateDTO.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/dtos/LayoutExecutableUpdateDTO.java index 01099013573e..d79512893a86 100644 --- a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/dtos/LayoutExecutableUpdateDTO.java +++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/dtos/LayoutExecutableUpdateDTO.java @@ -1,5 +1,6 @@ package com.appsmith.external.dtos; +import com.appsmith.external.models.RunBehaviourEnum; import com.appsmith.external.views.Views; import com.fasterxml.jackson.annotation.JsonView; import lombok.Getter; @@ -21,6 +22,26 @@ public class LayoutExecutableUpdateDTO { @JsonView(Views.Public.class) String collectionId; - @JsonView(Views.Public.class) + @Deprecated + @JsonView(Views.Internal.class) Boolean executeOnLoad; + + @Deprecated + @JsonView(Views.Public.class) + RunBehaviourEnum runBehaviour; + + /** + * Custom getter for runBehaviour that provides fallback to executeOnLoad if runBehaviour is null + * + * @return The runBehaviour, or a value derived from executeOnLoad if runBehaviour is null + */ + public RunBehaviourEnum getRunBehaviour() { + if (runBehaviour != null) { + return runBehaviour; + } + if (executeOnLoad != null) { + return Boolean.TRUE.equals(executeOnLoad) ? RunBehaviourEnum.ON_PAGE_LOAD : RunBehaviourEnum.MANUAL; + } + return null; + } } diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/helpers/DataTypeStringUtils.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/helpers/DataTypeStringUtils.java index 950850a20c4e..9c4f40b7ebaf 100644 --- a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/helpers/DataTypeStringUtils.java +++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/helpers/DataTypeStringUtils.java @@ -195,7 +195,7 @@ public static DataType stringToKnownDataTypeConverter(String input) { * @param replacement value that needs to be substituted in place of mustache expression * @param replacementDataType nullable DataType that is used to provide Plugin Specific types, by setting this * you can override the 'DataTypeStringUtils.stringToKnownDataTypeConverter(replacement)' - * default behavior. + * default behaviour. * @param insertedParams keeps a list of tuple (replacement, data_type) * @param smartSubstitutionUtils provides entry to plugin specific post-processing logic applied to replacement * value before the final substitution happens diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/Executable.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/Executable.java index b7e2aad60e5e..88126425612e 100644 --- a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/Executable.java +++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/Executable.java @@ -21,8 +21,11 @@ public interface Executable { Boolean getUserSetOnLoad(); + @Deprecated Boolean getExecuteOnLoad(); + RunBehaviourEnum getRunBehaviour(); + Set getSelfReferencingDataPaths(); @JsonIgnore @@ -69,13 +72,15 @@ default LayoutExecutableUpdateDTO createLayoutExecutableUpdateDTO() { layoutExecutableUpdateDTO.setId(this.getId()); layoutExecutableUpdateDTO.setName(this.getValidName()); - layoutExecutableUpdateDTO.setExecuteOnLoad(this.getExecuteOnLoad()); + layoutExecutableUpdateDTO.setRunBehaviour(this.getRunBehaviour()); return layoutExecutableUpdateDTO; } void setExecuteOnLoad(Boolean isExecuteOnLoad); + void setRunBehaviour(RunBehaviourEnum runBehaviour); + @JsonIgnore @Transient Boolean isOnLoadMessageAllowed(); diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/RunBehaviorEnum.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/RunBehaviourEnum.java similarity index 66% rename from app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/RunBehaviorEnum.java rename to app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/RunBehaviourEnum.java index fbe37d2a1ec8..f14f65791be0 100644 --- a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/RunBehaviorEnum.java +++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/RunBehaviourEnum.java @@ -1,9 +1,9 @@ package com.appsmith.external.models; /** - * Enum to define the behavior for running actions + * Enum to define the behaviour for running actions */ -public enum RunBehaviorEnum { +public enum RunBehaviourEnum { MANUAL, // Action will only run when manually triggered ON_PAGE_LOAD // Action will run when the page loads } diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/ce/ActionCE_DTO.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/ce/ActionCE_DTO.java index 3409139b3785..4de0347a1e76 100644 --- a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/ce/ActionCE_DTO.java +++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/ce/ActionCE_DTO.java @@ -15,7 +15,7 @@ import com.appsmith.external.models.PluginType; import com.appsmith.external.models.Policy; import com.appsmith.external.models.Property; -import com.appsmith.external.models.RunBehaviorEnum; +import com.appsmith.external.models.RunBehaviourEnum; import com.appsmith.external.views.FromRequest; import com.appsmith.external.views.Git; import com.appsmith.external.views.Views; @@ -103,14 +103,24 @@ public class ActionCE_DTO implements Identifiable, Executable { /** * @deprecated This field is deprecated and will be removed in a future release. - * Use runBehavior instead. + * Use runBehaviour instead. */ @Deprecated - @JsonView({Views.Public.class, FromRequest.class, Git.class}) + @JsonView({Views.Internal.class, FromRequest.class, Git.class}) Boolean executeOnLoad; @JsonView({Views.Public.class, FromRequest.class, Git.class}) - RunBehaviorEnum runBehavior = RunBehaviorEnum.MANUAL; + RunBehaviourEnum runBehaviour; + + public RunBehaviourEnum getRunBehaviour() { + if (runBehaviour != null) { + return runBehaviour; + } + if (executeOnLoad != null) { + return Boolean.TRUE.equals(executeOnLoad) ? RunBehaviourEnum.ON_PAGE_LOAD : RunBehaviourEnum.MANUAL; + } + return null; + } @JsonView({Views.Public.class, FromRequest.class, Git.class}) Boolean clientSideExecution; diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/ActionControllerCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/ActionControllerCE.java index fddfb6addbe3..3ff521e0e657 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/ActionControllerCE.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/ActionControllerCE.java @@ -2,7 +2,7 @@ import com.appsmith.external.models.ActionDTO; import com.appsmith.external.models.ActionExecutionResult; -import com.appsmith.external.models.RunBehaviorEnum; +import com.appsmith.external.models.RunBehaviourEnum; import com.appsmith.external.views.FromRequest; import com.appsmith.external.views.Views; import com.appsmith.server.constants.FieldName; @@ -117,17 +117,17 @@ public Mono>> getActionsForViewMode( } @JsonView(Views.Public.class) - @PutMapping("/runBehavior/{branchedActionId}") - public Mono> setRunBehavior( - @PathVariable String branchedActionId, @RequestParam RunBehaviorEnum behavior) { - log.debug("Going to set run behavior for action id {} to {}", branchedActionId, behavior); + @PutMapping("/runBehaviour/{branchedActionId}") + public Mono> setRunBehaviour( + @PathVariable String branchedActionId, @RequestParam RunBehaviourEnum behaviour) { + log.debug("Going to set run behaviour for action id {} to {}", branchedActionId, behaviour); return layoutActionService - .setRunBehavior(branchedActionId, behavior) + .setRunBehaviour(branchedActionId, behaviour) .map(action -> new ResponseDTO<>(HttpStatus.OK, action)); } /** - * @deprecated This endpoint is deprecated. Use /runBehavior/{branchedActionId} instead. + * @deprecated This endpoint is deprecated. Use /runBehaviour/{branchedActionId} instead. */ @Deprecated @JsonView(Views.Public.class) diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/ce/NewActionCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/ce/NewActionCE.java index f4dfd4823d23..9d4143447244 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/ce/NewActionCE.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/ce/NewActionCE.java @@ -71,8 +71,8 @@ public static class Fields extends RefAwareDomain.Fields { dotted(unpublishedAction, ActionDTO.Fields.contextType); public static final String unpublishedAction_userSetOnLoad = dotted(unpublishedAction, ActionDTO.Fields.userSetOnLoad); - public static final String unpublishedAction_executeOnLoad = - dotted(unpublishedAction, ActionDTO.Fields.executeOnLoad); + public static final String unpublishedAction_runBehaviour = + dotted(unpublishedAction, ActionDTO.Fields.runBehaviour); public static final String unpublishedAction_fullyQualifiedName = dotted(unpublishedAction, ActionDTO.Fields.fullyQualifiedName); public static final String unpublishedAction_actionConfiguration_httpMethod = diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/LayoutExecutableUpdateDTO.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/LayoutExecutableUpdateDTO.java index 07b29ace28fb..2b0c1cb57fbf 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/LayoutExecutableUpdateDTO.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/LayoutExecutableUpdateDTO.java @@ -1,5 +1,6 @@ package com.appsmith.server.dtos; +import com.appsmith.external.models.RunBehaviourEnum; import com.appsmith.external.views.Views; import com.fasterxml.jackson.annotation.JsonView; import lombok.Getter; @@ -21,6 +22,25 @@ public class LayoutExecutableUpdateDTO { @JsonView(Views.Public.class) String collectionId; - @JsonView(Views.Public.class) + @Deprecated + @JsonView(Views.Internal.class) Boolean executeOnLoad; + + @JsonView(Views.Public.class) + RunBehaviourEnum runBehaviour; + + /** + * Custom getter for runBehaviour that provides fallback to executeOnLoad if runBehaviour is null + * + * @return The runBehaviour, or a value derived from executeOnLoad if runBehaviour is null + */ + public RunBehaviourEnum getRunBehaviour() { + if (runBehaviour != null) { + return runBehaviour; + } + if (executeOnLoad != null) { + return Boolean.TRUE.equals(executeOnLoad) ? RunBehaviourEnum.ON_PAGE_LOAD : RunBehaviourEnum.MANUAL; + } + return null; + } } diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/ce/ActionViewCE_DTO.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/ce/ActionViewCE_DTO.java index 2a5663d08631..3db1f543d0b7 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/ce/ActionViewCE_DTO.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/ce/ActionViewCE_DTO.java @@ -1,5 +1,6 @@ package com.appsmith.server.dtos.ce; +import com.appsmith.external.models.RunBehaviourEnum; import com.appsmith.external.views.Views; import com.fasterxml.jackson.annotation.JsonView; import lombok.Getter; @@ -37,6 +38,23 @@ public class ActionViewCE_DTO { @JsonView(Views.Public.class) Set jsonPathKeys; + @Deprecated + @JsonView(Views.Internal.class) + Boolean executeOnLoad; + + @JsonView({Views.Public.class}) + RunBehaviourEnum runBehaviour; + + public RunBehaviourEnum getRunBehaviour() { + if (runBehaviour != null) { + return runBehaviour; + } + if (executeOnLoad != null) { + return Boolean.TRUE.equals(executeOnLoad) ? RunBehaviourEnum.ON_PAGE_LOAD : RunBehaviourEnum.MANUAL; + } + return null; + } + // Overriding the getter to ensure that for actions missing action configuration, the timeout is // still set for the client to use as a guideline (even though this would be an invalid action // and hence would return an action execution error. diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/layouts/UpdateLayoutServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/layouts/UpdateLayoutServiceCEImpl.java index 53ad0052a3a2..a974e878f88b 100755 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/layouts/UpdateLayoutServiceCEImpl.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/layouts/UpdateLayoutServiceCEImpl.java @@ -51,10 +51,10 @@ import static com.appsmith.external.constants.spans.LayoutSpan.EXTRACT_ALL_WIDGET_NAMES_AND_DYNAMIC_BINDINGS_FROM_DSL; import static com.appsmith.external.constants.spans.LayoutSpan.FIND_ALL_ON_LOAD_EXECUTABLES; import static com.appsmith.external.constants.spans.LayoutSpan.FIND_AND_UPDATE_LAYOUT; -import static com.appsmith.external.constants.spans.LayoutSpan.UPDATE_EXECUTABLES_EXECUTE_ONLOAD; import static com.appsmith.external.constants.spans.LayoutSpan.UPDATE_LAYOUT_DSL_METHOD; import static com.appsmith.external.constants.spans.LayoutSpan.UPDATE_LAYOUT_METHOD; import static com.appsmith.external.constants.spans.PageSpan.GET_PAGE_BY_ID; +import static com.appsmith.external.constants.spans.ce.LayoutSpanCE.UPDATE_EXECUTABLES_RUN_BEHAVIOUR; import static com.appsmith.external.constants.spans.ce.LayoutSpanCE.UPDATE_LAYOUT_BASED_ON_CONTEXT; import static com.appsmith.server.constants.CommonConstants.EVALUATION_VERSION; import static com.appsmith.server.helpers.ContextTypeUtils.isPageContext; @@ -197,12 +197,12 @@ protected Mono updateLayoutDsl( return Mono.just(allOnLoadExecutables); } // Update these executables to be executed on load, unless the user has touched - // the executeOnLoad + // the runBehaviour // setting for this return onLoadExecutablesUtil - .updateExecutablesExecuteOnLoad( + .updateExecutablesRunBehaviour( flatmapOnLoadExecutables, creatorId, executableUpdatesRef, messagesRef, creatorType) - .name(UPDATE_EXECUTABLES_EXECUTE_ONLOAD) + .name(UPDATE_EXECUTABLES_RUN_BEHAVIOUR) .tap(Micrometer.observation(observationRegistry)) .thenReturn(allOnLoadExecutables); }) diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/newactions/base/NewActionServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/newactions/base/NewActionServiceCEImpl.java index be6122088e56..737de838738e 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/newactions/base/NewActionServiceCEImpl.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/newactions/base/NewActionServiceCEImpl.java @@ -665,7 +665,7 @@ public Mono findActionDTObyIdAndViewMode(String id, Boolean viewMode, @Override public Flux findUnpublishedOnLoadActionsExplicitSetByUserInPage(String pageId) { return repository - .findUnpublishedActionsByPageIdAndExecuteOnLoadSetByUserTrue( + .findUnpublishedActionsByPageIdAndRunbehaviourSetByUserOnPageLoad( pageId, actionPermission.getEditPermission()) .flatMap(this::sanitizeAction); } @@ -1248,7 +1248,7 @@ private List addActionUpdatesForActionNames( layoutExecutableUpdateDTO.setId(pageAction.getId()); layoutExecutableUpdateDTO.setName(pageAction.getValidName()); layoutExecutableUpdateDTO.setCollectionId(pageAction.getCollectionId()); - layoutExecutableUpdateDTO.setExecuteOnLoad(pageAction.getExecuteOnLoad()); + layoutExecutableUpdateDTO.setRunBehaviour(pageAction.getRunBehaviour()); return layoutExecutableUpdateDTO; }) .collect(Collectors.toList()); diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/onload/internal/OnLoadExecutablesUtilCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/onload/internal/OnLoadExecutablesUtilCE.java index 3237ee77d04c..abc699f8c662 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/onload/internal/OnLoadExecutablesUtilCE.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/onload/internal/OnLoadExecutablesUtilCE.java @@ -33,10 +33,10 @@ Mono>> findAllOnLoadExecutables( * @param executableUpdatesRef : Empty array list which would be set in this function with all the page actions whose * execute on load setting has changed (whether flipped from true to false, or vice versa) * @param messagesRef : Empty array list which would be set in this function with all the messagesRef that should be - * displayed to the developer user communicating the action executeOnLoad changes. + * displayed to the developer user communicating the action runBehaviour changes. * @return */ - Mono updateExecutablesExecuteOnLoad( + Mono updateExecutablesRunBehaviour( List onLoadExecutables, String creatorId, List executableUpdatesRef, diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/onload/internal/OnLoadExecutablesUtilCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/onload/internal/OnLoadExecutablesUtilCEImpl.java index f311fe9fb1d3..692056474797 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/onload/internal/OnLoadExecutablesUtilCEImpl.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/onload/internal/OnLoadExecutablesUtilCEImpl.java @@ -9,6 +9,7 @@ import com.appsmith.external.models.EntityReferenceType; import com.appsmith.external.models.Executable; import com.appsmith.external.models.Property; +import com.appsmith.external.models.RunBehaviourEnum; import com.appsmith.server.domains.ExecutableDependencyEdge; import com.appsmith.server.domains.Layout; import com.appsmith.server.domains.NewPage; @@ -295,7 +296,7 @@ public Mono>> findAllOnLoadExecutables( } @Override - public Mono updateExecutablesExecuteOnLoad( + public Mono updateExecutablesRunBehaviour( List onLoadExecutables, String creatorId, List executableUpdatesRef, @@ -310,7 +311,7 @@ public Mono updateExecutablesExecuteOnLoad( // Before we update the actions, fetch all the actions which are currently set to execute on load. Mono> existingOnLoadExecutablesMono = creatorContextExecutablesFlux .flatMap(executable -> { - if (TRUE.equals(executable.getExecuteOnLoad())) { + if (RunBehaviourEnum.ON_PAGE_LOAD.equals(executable.getRunBehaviour())) { return Mono.just(executable); } return Mono.empty(); @@ -364,13 +365,13 @@ public Mono updateExecutablesExecuteOnLoad( // If this executable is no longer an onload executable, turn the execute on load to false if (turnedOffExecutableNames.contains(executableName)) { - executable.setExecuteOnLoad(FALSE); + executable.setRunBehaviour(RunBehaviourEnum.MANUAL); toUpdateExecutables.add(executable); } // If this executable is newly found to be on load, turn execute on load to true if (turnedOnExecutableNames.contains(executableName)) { - executable.setExecuteOnLoad(TRUE); + executable.setRunBehaviour(RunBehaviourEnum.ON_PAGE_LOAD); toUpdateExecutables.add(executable); } @@ -1262,7 +1263,8 @@ private Mono> addWidgetRelationshipToGraph( } private boolean hasUserSetExecutableToNotRunOnPageLoad(Executable executable) { - if (TRUE.equals(executable.getUserSetOnLoad()) && !TRUE.equals(executable.getExecuteOnLoad())) { + if (TRUE.equals(executable.getUserSetOnLoad()) + && executable.getRunBehaviour() != RunBehaviourEnum.ON_PAGE_LOAD) { return true; } diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomNewActionRepositoryCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomNewActionRepositoryCE.java index 7076da23aed5..7c70532d0a32 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomNewActionRepositoryCE.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomNewActionRepositoryCE.java @@ -29,7 +29,7 @@ public interface CustomNewActionRepositoryCE extends AppsmithRepository findUnpublishedActionsByNameInAndPageId(Set names, String pageId, AclPermission permission); - Flux findUnpublishedActionsByPageIdAndExecuteOnLoadSetByUserTrue( + Flux findUnpublishedActionsByPageIdAndRunbehaviourSetByUserOnPageLoad( String pageId, AclPermission permission); Flux findAllActionsByNameAndPageIdsAndViewMode( diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomNewActionRepositoryCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomNewActionRepositoryCEImpl.java index 60ab2e1c0eda..d5690373e47a 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomNewActionRepositoryCEImpl.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomNewActionRepositoryCEImpl.java @@ -2,6 +2,7 @@ import com.appsmith.external.models.CreatorContextType; import com.appsmith.external.models.PluginType; +import com.appsmith.external.models.RunBehaviourEnum; import com.appsmith.server.acl.AclPermission; import com.appsmith.server.domains.NewAction; import com.appsmith.server.dtos.PluginTypeAndCountDTO; @@ -178,9 +179,10 @@ public Flux findUnpublishedActionsByNameInAndPageId( } @Override - public Flux findUnpublishedActionsByPageIdAndExecuteOnLoadSetByUserTrue( + public Flux findUnpublishedActionsByPageIdAndRunbehaviourSetByUserOnPageLoad( String pageId, AclPermission permission) { - BridgeQuery q = Bridge.isTrue(NewAction.Fields.unpublishedAction_executeOnLoad) + BridgeQuery q = Bridge.equal( + NewAction.Fields.unpublishedAction_runBehaviour, RunBehaviourEnum.ON_PAGE_LOAD) .isTrue(NewAction.Fields.unpublishedAction_userSetOnLoad) .equal(NewAction.Fields.unpublishedAction_pageId, pageId) // In case an action has been deleted in edit mode, but still exists in deployed mode, NewAction object diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/LayoutActionServiceCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/LayoutActionServiceCE.java index 2d727c8a5101..87695893ab47 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/LayoutActionServiceCE.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/LayoutActionServiceCE.java @@ -1,7 +1,7 @@ package com.appsmith.server.services.ce; import com.appsmith.external.models.ActionDTO; -import com.appsmith.external.models.RunBehaviorEnum; +import com.appsmith.external.models.RunBehaviourEnum; import com.appsmith.server.dtos.ActionMoveDTO; import com.appsmith.server.dtos.CreateActionMetaDTO; import reactor.core.publisher.Mono; @@ -18,7 +18,7 @@ public interface LayoutActionServiceCE { Mono setExecuteOnLoad(String id, Boolean isExecuteOnLoad); - Mono setRunBehavior(String id, RunBehaviorEnum behavior); + Mono setRunBehaviour(String id, RunBehaviourEnum behaviour); Mono createAction(ActionDTO actionDTO); diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/LayoutActionServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/LayoutActionServiceCEImpl.java index f37f6092a475..7d70e488c16b 100755 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/LayoutActionServiceCEImpl.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/LayoutActionServiceCEImpl.java @@ -6,7 +6,7 @@ import com.appsmith.external.models.CreatorContextType; import com.appsmith.external.models.Datasource; import com.appsmith.external.models.PluginType; -import com.appsmith.external.models.RunBehaviorEnum; +import com.appsmith.external.models.RunBehaviourEnum; import com.appsmith.server.acl.AclPermission; import com.appsmith.server.constants.FieldName; import com.appsmith.server.datasources.base.DatasourceService; @@ -290,6 +290,7 @@ protected Mono updateActionBasedOnContextType(NewAction newAction, Ac } } + @Deprecated @Override public Mono setExecuteOnLoad(String id, Boolean isExecuteOnLoad) { return newActionService @@ -301,13 +302,6 @@ public Mono setExecuteOnLoad(String id, Boolean isExecuteOnLoad) { action.setUserSetOnLoad(true); action.setExecuteOnLoad(isExecuteOnLoad); - // Update runBehavior based on executeOnLoad for forward compatibility - if (Boolean.TRUE.equals(isExecuteOnLoad)) { - action.setRunBehavior(RunBehaviorEnum.ON_PAGE_LOAD); - } else { - action.setRunBehavior(RunBehaviorEnum.MANUAL); - } - newAction.setUnpublishedAction(action); return newActionService.save(newAction).flatMap(savedAction -> updateLayoutService @@ -320,7 +314,7 @@ public Mono setExecuteOnLoad(String id, Boolean isExecuteOnLoad) { } @Override - public Mono setRunBehavior(String id, RunBehaviorEnum behavior) { + public Mono setRunBehaviour(String id, RunBehaviourEnum behaviour) { return newActionService .findById(id, actionPermission.getEditPermission()) .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.ACTION, id))) @@ -328,14 +322,7 @@ public Mono setRunBehavior(String id, RunBehaviorEnum behavior) { ActionDTO action = newAction.getUnpublishedAction(); action.setUserSetOnLoad(true); - action.setRunBehavior(behavior); - - // Update executeOnLoad based on RunBehaviorEnum for backward compatibility - if (RunBehaviorEnum.ON_PAGE_LOAD.equals(behavior)) { - action.setExecuteOnLoad(true); - } else { - action.setExecuteOnLoad(false); - } + action.setRunBehaviour(behaviour); newAction.setUnpublishedAction(action); @@ -422,16 +409,7 @@ public Mono createAction(ActionDTO actionDTO, CreateActionMetaDTO act // New actions will never be set to auto-magical execution, unless it is triggered via a // page or application clone event. if (!AppsmithEventContextType.CLONE_PAGE.equals(eventContext.getAppsmithEventContextType())) { - actionDTO.setExecuteOnLoad(false); - - actionDTO.setRunBehavior(RunBehaviorEnum.MANUAL); - } else { - // For cloned pages, if executeOnLoad is true, set runBehavior to ON_PAGE_LOAD - if (Boolean.TRUE.equals(actionDTO.getExecuteOnLoad())) { - actionDTO.setRunBehavior(RunBehaviorEnum.ON_PAGE_LOAD); - } else { - actionDTO.setRunBehavior(RunBehaviorEnum.MANUAL); - } + actionDTO.setRunBehaviour(RunBehaviourEnum.MANUAL); } newAction.setUnpublishedAction(actionDTO); diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/CreateDBTablePageSolutionCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/CreateDBTablePageSolutionCEImpl.java index fc62b66cbca2..1b131a27a394 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/CreateDBTablePageSolutionCEImpl.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/CreateDBTablePageSolutionCEImpl.java @@ -15,6 +15,7 @@ import com.appsmith.external.models.DatasourceStructure.PrimaryKey; import com.appsmith.external.models.DatasourceStructure.Table; import com.appsmith.external.models.Property; +import com.appsmith.external.models.RunBehaviourEnum; import com.appsmith.server.applications.base.ApplicationService; import com.appsmith.server.constants.Assets; import com.appsmith.server.constants.Entity; @@ -452,7 +453,8 @@ public Mono createPageFromDBTable( .flatMap(actionDTO -> StringUtils.equals(actionDTO.getName(), SELECT_QUERY) || StringUtils.equals(actionDTO.getName(), FIND_QUERY) || StringUtils.equals(actionDTO.getName(), LIST_QUERY) - ? layoutActionService.setExecuteOnLoad(actionDTO.getId(), true) + ? layoutActionService.setRunBehaviour( + actionDTO.getId(), RunBehaviourEnum.ON_PAGE_LOAD) : Mono.just(actionDTO)) .then(applicationPageService .getPage(savedPageId, false) diff --git a/app/server/appsmith-server/src/main/resources/CRUD-DB-Table-Template-Application.json b/app/server/appsmith-server/src/main/resources/CRUD-DB-Table-Template-Application.json index 54a1133b67da..1b6d3f77417a 100644 --- a/app/server/appsmith-server/src/main/resources/CRUD-DB-Table-Template-Application.json +++ b/app/server/appsmith-server/src/main/resources/CRUD-DB-Table-Template-Application.json @@ -1835,7 +1835,7 @@ "pluginType": "DB", "unpublishedAction": { "userSetOnLoad": false, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "isValid": true, "actionConfiguration": { "paginationType": "NONE", @@ -1869,7 +1869,7 @@ "id": "SQL_DeleteQuery", "publishedAction": { "userSetOnLoad": false, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "isValid": true, "actionConfiguration": { "paginationType": "NONE", @@ -1904,7 +1904,7 @@ "pluginType": "DB", "unpublishedAction": { "userSetOnLoad": false, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "isValid": true, "actionConfiguration": { "paginationType": "NONE", @@ -1945,7 +1945,7 @@ "id": "SQL_SelectQuery", "publishedAction": { "userSetOnLoad": false, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "isValid": true, "actionConfiguration": { "paginationType": "NONE", @@ -1987,7 +1987,7 @@ "pluginType": "DB", "unpublishedAction": { "userSetOnLoad": false, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "isValid": true, "actionConfiguration": { "paginationType": "NONE", @@ -2035,7 +2035,7 @@ "id": "SQL_UpdateQuery", "publishedAction": { "userSetOnLoad": false, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "isValid": true, "actionConfiguration": { "paginationType": "NONE", @@ -2084,7 +2084,7 @@ "pluginType": "DB", "unpublishedAction": { "userSetOnLoad": false, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "isValid": true, "actionConfiguration": { "paginationType": "NONE", @@ -2132,7 +2132,7 @@ "id": "SQL_InsertQuery", "publishedAction": { "userSetOnLoad": false, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "isValid": true, "actionConfiguration": { "paginationType": "NONE", @@ -2181,7 +2181,7 @@ "pluginType": "SAAS", "unpublishedAction": { "userSetOnLoad": false, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "isValid": true, "actionConfiguration": { "paginationType": "NONE", @@ -2281,7 +2281,7 @@ "id": "Google Sheets_UpdateQuery", "publishedAction": { "userSetOnLoad": false, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "isValid": true, "actionConfiguration": { "paginationType": "NONE", @@ -2382,7 +2382,7 @@ "pluginType": "SAAS", "unpublishedAction": { "userSetOnLoad": false, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "isValid": true, "actionConfiguration": { "paginationType": "NONE", @@ -2497,7 +2497,7 @@ "id": "Google Sheets_SelectQuery", "publishedAction": { "userSetOnLoad": false, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "isValid": true, "actionConfiguration": { "paginationType": "NONE", @@ -2613,7 +2613,7 @@ "pluginType": "SAAS", "unpublishedAction": { "userSetOnLoad": false, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "isValid": true, "actionConfiguration": { "paginationType": "NONE", @@ -2731,7 +2731,7 @@ "id": "Google Sheets_DeleteQuery", "publishedAction": { "userSetOnLoad": false, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "isValid": true, "actionConfiguration": { "paginationType": "NONE", @@ -2850,7 +2850,7 @@ "pluginType": "SAAS", "unpublishedAction": { "userSetOnLoad": false, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "isValid": true, "actionConfiguration": { "paginationType": "NONE", @@ -2946,7 +2946,7 @@ "id": "Google Sheets_InsertQuery", "publishedAction": { "userSetOnLoad": false, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "isValid": true, "actionConfiguration": { "paginationType": "NONE", @@ -3043,7 +3043,7 @@ "pluginType": "DB", "unpublishedAction": { "userSetOnLoad": false, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "isValid": true, "actionConfiguration": { "paginationType": "NONE", @@ -3117,7 +3117,7 @@ "id": "S3_CreateFile", "publishedAction": { "userSetOnLoad": false, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "isValid": true, "actionConfiguration": { "paginationType": "NONE", @@ -3192,7 +3192,7 @@ "pluginType": "DB", "unpublishedAction": { "userSetOnLoad": false, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "isValid": true, "actionConfiguration": { "path": "", @@ -3293,7 +3293,7 @@ "id": "S3_ListFiles", "publishedAction": { "userSetOnLoad": false, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "isValid": true, "actionConfiguration": { "path": "", @@ -3395,7 +3395,7 @@ "pluginType": "DB", "unpublishedAction": { "userSetOnLoad": false, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "isValid": true, "actionConfiguration": { "paginationType": "NONE", @@ -3449,7 +3449,7 @@ "id": "S3_DeleteFile", "publishedAction": { "userSetOnLoad": false, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "isValid": true, "actionConfiguration": { "paginationType": "NONE", @@ -3504,7 +3504,7 @@ "pluginType": "DB", "unpublishedAction": { "userSetOnLoad": false, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "isValid": true, "actionConfiguration": { "paginationType": "NONE", @@ -3565,7 +3565,7 @@ "id": "S3_ReadFile", "publishedAction": { "userSetOnLoad": false, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "isValid": true, "actionConfiguration": { "paginationType": "NONE", @@ -3627,7 +3627,7 @@ "pluginType": "DB", "unpublishedAction": { "userSetOnLoad": false, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "isValid": true, "actionConfiguration": { "paginationType": "NONE", @@ -3699,7 +3699,7 @@ "id": "S3_UpdateFile", "publishedAction": { "userSetOnLoad": false, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "isValid": true, "actionConfiguration": { "paginationType": "NONE", @@ -3772,7 +3772,7 @@ "pluginType": "API", "unpublishedAction": { "userSetOnLoad": false, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "isValid": true, "actionConfiguration": { "autoGeneratedHeaders": [], @@ -3811,7 +3811,7 @@ "id": "Admin_get_datasource_structure", "publishedAction": { "userSetOnLoad": false, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "isValid": true, "actionConfiguration": { "autoGeneratedHeaders": [], @@ -3851,7 +3851,7 @@ "pluginType": "API", "unpublishedAction": { "userSetOnLoad": false, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "isValid": true, "actionConfiguration": { "autoGeneratedHeaders": [ @@ -3898,7 +3898,7 @@ "id": "Admin_update_template", "publishedAction": { "userSetOnLoad": false, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "isValid": true, "actionConfiguration": { "autoGeneratedHeaders": [ @@ -3946,7 +3946,7 @@ "pluginType": "API", "unpublishedAction": { "userSetOnLoad": false, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "isValid": true, "actionConfiguration": { "autoGeneratedHeaders": [ @@ -3990,7 +3990,7 @@ "id": "Admin_get_exported_app", "publishedAction": { "userSetOnLoad": false, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "isValid": true, "actionConfiguration": { "autoGeneratedHeaders": [ @@ -4035,7 +4035,7 @@ "pluginType": "API", "unpublishedAction": { "userSetOnLoad": false, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "isValid": true, "actionConfiguration": { "path": "/api/v1/users/me", @@ -4078,7 +4078,7 @@ "id": "Admin_get_user", "publishedAction": { "userSetOnLoad": false, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "isValid": true, "actionConfiguration": { "path": "/api/v1/users/me", @@ -4122,7 +4122,7 @@ "pluginType": "JS", "unpublishedAction": { "userSetOnLoad": true, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "isValid": true, "actionConfiguration": { "paginationType": "NONE", @@ -4162,7 +4162,7 @@ "id": "Admin_Utils.myFun2", "publishedAction": { "userSetOnLoad": true, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "isValid": true, "actionConfiguration": { "paginationType": "NONE", @@ -4203,7 +4203,7 @@ "pluginType": "API", "unpublishedAction": { "userSetOnLoad": false, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "isValid": true, "actionConfiguration": { "path": "/api/v1/pages/crud-page", @@ -4257,7 +4257,7 @@ "id": "Page Generator_generate_sql_app", "publishedAction": { "userSetOnLoad": false, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "isValid": true, "actionConfiguration": { "path": "/api/v1/pages/crud-page", @@ -4312,7 +4312,7 @@ "pluginType": "API", "unpublishedAction": { "userSetOnLoad": false, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "isValid": true, "actionConfiguration": { "path": "/api/v1/pages/crud-page", @@ -4364,7 +4364,7 @@ "id": "Page Generator_generate_mongo_app", "publishedAction": { "userSetOnLoad": false, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "isValid": true, "actionConfiguration": { "path": "/api/v1/pages/crud-page", @@ -4417,7 +4417,7 @@ "pluginType": "API", "unpublishedAction": { "userSetOnLoad": false, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "isValid": true, "actionConfiguration": { "path": "/api/v1/pages/crud-page", @@ -4469,7 +4469,7 @@ "id": "Page Generator_generate_gsheet_app", "publishedAction": { "userSetOnLoad": false, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "isValid": true, "actionConfiguration": { "path": "/api/v1/pages/crud-page", @@ -4522,7 +4522,7 @@ "pluginType": "DB", "unpublishedAction": { "userSetOnLoad": false, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "isValid": true, "actionConfiguration": { "paginationType": "NONE", @@ -4622,7 +4622,7 @@ "id": "MongoDB_UpdateQuery", "publishedAction": { "userSetOnLoad": false, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "isValid": true, "actionConfiguration": { "paginationType": "NONE", @@ -4723,7 +4723,7 @@ "pluginType": "DB", "unpublishedAction": { "userSetOnLoad": false, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "isValid": true, "actionConfiguration": { "paginationType": "NONE", @@ -4791,7 +4791,7 @@ "id": "MongoDB_InsertQuery", "publishedAction": { "userSetOnLoad": false, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "isValid": true, "actionConfiguration": { "paginationType": "NONE", @@ -4860,7 +4860,7 @@ "pluginType": "DB", "unpublishedAction": { "userSetOnLoad": false, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "isValid": true, "actionConfiguration": { "paginationType": "NONE", @@ -4963,7 +4963,7 @@ "id": "MongoDB_FindQuery", "publishedAction": { "userSetOnLoad": false, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "isValid": true, "actionConfiguration": { "paginationType": "NONE", @@ -5067,7 +5067,7 @@ "pluginType": "DB", "unpublishedAction": { "userSetOnLoad": false, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "isValid": true, "actionConfiguration": { "path": "template_table/{{data_table.selectedRow._ref}}", @@ -5132,7 +5132,7 @@ "id": "MongoDB_DeleteQuery", "publishedAction": { "userSetOnLoad": false, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "isValid": true, "actionConfiguration": { "path": "template_table/{{data_table.selectedRow._ref}}", @@ -5198,7 +5198,7 @@ "pluginType": "DB", "unpublishedAction": { "userSetOnLoad": false, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "isValid": true, "actionConfiguration": { "paginationType": "NONE", @@ -5280,7 +5280,7 @@ "id": "Firestore_UpdateQuery", "publishedAction": { "userSetOnLoad": false, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "isValid": true, "actionConfiguration": { "paginationType": "NONE", @@ -5363,7 +5363,7 @@ "pluginType": "DB", "unpublishedAction": { "userSetOnLoad": false, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "isValid": true, "actionConfiguration": { "paginationType": "NONE", @@ -5468,7 +5468,7 @@ "id": "Firestore_SelectQuery", "publishedAction": { "userSetOnLoad": false, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "isValid": true, "actionConfiguration": { "paginationType": "NONE", @@ -5574,7 +5574,7 @@ "pluginType": "DB", "unpublishedAction": { "userSetOnLoad": false, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "isValid": true, "actionConfiguration": { "paginationType": "NONE", @@ -5640,7 +5640,7 @@ "id": "Firestore_DeleteQuery", "publishedAction": { "userSetOnLoad": false, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "isValid": true, "actionConfiguration": { "paginationType": "NONE", @@ -5707,7 +5707,7 @@ "pluginType": "DB", "unpublishedAction": { "userSetOnLoad": false, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "isValid": true, "actionConfiguration": { "paginationType": "NONE", @@ -5784,7 +5784,7 @@ "id": "Firestore_InsertQuery", "publishedAction": { "userSetOnLoad": false, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "isValid": true, "actionConfiguration": { "paginationType": "NONE", @@ -5862,7 +5862,7 @@ "pluginType": "DB", "unpublishedAction": { "userSetOnLoad": false, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "isValid": true, "actionConfiguration": { "paginationType": "NONE", @@ -5896,7 +5896,7 @@ "id": "Redis_FetchKeys", "publishedAction": { "userSetOnLoad": false, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "isValid": true, "actionConfiguration": { "paginationType": "NONE", @@ -5931,7 +5931,7 @@ "pluginType": "DB", "unpublishedAction": { "userSetOnLoad": false, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "isValid": true, "actionConfiguration": { "paginationType": "NONE", @@ -5964,7 +5964,7 @@ "id": "Redis_InsertKey", "publishedAction": { "userSetOnLoad": false, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "isValid": true, "actionConfiguration": { "paginationType": "NONE", @@ -5998,7 +5998,7 @@ "pluginType": "DB", "unpublishedAction": { "userSetOnLoad": false, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "isValid": true, "actionConfiguration": { "paginationType": "NONE", @@ -6034,7 +6034,7 @@ "id": "Redis_UpdateKey", "publishedAction": { "userSetOnLoad": false, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "isValid": true, "actionConfiguration": { "paginationType": "NONE", @@ -6071,7 +6071,7 @@ "pluginType": "DB", "unpublishedAction": { "userSetOnLoad": false, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "isValid": true, "actionConfiguration": { "paginationType": "NONE", @@ -6104,7 +6104,7 @@ "id": "Redis_DeleteKey", "publishedAction": { "userSetOnLoad": false, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "isValid": true, "actionConfiguration": { "paginationType": "NONE", @@ -6138,7 +6138,7 @@ "pluginType": "DB", "unpublishedAction": { "userSetOnLoad": false, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "isValid": true, "actionConfiguration": { "paginationType": "NONE", @@ -6171,7 +6171,7 @@ "id": "Redis_FetchValue", "publishedAction": { "userSetOnLoad": false, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "isValid": true, "actionConfiguration": { "paginationType": "NONE", @@ -6205,7 +6205,7 @@ "pluginType": "DB", "unpublishedAction": { "userSetOnLoad": false, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "isValid": true, "actionConfiguration": { "paginationType": "NONE", @@ -6246,7 +6246,7 @@ "id": "PostgreSQL_SelectQuery", "publishedAction": { "userSetOnLoad": false, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "isValid": true, "actionConfiguration": { "paginationType": "NONE", @@ -6288,7 +6288,7 @@ "pluginType": "DB", "unpublishedAction": { "userSetOnLoad": false, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "isValid": true, "actionConfiguration": { "paginationType": "NONE", @@ -6336,7 +6336,7 @@ "id": "PostgreSQL_InsertQuery", "publishedAction": { "userSetOnLoad": false, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "isValid": true, "actionConfiguration": { "paginationType": "NONE", @@ -6385,7 +6385,7 @@ "pluginType": "DB", "unpublishedAction": { "userSetOnLoad": false, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "isValid": true, "actionConfiguration": { "paginationType": "NONE", @@ -6420,7 +6420,7 @@ "id": "PostgreSQL_DeleteQuery", "publishedAction": { "userSetOnLoad": false, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "isValid": true, "actionConfiguration": { "paginationType": "NONE", @@ -6456,7 +6456,7 @@ "pluginType": "DB", "unpublishedAction": { "userSetOnLoad": false, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "isValid": true, "actionConfiguration": { "paginationType": "NONE", @@ -6504,7 +6504,7 @@ "id": "PostgreSQL_UpdateQuery", "publishedAction": { "userSetOnLoad": false, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "isValid": true, "actionConfiguration": { "paginationType": "NONE", diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/exports/internal/ExportServiceTests.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/exports/internal/ExportServiceTests.java index 834a4b7e3ade..805dbee754b5 100644 --- a/app/server/appsmith-server/src/test/java/com/appsmith/server/exports/internal/ExportServiceTests.java +++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/exports/internal/ExportServiceTests.java @@ -16,6 +16,7 @@ import com.appsmith.external.models.PluginType; import com.appsmith.external.models.Policy; import com.appsmith.external.models.Property; +import com.appsmith.external.models.RunBehaviourEnum; import com.appsmith.external.models.SSLDetails; import com.appsmith.server.actioncollections.base.ActionCollectionService; import com.appsmith.server.applications.base.ApplicationService; @@ -460,7 +461,7 @@ public void createExportAppJsonWithActionAndActionCollectionTest() { ActionDTO action = new ActionDTO(); action.setName("validAction"); action.setPageId(testPage.getId()); - action.setExecuteOnLoad(true); + action.setRunBehaviour(RunBehaviourEnum.ON_PAGE_LOAD); ActionConfiguration actionConfiguration = new ActionConfiguration(); actionConfiguration.setHttpMethod(HttpMethod.GET); action.setActionConfiguration(actionConfiguration); @@ -469,7 +470,7 @@ public void createExportAppJsonWithActionAndActionCollectionTest() { ActionDTO action2 = new ActionDTO(); action2.setName("validAction2"); action2.setPageId(testPage.getId()); - action2.setExecuteOnLoad(true); + action2.setRunBehaviour(RunBehaviourEnum.ON_PAGE_LOAD); action2.setUserSetOnLoad(true); ActionConfiguration actionConfiguration2 = new ActionConfiguration(); actionConfiguration2.setHttpMethod(HttpMethod.GET); @@ -706,7 +707,7 @@ public void createExportAppJsonForGitTest() { ActionDTO action = new ActionDTO(); action.setName("validAction"); action.setPageId(testPage.getId()); - action.setExecuteOnLoad(true); + action.setRunBehaviour(RunBehaviourEnum.ON_PAGE_LOAD); ActionConfiguration actionConfiguration = new ActionConfiguration(); actionConfiguration.setHttpMethod(HttpMethod.GET); action.setActionConfiguration(actionConfiguration); @@ -851,7 +852,7 @@ public void exportImportApplication_importWithBranchName_updateApplicationResour ActionDTO action = new ActionDTO(); action.setName("validAction"); action.setPageId(newPage.getId()); - action.setExecuteOnLoad(true); + action.setRunBehaviour(RunBehaviourEnum.ON_PAGE_LOAD); ActionConfiguration actionConfiguration = new ActionConfiguration(); actionConfiguration.setHttpMethod(HttpMethod.GET); action.setActionConfiguration(actionConfiguration); @@ -1058,7 +1059,7 @@ public void exportApplication_withDatasourceConfig_exportedWithDecryptedFields() ActionDTO action = new ActionDTO(); action.setName("validAction"); action.setPageId(testPage.getId()); - action.setExecuteOnLoad(true); + action.setRunBehaviour(RunBehaviourEnum.ON_PAGE_LOAD); ActionConfiguration actionConfiguration = new ActionConfiguration(); actionConfiguration.setHttpMethod(HttpMethod.GET); action.setActionConfiguration(actionConfiguration); @@ -1067,7 +1068,7 @@ public void exportApplication_withDatasourceConfig_exportedWithDecryptedFields() ActionDTO action2 = new ActionDTO(); action2.setName("validAction2"); action2.setPageId(testPage.getId()); - action2.setExecuteOnLoad(true); + action2.setRunBehaviour(RunBehaviourEnum.ON_PAGE_LOAD); action2.setUserSetOnLoad(true); ActionConfiguration actionConfiguration2 = new ActionConfiguration(); actionConfiguration2.setHttpMethod(HttpMethod.GET); diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/fork/ApplicationForkingServiceTests.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/fork/ApplicationForkingServiceTests.java index e3850b0cbd01..6f3cc93d33a5 100644 --- a/app/server/appsmith-server/src/test/java/com/appsmith/server/fork/ApplicationForkingServiceTests.java +++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/fork/ApplicationForkingServiceTests.java @@ -14,6 +14,7 @@ import com.appsmith.external.models.PluginType; import com.appsmith.external.models.Policy; import com.appsmith.external.models.Property; +import com.appsmith.external.models.RunBehaviourEnum; import com.appsmith.external.models.SSLDetails; import com.appsmith.external.models.UploadedFile; import com.appsmith.server.acl.AclPermission; @@ -284,7 +285,7 @@ private String createApplication(Application app1) throws JsonProcessingExceptio ActionDTO action = new ActionDTO(); action.setName("forkActionTest"); action.setPageId(app1.getPages().get(0).getId()); - action.setExecuteOnLoad(true); + action.setRunBehaviour(RunBehaviourEnum.ON_PAGE_LOAD); ActionConfiguration actionConfiguration = new ActionConfiguration(); actionConfiguration.setHttpMethod(HttpMethod.GET); action.setActionConfiguration(actionConfiguration); @@ -1156,7 +1157,7 @@ private Mono> forkApplicationSetup( ActionDTO action = new ActionDTO(); action.setName("forkActionTest"); action.setPageId(srcApp.getPages().get(0).getId()); - action.setExecuteOnLoad(true); + action.setRunBehaviour(RunBehaviourEnum.ON_PAGE_LOAD); ActionConfiguration actionConfiguration = new ActionConfiguration(); actionConfiguration.setHttpMethod(HttpMethod.GET); action.setActionConfiguration(actionConfiguration); diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/git/CommonGitServiceCETest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/git/CommonGitServiceCETest.java index 9671e695a38c..f89ca77b723c 100644 --- a/app/server/appsmith-server/src/test/java/com/appsmith/server/git/CommonGitServiceCETest.java +++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/git/CommonGitServiceCETest.java @@ -13,6 +13,7 @@ import com.appsmith.external.models.JSValue; import com.appsmith.external.models.PluginType; import com.appsmith.external.models.Policy; +import com.appsmith.external.models.RunBehaviourEnum; import com.appsmith.server.acl.AclPermission; import com.appsmith.server.actioncollections.base.ActionCollectionService; import com.appsmith.server.applications.base.ApplicationService; @@ -1219,7 +1220,7 @@ public void detachRemote_applicationWithActionAndActionCollection_Success() { ActionDTO action = new ActionDTO(); action.setName("onPageLoadAction"); action.setPageId(application.getPages().get(0).getId()); - action.setExecuteOnLoad(true); + action.setRunBehaviour(RunBehaviourEnum.ON_PAGE_LOAD); ActionConfiguration actionConfiguration = new ActionConfiguration(); actionConfiguration.setHttpMethod(HttpMethod.GET); action.setActionConfiguration(actionConfiguration); @@ -2546,7 +2547,7 @@ public void createBranch_validCreateBranchRequest_newApplicationCreated() throws ActionDTO action = new ActionDTO(); action.setName("onPageLoadAction"); action.setPageId(application.getPages().get(0).getId()); - action.setExecuteOnLoad(true); + action.setRunBehaviour(RunBehaviourEnum.ON_PAGE_LOAD); ActionConfiguration actionConfiguration = new ActionConfiguration(); actionConfiguration.setHttpMethod(HttpMethod.GET); action.setActionConfiguration(actionConfiguration); diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/imports/internal/ImportServiceTests.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/imports/internal/ImportServiceTests.java index f4ee9f51f368..66c2ce93d4b4 100644 --- a/app/server/appsmith-server/src/test/java/com/appsmith/server/imports/internal/ImportServiceTests.java +++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/imports/internal/ImportServiceTests.java @@ -18,6 +18,7 @@ import com.appsmith.external.models.PluginType; import com.appsmith.external.models.Policy; import com.appsmith.external.models.Property; +import com.appsmith.external.models.RunBehaviourEnum; import com.appsmith.external.models.SSLDetails; import com.appsmith.server.actioncollections.base.ActionCollectionService; import com.appsmith.server.applications.base.ApplicationService; @@ -493,7 +494,7 @@ public void createExportAppJsonWithActionAndActionCollectionTest() { ActionDTO action = new ActionDTO(); action.setName("validAction"); action.setPageId(testPage.getId()); - action.setExecuteOnLoad(true); + action.setRunBehaviour(RunBehaviourEnum.ON_PAGE_LOAD); ActionConfiguration actionConfiguration = new ActionConfiguration(); actionConfiguration.setHttpMethod(HttpMethod.GET); action.setActionConfiguration(actionConfiguration); @@ -502,7 +503,7 @@ public void createExportAppJsonWithActionAndActionCollectionTest() { ActionDTO action2 = new ActionDTO(); action2.setName("validAction2"); action2.setPageId(testPage.getId()); - action2.setExecuteOnLoad(true); + action2.setRunBehaviour(RunBehaviourEnum.ON_PAGE_LOAD); action2.setUserSetOnLoad(true); ActionConfiguration actionConfiguration2 = new ActionConfiguration(); actionConfiguration2.setHttpMethod(HttpMethod.GET); @@ -738,7 +739,7 @@ public void createExportAppJsonForGitTest() { ActionDTO action = new ActionDTO(); action.setName("validAction"); action.setPageId(testPage.getId()); - action.setExecuteOnLoad(true); + action.setRunBehaviour(RunBehaviourEnum.ON_PAGE_LOAD); ActionConfiguration actionConfiguration = new ActionConfiguration(); actionConfiguration.setHttpMethod(HttpMethod.GET); action.setActionConfiguration(actionConfiguration); @@ -1382,7 +1383,7 @@ public void exportImportApplication_importWithBranchName_updateApplicationResour ActionDTO action = new ActionDTO(); action.setName("validAction"); action.setPageId(newPage.getId()); - action.setExecuteOnLoad(true); + action.setRunBehaviour(RunBehaviourEnum.ON_PAGE_LOAD); ActionConfiguration actionConfiguration = new ActionConfiguration(); actionConfiguration.setHttpMethod(HttpMethod.GET); action.setActionConfiguration(actionConfiguration); @@ -2798,7 +2799,7 @@ public void exportApplication_withDatasourceConfig_exportedWithDecryptedFields() ActionDTO action = new ActionDTO(); action.setName("validAction"); action.setPageId(testPage.getId()); - action.setExecuteOnLoad(true); + action.setRunBehaviour(RunBehaviourEnum.ON_PAGE_LOAD); ActionConfiguration actionConfiguration = new ActionConfiguration(); actionConfiguration.setHttpMethod(HttpMethod.GET); action.setActionConfiguration(actionConfiguration); @@ -2807,7 +2808,7 @@ public void exportApplication_withDatasourceConfig_exportedWithDecryptedFields() ActionDTO action2 = new ActionDTO(); action2.setName("validAction2"); action2.setPageId(testPage.getId()); - action2.setExecuteOnLoad(true); + action2.setRunBehaviour(RunBehaviourEnum.ON_PAGE_LOAD); action2.setUserSetOnLoad(true); ActionConfiguration actionConfiguration2 = new ActionConfiguration(); actionConfiguration2.setHttpMethod(HttpMethod.GET); diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/LayoutActionServiceTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/LayoutActionServiceTest.java index d567156203ee..2813a70bad4b 100644 --- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/LayoutActionServiceTest.java +++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/LayoutActionServiceTest.java @@ -8,7 +8,7 @@ import com.appsmith.external.models.DatasourceConfiguration; import com.appsmith.external.models.PluginType; import com.appsmith.external.models.Property; -import com.appsmith.external.models.RunBehaviorEnum; +import com.appsmith.external.models.RunBehaviourEnum; import com.appsmith.server.actioncollections.base.ActionCollectionService; import com.appsmith.server.applications.base.ApplicationService; import com.appsmith.server.constants.ArtifactType; @@ -286,7 +286,7 @@ void deleteUnpublishedAction_WhenActionDeleted_OnPageLoadActionsIsEmpty() { ActionDTO updates = new ActionDTO(); // Configure action to execute on page load. - updates.setExecuteOnLoad(true); + updates.setRunBehaviour(RunBehaviourEnum.ON_PAGE_LOAD); updates.setPolicies(null); updates.setUserPermissions(null); @@ -358,7 +358,7 @@ void updateActionUpdatesLayout() { .createSingleAction(action, Boolean.FALSE) .flatMap(savedAction -> { ActionDTO updates = new ActionDTO(); - updates.setExecuteOnLoad(true); + updates.setRunBehaviour(RunBehaviourEnum.ON_PAGE_LOAD); updates.setPolicies(null); updates.setUserPermissions(null); updates.setDatasource(datasource); @@ -371,7 +371,7 @@ void updateActionUpdatesLayout() { .flatMap(savedAction -> layoutActionService.createSingleAction(unreferencedAction, Boolean.FALSE)) .flatMap(savedAction -> { ActionDTO updates = new ActionDTO(); - updates.setExecuteOnLoad(true); + updates.setRunBehaviour(RunBehaviourEnum.ON_PAGE_LOAD); updates.setPolicies(null); updates.setUserPermissions(null); updates.setDatasource(datasource); @@ -386,7 +386,7 @@ void updateActionUpdatesLayout() { assertFalse(savedAction.getActionConfiguration().getIsValid()); assertTrue(savedAction.getInvalids().contains(AppsmithError.INVALID_JS_ACTION.getMessage())); ActionDTO updates = new ActionDTO(); - updates.setExecuteOnLoad(true); + updates.setRunBehaviour(RunBehaviourEnum.ON_PAGE_LOAD); updates.setPolicies(null); updates.setUserPermissions(null); updates.setDatasource(d2); @@ -474,20 +474,20 @@ void updateLayout_WhenOnLoadChanged_ActionExecuted() { List actionUpdates = updatedLayout.getActionUpdates(); assertThat(actionUpdates).hasSize(1); assertThat(actionUpdates.get(0).getName()).isEqualTo("firstAction"); - assertThat(actionUpdates.get(0).getExecuteOnLoad()).isTrue(); + assertThat(actionUpdates.get(0).getRunBehaviour()).isEqualTo(RunBehaviourEnum.ON_PAGE_LOAD); }) .verifyComplete(); StepVerifier.create(newActionService.findById(createdAction1.getId())) .assertNext( - newAction -> assertThat(newAction.getUnpublishedAction().getExecuteOnLoad()) - .isTrue()) + newAction -> assertThat(newAction.getUnpublishedAction().getRunBehaviour()) + .isEqualTo(RunBehaviourEnum.ON_PAGE_LOAD)) .verifyComplete(); StepVerifier.create(newActionService.findById(createdAction2.getId())) .assertNext( - newAction -> assertThat(newAction.getUnpublishedAction().getExecuteOnLoad()) - .isFalse()) + newAction -> assertThat(newAction.getUnpublishedAction().getRunBehaviour()) + .isEqualTo(RunBehaviourEnum.MANUAL)) .verifyComplete(); dsl = new JSONObject(); @@ -520,24 +520,24 @@ void updateLayout_WhenOnLoadChanged_ActionExecuted() { .findFirst(); LayoutExecutableUpdateDTO firstActionUpdate = firstActionUpdateOptional.get(); assertThat(firstActionUpdate).isNotNull(); - assertThat(firstActionUpdate.getExecuteOnLoad()).isFalse(); + assertThat(firstActionUpdate.getRunBehaviour()).isEqualTo(RunBehaviourEnum.MANUAL); Optional secondActionUpdateOptional = actionUpdates.stream() .filter(actionUpdate -> actionUpdate.getName().equals("secondAction")) .findFirst(); LayoutExecutableUpdateDTO secondActionUpdate = secondActionUpdateOptional.get(); assertThat(secondActionUpdate).isNotNull(); - assertThat(secondActionUpdate.getExecuteOnLoad()).isTrue(); + assertThat(secondActionUpdate.getRunBehaviour()).isEqualTo(RunBehaviourEnum.ON_PAGE_LOAD); }) .verifyComplete(); StepVerifier.create(newActionService.findById(createdAction1.getId())).assertNext(newAction -> assertThat( - newAction.getUnpublishedAction().getExecuteOnLoad()) - .isFalse()); + newAction.getUnpublishedAction().getRunBehaviour()) + .isEqualTo(RunBehaviourEnum.MANUAL)); StepVerifier.create(newActionService.findById(createdAction2.getId())).assertNext(newAction -> assertThat( - newAction.getUnpublishedAction().getExecuteOnLoad()) - .isTrue()); + newAction.getUnpublishedAction().getRunBehaviour()) + .isEqualTo(RunBehaviourEnum.ON_PAGE_LOAD)); } @Test @@ -558,7 +558,7 @@ void testHintMessageOnLocalhostUrlOnUpdateActionEvent() { .createSingleAction(action, Boolean.FALSE) .flatMap(savedAction -> { ActionDTO updates = new ActionDTO(); - updates.setExecuteOnLoad(true); + updates.setRunBehaviour(RunBehaviourEnum.ON_PAGE_LOAD); updates.setPolicies(null); updates.setUserPermissions(null); Datasource ds = new Datasource(); @@ -837,7 +837,7 @@ void simpleOnPageLoadActionCreationTest() throws JsonProcessingException { ActionDTO updates = new ActionDTO(); // Configure action to execute on page load. - updates.setExecuteOnLoad(true); + updates.setRunBehaviour(RunBehaviourEnum.ON_PAGE_LOAD); // Save updated configuration and re-compute on page load actions. return layoutActionService @@ -853,7 +853,7 @@ void simpleOnPageLoadActionCreationTest() throws JsonProcessingException { ActionDTO updates = new ActionDTO(); // Configure action to execute on page load. - updates.setExecuteOnLoad(true); + updates.setRunBehaviour(RunBehaviourEnum.ON_PAGE_LOAD); // Save updated configuration and re-compute on page load actions. return layoutActionService @@ -1083,7 +1083,7 @@ void testExecuteOnPageLoadOrderWhenAllActionsAreOnlyExplicitlySetToExecute() thr ActionConfiguration actionConfiguration1 = new ActionConfiguration(); actionConfiguration1.setHttpMethod(HttpMethod.GET); action1.setActionConfiguration(actionConfiguration1); - action1.setExecuteOnLoad(true); + action1.setRunBehaviour(RunBehaviourEnum.ON_PAGE_LOAD); action1.setDatasource(datasource); // Configure action2 @@ -1095,7 +1095,7 @@ void testExecuteOnPageLoadOrderWhenAllActionsAreOnlyExplicitlySetToExecute() thr actionConfiguration2.setBody("{{ firstAction.data }}"); // make action2 dependent on action1 action2.setActionConfiguration(actionConfiguration2); action2.setDynamicBindingPathList(List.of(new Property("body", null))); - action2.setExecuteOnLoad(true); + action2.setRunBehaviour(RunBehaviourEnum.ON_PAGE_LOAD); action2.setDatasource(datasource); JSONObject parentDsl = new JSONObject( @@ -1104,9 +1104,10 @@ void testExecuteOnPageLoadOrderWhenAllActionsAreOnlyExplicitlySetToExecute() thr layout.setDsl(parentDsl); ActionDTO createdAction1 = - layoutActionService.createSingleAction(action1, Boolean.FALSE).block(); // create action1 + layoutActionService.createSingleAction(action1, Boolean.FALSE).block(); assertNotNull(createdAction1); - createdAction1.setExecuteOnLoad(true); // this can only be set to true post action creation. + createdAction1.setRunBehaviour( + RunBehaviourEnum.ON_PAGE_LOAD); // this can only be set to on page load only after creation. NewAction newAction1 = new NewAction(); newAction1.setUnpublishedAction(createdAction1); newAction1.setRefType(createdAction1.getRefType()); @@ -1116,9 +1117,10 @@ void testExecuteOnPageLoadOrderWhenAllActionsAreOnlyExplicitlySetToExecute() thr newAction1.setPluginType(installed_plugin.getType()); ActionDTO createdAction2 = - layoutActionService.createSingleAction(action2, Boolean.FALSE).block(); // create action2 + layoutActionService.createSingleAction(action2, Boolean.FALSE).block(); assertNotNull(createdAction1); - createdAction2.setExecuteOnLoad(true); // this can only be set to true post action creation. + createdAction2.setRunBehaviour( + RunBehaviourEnum.ON_PAGE_LOAD); // this can only be set to on page load post action creation. NewAction newAction2 = new NewAction(); newAction2.setUnpublishedAction(createdAction2); newAction2.setRefType(createdAction2.getRefType()); @@ -1192,7 +1194,8 @@ void updateLayout_WhenPageLoadActionSetBothWaysExplicitlyAndImplicitlyViaWidget_ ActionDTO createdAction1 = layoutActionService.createSingleAction(action1, Boolean.FALSE).block(); assertNotNull(createdAction1); - createdAction1.setExecuteOnLoad(true); // this can only be set to true post action creation. + createdAction1.setRunBehaviour( + RunBehaviourEnum.ON_PAGE_LOAD); // this can only be set to on page load post action creation. createdAction1.setUserSetOnLoad(true); NewAction newAction1 = new NewAction(); newAction1.setUnpublishedAction(createdAction1); @@ -1241,7 +1244,7 @@ void introduceCyclicDependencyAndRemoveLater() { actionConfiguration.setHttpMethod(HttpMethod.GET); actionDTO.setActionConfiguration(actionConfiguration); actionDTO.setDatasource(datasource); - actionDTO.setExecuteOnLoad(true); + actionDTO.setRunBehaviour(RunBehaviourEnum.ON_PAGE_LOAD); ActionDTO createdAction = layoutActionService.createSingleAction(actionDTO, Boolean.FALSE).block(); @@ -1356,13 +1359,13 @@ private JSONObject createTestDslWithTestWidget(String testWidgetName) throws Jso @Test @WithUserDetails(value = "api_user") - void testSetRunBehavior_WhenRunBehaviorChanged_ValuesUpdatedCorrectly() { + void testSetRunbehaviour_WhenRunbehaviourChanged_ValuesUpdatedCorrectly() { Mockito.when(pluginExecutorHelper.getPluginExecutor(Mockito.any())) .thenReturn(Mono.just(new MockPluginExecutor())); // Create a new action ActionDTO action = new ActionDTO(); - action.setName("testRunBehaviorAction"); + action.setName("testRunbehaviourAction"); action.setPageId(testPage.getId()); ActionConfiguration actionConfiguration = new ActionConfiguration(); actionConfiguration.setHttpMethod(HttpMethod.GET); @@ -1373,70 +1376,27 @@ void testSetRunBehavior_WhenRunBehaviorChanged_ValuesUpdatedCorrectly() { ActionDTO createdAction = layoutActionService.createSingleAction(action, Boolean.FALSE).block(); assertNotNull(createdAction); - assertEquals(RunBehaviorEnum.MANUAL, createdAction.getRunBehavior()); - assertEquals(Boolean.FALSE, createdAction.getExecuteOnLoad()); + assertEquals(RunBehaviourEnum.MANUAL, createdAction.getRunBehaviour()); - // Test setting runBehavior to ON_PAGE_LOAD + // Test setting runBehaviour to ON_PAGE_LOAD ActionDTO updatedAction = layoutActionService - .setRunBehavior(createdAction.getId(), RunBehaviorEnum.ON_PAGE_LOAD) + .setRunBehaviour(createdAction.getId(), RunBehaviourEnum.ON_PAGE_LOAD) .block(); assertNotNull(updatedAction); - assertEquals(RunBehaviorEnum.ON_PAGE_LOAD, updatedAction.getRunBehavior()); - assertEquals(Boolean.TRUE, updatedAction.getExecuteOnLoad()); + assertEquals(RunBehaviourEnum.ON_PAGE_LOAD, updatedAction.getRunBehaviour()); assertEquals(Boolean.TRUE, updatedAction.getUserSetOnLoad()); - // Test setting runBehavior back to MANUAL + // Test setting runBehaviour back to MANUAL updatedAction = layoutActionService - .setRunBehavior(createdAction.getId(), RunBehaviorEnum.MANUAL) + .setRunBehaviour(createdAction.getId(), RunBehaviourEnum.MANUAL) .block(); assertNotNull(updatedAction); - assertEquals(RunBehaviorEnum.MANUAL, updatedAction.getRunBehavior()); - assertEquals(Boolean.FALSE, updatedAction.getExecuteOnLoad()); + assertEquals(RunBehaviourEnum.MANUAL, updatedAction.getRunBehaviour()); assertEquals(Boolean.TRUE, updatedAction.getUserSetOnLoad()); // Ensure the changes were persisted by getting the action again NewAction savedAction = actionRepository.findById(createdAction.getId()).block(); assertNotNull(savedAction); - assertEquals(RunBehaviorEnum.MANUAL, savedAction.getUnpublishedAction().getRunBehavior()); - assertEquals(Boolean.FALSE, savedAction.getUnpublishedAction().getExecuteOnLoad()); - } - - @Test - @WithUserDetails(value = "api_user") - void testSetExecuteOnLoad_AlsoUpdatesRunBehavior() { - Mockito.when(pluginExecutorHelper.getPluginExecutor(Mockito.any())) - .thenReturn(Mono.just(new MockPluginExecutor())); - - // Create a new action - ActionDTO action = new ActionDTO(); - action.setName("testExecuteLoadRunBehaviorAction"); - action.setPageId(testPage.getId()); - ActionConfiguration actionConfiguration = new ActionConfiguration(); - actionConfiguration.setHttpMethod(HttpMethod.GET); - action.setActionConfiguration(actionConfiguration); - action.setDatasource(datasource); - - // Create the action and validate default values - ActionDTO createdAction = - layoutActionService.createSingleAction(action, Boolean.FALSE).block(); - assertNotNull(createdAction); - assertEquals(RunBehaviorEnum.MANUAL, createdAction.getRunBehavior()); - assertEquals(Boolean.FALSE, createdAction.getExecuteOnLoad()); - - // Test setting executeOnLoad to TRUE - ActionDTO updatedAction = layoutActionService - .setExecuteOnLoad(createdAction.getId(), Boolean.TRUE) - .block(); - assertNotNull(updatedAction); - assertEquals(RunBehaviorEnum.ON_PAGE_LOAD, updatedAction.getRunBehavior()); - assertEquals(Boolean.TRUE, updatedAction.getExecuteOnLoad()); - - // Test setting executeOnLoad to FALSE - updatedAction = layoutActionService - .setExecuteOnLoad(createdAction.getId(), Boolean.FALSE) - .block(); - assertNotNull(updatedAction); - assertEquals(RunBehaviorEnum.MANUAL, updatedAction.getRunBehavior()); - assertEquals(Boolean.FALSE, updatedAction.getExecuteOnLoad()); + assertEquals(RunBehaviourEnum.MANUAL, savedAction.getUnpublishedAction().getRunBehaviour()); } } diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/LayoutServiceTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/LayoutServiceTest.java index 567b2797cd4d..fc6c5e7bece5 100644 --- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/LayoutServiceTest.java +++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/LayoutServiceTest.java @@ -7,6 +7,7 @@ import com.appsmith.external.models.Datasource; import com.appsmith.external.models.PluginType; import com.appsmith.external.models.Property; +import com.appsmith.external.models.RunBehaviourEnum; import com.appsmith.server.acl.AclPermission; import com.appsmith.server.applications.base.ApplicationService; import com.appsmith.server.constants.FieldName; @@ -344,7 +345,7 @@ private Mono createComplexAppForExecuteOnLoad(Mono pageMono) action.getActionConfiguration().setHttpMethod(HttpMethod.POST); action.setPageId(page1.getId()); action.setDatasource(datasource); - action.setExecuteOnLoad(false); + action.setRunBehaviour(RunBehaviourEnum.MANUAL); action.setUserSetOnLoad(true); monos.add(layoutActionService.createSingleAction(action, Boolean.FALSE)); @@ -889,8 +890,10 @@ public void getActionsExecuteOnLoadWithAstLogic_withAllTypesOfActionReferences() StepVerifier.create(actionDTOMono) .assertNext(tuple -> { - assertThat(tuple.getT1().getExecuteOnLoad()).isTrue(); - assertThat(tuple.getT2().getExecuteOnLoad()).isTrue(); + assertThat(tuple.getT1().getRunBehaviour()).isEqualTo(RunBehaviourEnum.ON_PAGE_LOAD); + ; + assertThat(tuple.getT2().getRunBehaviour()).isEqualTo(RunBehaviourEnum.ON_PAGE_LOAD); + ; }) .verifyComplete(); } @@ -1115,8 +1118,9 @@ public void getActionsExecuteOnLoadWithAstLogic() { StepVerifier.create(actionDTOMono) .assertNext(tuple -> { - assertThat(tuple.getT1().getExecuteOnLoad()).isTrue(); - assertThat(tuple.getT2().getExecuteOnLoad()).isNotEqualTo(Boolean.TRUE); + assertThat(tuple.getT1().getRunBehaviour()).isEqualTo(RunBehaviourEnum.ON_PAGE_LOAD); + ; + assertThat(tuple.getT2().getRunBehaviour()).isNotEqualTo(RunBehaviourEnum.ON_PAGE_LOAD); }) .verifyComplete(); } @@ -1213,8 +1217,8 @@ public void getActionsExecuteOnLoadWithoutAstLogic() { StepVerifier.create(actionDTOMono) .assertNext(tuple -> { - assertThat(tuple.getT1().getExecuteOnLoad()).isTrue(); - assertThat(tuple.getT2().getExecuteOnLoad()).isTrue(); + assertThat(tuple.getT1().getRunBehaviour()).isEqualTo(RunBehaviourEnum.ON_PAGE_LOAD); + assertThat(tuple.getT2().getRunBehaviour()).isEqualTo(RunBehaviourEnum.ON_PAGE_LOAD); }) .verifyComplete(); } diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/PageServiceTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/PageServiceTest.java index 3a1400042ecb..95c17ea5057e 100644 --- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/PageServiceTest.java +++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/PageServiceTest.java @@ -7,6 +7,7 @@ import com.appsmith.external.models.JSValue; import com.appsmith.external.models.PluginType; import com.appsmith.external.models.Policy; +import com.appsmith.external.models.RunBehaviourEnum; import com.appsmith.external.plugins.PluginExecutor; import com.appsmith.server.acl.AclPermission; import com.appsmith.server.actioncollections.base.ActionCollectionService; @@ -593,7 +594,7 @@ public void clonePage() { pluginRepository.findByPackageName("installed-plugin").block(); datasource.setPluginId(installed_plugin.getId()); action.setDatasource(datasource); - action.setExecuteOnLoad(true); + action.setRunBehaviour(RunBehaviourEnum.ON_PAGE_LOAD); assert page != null; Layout layout = page.getLayouts().get(0); @@ -736,9 +737,9 @@ public void clonePage() { assertThat(actionWithoutCollection.getUnpublishedAction().getName()) .isEqualTo("PageAction"); - // Confirm that executeOnLoad is cloned as well. - assertThat(actionWithoutCollection.getUnpublishedAction().getExecuteOnLoad()) - .isTrue(); + // Confirm that RunBehaviour Page load is cloned as well. + assertThat(actionWithoutCollection.getUnpublishedAction().getRunBehaviour()) + .isEqualTo(RunBehaviourEnum.ON_PAGE_LOAD); // Check if collections got copied too List collections = tuple.getT3(); @@ -965,7 +966,7 @@ public void clonePage_whenPageCloned_defaultIdsRetained() { assertThat(actionWithoutCollection.getBaseId()).isEqualTo(actionWithoutCollection.getId()); assertThat(actionWithoutCollection.getBranchName()).isEqualTo(branchName); - // Confirm that executeOnLoad is cloned as well. + // Confirm that RunBehaviour page load is cloned as well. assertThat(actions.stream() .filter(clonedAction -> "PageAction" .equals(clonedAction @@ -974,8 +975,9 @@ public void clonePage_whenPageCloned_defaultIdsRetained() { .findFirst() .get() .getUnpublishedAction() - .getExecuteOnLoad()) - .isTrue(); + .getRunBehaviour()) + .isEqualTo(RunBehaviourEnum.ON_PAGE_LOAD); + ; // Check if collections got copied too List collections = tuple.getT3(); 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 71b7435b6952..0fd35eea0d71 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 @@ -11,6 +11,7 @@ import com.appsmith.external.models.PaginationType; import com.appsmith.external.models.Policy; import com.appsmith.external.models.Property; +import com.appsmith.external.models.RunBehaviourEnum; import com.appsmith.external.plugins.PluginExecutor; import com.appsmith.server.acl.AclPermission; import com.appsmith.server.applications.base.ApplicationService; @@ -302,7 +303,7 @@ public void findByIdAndBranchName_forGitConnectedAction_getBranchedAction() { ActionDTO action = new ActionDTO(); action.setName("findActionByBranchNameTest"); action.setPageId(gitConnectedPage.getId()); - action.setExecuteOnLoad(true); + action.setRunBehaviour(RunBehaviourEnum.ON_PAGE_LOAD); ActionConfiguration actionConfiguration = new ActionConfiguration(); actionConfiguration.setHttpMethod(HttpMethod.GET); action.setActionConfiguration(actionConfiguration); @@ -336,7 +337,7 @@ public void createValidActionAndCheckPermissions() { ActionDTO action = new ActionDTO(); action.setName("validAction"); action.setPageId(testPage.getId()); - action.setExecuteOnLoad(true); + action.setRunBehaviour(RunBehaviourEnum.ON_PAGE_LOAD); ActionConfiguration actionConfiguration = new ActionConfiguration(); actionConfiguration.setHttpMethod(HttpMethod.GET); action.setActionConfiguration(actionConfiguration); @@ -349,7 +350,7 @@ public void createValidActionAndCheckPermissions() { ActionDTO createdAction = tuple.getT1(); assertThat(createdAction.getId()).isNotEmpty(); assertThat(createdAction.getName()).isEqualTo(action.getName()); - assertThat(createdAction.getExecuteOnLoad()).isFalse(); + assertThat(createdAction.getRunBehaviour()).isEqualTo(RunBehaviourEnum.MANUAL); assertThat(createdAction.getUserPermissions()).isNotEmpty(); List permissionGroups = tuple.getT2(); @@ -408,7 +409,7 @@ public void createValidAction_forGitConnectedApp_getValidPermissionAndDefaultIds ActionDTO action = new ActionDTO(); action.setName("validAction"); action.setPageId(gitConnectedPage.getId()); - action.setExecuteOnLoad(true); + action.setRunBehaviour(RunBehaviourEnum.ON_PAGE_LOAD); ActionConfiguration actionConfiguration = new ActionConfiguration(); actionConfiguration.setHttpMethod(HttpMethod.GET); action.setActionConfiguration(actionConfiguration); @@ -419,7 +420,7 @@ public void createValidAction_forGitConnectedApp_getValidPermissionAndDefaultIds StepVerifier.create(Mono.zip(actionMono, defaultPermissionGroupsMono)) .assertNext(tuple -> { ActionDTO createdAction = tuple.getT1(); - assertThat(createdAction.getExecuteOnLoad()).isFalse(); + assertThat(createdAction.getRunBehaviour()).isEqualTo(RunBehaviourEnum.MANUAL); assertThat(createdAction.getUserPermissions()).isNotEmpty(); assertThat(createdAction.getBaseId()).isEqualTo(createdAction.getId()); @@ -798,8 +799,8 @@ public void updateShouldNotResetUserSetOnLoad() { Mono newActionMono = layoutActionService.createSingleAction(action, Boolean.FALSE).cache(); - Mono setExecuteOnLoadMono = - newActionMono.flatMap(savedAction -> layoutActionService.setExecuteOnLoad(savedAction.getId(), true)); + Mono setRunbehaviourMono = newActionMono.flatMap( + savedAction -> layoutActionService.setRunBehaviour(savedAction.getId(), RunBehaviourEnum.ON_PAGE_LOAD)); Mono updateActionMono = newActionMono.flatMap(preUpdateAction -> { ActionDTO actionUpdate = action; @@ -811,7 +812,7 @@ public void updateShouldNotResetUserSetOnLoad() { .thenReturn(updatedAction)); }); - StepVerifier.create(setExecuteOnLoadMono.then(updateActionMono)) + StepVerifier.create(setRunbehaviourMono.then(updateActionMono)) .assertNext(updatedAction -> { assertThat(updatedAction).isNotNull(); assertThat(updatedAction.getActionConfiguration().getBody()).isEqualTo("New Body"); @@ -1148,7 +1149,7 @@ public void testExecuteOnLoadParamOnActionCreateWithDefaultContext() { ActionDTO action = new ActionDTO(); action.setName("testAction"); action.setPageId(testPage.getId()); - action.setExecuteOnLoad(true); + action.setRunBehaviour(RunBehaviourEnum.ON_PAGE_LOAD); ActionConfiguration actionConfiguration = new ActionConfiguration(); actionConfiguration.setHttpMethod(HttpMethod.GET); action.setActionConfiguration(actionConfiguration); @@ -1158,7 +1159,7 @@ public void testExecuteOnLoadParamOnActionCreateWithDefaultContext() { StepVerifier.create(actionMono) .assertNext(createdAction -> { // executeOnLoad is expected to be set to false in case of default context - assertThat(createdAction.getExecuteOnLoad()).isFalse(); + assertThat(createdAction.getRunBehaviour()).isEqualTo(RunBehaviourEnum.MANUAL); }) .verifyComplete(); } @@ -1172,7 +1173,7 @@ public void testExecuteOnLoadParamOnActionCreateWithClonePageContext() { ActionDTO action = new ActionDTO(); action.setName("testAction"); action.setPageId(testPage.getId()); - action.setExecuteOnLoad(true); + action.setRunBehaviour(RunBehaviourEnum.ON_PAGE_LOAD); ActionConfiguration actionConfiguration = new ActionConfiguration(); actionConfiguration.setHttpMethod(HttpMethod.GET); action.setActionConfiguration(actionConfiguration); @@ -1186,7 +1187,7 @@ public void testExecuteOnLoadParamOnActionCreateWithClonePageContext() { StepVerifier.create(actionMono) .assertNext(createdAction -> { // executeOnLoad is expected to be set to false in case of default context - assertThat(createdAction.getExecuteOnLoad()).isTrue(); + assertThat(createdAction.getRunBehaviour()).isEqualTo(RunBehaviourEnum.ON_PAGE_LOAD); }) .verifyComplete(); } @@ -1273,7 +1274,7 @@ public void testCreateActionWithOutOfRangeTimeout() { ActionDTO action = new ActionDTO(); action.setName("validAction"); action.setPageId(testPage.getId()); - action.setExecuteOnLoad(true); + action.setRunBehaviour(RunBehaviourEnum.ON_PAGE_LOAD); ActionConfiguration actionConfiguration = new ActionConfiguration(); actionConfiguration.setHttpMethod(HttpMethod.GET); actionConfiguration.setTimeoutInMillisecond("60001"); @@ -1305,7 +1306,7 @@ public void testCreateActionWithValidRangeTimeout() { ActionDTO action = new ActionDTO(); action.setName("validAction"); action.setPageId(testPage.getId()); - action.setExecuteOnLoad(true); + action.setRunBehaviour(RunBehaviourEnum.ON_PAGE_LOAD); ActionConfiguration actionConfiguration = new ActionConfiguration(); actionConfiguration.setHttpMethod(HttpMethod.GET); actionConfiguration.setTimeoutInMillisecond("6000"); diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/ApplicationServiceCETest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/ApplicationServiceCETest.java index 0104d9999d1d..7813cff5a25f 100644 --- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/ApplicationServiceCETest.java +++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/ApplicationServiceCETest.java @@ -11,6 +11,7 @@ import com.appsmith.external.models.JSValue; import com.appsmith.external.models.PluginType; import com.appsmith.external.models.Policy; +import com.appsmith.external.models.RunBehaviourEnum; import com.appsmith.external.plugins.PluginExecutor; import com.appsmith.server.acl.AclPermission; import com.appsmith.server.actioncollections.base.ActionCollectionService; @@ -1943,7 +1944,7 @@ public void cloneApplication_withActionAndActionCollection_success() { ActionDTO action = new ActionDTO(); action.setName("cloneActionTest"); action.setPageId(application.getPages().get(0).getId()); - action.setExecuteOnLoad(true); + action.setRunBehaviour(RunBehaviourEnum.ON_PAGE_LOAD); ActionConfiguration actionConfiguration = new ActionConfiguration(); actionConfiguration.setHttpMethod(HttpMethod.GET); action.setActionConfiguration(actionConfiguration); @@ -2247,7 +2248,7 @@ public void cloneApplication_withDeletedActionInActionCollection_deletedActionIs ActionDTO action = new ActionDTO(); action.setName("cloneActionTest"); action.setPageId(application.getPages().get(0).getId()); - action.setExecuteOnLoad(true); + action.setRunBehaviour(RunBehaviourEnum.ON_PAGE_LOAD); ActionConfiguration actionConfiguration = new ActionConfiguration(); actionConfiguration.setHttpMethod(HttpMethod.GET); action.setActionConfiguration(actionConfiguration); @@ -2662,7 +2663,7 @@ public void publishApplication_withArchivedUnpublishedResources_resourcesArchive ActionDTO action = new ActionDTO(); action.setName("publishActionTest"); action.setPageId(page.getId()); - action.setExecuteOnLoad(true); + action.setRunBehaviour(RunBehaviourEnum.ON_PAGE_LOAD); ActionConfiguration actionConfiguration = new ActionConfiguration(); actionConfiguration.setHttpMethod(HttpMethod.GET); action.setActionConfiguration(actionConfiguration); @@ -3636,7 +3637,7 @@ public void deleteApplication_withPagesActionsAndActionCollections_resourcesArch ActionDTO action = new ActionDTO(); action.setName("validAction"); action.setPageId(page.getId()); - action.setExecuteOnLoad(true); + action.setRunBehaviour(RunBehaviourEnum.ON_PAGE_LOAD); ActionConfiguration actionConfiguration = new ActionConfiguration(); actionConfiguration.setHttpMethod(HttpMethod.GET); action.setActionConfiguration(actionConfiguration); @@ -4158,7 +4159,7 @@ public void cloneApplication_noDatasourceCreateActionPermissions() { ActionDTO action = new ActionDTO(); action.setName("validAction"); action.setPageId(gitAppPageId); - action.setExecuteOnLoad(true); + action.setRunBehaviour(RunBehaviourEnum.ON_PAGE_LOAD); ActionConfiguration actionConfiguration = new ActionConfiguration(); actionConfiguration.setHttpMethod(HttpMethod.GET); action.setActionConfiguration(actionConfiguration); diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/CreateDBTablePageSolutionTests.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/CreateDBTablePageSolutionTests.java index 1e42e70792cc..01e128f933ee 100644 --- a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/CreateDBTablePageSolutionTests.java +++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/CreateDBTablePageSolutionTests.java @@ -13,6 +13,7 @@ import com.appsmith.external.models.DatasourceStructure.Table; import com.appsmith.external.models.DatasourceStructure.TableType; import com.appsmith.external.models.Property; +import com.appsmith.external.models.RunBehaviourEnum; import com.appsmith.external.plugins.PluginExecutor; import com.appsmith.server.applications.base.ApplicationService; import com.appsmith.server.constants.FieldName; @@ -679,11 +680,11 @@ public void createPageWithValidPageIdForMySqlDS() { assertThat(actionBody).isEqualTo(templateActionBody); if (SELECT_QUERY.equals(action.getUnpublishedAction().getName())) { - assertThat(action.getUnpublishedAction().getExecuteOnLoad()) - .isTrue(); + assertThat(action.getUnpublishedAction().getRunBehaviour()) + .isEqualTo(RunBehaviourEnum.ON_PAGE_LOAD); } else { - assertThat(action.getUnpublishedAction().getExecuteOnLoad()) - .isFalse(); + assertThat(action.getUnpublishedAction().getRunBehaviour()) + .isEqualTo(RunBehaviourEnum.MANUAL); } } assertThat(crudPageResponseDTO.getSuccessMessage()).containsIgnoringCase(pluginName); @@ -759,11 +760,11 @@ public void createPageWithValidPageIdForRedshiftDS() { assertThat(actionBody).isEqualTo(templateActionBody); if (SELECT_QUERY.equals(action.getUnpublishedAction().getName())) { - assertThat(action.getUnpublishedAction().getExecuteOnLoad()) - .isTrue(); + assertThat(action.getUnpublishedAction().getRunBehaviour()) + .isEqualTo(RunBehaviourEnum.ON_PAGE_LOAD); } else { - assertThat(action.getUnpublishedAction().getExecuteOnLoad()) - .isFalse(); + assertThat(action.getUnpublishedAction().getRunBehaviour()) + .isEqualTo(RunBehaviourEnum.MANUAL); } } }) @@ -817,9 +818,9 @@ public void createPageWithNullPageIdForMSSqlDS() { assertThat(actionBody).isEqualTo(templateActionBody); if (SELECT_QUERY.equals(action.getUnpublishedAction().getName())) { - assertThat(action.getUnpublishedAction().getExecuteOnLoad()).isTrue(); + assertThat(action.getUnpublishedAction().getRunbehaviour()()).isTrue(); } else { - assertThat(action.getUnpublishedAction().getExecuteOnLoad()).isFalse(); + assertThat(action.getUnpublishedAction().getRunbehaviour()()).isFalse(); } } }) @@ -887,11 +888,11 @@ public void createPageWithNullPageIdForSnowflake() { .replaceAll(specialCharactersRegex, ""); assertThat(actionBody).isEqualTo(templateActionBody); if (SELECT_QUERY.equals(action.getUnpublishedAction().getName())) { - assertThat(action.getUnpublishedAction().getExecuteOnLoad()) - .isTrue(); + assertThat(action.getUnpublishedAction().getRunBehaviour()) + .isEqualTo(RunBehaviourEnum.ON_PAGE_LOAD); } else { - assertThat(action.getUnpublishedAction().getExecuteOnLoad()) - .isFalse(); + assertThat(action.getUnpublishedAction().getRunBehaviour()) + .isEqualTo(RunBehaviourEnum.MANUAL); } } }) @@ -1054,11 +1055,11 @@ public void createPageWithValidPageIdForGoogleSheet() { ActionConfiguration actionConfiguration = action.getUnpublishedAction().getActionConfiguration(); if (SELECT_QUERY.equals(action.getUnpublishedAction().getName())) { - assertThat(action.getUnpublishedAction().getExecuteOnLoad()) - .isTrue(); + assertThat(action.getUnpublishedAction().getRunBehaviour()) + .isEqualTo(RunBehaviourEnum.ON_PAGE_LOAD); } else { - assertThat(action.getUnpublishedAction().getExecuteOnLoad()) - .isFalse(); + assertThat(action.getUnpublishedAction().getRunBehaviour()) + .isEqualTo(RunBehaviourEnum.MANUAL); } List pluginSpecifiedTemplate = actionConfiguration.getPluginSpecifiedTemplates(); @@ -1134,11 +1135,11 @@ public void createPageWithValidPageIdForMongoDB() { ActionConfiguration actionConfiguration = action.getUnpublishedAction().getActionConfiguration(); if (FIND_QUERY.equals(action.getUnpublishedAction().getName())) { - assertThat(action.getUnpublishedAction().getExecuteOnLoad()) - .isTrue(); + assertThat(action.getUnpublishedAction().getRunBehaviour()) + .isEqualTo(RunBehaviourEnum.ON_PAGE_LOAD); } else { - assertThat(action.getUnpublishedAction().getExecuteOnLoad()) - .isFalse(); + assertThat(action.getUnpublishedAction().getRunBehaviour()) + .isEqualTo(RunBehaviourEnum.MANUAL); } Map formData = actionConfiguration.getFormData(); diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/PartialExportServiceTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/PartialExportServiceTest.java index 0ba451f58822..a22b7ca31eb6 100644 --- a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/PartialExportServiceTest.java +++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/PartialExportServiceTest.java @@ -9,6 +9,7 @@ import com.appsmith.external.models.DatasourceStorage; import com.appsmith.external.models.DatasourceStorageDTO; import com.appsmith.external.models.Property; +import com.appsmith.external.models.RunBehaviourEnum; import com.appsmith.server.applications.base.ApplicationService; import com.appsmith.server.datasources.base.DatasourceService; import com.appsmith.server.domains.Application; @@ -297,7 +298,7 @@ public void testGetPartialExport_gitConnectedApp_branchResourceExported() { ActionDTO action = new ActionDTO(); action.setName("validAction"); action.setPageId(savedPage.getId()); - action.setExecuteOnLoad(true); + action.setRunBehaviour(RunBehaviourEnum.ON_PAGE_LOAD); ActionConfiguration actionConfiguration = new ActionConfiguration(); actionConfiguration.setHttpMethod(HttpMethod.GET); actionConfiguration.setTimeoutInMillisecond("6000"); @@ -357,7 +358,7 @@ public void testGetPartialExport_gitConnectedApp_featureBranchResourceExported() ActionDTO action = new ActionDTO(); action.setName("validAction"); action.setPageId(savedPage.getId()); - action.setExecuteOnLoad(true); + action.setRunBehaviour(RunBehaviourEnum.ON_PAGE_LOAD); ActionConfiguration actionConfiguration = new ActionConfiguration(); actionConfiguration.setHttpMethod(HttpMethod.GET); actionConfiguration.setTimeoutInMillisecond("6000"); diff --git a/app/server/appsmith-server/src/test/resources/com/appsmith/server/git/application.json b/app/server/appsmith-server/src/test/resources/com/appsmith/server/git/application.json index 840989b2066d..4b7390327d91 100644 --- a/app/server/appsmith-server/src/test/resources/com/appsmith/server/git/application.json +++ b/app/server/appsmith-server/src/test/resources/com/appsmith/server/git/application.json @@ -20303,7 +20303,7 @@ "jsArguments": [], "isAsync": false }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -20342,7 +20342,7 @@ "jsArguments": [], "isAsync": false }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -20388,7 +20388,7 @@ "jsArguments": [], "isAsync": false }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -20427,7 +20427,7 @@ "jsArguments": [], "isAsync": false }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -20473,7 +20473,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -20514,7 +20514,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -20561,7 +20561,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "clientSideExecution": true, "dynamicBindingPathList": [ { @@ -20602,7 +20602,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "clientSideExecution": true, "dynamicBindingPathList": [ { @@ -20651,7 +20651,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "clientSideExecution": true, "dynamicBindingPathList": [ { @@ -20695,7 +20695,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "clientSideExecution": true, "dynamicBindingPathList": [ { @@ -20743,7 +20743,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "clientSideExecution": true, "dynamicBindingPathList": [ { @@ -20786,7 +20786,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "clientSideExecution": true, "dynamicBindingPathList": [ { @@ -20834,7 +20834,7 @@ "jsArguments": [], "isAsync": false }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -20876,7 +20876,7 @@ "jsArguments": [], "isAsync": false }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -20923,7 +20923,7 @@ "jsArguments": [], "isAsync": false }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -20965,7 +20965,7 @@ "jsArguments": [], "isAsync": false }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -21012,7 +21012,7 @@ "jsArguments": [], "isAsync": false }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "clientSideExecution": true, "dynamicBindingPathList": [ { @@ -21053,7 +21053,7 @@ "jsArguments": [], "isAsync": false }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "clientSideExecution": true, "dynamicBindingPathList": [ { @@ -21100,7 +21100,7 @@ "selfReferencingDataPaths": [], "jsArguments": [] }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -21139,7 +21139,7 @@ "selfReferencingDataPaths": [], "jsArguments": [] }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -21185,7 +21185,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -21226,7 +21226,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -21273,7 +21273,7 @@ "jsArguments": [], "isAsync": false }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "clientSideExecution": true, "dynamicBindingPathList": [ { @@ -21314,7 +21314,7 @@ "jsArguments": [], "isAsync": false }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "clientSideExecution": true, "dynamicBindingPathList": [ { @@ -21362,7 +21362,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "clientSideExecution": true, "dynamicBindingPathList": [ { @@ -21405,7 +21405,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "clientSideExecution": true, "dynamicBindingPathList": [ { @@ -21453,7 +21453,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -21495,7 +21495,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -21542,7 +21542,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "clientSideExecution": true, "dynamicBindingPathList": [ { @@ -21585,7 +21585,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "clientSideExecution": true, "dynamicBindingPathList": [ { @@ -21633,7 +21633,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -21675,7 +21675,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [ { "key": "body" @@ -21722,7 +21722,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "clientSideExecution": true, "dynamicBindingPathList": [ { @@ -21765,7 +21765,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "clientSideExecution": true, "dynamicBindingPathList": [ { @@ -21814,7 +21814,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -21857,7 +21857,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -21904,7 +21904,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "clientSideExecution": true, "dynamicBindingPathList": [ { @@ -21945,7 +21945,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "clientSideExecution": true, "dynamicBindingPathList": [ { @@ -21992,7 +21992,7 @@ "jsArguments": [], "isAsync": false }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -22031,7 +22031,7 @@ "jsArguments": [], "isAsync": false }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -22077,7 +22077,7 @@ "jsArguments": [], "isAsync": false }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -22116,7 +22116,7 @@ "jsArguments": [], "isAsync": false }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -22163,7 +22163,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "clientSideExecution": true, "dynamicBindingPathList": [ { @@ -22206,7 +22206,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "clientSideExecution": true, "dynamicBindingPathList": [ { @@ -22253,7 +22253,7 @@ "jsArguments": [], "isAsync": false }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -22292,7 +22292,7 @@ "jsArguments": [], "isAsync": false }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -22340,7 +22340,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -22383,7 +22383,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -22429,7 +22429,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -22470,7 +22470,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -22517,7 +22517,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "clientSideExecution": true, "dynamicBindingPathList": [ { @@ -22558,7 +22558,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "clientSideExecution": true, "dynamicBindingPathList": [ { @@ -22605,7 +22605,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -22646,7 +22646,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -22692,7 +22692,7 @@ "selfReferencingDataPaths": [], "jsArguments": [] }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -22731,7 +22731,7 @@ "selfReferencingDataPaths": [], "jsArguments": [] }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -22778,7 +22778,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -22820,7 +22820,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -22867,7 +22867,7 @@ "jsArguments": [], "isAsync": false }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "clientSideExecution": true, "dynamicBindingPathList": [ { @@ -22908,7 +22908,7 @@ "jsArguments": [], "isAsync": false }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "clientSideExecution": true, "dynamicBindingPathList": [ { @@ -22956,7 +22956,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -22998,7 +22998,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -23045,7 +23045,7 @@ "jsArguments": [], "isAsync": false }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [ { "key": "body" @@ -23087,7 +23087,7 @@ "jsArguments": [], "isAsync": false }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [ { "key": "body" @@ -23134,7 +23134,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -23176,7 +23176,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -23223,7 +23223,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -23265,7 +23265,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -23312,7 +23312,7 @@ "jsArguments": [], "isAsync": false }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "clientSideExecution": true, "dynamicBindingPathList": [ { @@ -23355,7 +23355,7 @@ "jsArguments": [], "isAsync": false }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "clientSideExecution": true, "dynamicBindingPathList": [ { @@ -23416,7 +23416,7 @@ "apiContentType": "none" } }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [ { "key": "datasourceUrl" @@ -23469,7 +23469,7 @@ "apiContentType": "none" } }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "datasourceUrl" @@ -23529,7 +23529,7 @@ "apiContentType": "none" } }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [ { "key": "datasourceUrl" @@ -23582,7 +23582,7 @@ "apiContentType": "none" } }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "datasourceUrl" @@ -23639,7 +23639,7 @@ "apiContentType": "none" } }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "datasourceUrl" @@ -23689,7 +23689,7 @@ "apiContentType": "none" } }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "datasourceUrl" @@ -23746,7 +23746,7 @@ "apiContentType": "none" } }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -23792,7 +23792,7 @@ "apiContentType": "none" } }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -23835,7 +23835,7 @@ "jsArguments": [], "isAsync": false }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "clientSideExecution": true, "dynamicBindingPathList": [ { @@ -23878,7 +23878,7 @@ "jsArguments": [], "isAsync": false }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "clientSideExecution": true, "dynamicBindingPathList": [ { @@ -23936,7 +23936,7 @@ "apiContentType": "none" } }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "datasourceUrl" @@ -23986,7 +23986,7 @@ "apiContentType": "none" } }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "datasourceUrl" @@ -24033,7 +24033,7 @@ "jsArguments": [], "isAsync": false }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -24075,7 +24075,7 @@ "jsArguments": [], "isAsync": false }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -24137,7 +24137,7 @@ "apiContentType": "none" } }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -24188,7 +24188,7 @@ "apiContentType": "none" } }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -24260,7 +24260,7 @@ } } }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -24325,7 +24325,7 @@ } } }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -24383,7 +24383,7 @@ "apiContentType": "none" } }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "path" @@ -24438,7 +24438,7 @@ "apiContentType": "none" } }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [ { "key": "path" @@ -24485,7 +24485,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -24527,7 +24527,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -24574,7 +24574,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -24616,7 +24616,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [ { "key": "body" @@ -24675,7 +24675,7 @@ "apiContentType": "none" } }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -24723,7 +24723,7 @@ "apiContentType": "none" } }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -24774,7 +24774,7 @@ "httpMethod": "GET", "selfReferencingDataPaths": [] }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [ { "key": "path" @@ -24822,7 +24822,7 @@ "httpMethod": "GET", "selfReferencingDataPaths": [] }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [ { "key": "path" @@ -24885,7 +24885,7 @@ "apiContentType": "none" } }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -24937,7 +24937,7 @@ "apiContentType": "none" } }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -24981,7 +24981,7 @@ } ] }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -25022,7 +25022,7 @@ } ] }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -25078,7 +25078,7 @@ "apiContentType": "none" } }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -25123,7 +25123,7 @@ "apiContentType": "none" } }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -25175,7 +25175,7 @@ "apiContentType": "none" } }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -25220,7 +25220,7 @@ "apiContentType": "none" } }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -25289,7 +25289,7 @@ "apiContentType": "none" } }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "isValid": true, "invalids": [], "messages": [], @@ -25350,7 +25350,7 @@ "apiContentType": "none" } }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "isValid": true, "invalids": [], "messages": [], @@ -25405,7 +25405,7 @@ "httpMethod": "GET", "selfReferencingDataPaths": [] }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [ { "key": "path" @@ -25461,7 +25461,7 @@ "httpMethod": "GET", "selfReferencingDataPaths": [] }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [ { "key": "path" @@ -25520,7 +25520,7 @@ "apiContentType": "none" } }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -25565,7 +25565,7 @@ "apiContentType": "none" } }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -25616,7 +25616,7 @@ "apiContentType": "none" } }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -25660,7 +25660,7 @@ "apiContentType": "none" } }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -25712,7 +25712,7 @@ "apiContentType": "none" } }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -25757,7 +25757,7 @@ "apiContentType": "none" } }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -25801,7 +25801,7 @@ } ] }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -25838,7 +25838,7 @@ } ] }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -25891,7 +25891,7 @@ "apiContentType": "none" } }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -25937,7 +25937,7 @@ "apiContentType": "none" } }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [], "isValid": true, "invalids": [], diff --git a/app/server/appsmith-server/src/test/resources/com/appsmith/server/git/autocommit/application.json b/app/server/appsmith-server/src/test/resources/com/appsmith/server/git/autocommit/application.json index 840989b2066d..4b7390327d91 100644 --- a/app/server/appsmith-server/src/test/resources/com/appsmith/server/git/autocommit/application.json +++ b/app/server/appsmith-server/src/test/resources/com/appsmith/server/git/autocommit/application.json @@ -20303,7 +20303,7 @@ "jsArguments": [], "isAsync": false }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -20342,7 +20342,7 @@ "jsArguments": [], "isAsync": false }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -20388,7 +20388,7 @@ "jsArguments": [], "isAsync": false }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -20427,7 +20427,7 @@ "jsArguments": [], "isAsync": false }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -20473,7 +20473,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -20514,7 +20514,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -20561,7 +20561,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "clientSideExecution": true, "dynamicBindingPathList": [ { @@ -20602,7 +20602,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "clientSideExecution": true, "dynamicBindingPathList": [ { @@ -20651,7 +20651,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "clientSideExecution": true, "dynamicBindingPathList": [ { @@ -20695,7 +20695,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "clientSideExecution": true, "dynamicBindingPathList": [ { @@ -20743,7 +20743,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "clientSideExecution": true, "dynamicBindingPathList": [ { @@ -20786,7 +20786,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "clientSideExecution": true, "dynamicBindingPathList": [ { @@ -20834,7 +20834,7 @@ "jsArguments": [], "isAsync": false }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -20876,7 +20876,7 @@ "jsArguments": [], "isAsync": false }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -20923,7 +20923,7 @@ "jsArguments": [], "isAsync": false }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -20965,7 +20965,7 @@ "jsArguments": [], "isAsync": false }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -21012,7 +21012,7 @@ "jsArguments": [], "isAsync": false }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "clientSideExecution": true, "dynamicBindingPathList": [ { @@ -21053,7 +21053,7 @@ "jsArguments": [], "isAsync": false }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "clientSideExecution": true, "dynamicBindingPathList": [ { @@ -21100,7 +21100,7 @@ "selfReferencingDataPaths": [], "jsArguments": [] }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -21139,7 +21139,7 @@ "selfReferencingDataPaths": [], "jsArguments": [] }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -21185,7 +21185,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -21226,7 +21226,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -21273,7 +21273,7 @@ "jsArguments": [], "isAsync": false }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "clientSideExecution": true, "dynamicBindingPathList": [ { @@ -21314,7 +21314,7 @@ "jsArguments": [], "isAsync": false }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "clientSideExecution": true, "dynamicBindingPathList": [ { @@ -21362,7 +21362,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "clientSideExecution": true, "dynamicBindingPathList": [ { @@ -21405,7 +21405,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "clientSideExecution": true, "dynamicBindingPathList": [ { @@ -21453,7 +21453,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -21495,7 +21495,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -21542,7 +21542,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "clientSideExecution": true, "dynamicBindingPathList": [ { @@ -21585,7 +21585,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "clientSideExecution": true, "dynamicBindingPathList": [ { @@ -21633,7 +21633,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -21675,7 +21675,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [ { "key": "body" @@ -21722,7 +21722,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "clientSideExecution": true, "dynamicBindingPathList": [ { @@ -21765,7 +21765,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "clientSideExecution": true, "dynamicBindingPathList": [ { @@ -21814,7 +21814,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -21857,7 +21857,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -21904,7 +21904,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "clientSideExecution": true, "dynamicBindingPathList": [ { @@ -21945,7 +21945,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "clientSideExecution": true, "dynamicBindingPathList": [ { @@ -21992,7 +21992,7 @@ "jsArguments": [], "isAsync": false }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -22031,7 +22031,7 @@ "jsArguments": [], "isAsync": false }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -22077,7 +22077,7 @@ "jsArguments": [], "isAsync": false }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -22116,7 +22116,7 @@ "jsArguments": [], "isAsync": false }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -22163,7 +22163,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "clientSideExecution": true, "dynamicBindingPathList": [ { @@ -22206,7 +22206,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "clientSideExecution": true, "dynamicBindingPathList": [ { @@ -22253,7 +22253,7 @@ "jsArguments": [], "isAsync": false }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -22292,7 +22292,7 @@ "jsArguments": [], "isAsync": false }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -22340,7 +22340,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -22383,7 +22383,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -22429,7 +22429,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -22470,7 +22470,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -22517,7 +22517,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "clientSideExecution": true, "dynamicBindingPathList": [ { @@ -22558,7 +22558,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "clientSideExecution": true, "dynamicBindingPathList": [ { @@ -22605,7 +22605,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -22646,7 +22646,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -22692,7 +22692,7 @@ "selfReferencingDataPaths": [], "jsArguments": [] }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -22731,7 +22731,7 @@ "selfReferencingDataPaths": [], "jsArguments": [] }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -22778,7 +22778,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -22820,7 +22820,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -22867,7 +22867,7 @@ "jsArguments": [], "isAsync": false }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "clientSideExecution": true, "dynamicBindingPathList": [ { @@ -22908,7 +22908,7 @@ "jsArguments": [], "isAsync": false }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "clientSideExecution": true, "dynamicBindingPathList": [ { @@ -22956,7 +22956,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -22998,7 +22998,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -23045,7 +23045,7 @@ "jsArguments": [], "isAsync": false }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [ { "key": "body" @@ -23087,7 +23087,7 @@ "jsArguments": [], "isAsync": false }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [ { "key": "body" @@ -23134,7 +23134,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -23176,7 +23176,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -23223,7 +23223,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -23265,7 +23265,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -23312,7 +23312,7 @@ "jsArguments": [], "isAsync": false }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "clientSideExecution": true, "dynamicBindingPathList": [ { @@ -23355,7 +23355,7 @@ "jsArguments": [], "isAsync": false }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "clientSideExecution": true, "dynamicBindingPathList": [ { @@ -23416,7 +23416,7 @@ "apiContentType": "none" } }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [ { "key": "datasourceUrl" @@ -23469,7 +23469,7 @@ "apiContentType": "none" } }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "datasourceUrl" @@ -23529,7 +23529,7 @@ "apiContentType": "none" } }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [ { "key": "datasourceUrl" @@ -23582,7 +23582,7 @@ "apiContentType": "none" } }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "datasourceUrl" @@ -23639,7 +23639,7 @@ "apiContentType": "none" } }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "datasourceUrl" @@ -23689,7 +23689,7 @@ "apiContentType": "none" } }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "datasourceUrl" @@ -23746,7 +23746,7 @@ "apiContentType": "none" } }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -23792,7 +23792,7 @@ "apiContentType": "none" } }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -23835,7 +23835,7 @@ "jsArguments": [], "isAsync": false }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "clientSideExecution": true, "dynamicBindingPathList": [ { @@ -23878,7 +23878,7 @@ "jsArguments": [], "isAsync": false }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "clientSideExecution": true, "dynamicBindingPathList": [ { @@ -23936,7 +23936,7 @@ "apiContentType": "none" } }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "datasourceUrl" @@ -23986,7 +23986,7 @@ "apiContentType": "none" } }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "datasourceUrl" @@ -24033,7 +24033,7 @@ "jsArguments": [], "isAsync": false }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -24075,7 +24075,7 @@ "jsArguments": [], "isAsync": false }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -24137,7 +24137,7 @@ "apiContentType": "none" } }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -24188,7 +24188,7 @@ "apiContentType": "none" } }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -24260,7 +24260,7 @@ } } }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -24325,7 +24325,7 @@ } } }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -24383,7 +24383,7 @@ "apiContentType": "none" } }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "path" @@ -24438,7 +24438,7 @@ "apiContentType": "none" } }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [ { "key": "path" @@ -24485,7 +24485,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -24527,7 +24527,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -24574,7 +24574,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -24616,7 +24616,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [ { "key": "body" @@ -24675,7 +24675,7 @@ "apiContentType": "none" } }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -24723,7 +24723,7 @@ "apiContentType": "none" } }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -24774,7 +24774,7 @@ "httpMethod": "GET", "selfReferencingDataPaths": [] }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [ { "key": "path" @@ -24822,7 +24822,7 @@ "httpMethod": "GET", "selfReferencingDataPaths": [] }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [ { "key": "path" @@ -24885,7 +24885,7 @@ "apiContentType": "none" } }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -24937,7 +24937,7 @@ "apiContentType": "none" } }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -24981,7 +24981,7 @@ } ] }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -25022,7 +25022,7 @@ } ] }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -25078,7 +25078,7 @@ "apiContentType": "none" } }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -25123,7 +25123,7 @@ "apiContentType": "none" } }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -25175,7 +25175,7 @@ "apiContentType": "none" } }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -25220,7 +25220,7 @@ "apiContentType": "none" } }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -25289,7 +25289,7 @@ "apiContentType": "none" } }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "isValid": true, "invalids": [], "messages": [], @@ -25350,7 +25350,7 @@ "apiContentType": "none" } }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "isValid": true, "invalids": [], "messages": [], @@ -25405,7 +25405,7 @@ "httpMethod": "GET", "selfReferencingDataPaths": [] }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [ { "key": "path" @@ -25461,7 +25461,7 @@ "httpMethod": "GET", "selfReferencingDataPaths": [] }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [ { "key": "path" @@ -25520,7 +25520,7 @@ "apiContentType": "none" } }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -25565,7 +25565,7 @@ "apiContentType": "none" } }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -25616,7 +25616,7 @@ "apiContentType": "none" } }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -25660,7 +25660,7 @@ "apiContentType": "none" } }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -25712,7 +25712,7 @@ "apiContentType": "none" } }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -25757,7 +25757,7 @@ "apiContentType": "none" } }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -25801,7 +25801,7 @@ } ] }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -25838,7 +25838,7 @@ } ] }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -25891,7 +25891,7 @@ "apiContentType": "none" } }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -25937,7 +25937,7 @@ "apiContentType": "none" } }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [], "isValid": true, "invalids": [], diff --git a/app/server/appsmith-server/src/test/resources/com/appsmith/server/git/autocommit/autocommit.json b/app/server/appsmith-server/src/test/resources/com/appsmith/server/git/autocommit/autocommit.json index 73e16644d823..48cfbf0e5e78 100644 --- a/app/server/appsmith-server/src/test/resources/com/appsmith/server/git/autocommit/autocommit.json +++ b/app/server/appsmith-server/src/test/resources/com/appsmith/server/git/autocommit/autocommit.json @@ -2159,7 +2159,7 @@ "pageId": "Page2", "contextType": "PAGE", "collectionId": "Page2__$JSModule11$_JSModule1", - "executeOnLoad": false, + "runBehaviour": "MANUAL", "clientSideExecution": true, "isValid": false, "invalids": ["No configurations found in this action"], @@ -2185,7 +2185,7 @@ "pageId": "Page2", "contextType": "PAGE", "collectionId": "Page2__$JSModule11$_JSModule1", - "executeOnLoad": false, + "runBehaviour": "MANUAL", "clientSideExecution": true, "isValid": false, "invalids": ["No configurations found in this action"], @@ -2221,7 +2221,7 @@ "pageId": "Page2", "contextType": "PAGE", "collectionId": "Page2__$JSModule11$_JSModule1", - "executeOnLoad": false, + "runBehaviour": "MANUAL", "clientSideExecution": true, "isValid": false, "invalids": ["No configurations found in this action"], @@ -2247,7 +2247,7 @@ "pageId": "Page2", "contextType": "PAGE", "collectionId": "Page2__$JSModule11$_JSModule1", - "executeOnLoad": false, + "runBehaviour": "MANUAL", "clientSideExecution": true, "isValid": false, "invalids": ["No configurations found in this action"], @@ -2346,7 +2346,7 @@ } ] }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [ { "key": "body" @@ -2392,7 +2392,7 @@ } ] }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [ { "key": "body" @@ -2445,7 +2445,7 @@ } ] }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [ { "key": "body" @@ -2486,7 +2486,7 @@ } ] }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [ { "key": "body" @@ -2590,7 +2590,7 @@ } ] }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -2643,7 +2643,7 @@ } ] }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -2703,7 +2703,7 @@ } ] }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -2757,7 +2757,7 @@ } ] }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" diff --git a/app/server/appsmith-server/src/test/resources/com/appsmith/server/git/ce-automation-test.json b/app/server/appsmith-server/src/test/resources/com/appsmith/server/git/ce-automation-test.json index e32443e002c1..508018edcc8d 100644 --- a/app/server/appsmith-server/src/test/resources/com/appsmith/server/git/ce-automation-test.json +++ b/app/server/appsmith-server/src/test/resources/com/appsmith/server/git/ce-automation-test.json @@ -20303,7 +20303,7 @@ "jsArguments": [], "isAsync": false }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -20342,7 +20342,7 @@ "jsArguments": [], "isAsync": false }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -20388,7 +20388,7 @@ "jsArguments": [], "isAsync": false }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -20427,7 +20427,7 @@ "jsArguments": [], "isAsync": false }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -20473,7 +20473,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -20514,7 +20514,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -20561,7 +20561,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "clientSideExecution": true, "dynamicBindingPathList": [ { @@ -20602,7 +20602,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "clientSideExecution": true, "dynamicBindingPathList": [ { @@ -20651,7 +20651,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "clientSideExecution": true, "dynamicBindingPathList": [ { @@ -20695,7 +20695,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "clientSideExecution": true, "dynamicBindingPathList": [ { @@ -20743,7 +20743,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "clientSideExecution": true, "dynamicBindingPathList": [ { @@ -20786,7 +20786,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "clientSideExecution": true, "dynamicBindingPathList": [ { @@ -20834,7 +20834,7 @@ "jsArguments": [], "isAsync": false }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -20876,7 +20876,7 @@ "jsArguments": [], "isAsync": false }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -20923,7 +20923,7 @@ "jsArguments": [], "isAsync": false }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -20965,7 +20965,7 @@ "jsArguments": [], "isAsync": false }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -21012,7 +21012,7 @@ "jsArguments": [], "isAsync": false }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "clientSideExecution": true, "dynamicBindingPathList": [ { @@ -21053,7 +21053,7 @@ "jsArguments": [], "isAsync": false }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "clientSideExecution": true, "dynamicBindingPathList": [ { @@ -21100,7 +21100,7 @@ "selfReferencingDataPaths": [], "jsArguments": [] }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -21139,7 +21139,7 @@ "selfReferencingDataPaths": [], "jsArguments": [] }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -21185,7 +21185,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -21226,7 +21226,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -21273,7 +21273,7 @@ "jsArguments": [], "isAsync": false }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "clientSideExecution": true, "dynamicBindingPathList": [ { @@ -21314,7 +21314,7 @@ "jsArguments": [], "isAsync": false }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "clientSideExecution": true, "dynamicBindingPathList": [ { @@ -21362,7 +21362,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "clientSideExecution": true, "dynamicBindingPathList": [ { @@ -21405,7 +21405,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "clientSideExecution": true, "dynamicBindingPathList": [ { @@ -21453,7 +21453,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -21495,7 +21495,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -21542,7 +21542,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "clientSideExecution": true, "dynamicBindingPathList": [ { @@ -21585,7 +21585,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "clientSideExecution": true, "dynamicBindingPathList": [ { @@ -21633,7 +21633,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -21675,7 +21675,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [ { "key": "body" @@ -21722,7 +21722,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "clientSideExecution": true, "dynamicBindingPathList": [ { @@ -21765,7 +21765,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "clientSideExecution": true, "dynamicBindingPathList": [ { @@ -21814,7 +21814,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -21857,7 +21857,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -21904,7 +21904,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "clientSideExecution": true, "dynamicBindingPathList": [ { @@ -21945,7 +21945,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "clientSideExecution": true, "dynamicBindingPathList": [ { @@ -21992,7 +21992,7 @@ "jsArguments": [], "isAsync": false }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -22031,7 +22031,7 @@ "jsArguments": [], "isAsync": false }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -22077,7 +22077,7 @@ "jsArguments": [], "isAsync": false }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -22116,7 +22116,7 @@ "jsArguments": [], "isAsync": false }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -22163,7 +22163,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "clientSideExecution": true, "dynamicBindingPathList": [ { @@ -22206,7 +22206,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "clientSideExecution": true, "dynamicBindingPathList": [ { @@ -22253,7 +22253,7 @@ "jsArguments": [], "isAsync": false }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -22292,7 +22292,7 @@ "jsArguments": [], "isAsync": false }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -22340,7 +22340,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -22383,7 +22383,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -22429,7 +22429,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -22470,7 +22470,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -22517,7 +22517,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "clientSideExecution": true, "dynamicBindingPathList": [ { @@ -22558,7 +22558,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "clientSideExecution": true, "dynamicBindingPathList": [ { @@ -22605,7 +22605,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -22646,7 +22646,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -22692,7 +22692,7 @@ "selfReferencingDataPaths": [], "jsArguments": [] }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -22731,7 +22731,7 @@ "selfReferencingDataPaths": [], "jsArguments": [] }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -22778,7 +22778,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -22820,7 +22820,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -22867,7 +22867,7 @@ "jsArguments": [], "isAsync": false }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "clientSideExecution": true, "dynamicBindingPathList": [ { @@ -22908,7 +22908,7 @@ "jsArguments": [], "isAsync": false }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "clientSideExecution": true, "dynamicBindingPathList": [ { @@ -22956,7 +22956,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -22998,7 +22998,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -23045,7 +23045,7 @@ "jsArguments": [], "isAsync": false }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [ { "key": "body" @@ -23087,7 +23087,7 @@ "jsArguments": [], "isAsync": false }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [ { "key": "body" @@ -23134,7 +23134,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -23176,7 +23176,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -23223,7 +23223,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -23265,7 +23265,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -23312,7 +23312,7 @@ "jsArguments": [], "isAsync": false }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "clientSideExecution": true, "dynamicBindingPathList": [ { @@ -23355,7 +23355,7 @@ "jsArguments": [], "isAsync": false }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "clientSideExecution": true, "dynamicBindingPathList": [ { @@ -23416,7 +23416,7 @@ "apiContentType": "none" } }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [ { "key": "datasourceUrl" @@ -23469,7 +23469,7 @@ "apiContentType": "none" } }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "datasourceUrl" @@ -23529,7 +23529,7 @@ "apiContentType": "none" } }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [ { "key": "datasourceUrl" @@ -23582,7 +23582,7 @@ "apiContentType": "none" } }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "datasourceUrl" @@ -23639,7 +23639,7 @@ "apiContentType": "none" } }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "datasourceUrl" @@ -23689,7 +23689,7 @@ "apiContentType": "none" } }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "datasourceUrl" @@ -23746,7 +23746,7 @@ "apiContentType": "none" } }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -23792,7 +23792,7 @@ "apiContentType": "none" } }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -23835,7 +23835,7 @@ "jsArguments": [], "isAsync": false }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "clientSideExecution": true, "dynamicBindingPathList": [ { @@ -23878,7 +23878,7 @@ "jsArguments": [], "isAsync": false }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "clientSideExecution": true, "dynamicBindingPathList": [ { @@ -23936,7 +23936,7 @@ "apiContentType": "none" } }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "datasourceUrl" @@ -23986,7 +23986,7 @@ "apiContentType": "none" } }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "datasourceUrl" @@ -24033,7 +24033,7 @@ "jsArguments": [], "isAsync": false }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -24075,7 +24075,7 @@ "jsArguments": [], "isAsync": false }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -24137,7 +24137,7 @@ "apiContentType": "none" } }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -24188,7 +24188,7 @@ "apiContentType": "none" } }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -24260,7 +24260,7 @@ } } }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -24325,7 +24325,7 @@ } } }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -24383,7 +24383,7 @@ "apiContentType": "none" } }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "path" @@ -24438,7 +24438,7 @@ "apiContentType": "none" } }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [ { "key": "path" @@ -24485,7 +24485,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -24527,7 +24527,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -24574,7 +24574,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -24616,7 +24616,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [ { "key": "body" @@ -24675,7 +24675,7 @@ "apiContentType": "none" } }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -24723,7 +24723,7 @@ "apiContentType": "none" } }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -24774,7 +24774,7 @@ "httpMethod": "GET", "selfReferencingDataPaths": [] }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [ { "key": "path" @@ -24822,7 +24822,7 @@ "httpMethod": "GET", "selfReferencingDataPaths": [] }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [ { "key": "path" @@ -24885,7 +24885,7 @@ "apiContentType": "none" } }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -24937,7 +24937,7 @@ "apiContentType": "none" } }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -24981,7 +24981,7 @@ } ] }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -25022,7 +25022,7 @@ } ] }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "body" @@ -25078,7 +25078,7 @@ "apiContentType": "none" } }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -25123,7 +25123,7 @@ "apiContentType": "none" } }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -25175,7 +25175,7 @@ "apiContentType": "none" } }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -25220,7 +25220,7 @@ "apiContentType": "none" } }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -25289,7 +25289,7 @@ "apiContentType": "none" } }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "isValid": true, "invalids": [], "messages": [], @@ -25350,7 +25350,7 @@ "apiContentType": "none" } }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "isValid": true, "invalids": [], "messages": [], @@ -25405,7 +25405,7 @@ "httpMethod": "GET", "selfReferencingDataPaths": [] }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [ { "key": "path" @@ -25461,7 +25461,7 @@ "httpMethod": "GET", "selfReferencingDataPaths": [] }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [ { "key": "path" @@ -25520,7 +25520,7 @@ "apiContentType": "none" } }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -25565,7 +25565,7 @@ "apiContentType": "none" } }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -25616,7 +25616,7 @@ "apiContentType": "none" } }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -25660,7 +25660,7 @@ "apiContentType": "none" } }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -25712,7 +25712,7 @@ "apiContentType": "none" } }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -25757,7 +25757,7 @@ "apiContentType": "none" } }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -25801,7 +25801,7 @@ } ] }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -25838,7 +25838,7 @@ } ] }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -25891,7 +25891,7 @@ "apiContentType": "none" } }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -25937,7 +25937,7 @@ "apiContentType": "none" } }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [], "isValid": true, "invalids": [], diff --git a/app/server/appsmith-server/src/test/resources/com/appsmith/server/imports/internal/faulty-dsl.json b/app/server/appsmith-server/src/test/resources/com/appsmith/server/imports/internal/faulty-dsl.json index 68f2e5e599fb..54dd1936ee95 100644 --- a/app/server/appsmith-server/src/test/resources/com/appsmith/server/imports/internal/faulty-dsl.json +++ b/app/server/appsmith-server/src/test/resources/com/appsmith/server/imports/internal/faulty-dsl.json @@ -3533,7 +3533,7 @@ "selfReferencingDataPaths": [], "pluginSpecifiedTemplates": [{ "value": true }] }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [{ "key": "body" }], "isValid": true, "invalids": [], @@ -3565,7 +3565,7 @@ "selfReferencingDataPaths": [], "pluginSpecifiedTemplates": [{ "value": true }] }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [{ "key": "body" }], "isValid": true, "invalids": [], @@ -3608,7 +3608,7 @@ "jsArguments": [], "isAsync": false }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [{ "key": "body" }], "isValid": true, "invalids": [], @@ -3645,7 +3645,7 @@ "jsArguments": [], "isAsync": false }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [{ "key": "body" }], "isValid": true, "invalids": [], @@ -3687,7 +3687,7 @@ "selfReferencingDataPaths": [], "pluginSpecifiedTemplates": [{ "value": true }] }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -3719,7 +3719,7 @@ "selfReferencingDataPaths": [], "pluginSpecifiedTemplates": [{ "value": true }] }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -3761,7 +3761,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [{ "key": "body" }], "isValid": true, "invalids": [], @@ -3797,7 +3797,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [{ "key": "body" }], "isValid": true, "invalids": [], @@ -3839,7 +3839,7 @@ "selfReferencingDataPaths": [], "pluginSpecifiedTemplates": [{ "value": true }] }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -3871,7 +3871,7 @@ "selfReferencingDataPaths": [], "pluginSpecifiedTemplates": [{ "value": true }] }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -3911,7 +3911,7 @@ "selfReferencingDataPaths": [], "pluginSpecifiedTemplates": [{ "value": true }] }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [{ "key": "body" }], "isValid": true, "invalids": [], @@ -3952,7 +3952,7 @@ "selfReferencingDataPaths": [], "pluginSpecifiedTemplates": [{ "value": true }] }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [{ "key": "body" }], "isValid": true, "invalids": [], @@ -4003,7 +4003,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [{ "key": "body" }], "isValid": true, "invalids": [], @@ -4039,7 +4039,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [{ "key": "body" }], "isValid": true, "invalids": [], @@ -4083,7 +4083,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [{ "key": "body" }], "isValid": true, "invalids": [], @@ -4119,7 +4119,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [{ "key": "body" }], "isValid": true, "invalids": [], @@ -4163,7 +4163,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [{ "key": "body" }], "isValid": true, "invalids": [], @@ -4199,7 +4199,7 @@ "jsArguments": [], "isAsync": true }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [{ "key": "body" }], "isValid": true, "invalids": [], @@ -4241,7 +4241,7 @@ "selfReferencingDataPaths": [], "pluginSpecifiedTemplates": [{ "value": true }] }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [{ "key": "body" }], "isValid": true, "invalids": [], @@ -4273,7 +4273,7 @@ "selfReferencingDataPaths": [], "pluginSpecifiedTemplates": [{ "value": true }] }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [{ "key": "body" }], "isValid": true, "invalids": [], @@ -4313,7 +4313,7 @@ "selfReferencingDataPaths": [], "pluginSpecifiedTemplates": [{ "value": true }] }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [{ "key": "body" }], "isValid": true, "invalids": [], @@ -4349,7 +4349,7 @@ "selfReferencingDataPaths": [], "pluginSpecifiedTemplates": [{ "value": true }] }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [{ "key": "body" }], "isValid": true, "invalids": [], @@ -4393,7 +4393,7 @@ "selfReferencingDataPaths": [], "pluginSpecifiedTemplates": [{ "value": true }] }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [{ "key": "body" }], "isValid": true, "invalids": [], @@ -4428,7 +4428,7 @@ "selfReferencingDataPaths": [], "pluginSpecifiedTemplates": [{ "value": true }] }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [{ "key": "body" }], "isValid": true, "invalids": [], @@ -4471,7 +4471,7 @@ "selfReferencingDataPaths": [], "pluginSpecifiedTemplates": [{ "value": true }] }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -4503,7 +4503,7 @@ "selfReferencingDataPaths": [], "pluginSpecifiedTemplates": [{ "value": true }] }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -4543,7 +4543,7 @@ "selfReferencingDataPaths": [], "pluginSpecifiedTemplates": [{ "value": true }] }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [{ "key": "body" }], "isValid": true, "invalids": [], @@ -4575,7 +4575,7 @@ "selfReferencingDataPaths": [], "pluginSpecifiedTemplates": [{ "value": true }] }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [{ "key": "body" }], "isValid": true, "invalids": [], @@ -4615,7 +4615,7 @@ "selfReferencingDataPaths": [], "pluginSpecifiedTemplates": [{ "value": true }] }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [{ "key": "body" }], "isValid": true, "invalids": [], @@ -4647,7 +4647,7 @@ "selfReferencingDataPaths": [], "pluginSpecifiedTemplates": [{ "value": true }] }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [{ "key": "body" }], "isValid": true, "invalids": [], diff --git a/app/server/appsmith-server/src/test/resources/test_assets/ImportExportServiceTest/building-block.json b/app/server/appsmith-server/src/test/resources/test_assets/ImportExportServiceTest/building-block.json index 0beb73bdf172..2fcabd0f6b05 100644 --- a/app/server/appsmith-server/src/test/resources/test_assets/ImportExportServiceTest/building-block.json +++ b/app/server/appsmith-server/src/test/resources/test_assets/ImportExportServiceTest/building-block.json @@ -3277,7 +3277,7 @@ } ] }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -3320,7 +3320,7 @@ } ] }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -3370,7 +3370,7 @@ } ] }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -3407,7 +3407,7 @@ } ] }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -3451,7 +3451,7 @@ } ] }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -3493,7 +3493,7 @@ } ] }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [], "isValid": true, "invalids": [], diff --git a/app/server/appsmith-server/src/test/resources/test_assets/ImportExportServiceTest/invalid-application-without-pageId-action-collection.json b/app/server/appsmith-server/src/test/resources/test_assets/ImportExportServiceTest/invalid-application-without-pageId-action-collection.json index bda8fe57c287..e3a85a350186 100644 --- a/app/server/appsmith-server/src/test/resources/test_assets/ImportExportServiceTest/invalid-application-without-pageId-action-collection.json +++ b/app/server/appsmith-server/src/test/resources/test_assets/ImportExportServiceTest/invalid-application-without-pageId-action-collection.json @@ -394,7 +394,7 @@ "body": "{\n \"find\": \"users\",\n \"sort\": {\n \"id\": 1\n },\n \"limit\": 10\n}" } }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -453,7 +453,7 @@ } ] }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [], "isValid": true, "invalids": [], diff --git a/app/server/appsmith-server/src/test/resources/test_assets/ImportExportServiceTest/partial-export-resource.json b/app/server/appsmith-server/src/test/resources/test_assets/ImportExportServiceTest/partial-export-resource.json index 05cd44022aee..1e21cbd9d594 100644 --- a/app/server/appsmith-server/src/test/resources/test_assets/ImportExportServiceTest/partial-export-resource.json +++ b/app/server/appsmith-server/src/test/resources/test_assets/ImportExportServiceTest/partial-export-resource.json @@ -152,7 +152,7 @@ } } }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -300,7 +300,7 @@ } } }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -454,7 +454,7 @@ } } }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -604,7 +604,7 @@ } } }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -781,7 +781,7 @@ } } }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -946,7 +946,7 @@ } } }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -1092,7 +1092,7 @@ } } }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "formData.rowObjects.data" @@ -1246,7 +1246,7 @@ } } }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [ { "key": "formData.rowObjects.data" diff --git a/app/server/appsmith-server/src/test/resources/test_assets/ImportExportServiceTest/partial-export-valid-without-widget.json b/app/server/appsmith-server/src/test/resources/test_assets/ImportExportServiceTest/partial-export-valid-without-widget.json index 55427a4ae4ba..d004200528c1 100644 --- a/app/server/appsmith-server/src/test/resources/test_assets/ImportExportServiceTest/partial-export-valid-without-widget.json +++ b/app/server/appsmith-server/src/test/resources/test_assets/ImportExportServiceTest/partial-export-valid-without-widget.json @@ -75,7 +75,7 @@ } ] }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -131,7 +131,7 @@ } ] }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [], "isValid": true, "invalids": [], diff --git a/app/server/appsmith-server/src/test/resources/test_assets/ImportExportServiceTest/valid-application-with-custom-themes.json b/app/server/appsmith-server/src/test/resources/test_assets/ImportExportServiceTest/valid-application-with-custom-themes.json index 073790cc3722..1186fa6c194e 100644 --- a/app/server/appsmith-server/src/test/resources/test_assets/ImportExportServiceTest/valid-application-with-custom-themes.json +++ b/app/server/appsmith-server/src/test/resources/test_assets/ImportExportServiceTest/valid-application-with-custom-themes.json @@ -436,7 +436,7 @@ "body": "{\n \"find\": \"users\",\n \"sort\": {\n \"id\": 1\n },\n \"limit\": 10\n}" } }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -495,7 +495,7 @@ } ] }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -538,7 +538,7 @@ "body": "() => {\n\t\t//write code here\n\t\treturn \"Hi\"\n\t}", "jsArguments": [] }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "isValid": true, "invalids": [], "jsonPathKeys": [ diff --git a/app/server/appsmith-server/src/test/resources/test_assets/ImportExportServiceTest/valid-application-with-page-added.json b/app/server/appsmith-server/src/test/resources/test_assets/ImportExportServiceTest/valid-application-with-page-added.json index b81c78a86dfa..79e7e3e61367 100644 --- a/app/server/appsmith-server/src/test/resources/test_assets/ImportExportServiceTest/valid-application-with-page-added.json +++ b/app/server/appsmith-server/src/test/resources/test_assets/ImportExportServiceTest/valid-application-with-page-added.json @@ -563,7 +563,7 @@ } } }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -613,7 +613,7 @@ } } }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -707,7 +707,7 @@ } ] }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -793,7 +793,7 @@ } ] }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -833,7 +833,7 @@ } ] }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -865,7 +865,7 @@ } ] }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -961,7 +961,7 @@ } } }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -1049,7 +1049,7 @@ } } }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -1143,7 +1143,7 @@ } ] }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -1229,7 +1229,7 @@ } ] }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -1284,7 +1284,7 @@ "apiContentType": "none" } }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -1331,7 +1331,7 @@ "apiContentType": "none" } }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -1427,7 +1427,7 @@ } } }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -1515,7 +1515,7 @@ } } }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -1553,7 +1553,7 @@ "body": "async () => {\n\t\t//use async-await or promises\n\t}", "jsArguments": [] }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "clientSideExecution": true, "dynamicBindingPathList": [ { @@ -1609,7 +1609,7 @@ "body": "() => {\n\t\t//write code here\n\t}", "jsArguments": [] }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "clientSideExecution": true, "dynamicBindingPathList": [ { diff --git a/app/server/appsmith-server/src/test/resources/test_assets/ImportExportServiceTest/valid-application-with-un-configured-datasource.json b/app/server/appsmith-server/src/test/resources/test_assets/ImportExportServiceTest/valid-application-with-un-configured-datasource.json index 524970a8dbf8..d889334003c2 100644 --- a/app/server/appsmith-server/src/test/resources/test_assets/ImportExportServiceTest/valid-application-with-un-configured-datasource.json +++ b/app/server/appsmith-server/src/test/resources/test_assets/ImportExportServiceTest/valid-application-with-un-configured-datasource.json @@ -315,7 +315,7 @@ } } }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -366,7 +366,7 @@ } ] }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "dynamicBindingPathList": [], "isValid": true, "invalids": [], diff --git a/app/server/appsmith-server/src/test/resources/test_assets/ImportExportServiceTest/valid-application-without-action-collection.json b/app/server/appsmith-server/src/test/resources/test_assets/ImportExportServiceTest/valid-application-without-action-collection.json index 4874f7b57815..d3944ff55970 100644 --- a/app/server/appsmith-server/src/test/resources/test_assets/ImportExportServiceTest/valid-application-without-action-collection.json +++ b/app/server/appsmith-server/src/test/resources/test_assets/ImportExportServiceTest/valid-application-without-action-collection.json @@ -436,7 +436,7 @@ "body": "{\n \"find\": \"users\",\n \"sort\": {\n \"id\": 1\n },\n \"limit\": 10\n}" } }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -495,7 +495,7 @@ } ] }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [], "isValid": true, "invalids": [], diff --git a/app/server/appsmith-server/src/test/resources/test_assets/ImportExportServiceTest/valid-application-without-theme.json b/app/server/appsmith-server/src/test/resources/test_assets/ImportExportServiceTest/valid-application-without-theme.json index 655a971465f4..0c9402e83e47 100644 --- a/app/server/appsmith-server/src/test/resources/test_assets/ImportExportServiceTest/valid-application-without-theme.json +++ b/app/server/appsmith-server/src/test/resources/test_assets/ImportExportServiceTest/valid-application-without-theme.json @@ -436,7 +436,7 @@ "body": "{\n \"find\": \"users\",\n \"sort\": {\n \"id\": 1\n },\n \"limit\": 10\n}" } }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -495,7 +495,7 @@ } ] }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -538,7 +538,7 @@ "body": "() => {\n\t\t//write code here\n\t\treturn \"Hi\"\n\t}", "jsArguments": [] }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "isValid": true, "invalids": [], "jsonPathKeys": [ diff --git a/app/server/appsmith-server/src/test/resources/test_assets/ImportExportServiceTest/valid-application.json b/app/server/appsmith-server/src/test/resources/test_assets/ImportExportServiceTest/valid-application.json index 1676cfa0bdee..5817568ccae5 100644 --- a/app/server/appsmith-server/src/test/resources/test_assets/ImportExportServiceTest/valid-application.json +++ b/app/server/appsmith-server/src/test/resources/test_assets/ImportExportServiceTest/valid-application.json @@ -439,7 +439,7 @@ "body": "{\n \"find\": \"users\",\n \"sort\": {\n \"id\": 1\n },\n \"limit\": 10\n}" } }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -498,7 +498,7 @@ } ] }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -539,7 +539,7 @@ } ] }, - "executeOnLoad": true, + "runBehaviour": "ON_PAGE_LOAD", "dynamicBindingPathList": [], "isValid": true, "invalids": [], @@ -573,7 +573,7 @@ "body": "() => {\n\t\t//write code here\n\t\treturn \"Hi\"\n\t}", "jsArguments": [] }, - "executeOnLoad": false, + "runBehaviour": "MANUAL", "isValid": true, "invalids": [], "jsonPathKeys": [