Commit 7d2a7a9

authored

Merge branch 'dev' into feature-pagination

2 parents 43eb5b7 + e3febbd commit 7d2a7a9Copy full SHA for 7d2a7a9

File tree

-3

lines changed

-3

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,8 @@`
`8`	`8`	`public enum ApplicationType {`
`9`	`9`	`APPLICATION(1),`
`10`	`10`	`MODULE(2),`
`11`		`- COMPOUND_APPLICATION(3);`
	`11`	`+ COMPOUND_APPLICATION(3),`
	`12`	`+ FOLDER(4);`
`12`	`13`
`13`	`14`	`private final int value;`
`14`	`15`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -284,7 +284,7 @@ private Mono<Tree<ApplicationInfoView, FolderInfoView>> buildApplicationInfoView`
`284`	`284`	`.cache();`
`285`	`285`
`286`	`286`	`Flux<ApplicationInfoView> applicationInfoViewFlux =`
`287`		`- userHomeApiService.getAllAuthorisedApplications4CurrentOrgMember(applicationType, ApplicationStatus.NORMAL, false, null)`
	`287`	`+ userHomeApiService.getAllAuthorisedApplications4CurrentOrgMember(applicationType, ApplicationStatus.NORMAL, false, name)`
`288`	`288`	`.cache();`
`289`	`289`
`290`	`290`	`Mono<Map<String, String>> application2FolderMapMono = applicationInfoViewFlux`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,10 @@ private Flux<LibraryQuery> getByOrgIdWithDatasourcePermissions(String orgId) {`
`87`	`87`	`Flux<LibraryQuery> libraryQueryFlux = libraryQueryService.getByOrganizationId(orgId)`
`88`	`88`	`.cache();`
`89`	`89`
`90`		`- Mono<List<String>> datasourceIdListMono = libraryQueryFlux.map(libraryQuery -> libraryQuery.getQuery().getDatasourceId())`
	`90`	`+ Mono<List<String>> datasourceIdListMono = libraryQueryFlux.map(libraryQuery -> {`
	`91`	`+ var datasourceId = libraryQuery.getQuery().getDatasourceId();`
	`92`	`+ return Objects.requireNonNullElse(datasourceId, "");`
	`93`	`+ })`
`91`	`94`	`.filter(StringUtils::isNotBlank)`
`92`	`95`	`.collectList()`
`93`	`96`	`.cache();`

Comments

(0)