Skip to content

Modify app constant names to match frontend #1377

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 5, 2024
Merged

Modify app constant names to match frontend #1377

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Modify app constant names to match frontend
  • Loading branch information
@dragonpoo
dragonpoo committed Dec 5, 2024
commit 8e2b1be07769ae23dd519c298642757bf6be097c
8 changes: 6 additions & 2 deletions .../lowcoder-domain/src/main/java/org/lowcoder/domain/application/model/ApplicationType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion ...lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationApiServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion ...i-service/lowcoder-server/src/main/java/org/lowcoder/api/home/UserHomeApiServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)))
Expand Down
Loading