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

[Bug] Update of an action leads to userSetOnLoad getting reset. (#2023)

Browse Source 
* Update of an action leads to userSetOnLoad getting reset.

* Added test case to assert the same.
This commit is contained in:
Trisha Anand 2020-12-04 13:07:34 +05:30 committed by GitHub
parent 864c01ef60
commit b8b24604a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 54 additions and 1 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/services/NewActionServiceImpl.java
View File

@ -387,6 +387,10 @@ public class NewActionServiceImpl extends BaseService<NewActionRepository, NewAc
return Mono.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, FieldName.ID));
}
// The client does not know about this field. Hence the default value takes over. Set this to null to ensure
// the update doesn't lead to resetting of this field.
action.setUserSetOnLoad(null);
NewAction newAction = new NewAction();
newAction.setUnpublishedAction(action);

51
app/server/appsmith-server/src/test/java/com/appsmith/server/services/ActionServiceTest.java
View File

@ -51,7 +51,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.UUID;
import java.util.concurrent.TimeoutException;
import static com.appsmith.external.constants.ActionConstants.DEFAULT_ACTION_EXECUTION_TIMEOUT_MS;
import static com.appsmith.server.acl.AclPermission.MANAGE_ACTIONS;
@ -103,6 +102,9 @@ public class ActionServiceTest {
@Autowired
DatasourceService datasourceService;
@Autowired
ActionCollectionService actionCollectionService;
Application testApp = null;
PageDTO testPage = null;
@ -785,4 +787,51 @@ public class ActionServiceTest {
})
.verifyComplete();
}
@Test
@WithUserDetails(value = "api_user")
public void updateShouldNotResetUserSetOnLoad() {
Mockito.when(pluginExecutorHelper.getPluginExecutor(Mockito.any())).thenReturn(Mono.just(new MockPluginExecutor()));
Datasource externalDatasource = new Datasource();
externalDatasource.setName("updateShouldNotResetUserSetOnLoad Database");
externalDatasource.setOrganizationId(orgId);
Plugin installed_plugin = pluginRepository.findByPackageName("installed-plugin").block();
externalDatasource.setPluginId(installed_plugin.getId());
DatasourceConfiguration datasourceConfiguration = new DatasourceConfiguration();
datasourceConfiguration.setUrl("some url here");
externalDatasource.setDatasourceConfiguration(datasourceConfiguration);
Datasource savedDs = datasourceService.create(externalDatasource).block();
ActionDTO action = new ActionDTO();
action.setName("updateShouldNotResetUserSetOnLoad");
action.setPageId(testPage.getId());
ActionConfiguration actionConfiguration = new ActionConfiguration();
actionConfiguration.setHttpMethod(HttpMethod.GET);
action.setActionConfiguration(actionConfiguration);
action.setDatasource(savedDs);
Mono<ActionDTO> newActionMono = newActionService
.createAction(action)
.cache();
Mono<ActionDTO> setExecuteOnLoadMono = newActionMono
.flatMap(savedAction -> layoutActionService.setExecuteOnLoad(savedAction.getId(), true));
Mono<ActionDTO> updateActionMono = newActionMono
.flatMap(preUpdateAction -> {
ActionDTO actionUpdate = action;
actionUpdate.getActionConfiguration().setBody("New Body");
return actionCollectionService.updateAction(preUpdateAction.getId(), actionUpdate);
});
StepVerifier
.create(setExecuteOnLoadMono.then(updateActionMono))
.assertNext(updatedAction -> {
assertThat(updatedAction).isNotNull();
assertThat(updatedAction.getActionConfiguration().getBody()).isEqualTo("New Body");
assertThat(updatedAction.getUserSetOnLoad()).isTrue();
})
.verifyComplete();
}
}