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

fix: Only add missing user set actions to scheduling order (#12601)

Browse Source
This commit is contained in:
Nidhi 2022-04-06 12:04:41 +05:30 committed by GitHub
parent 26fd0305ee
commit 79a63d535d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 43 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/PageLoadActionsUtilCEImpl.java
View File

@ -178,14 +178,14 @@ public class PageLoadActionsUtilCEImpl implements PageLoadActionsUtilCE {
// If any of the explicitly set on page load actions havent been added yet, add them to the 0th set
// of actions set since no relationships were found with any other appsmith entity
if (!pageLoadActionNames.isEmpty()) {
onPageLoadActionSet.addAll(explicitUserSetOnLoadActions);
onPageLoadActionSet.addAll(pageLoadActionNames);
// In case there are no page load actions, initialize the 0th set of page load actions list.
if (onPageLoadActionsSchedulingOrder.isEmpty()) {
onPageLoadActionsSchedulingOrder.add(new HashSet<>());
}
onPageLoadActionsSchedulingOrder.get(0).addAll(explicitUserSetOnLoadActions);
onPageLoadActionsSchedulingOrder.get(0).addAll(pageLoadActionNames);
}
return onPageLoadActionsSchedulingOrder;

48
app/server/appsmith-server/src/test/java/com/appsmith/server/services/LayoutActionServiceTest.java
View File

@ -1163,17 +1163,30 @@ public class LayoutActionServiceTest {
action1.setActionConfiguration(actionConfiguration1);
action1.setDatasource(datasource);
// Gen action which does not get used anywhere but depends implicitly on first action
// Gen action which does not get used anywhere but depends implicitly on first action and has been set to run on load
ActionDTO action2 = new ActionDTO();
action2.setName("secondAction");
action2.setPageId(testPage.getId());
ActionConfiguration actionConfiguration2 = new ActionConfiguration();
actionConfiguration2.setHttpMethod(HttpMethod.GET);
actionConfiguration2.setBody("{{ firstWidget.data }}");
actionConfiguration2.setBody("{{ firstAction.data }}");
action2.setUserSetOnLoad(true);
action2.setActionConfiguration(actionConfiguration2);
action2.setDynamicBindingPathList(List.of(new Property("body", null)));
action2.setDatasource(datasource);
// Gen action which does not get used anywhere but has been set to run on load
ActionDTO action3 = new ActionDTO();
action3.setName("thirdAction");
action3.setPageId(testPage.getId());
ActionConfiguration actionConfiguration3 = new ActionConfiguration();
actionConfiguration3.setHttpMethod(HttpMethod.GET);
actionConfiguration3.setBody("irrelevantValue");
action3.setUserSetOnLoad(true);
action3.setActionConfiguration(actionConfiguration3);
action3.setDynamicBindingPathList(List.of(new Property("body", null)));
action3.setDatasource(datasource);
JSONObject parentDsl = new JSONObject(objectMapper.readValue(DEFAULT_PAGE_LAYOUT, new TypeReference<HashMap<String, Object>>() {
}));
@ -1193,18 +1206,39 @@ public class LayoutActionServiceTest {
layout.setDsl(parentDsl);
ActionDTO createdAction1 = layoutActionService.createSingleAction(action1).block();
ActionDTO createdAction2 = layoutActionService.createSingleAction(action2).block();
ActionDTO createdAction2 = layoutActionService.createSingleAction(action2)
.flatMap(savedAction -> {
ActionDTO updates = new ActionDTO();
// Configure action to execute on page load.
updates.setExecuteOnLoad(true);
// Save updated configuration and re-compute on page load actions.
return layoutActionService.updateSingleAction(savedAction.getId(), updates);
}).block();
ActionDTO createdAction3 = layoutActionService.createSingleAction(action3)
.flatMap(savedAction -> {
ActionDTO updates = new ActionDTO();
// Configure action to execute on page load.
updates.setExecuteOnLoad(true);
// Save updated configuration and re-compute on page load actions.
return layoutActionService.updateSingleAction(savedAction.getId(), updates);
}).block();
Mono<LayoutDTO> updateLayoutMono = layoutActionService.updateLayout(testPage.getId(), layout.getId(), layout);
StepVerifier.create(updateLayoutMono)
.assertNext(updatedLayout -> {
assertThat(updatedLayout.getLayoutOnLoadActions().size()).isEqualTo(1);
assertThat(updatedLayout.getLayoutOnLoadActions().size()).isEqualTo(2);
// Assert that both the actions dont belong to the same set. They should be run iteratively.
DslActionDTO actionDTO = updatedLayout.getLayoutOnLoadActions().get(0).iterator().next();
assertThat(actionDTO.getName()).isEqualTo("firstAction");
// Assert that all three the actions dont belong to the same set
final Set<DslActionDTO> firstSet = updatedLayout.getLayoutOnLoadActions().get(0);
assertThat(firstSet).allMatch(actionDTO -> Set.of("firstAction", "thirdAction").contains(actionDTO.getName()));
final DslActionDTO secondSetAction = updatedLayout.getLayoutOnLoadActions().get(1).iterator().next();
assertThat(secondSetAction.getName()).isEqualTo("secondAction");
})
.verifyComplete();