Commitac6aa91

authored

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

Modify app constant names to match frontend

2 parents18e2917 +8e2b1be commitac6aa91Copy full SHA for ac6aa91

File tree

-4

lines changed

-4

lines changed

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,10 +6,14 @@`
`6`	`6`
`7`	`7`	`@Getter`
`8`	`8`	`publicenumApplicationType {`
	`9`	`+ALL(0),`
`9`	`10`	`APPLICATION(1),`
`10`	`11`	`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);`
`13`	`17`
`14`	`18`	`privatefinalintvalue;`
`15`	`19`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -300,7 +300,7 @@ public Mono<ApplicationView> getPublishedApplication(String applicationId, Appli`
`300`	`300`	`.build();`
`301`	`301`	`})`
`302`	`302`	`.delayUntil(applicationView -> {`
`303`		`-if (applicationView.getApplicationInfoView().getApplicationType() ==ApplicationType.COMPOUND_APPLICATION.getValue()) {`
	`303`	`+if (applicationView.getApplicationInfoView().getApplicationType() ==ApplicationType.NAV_LAYOUT.getValue()) {`
`304`	`304`	`returncompoundApplicationDslFilter.removeSubAppsFromCompoundDsl(applicationView.getApplicationDSL());`
`305`	`305`	`}`
`306`	`306`	`returnMono.empty();`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -202,7 +202,7 @@ public Flux<ApplicationInfoView> getAllAuthorisedApplications4CurrentOrgMember(@`
`202`	`202`	`}`
`203`	`203`	`returnapplicationService.findByOrganizationIdWithoutDsl(currentOrgId);`
`204`	`204`	`})`
`205`		`- .filter(application -> (isNull(applicationType) \|\|application.getApplicationType() ==applicationType.getValue())`
	`205`	`+ .filter(application -> (isNull(applicationType) \|\|applicationType ==ApplicationType.ALL \|\|application.getApplicationType() ==applicationType.getValue())`
`206`	`206`	`&& (isNull(applicationStatus) \|\|application.getApplicationStatus() ==applicationStatus)`
`207`	`207`	`&& (isNull(name) \|\|StringUtils.containsIgnoreCase(application.getName(),name))`
`208`	`208`	`&& (isNull(category) \|\|StringUtils.containsIgnoreCase(application.getCategory(),category)))`

Comments

(0)