Add name param to datasource, libraryquery list endpoint

Thomasr · ludomikula · commit 7d5fb6be355d · 2024-10-17T18:37:40.000+02:00
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/datasource/DatasourceApiService.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/datasource/DatasourceApiService.java
@@ -6,6 +6,7 @@
 import org.lowcoder.domain.permission.model.ResourceRole;
 import org.lowcoder.domain.plugin.client.dto.GetPluginDynamicConfigRequestDTO;
 import org.lowcoder.sdk.models.DatasourceTestResult;
+import org.springframework.web.bind.annotation.RequestParam;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
@@ -15,11 +16,11 @@
 public interface DatasourceApiService {
     Mono<Datasource> create(Datasource datasource);
 
-    Flux<Datasource> listJsDatasourcePlugins(String applicationId);
+    Flux<Datasource> listJsDatasourcePlugins(String applicationId, String name, String type);
 
-    Flux<DatasourceView> listAppDataSources(String appId);
+    Flux<DatasourceView> listAppDataSources(String appId, String name, String type);
 
-    Flux<DatasourceView> listOrgDataSources(String orgId);
+    Flux<DatasourceView> listOrgDataSources(String orgId, String name, String type);
 
     Mono<Datasource> update(String datasourceId, Datasource updatedDatasource);
 
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/datasource/DatasourceApiServiceImpl.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/datasource/DatasourceApiServiceImpl.java
@@ -84,27 +84,33 @@ public Mono<Datasource> create(Datasource datasource) {
     }
 
     @Override
-    public Flux<Datasource> listJsDatasourcePlugins(String applicationId) {
+    public Flux<Datasource> listJsDatasourcePlugins(String applicationId, String name, String type) {
         return applicationService.findById(applicationId)
                 .delayUntil(application -> applicationApiService.checkPermissionWithReadableErrorMsg(applicationId, READ_APPLICATIONS))
                 .flatMapMany(application -> datasourceService.getByOrgId(application.getOrganizationId()))
                 .filter(datasource -> datasource.getDatasourceStatus() == DatasourceStatus.NORMAL)
-                .filter(datasource -> datasourceMetaInfoService.isJsDatasourcePlugin(datasource.getType()))
-                .delayUntil(datasource -> jsDatasourceHelper.processDynamicQueryConfig(datasource))
+                .filter(datasource -> datasourceMetaInfoService.isJsDatasourcePlugin(datasource.getType()) &&
+                        (name == null || datasource.getName().toLowerCase().contains(name.toLowerCase())) &&
+                        (type == null || datasource.getType().equals(type))
+                )
+                .delayUntil(jsDatasourceHelper::processDynamicQueryConfig)
                 .doOnNext(datasource -> datasource.setDetailConfig(null));
     }
 
     @Override
-    public Flux<DatasourceView> listAppDataSources(String appId) {
+    public Flux<DatasourceView> listAppDataSources(String appId, String name, String type) {
         return applicationService.findById(appId)
-                .flatMapMany(application -> listOrgDataSources(application.getOrganizationId()));
+                .flatMapMany(application -> listOrgDataSources(application.getOrganizationId(), name, type));
     }
 
     @Override
-    public Flux<DatasourceView> listOrgDataSources(String orgId) {
+    public Flux<DatasourceView> listOrgDataSources(String orgId, String name, String type) {
         // get datasource
         Flux<Datasource> datasourceFlux = datasourceService.getByOrgId(orgId)
-                .filter(datasource -> datasource.getDatasourceStatus() == DatasourceStatus.NORMAL)
+                .filter(datasource -> datasource.getDatasourceStatus() == DatasourceStatus.NORMAL &&
+                        (name == null || datasource.getName().toLowerCase().contains(name.toLowerCase())) &&
+                        (type == null || datasource.getType().equals(type))
+                )
                 .cache();
 
         // get user-datasource permissions
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/datasource/DatasourceController.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/datasource/DatasourceController.java
@@ -116,9 +116,9 @@ public Mono<ResponseView<DatasourceStructure>> getStructure(@PathVariable String
      * name, type... and the plugin definition of it, excluding the detail configs such as the connection uri, password...
      */
     @Override
-    public Mono<ResponseView<List<Datasource>>> listJsDatasourcePlugins(@RequestParam("appId") String applicationId) {
+    public Mono<ResponseView<List<Datasource>>> listJsDatasourcePlugins(@RequestParam("appId") String applicationId, @RequestParam String name, @RequestParam String type) {
         String objectId = gidService.convertApplicationIdToObjectId(applicationId);
-        return datasourceApiService.listJsDatasourcePlugins(objectId)
+        return datasourceApiService.listJsDatasourcePlugins(objectId, name, type)
                 .collectList()
                 .map(ResponseView::success);
     }
@@ -139,24 +139,24 @@ public Mono<ResponseView<List<Object>>> getPluginDynamicConfig(
 
     @SneakyThrows
     @Override
-    public Mono<ResponseView<List<DatasourceView>>> listOrgDataSources(@RequestParam(name = "orgId") String orgId) {
+    public Mono<ResponseView<List<DatasourceView>>> listOrgDataSources(@RequestParam(name = "orgId") String orgId, @RequestParam String name, @RequestParam String type) {
         if (StringUtils.isBlank(orgId)) {
             return ofError(BizError.INVALID_PARAMETER, "ORG_ID_EMPTY");
         }
         String objectId = gidService.convertOrganizationIdToObjectId(orgId);
-        return datasourceApiService.listOrgDataSources(objectId)
+        return datasourceApiService.listOrgDataSources(objectId, name, type)
                 .collectList()
                 .map(ResponseView::success);
     }
 
     @Override
-    public Mono<ResponseView<List<DatasourceView>>> listAppDataSources(@RequestParam(name = "appId") String applicationId) {
+    public Mono<ResponseView<List<DatasourceView>>> listAppDataSources(@RequestParam(name = "appId") String applicationId, @RequestParam String name, @RequestParam String type) {
         if (StringUtils.isBlank(applicationId)) {
             return ofError(BizError.INVALID_PARAMETER, "INVALID_APP_ID");
         }
         String objectId = gidService.convertApplicationIdToObjectId(applicationId);
 
-        return datasourceApiService.listAppDataSources(objectId)
+        return datasourceApiService.listAppDataSources(objectId, name, type)
                 .collectList()
                 .map(ResponseView::success);
     }
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/datasource/DatasourceEndpoints.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/datasource/DatasourceEndpoints.java
@@ -99,7 +99,7 @@ public Mono<ResponseView<DatasourceStructure>> getStructure(@PathVariable String
 		    description = "Retrieve a list of node service plugins available within Lowcoder."
 	)
     @GetMapping("/jsDatasourcePlugins")
-    public Mono<ResponseView<List<Datasource>>> listJsDatasourcePlugins(@RequestParam("appId") String applicationId);
+    public Mono<ResponseView<List<Datasource>>> listJsDatasourcePlugins(@RequestParam("appId") String applicationId, @RequestParam String name, @RequestParam String type);
 
     /**
      * Proxy the request to the node service, besides, add the "extra" information from the data source config stored in the mongodb if exists to
@@ -123,7 +123,7 @@ public Mono<ResponseView<List<Object>>> getPluginDynamicConfig(
 	)
     @JsonView(JsonViews.Public.class)
     @GetMapping("/listByOrg")
-    public Mono<ResponseView<List<DatasourceView>>> listOrgDataSources(@RequestParam(name = "orgId") String orgId);
+    public Mono<ResponseView<List<DatasourceView>>> listOrgDataSources(@RequestParam(name = "orgId") String orgId, @RequestParam String name, @RequestParam String type);
 
 	@Operation(
 			tags = TAG_DATASOURCE_MANAGEMENT,
@@ -134,7 +134,7 @@ public Mono<ResponseView<List<Object>>> getPluginDynamicConfig(
     @Deprecated
     @JsonView(JsonViews.Public.class)
     @GetMapping("/listByApp")
-    public Mono<ResponseView<List<DatasourceView>>> listAppDataSources(@RequestParam(name = "appId") String applicationId);
+    public Mono<ResponseView<List<DatasourceView>>> listAppDataSources(@RequestParam(name = "appId") String applicationId, @RequestParam String name, @RequestParam String type);
 
 	@Operation(
 			tags = TAG_DATASOURCE_PERMISSIONS,
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query/LibraryQueryApiService.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query/LibraryQueryApiService.java
@@ -9,7 +9,7 @@
 import java.util.List;
 
 public interface LibraryQueryApiService {
-    Mono<List<LibraryQueryView>> listLibraryQueries();
+    Mono<List<LibraryQueryView>> listLibraryQueries(String name);
 
     Mono<LibraryQueryView> create(LibraryQuery libraryQuery);
 
@@ -20,7 +20,7 @@ public interface LibraryQueryApiService {
     Mono<LibraryQueryRecordMetaView> publish(String libraryQueryId, LibraryQueryPublishRequest libraryQueryPublishRequest);
 
     @SuppressWarnings("ConstantConditions")
-    Mono<List<LibraryQueryAggregateView>> dropDownList();
+    Mono<List<LibraryQueryAggregateView>> dropDownList(String name);
 
     Mono<QueryExecutionResult> executeLibraryQueryFromJs(ServerWebExchange exchange, LibraryQueryRequestFromJs request);
 
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query/LibraryQueryApiServiceImpl.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query/LibraryQueryApiServiceImpl.java
@@ -71,10 +71,11 @@ public class LibraryQueryApiServiceImpl implements LibraryQueryApiService {
     private int port;
 
     @Override
-    public Mono<List<LibraryQueryView>> listLibraryQueries() {
+    public Mono<List<LibraryQueryView>> listLibraryQueries(String name) {
         return orgDevChecker.checkCurrentOrgDev()
                 .then(sessionUserService.getVisitorOrgMemberCache())
                 .flatMapMany(orgMember -> getByOrgIdWithDatasourcePermissions(orgMember.getOrgId()))
+                .filter(libraryQuery -> libraryQuery.getName().toLowerCase().contains(name.toLowerCase()))
                 .collectList()
                 .flatMap(libraryQueries -> ViewBuilder.multiBuild(libraryQueries,
                         LibraryQuery::getCreatedBy,
@@ -152,9 +153,10 @@ public Mono<LibraryQueryRecordMetaView> publish(String libraryQueryId, LibraryQu
 
     @Override
     @SuppressWarnings("ConstantConditions")
-    public Mono<List<LibraryQueryAggregateView>> dropDownList() {
+    public Mono<List<LibraryQueryAggregateView>> dropDownList(String name) {
         Mono<List<LibraryQuery>> libraryQueryListMono = sessionUserService.getVisitorOrgMemberCache()
                 .flatMapMany(orgMember -> getByOrgIdWithDatasourcePermissions(orgMember.getOrgId()))
+                .filter(libraryQuery -> libraryQuery.getName().toLowerCase().contains(name.toLowerCase()))
                 .collectList()
                 .cache();
 
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query/LibraryQueryController.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query/LibraryQueryController.java
@@ -16,6 +16,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import reactor.core.publisher.Mono;
@@ -34,14 +35,14 @@ public class LibraryQueryController implements LibraryQueryEndpoints
     private GidService gidService;
 
     @Override
-    public Mono<ResponseView<List<LibraryQueryAggregateView>>> dropDownList() {
-        return libraryQueryApiService.dropDownList()
+    public Mono<ResponseView<List<LibraryQueryAggregateView>>> dropDownList(@RequestParam String name) {
+        return libraryQueryApiService.dropDownList(name)
                 .map(ResponseView::success);
     }
 
     @Override
-    public Mono<ResponseView<List<LibraryQueryView>>> list() {
-        return libraryQueryApiService.listLibraryQueries()
+    public Mono<ResponseView<List<LibraryQueryView>>> list(@RequestParam String name) {
+        return libraryQueryApiService.listLibraryQueries(name)
                 .map(ResponseView::success);
     }
 
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query/LibraryQueryEndpoints.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query/LibraryQueryEndpoints.java
@@ -11,14 +11,7 @@
 import org.lowcoder.api.query.view.LibraryQueryView;
 import org.lowcoder.api.query.view.UpsertLibraryQueryRequest;
 import org.lowcoder.domain.query.model.LibraryQuery;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import io.swagger.v3.oas.annotations.Operation;
 import reactor.core.publisher.Mono;
@@ -36,7 +29,7 @@ public interface LibraryQueryEndpoints
 		    description = "Retrieve Library Queries in a dropdown format within Lowcoder, suitable for selection in user interfaces."
 	)
     @GetMapping("/dropDownList")
-    public Mono<ResponseView<List<LibraryQueryAggregateView>>> dropDownList();
+    public Mono<ResponseView<List<LibraryQueryAggregateView>>> dropDownList(@RequestParam String name);
 
 	@Operation(
 			tags = TAG_LIBRARY_QUERY_MANAGEMENT,
@@ -45,7 +38,7 @@ public interface LibraryQueryEndpoints
 		    description = "Retrieve a list of Library Queries for a specific Organization within Lowcoder."
 	)
     @GetMapping("/listByOrg")
-    public Mono<ResponseView<List<LibraryQueryView>>> list();
+    public Mono<ResponseView<List<LibraryQueryView>>> list(@RequestParam String name);
 
 	@Operation(
 			tags = TAG_LIBRARY_QUERY_MANAGEMENT,
diff --git a/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/datasource/DatasourceApiServiceIntegrationTest.java b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/datasource/DatasourceApiServiceIntegrationTest.java
@@ -54,7 +54,7 @@ public void testListOrgDatasource() {
                         .flatMap(permissionItemView -> datasourceApiService.updatePermission(permissionItemView.getPermissionId(), VIEWER))
                         // create mysql05
                         .then(datasourceApiService.create(buildMysqlDatasource("mysql05")))
-                        .then(datasourceApiService.listOrgDataSources("org01").collectList());
+                        .then(datasourceApiService.listOrgDataSources("org01", null, null).collectList());
 
         StepVerifier.create(datasourceListMono)
                 .assertNext(datasourceViews -> {
diff --git a/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/query/LibraryQueryApiServiceIntegrationTest.java b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/query/LibraryQueryApiServiceIntegrationTest.java
@@ -47,7 +47,7 @@ public void beforeEach() {
     public void testListLibraryQueries() {
         Mono<List<LibraryQueryView>> listMono = datasourceApiService.create(DatasourceApiServiceIntegrationTest.buildMysqlDatasource("mysql06"))
                 .flatMap(datasource -> libraryQueryApiService.create(buildLibraryQuery("query01", datasource.getId())))
-                .then(libraryQueryApiService.listLibraryQueries());
+                .then(libraryQueryApiService.listLibraryQueries(null));
 
         StepVerifier.create(listMono)
                 .assertNext(libraryQueryViews -> {
