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

Merge branch 'hotfix/application-delete' into 'release'

Browse Source 
When deleting a page, also remove it from the application page cache.

This fixes the bug where the application could not be published because it assumed a page existed when that page had been deleted.

See merge request theappsmith/internal-tools-server!205
This commit is contained in:
Arpit Mohan 2020-02-25 06:00:49 +00:00
commit 6eace6ae1a
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/server/appsmith-server/src/main/java/com/appsmith/server/services/PageServiceImpl.java
View File

@ -95,17 +95,23 @@ public class PageServiceImpl extends BaseService<PageRepository, Page, String> i
.switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.PAGE_ID, id))) .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.PAGE_ID, id)))
.flatMap(page -> { .flatMap(page -> {
log.debug("Going to archive pageId: {} for applicationId: {}", page.getId(), page.getApplicationId()); log.debug("Going to archive pageId: {} for applicationId: {}", page.getId(), page.getApplicationId());
Mono<Application> applicationMono = applicationService.getById(page.getApplicationId())
.flatMap(application -> {
application.getPages().removeIf(p -> p.getId().equals(page.getId()));
return applicationService.save(application);
});
Mono<Page> archivedPageMono = repository.archive(page); Mono<Page> archivedPageMono = repository.archive(page);
Mono<List<Action>> archivedActionsMono = actionRepository.findByPageId(page.getId()) Mono<List<Action>> archivedActionsMono = actionRepository.findByPageId(page.getId())
.flatMap(action -> { .flatMap(action -> {
log.debug("Going to archive actionId: {} for applicationId: {}", action.getId(), id); log.debug("Going to archive actionId: {} for applicationId: {}", action.getId(), id);
return actionRepository.archive(action); return actionRepository.archive(action);
}).collectList(); }).collectList();
return Mono.zip(archivedPageMono, archivedActionsMono) return Mono.zip(archivedPageMono, archivedActionsMono, applicationMono)
.map(tuple -> { .map(tuple -> {
Page page1 = tuple.getT1(); Page page1 = tuple.getT1();
List<Action> actions = tuple.getT2(); List<Action> actions = tuple.getT2();
log.debug("Archived pageId: {} and {} actions for applicationId: {}", page1.getId(), actions.size(), id); Application application = tuple.getT3();
log.debug("Archived pageId: {} and {} actions for applicationId: {}", page1.getId(), actions.size(), application.getId());
return page1; return page1;
}); });
}); });