Skip to content

Commit ac6aa91

Browse files
authored
Merge pull request #1377 from lowcoder-org/fix/app_type
Modify app constant names to match frontend
2 parents 18e2917 + 8e2b1be commit ac6aa91

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/model/ApplicationType.java

+6-2
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,14 @@
66

77
@Getter
88
public enum ApplicationType {
9+
ALL(0),
910
APPLICATION(1),
1011
MODULE(2),
11-
COMPOUND_APPLICATION(3),
12-
FOLDER(4);
12+
NAV_LAYOUT(3),
13+
FOLDER(4),
14+
MOBILE_TAB_LAYOUT(6),
15+
NAVIGATION(7),
16+
BUNDLE(8);
1317

1418
private final int value;
1519

server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationApiServiceImpl.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ public Mono<ApplicationView> getPublishedApplication(String applicationId, Appli
300300
.build();
301301
})
302302
.delayUntil(applicationView -> {
303-
if (applicationView.getApplicationInfoView().getApplicationType() == ApplicationType.COMPOUND_APPLICATION.getValue()) {
303+
if (applicationView.getApplicationInfoView().getApplicationType() == ApplicationType.NAV_LAYOUT.getValue()) {
304304
return compoundApplicationDslFilter.removeSubAppsFromCompoundDsl(applicationView.getApplicationDSL());
305305
}
306306
return Mono.empty();

server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/home/UserHomeApiServiceImpl.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ public Flux<ApplicationInfoView> getAllAuthorisedApplications4CurrentOrgMember(@
202202
}
203203
return applicationService.findByOrganizationIdWithoutDsl(currentOrgId);
204204
})
205-
.filter(application -> (isNull(applicationType) || application.getApplicationType() == applicationType.getValue())
205+
.filter(application -> (isNull(applicationType) || applicationType == ApplicationType.ALL || application.getApplicationType() == applicationType.getValue())
206206
&& (isNull(applicationStatus) || application.getApplicationStatus() == applicationStatus)
207207
&& (isNull(name) || StringUtils.containsIgnoreCase(application.getName(), name))
208208
&& (isNull(category) || StringUtils.containsIgnoreCase(application.getCategory(), category)))

0 commit comments

Comments
 (0)