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

Update the delete app flow for git connected apps (#14399)

Browse Source
This commit is contained in:
Anagh Hegde 2022-06-10 18:39:00 +05:30 committed by GitHub
parent fc1a016c81
commit c64784646a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApplicationPageServiceCEImpl.java
View File

@ -399,12 +399,8 @@ public class ApplicationPageServiceCEImpl implements ApplicationPageServiceCE {
.flatMapMany(application -> {
GitApplicationMetadata gitData = application.getGitApplicationMetadata();
if (gitData != null && !StringUtils.isEmpty(gitData.getDefaultApplicationId()) && !StringUtils.isEmpty(gitData.getRepoName())) {
String repoName = gitData.getRepoName();
Path repoPath = Paths.get(application.getOrganizationId(), gitData.getDefaultApplicationId(), repoName);
// Delete git repo from local and delete the applications from DB
return gitFileUtils.deleteLocalRepo(repoPath)
.flatMapMany(isCleared -> applicationService
.findAllApplicationsByDefaultApplicationId(gitData.getDefaultApplicationId(), MANAGE_APPLICATIONS));
return applicationService
.findAllApplicationsByDefaultApplicationId(gitData.getDefaultApplicationId(), MANAGE_APPLICATIONS);
}
return Flux.fromIterable(List.of(application));
})
@ -412,7 +408,18 @@ public class ApplicationPageServiceCEImpl implements ApplicationPageServiceCE {
log.debug("Archiving application with id: {}", application.getId());
return deleteApplicationByResource(application);
})
.then(applicationMono);
.then(applicationMono)
.flatMap(application ->{
GitApplicationMetadata gitData = application.getGitApplicationMetadata();
if (gitData != null && !StringUtils.isEmpty(gitData.getDefaultApplicationId()) && !StringUtils.isEmpty(gitData.getRepoName())) {
String repoName = gitData.getRepoName();
Path repoPath = Paths.get(application.getOrganizationId(), gitData.getDefaultApplicationId(), repoName);
// Delete git repo from local
return gitFileUtils.deleteLocalRepo(repoPath)
.then(Mono.just(application));
}
return Mono.just(application);
});
}
public Mono<Application> deleteApplicationByResource(Application application) {