Add name param to folder list endpoint

Thomasr · ludomikula · commit 0ad8fef6b02c · 2024-10-17T18:37:40.000+02:00
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/home/FolderApiService.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/home/FolderApiService.java
@@ -27,7 +27,7 @@ public interface FolderApiService {
 
     Mono<Void> upsertLastViewTime(@Nullable String folderId);
 
-    Flux<?> getElements(@Nullable String folderId, @Nullable ApplicationType applicationType);
+    Flux<?> getElements(@Nullable String folderId, @Nullable ApplicationType applicationType, @Nullable String name);
 
     Mono<Void> grantPermission(String folderId, Set<String> userIds, Set<String> groupIds, ResourceRole role);
 
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/home/FolderApiServiceImpl.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/home/FolderApiServiceImpl.java
@@ -233,8 +233,8 @@ public Mono<Void> upsertLastViewTime(@Nullable String folderId) {
      * @return flux of {@link ApplicationInfoView} or {@link FolderInfoView}
      */
     @Override
-    public Flux<?> getElements(@Nullable String folderId, @Nullable ApplicationType applicationType) {
-        return buildApplicationInfoViewTree(applicationType)
+    public Flux<?> getElements(@Nullable String folderId, @Nullable ApplicationType applicationType, @Nullable String name) {
+        return buildApplicationInfoViewTree(applicationType, name)
                 .flatMap(tree -> {
                     FolderNode<ApplicationInfoView, FolderInfoView> folderNode = tree.get(folderId);
                     if (folderNode == null) {
@@ -278,7 +278,7 @@ private Mono<Tree<Object, Folder>> buildFolderTree(String orgId) {
                 .map(folders -> new Tree<>(folders, Folder::getId, Folder::getParentFolderId, Collections.emptyList(), null, null));
     }
 
-    private Mono<Tree<ApplicationInfoView, FolderInfoView>> buildApplicationInfoViewTree(@Nullable ApplicationType applicationType) {
+    private Mono<Tree<ApplicationInfoView, FolderInfoView>> buildApplicationInfoViewTree(@Nullable ApplicationType applicationType, @Nullable String name) {
 
         Mono<OrgMember> orgMemberMono = sessionUserService.getVisitorOrgMemberCache()
                 .cache();
@@ -294,6 +294,7 @@ private Mono<Tree<ApplicationInfoView, FolderInfoView>> buildApplicationInfoView
                 .collectMap(FolderElement::elementId, FolderElement::folderId);
 
         Flux<Folder> folderFlux = orgMemberMono.flatMapMany(orgMember -> folderService.findByOrganizationId(orgMember.getOrgId()))
+                .filter(folder -> name == null || folder.getName().toLowerCase().contains(name.toLowerCase()))
                 .cache();
 
         Mono<Map<String, Instant>> folderId2LastViewTimeMapMono = orgMemberMono
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/home/FolderController.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/home/FolderController.java
@@ -69,9 +69,10 @@ public Mono<ResponseView<FolderInfoView>> update(@RequestBody Folder folder) {
      */
     @Override
     public Mono<ResponseView<List<?>>> getElements(@RequestParam(value = "id", required = false) String folderId,
-            @RequestParam(value = "applicationType", required = false) ApplicationType applicationType) {
+            @RequestParam(value = "applicationType", required = false) ApplicationType applicationType,
+            @RequestParam(required = false) String name) {
         String objectId = gidService.convertFolderIdToObjectId(folderId);
-        return folderApiService.getElements(objectId, applicationType)
+        return folderApiService.getElements(objectId, applicationType, name)
                 .collectList()
                 .delayUntil(__ -> folderApiService.upsertLastViewTime(objectId))
                 .map(ResponseView::success);
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/home/FolderEndpoints.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/home/FolderEndpoints.java
@@ -69,7 +69,8 @@ public interface FolderEndpoints
 	)
     @GetMapping("/elements")
     public Mono<ResponseView<List<?>>> getElements(@RequestParam(value = "id", required = false) String folderId,
-            @RequestParam(value = "applicationType", required = false) ApplicationType applicationType);
+            @RequestParam(value = "applicationType", required = false) ApplicationType applicationType,
+			@RequestParam(required = false) String name);
 
 	@Operation(
 			tags = TAG_FOLDER_MANAGEMENT,
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/home/UserHomeApiServiceImpl.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/home/UserHomeApiServiceImpl.java
@@ -157,7 +157,7 @@ public Mono<UserHomepageView> getUserHomePageView(ApplicationType applicationTyp
                     }
 
                     return organizationService.getById(currentOrgId)
-                            .zipWith(folderApiService.getElements(null, applicationType).collectList())
+                            .zipWith(folderApiService.getElements(null, applicationType, null).collectList())
                             .map(tuple2 -> {
                                 Organization organization = tuple2.getT1();
                                 List<?> list = tuple2.getT2();
diff --git a/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/service/FolderApiServiceTest.java b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/service/FolderApiServiceTest.java
@@ -137,7 +137,7 @@ public void updateByGid() {
     public void move() {
 
         Mono<? extends List<?>> mono = folderApiService.move("app01", "folder02")
-                .then(folderApiService.getElements("folder02", null).collectList());
+                .then(folderApiService.getElements("folder02", null, null).collectList());
 
         StepVerifier.create(mono)
                 .assertNext(list -> {

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,8 @@ public interface FolderEndpoints`
`69`	`69`	`)`
`70`	`70`	`@GetMapping("/elements")`
`71`	`71`	`public Mono<ResponseView<List<?>>> getElements(@RequestParam(value = "id", required = false) String folderId,`
`72`		`- @RequestParam(value = "applicationType", required = false) ApplicationType applicationType);`
	`72`	`+ @RequestParam(value = "applicationType", required = false) ApplicationType applicationType,`
	`73`	`+ @RequestParam(required = false) String name);`
`73`	`74`
`74`	`75`	`@Operation(`
`75`	`76`	`tags = TAG_FOLDER_MANAGEMENT,`
Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,7 @@ public Mono<UserHomepageView> getUserHomePageView(ApplicationType applicationTyp`
`157`	`157`	`}`
`158`	`158`
`159`	`159`	`return organizationService.getById(currentOrgId)`
`160`		`- .zipWith(folderApiService.getElements(null, applicationType).collectList())`
	`160`	`+ .zipWith(folderApiService.getElements(null, applicationType, null).collectList())`
`161`	`161`	`.map(tuple2 -> {`
`162`	`162`	`Organization organization = tuple2.getT1();`
`163`	`163`	`List<?> list = tuple2.getT2();`