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

fix: Set default theme when application is exported (#13321)

Browse Source 
When application is exported and it does not have a theme set, a NullPointerException was raised in that case. This PR fixes that by returning the default theme when theme is missing.
This commit is contained in:
Nayan 2022-04-30 01:41:08 +06:00 committed by GitHub
parent c6f3f356e6
commit e9b1108e47
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/ImportExportApplicationServiceCEImpl.java
View File

@ -186,6 +186,8 @@ public class ImportExportApplicationServiceCEImpl implements ImportExportApplica
applicationJson.setServerSchemaVersion(JsonSchemaVersions.serverVersion); applicationJson.setServerSchemaVersion(JsonSchemaVersions.serverVersion);
applicationJson.setClientSchemaVersion(JsonSchemaVersions.clientVersion); applicationJson.setClientSchemaVersion(JsonSchemaVersions.clientVersion);
Mono<Theme> defaultThemeMono = themeService.getSystemTheme(Theme.DEFAULT_THEME_NAME).cache();
return pluginRepository return pluginRepository
.findAll() .findAll()
.map(plugin -> { .map(plugin -> {
@ -194,10 +196,10 @@ public class ImportExportApplicationServiceCEImpl implements ImportExportApplica
}) })
.then(applicationMono) .then(applicationMono)
.flatMap(application -> themeService.getThemeById(application.getEditModeThemeId(), READ_THEMES) .flatMap(application -> themeService.getThemeById(application.getEditModeThemeId(), READ_THEMES)
.switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.ACL_NO_RESOURCE_FOUND, FieldName.THEME, application.getEditModeThemeId()))) .switchIfEmpty(defaultThemeMono) // setting default theme if theme is missing
.zipWith(themeService .zipWith(themeService
.getThemeById(application.getPublishedModeThemeId(), READ_THEMES) .getThemeById(application.getPublishedModeThemeId(), READ_THEMES)
.switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.ACL_NO_RESOURCE_FOUND, FieldName.THEME, application.getPublishedModeThemeId()))) .switchIfEmpty(defaultThemeMono)// setting default theme if theme is missing
) )
.map(themesTuple -> { .map(themesTuple -> {
Theme editModeTheme = exportTheme(themesTuple.getT1()); Theme editModeTheme = exportTheme(themesTuple.getT1());

26
app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ImportExportApplicationServiceTests.java
View File

@ -94,6 +94,7 @@ import java.util.Map;
import java.util.Objects; import java.util.Objects;
import java.util.Optional; import java.util.Optional;
import java.util.Set; import java.util.Set;
import java.util.UUID;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static com.appsmith.server.acl.AclPermission.MANAGE_ACTIONS; import static com.appsmith.server.acl.AclPermission.MANAGE_ACTIONS;
@ -2523,5 +2524,28 @@ public class ImportExportApplicationServiceTests {
.verifyComplete(); .verifyComplete();
} }
@Test
@WithUserDetails(value = "api_user")
public void exportApplicationById_WhenThemeDoesNotExist_ExportedWithDefaultTheme() {
Theme customTheme = new Theme();
customTheme.setName("my-custom-theme");
String randomId = UUID.randomUUID().toString();
Application testApplication = new Application();
testApplication.setName("Application_" + randomId);
Mono<ApplicationJson> exportedAppJson = applicationPageService.createApplication(testApplication, orgId)
.flatMap(application -> {
application.setEditModeThemeId("invalid-theme-id");
application.setPublishedModeThemeId("invalid-theme-id");
String branchName = null;
return applicationService.save(application)
.then(importExportApplicationService.exportApplicationById(application.getId(), branchName));
});
StepVerifier.create(exportedAppJson).assertNext(applicationJson -> {
assertThat(applicationJson.getEditModeTheme().getName()).isEqualTo(Theme.DEFAULT_THEME_NAME);
assertThat(applicationJson.getPublishedTheme().getName()).isEqualTo(Theme.DEFAULT_THEME_NAME);
}).verifyComplete();
}
} }