Merge pull request #1377 from lowcoder-org/fix/app_type

Modify app constant names to match frontend
lowcoder-org · Dec 5, 2024 · ac6aa91 · ac6aa91
2 parents 18e2917 + 8e2b1be
commit ac6aa91
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/.../lowcoder-domain/src/main/java/org/lowcoder/domain/application/model/ApplicationType.java b/.../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/...lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationApiServiceImpl.java b/...lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationApiServiceImpl.java
@@ -300,7 +300,7 @@ public Mono<ApplicationView> 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/...i-service/lowcoder-server/src/main/java/org/lowcoder/api/home/UserHomeApiServiceImpl.java b/...i-service/lowcoder-server/src/main/java/org/lowcoder/api/home/UserHomeApiServiceImpl.java
@@ -202,7 +202,7 @@ public Flux<ApplicationInfoView> 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)))