From 8e2b1be07769ae23dd519c298642757bf6be097c Mon Sep 17 00:00:00 2001 From: Thomasr Date: Thu, 5 Dec 2024 04:07:13 -0500 Subject: [PATCH] Modify app constant names to match frontend --- .../domain/application/model/ApplicationType.java | 8 ++++++-- .../api/application/ApplicationApiServiceImpl.java | 2 +- .../org/lowcoder/api/home/UserHomeApiServiceImpl.java | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/model/ApplicationType.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/model/ApplicationType.java index 9a953cc3f..981fd39d7 100644 --- a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/model/ApplicationType.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/model/ApplicationType.java @@ -6,10 +6,14 @@ @Getter public enum ApplicationType { + ALL(0), APPLICATION(1), MODULE(2), - COMPOUND_APPLICATION(3), - FOLDER(4); + NAV_LAYOUT(3), + FOLDER(4), + MOBILE_TAB_LAYOUT(6), + NAVIGATION(7), + BUNDLE(8); private final int value; diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationApiServiceImpl.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationApiServiceImpl.java index e7ae4e0dd..3724cc69b 100644 --- a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationApiServiceImpl.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationApiServiceImpl.java @@ -300,7 +300,7 @@ public Mono getPublishedApplication(String applicationId, Appli .build(); }) .delayUntil(applicationView -> { - if (applicationView.getApplicationInfoView().getApplicationType() == ApplicationType.COMPOUND_APPLICATION.getValue()) { + if (applicationView.getApplicationInfoView().getApplicationType() == ApplicationType.NAV_LAYOUT.getValue()) { return compoundApplicationDslFilter.removeSubAppsFromCompoundDsl(applicationView.getApplicationDSL()); } return Mono.empty(); diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/home/UserHomeApiServiceImpl.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/home/UserHomeApiServiceImpl.java index 421e451cc..4fe04695f 100644 --- a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/home/UserHomeApiServiceImpl.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/home/UserHomeApiServiceImpl.java @@ -202,7 +202,7 @@ public Flux getAllAuthorisedApplications4CurrentOrgMember(@ } return applicationService.findByOrganizationIdWithoutDsl(currentOrgId); }) - .filter(application -> (isNull(applicationType) || application.getApplicationType() == applicationType.getValue()) + .filter(application -> (isNull(applicationType) || applicationType == ApplicationType.ALL || application.getApplicationType() == applicationType.getValue()) && (isNull(applicationStatus) || application.getApplicationStatus() == applicationStatus) && (isNull(name) || StringUtils.containsIgnoreCase(application.getName(), name)) && (isNull(category) || StringUtils.containsIgnoreCase(application.getCategory(), category)))