Merge branch 'dev' into feature-pagination

Author: FalkWolsky

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

@@ -8,7 +8,8 @@
 public enum ApplicationType {
     APPLICATION(1),
     MODULE(2),
-    COMPOUND_APPLICATION(3);
+    COMPOUND_APPLICATION(3),
+    FOLDER(4);
 
     private final int value;
 

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

@@ -284,7 +284,7 @@ private Mono<Tree<ApplicationInfoView, FolderInfoView>> buildApplicationInfoView
                 .cache();
 
         Flux<ApplicationInfoView> applicationInfoViewFlux =
-                userHomeApiService.getAllAuthorisedApplications4CurrentOrgMember(applicationType, ApplicationStatus.NORMAL, false, null)
+                userHomeApiService.getAllAuthorisedApplications4CurrentOrgMember(applicationType, ApplicationStatus.NORMAL, false, name)
                         .cache();
 
         Mono<Map<String, String>> application2FolderMapMono = applicationInfoViewFlux

server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query/LibraryQueryApiServiceImpl.java

@@ -87,7 +87,10 @@ private Flux<LibraryQuery> getByOrgIdWithDatasourcePermissions(String orgId) {
         Flux<LibraryQuery> libraryQueryFlux = libraryQueryService.getByOrganizationId(orgId)
                 .cache();
 
-        Mono<List<String>> datasourceIdListMono = libraryQueryFlux.map(libraryQuery -> libraryQuery.getQuery().getDatasourceId())
+        Mono<List<String>> datasourceIdListMono = libraryQueryFlux.map(libraryQuery -> {
+                    var datasourceId = libraryQuery.getQuery().getDatasourceId();
+                    return Objects.requireNonNullElse(datasourceId, "");
+                })
                 .filter(StringUtils::isNotBlank)
                 .collectList()
                 .cache();