Merge branch 'dev' into feat/image_capture

FalkWolsky · web-flow · commit 0b89f47edd9b · 2024-11-14T15:44:25.000+01:00
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationApiServiceImpl.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationApiServiceImpl.java
@@ -170,7 +170,7 @@ private Mono<Void> autoGrantPermissionsByFolderDefault(String applicationId, @Nu
 
     @Override
     public Flux<ApplicationInfoView> getRecycledApplications(String name) {
-        return userHomeApiService.getAllAuthorisedApplications4CurrentOrgMember(null, ApplicationStatus.RECYCLED, false, name);
+        return userHomeApiService.getAllAuthorisedApplications4CurrentOrgMember(null, ApplicationStatus.RECYCLED, false, name, 0, 0);
     }
 
     private Mono<Void> checkCurrentUserApplicationPermission(String applicationId, ResourceAction action) {
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationController.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationController.java
@@ -160,9 +160,11 @@ public Mono<ResponseView<UserHomepageView>> getUserHomePage(@RequestParam(requir
     public Mono<ResponseView<List<ApplicationInfoView>>> getApplications(@RequestParam(required = false) Integer applicationType,
             @RequestParam(required = false) ApplicationStatus applicationStatus,
             @RequestParam(defaultValue = "true") boolean withContainerSize,
-            @RequestParam(required = false) String name) {
+            @RequestParam(required = false) String name,
+            @RequestParam(required = false, defaultValue = "0") Integer pageNum,
+            @RequestParam(required = false, defaultValue = "0") Integer pageSize) {
         ApplicationType applicationTypeEnum = applicationType == null ? null : ApplicationType.fromValue(applicationType);
-        return userHomeApiService.getAllAuthorisedApplications4CurrentOrgMember(applicationTypeEnum, applicationStatus, withContainerSize, name)
+        return userHomeApiService.getAllAuthorisedApplications4CurrentOrgMember(applicationTypeEnum, applicationStatus, withContainerSize, name, pageNum, pageSize)
                 .collectList()
                 .map(ResponseView::success);
     }
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationEndpoints.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationEndpoints.java
@@ -166,7 +166,9 @@ public Mono<ResponseView<Boolean>> updateEditState(@PathVariable String applicat
     public Mono<ResponseView<List<ApplicationInfoView>>> getApplications(@RequestParam(required = false) Integer applicationType,
             @RequestParam(required = false) ApplicationStatus applicationStatus,
             @RequestParam(defaultValue = "true") boolean withContainerSize,
-			@RequestParam(required = false) String name);
+			@RequestParam(required = false) String name,
+			@RequestParam(required = false, defaultValue = "0") Integer pageNum,
+			@RequestParam(required = false, defaultValue = "0") Integer pageSize);
 
 	@Operation(
 			tags = TAG_APPLICATION_MANAGEMENT,
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, @Nullable String name);
+    Flux<?> getElements(@Nullable String folderId, @Nullable ApplicationType applicationType, @Nullable String name, Integer pageNum, Integer pageSize);
 
     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, @Nullable String name) {
-        return buildApplicationInfoViewTree(applicationType, name)
+    public Flux<?> getElements(@Nullable String folderId, @Nullable ApplicationType applicationType, @Nullable String name, Integer pageNum, Integer pageSize) {
+        var retMono = buildApplicationInfoViewTree(applicationType, name)
                 .flatMap(tree -> {
                     FolderNode<ApplicationInfoView, FolderInfoView> folderNode = tree.get(folderId);
                     if (folderNode == null) {
@@ -264,7 +264,9 @@ public Flux<?> getElements(@Nullable String folderId, @Nullable ApplicationType
                     });
                 })
                 .flatMapIterable(tuple -> tuple.getT1().getChildren())
-                .map(node -> {
+                .skip(pageNum * pageSize);
+        if(pageSize > 0) retMono = retMono.take(pageSize);
+        return retMono.map(node -> {
                     if (node instanceof ElementNode<ApplicationInfoView, FolderInfoView> elementNode) {
                         return elementNode.getSelf();
                     }
@@ -284,7 +286,7 @@ private Mono<Tree<ApplicationInfoView, FolderInfoView>> buildApplicationInfoView
                 .cache();
 
         Flux<ApplicationInfoView> applicationInfoViewFlux =
-                userHomeApiService.getAllAuthorisedApplications4CurrentOrgMember(applicationType, ApplicationStatus.NORMAL, false, null)
+                userHomeApiService.getAllAuthorisedApplications4CurrentOrgMember(applicationType, ApplicationStatus.NORMAL, false, null, 0, 0)
                         .cache();
 
         Mono<Map<String, String>> application2FolderMapMono = applicationInfoViewFlux
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
@@ -70,9 +70,11 @@ 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(required = false) String name) {
+            @RequestParam(required = false) String name,
+            @RequestParam(required = false, defaultValue = "0") Integer pageNum,
+            @RequestParam(required = false, defaultValue = "0") Integer pageSize) {
         String objectId = gidService.convertFolderIdToObjectId(folderId);
-        return folderApiService.getElements(objectId, applicationType, name)
+        return folderApiService.getElements(objectId, applicationType, name, pageNum, pageSize)
                 .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
@@ -70,7 +70,9 @@ 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(required = false) String name);
+			@RequestParam(required = false) String name,
+		    @RequestParam(required = false, defaultValue = "0") Integer pageNum,
+		    @RequestParam(required = false, defaultValue = "0") Integer pageSize);
 
 	@Operation(
 			tags = TAG_FOLDER_MANAGEMENT,
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/home/UserHomeApiService.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/home/UserHomeApiService.java
@@ -24,7 +24,7 @@ public interface UserHomeApiService {
     Mono<UserHomepageView> getUserHomePageView(ApplicationType applicationType);
 
     Flux<ApplicationInfoView> getAllAuthorisedApplications4CurrentOrgMember(@Nullable ApplicationType applicationType,
-                                                                            @Nullable ApplicationStatus applicationStatus, boolean withContainerSize, @Nullable String name);
+                                                                            @Nullable ApplicationStatus applicationStatus, boolean withContainerSize, @Nullable String name, Integer pageNum, Integer pageSize);
 
     Flux<BundleInfoView> getAllAuthorisedBundles4CurrentOrgMember(@Nullable BundleStatus bundleStatus);
 
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, null).collectList())
+                            .zipWith(folderApiService.getElements(null, applicationType, null, 0, 0).collectList())
                             .map(tuple2 -> {
                                 Organization organization = tuple2.getT1();
                                 List<?> list = tuple2.getT2();
@@ -189,7 +189,7 @@ public Mono<UserHomepageView> getUserHomePageView(ApplicationType applicationTyp
 
     @Override
     public Flux<ApplicationInfoView> getAllAuthorisedApplications4CurrentOrgMember(@Nullable ApplicationType applicationType,
-                                                                                   @Nullable ApplicationStatus applicationStatus, boolean withContainerSize, @Nullable String name) {
+                                                                                   @Nullable ApplicationStatus applicationStatus, boolean withContainerSize, @Nullable String name, Integer pageNum, Integer pageSize) {
 
         return sessionUserService.getVisitorOrgMemberCache()
                 .flatMapMany(orgMember -> {
@@ -207,7 +207,9 @@ public Flux<ApplicationInfoView> getAllAuthorisedApplications4CurrentOrgMember(@
                                     && (isNull(name) || StringUtils.containsIgnoreCase(application.getName(), name)))
                             .cache()
                             .collectList()
-                            .flatMapIterable(Function.identity());
+                            .flatMapIterable(Function.identity())
+                            .skip((long) pageNum * pageSize);
+                    if(pageSize > 0) applicationFlux = applicationFlux.take(pageSize);
 
                     // last view time
                     Mono<Map<String, Instant>> applicationLastViewTimeMapMono = userApplicationInteractionService.findByUserId(visitorId)
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/npm/PrivateNpmRegistryController.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/npm/PrivateNpmRegistryController.java
@@ -35,8 +35,8 @@ public class PrivateNpmRegistryController implements PrivateNpmRegistryEndpoint{
     private final ApplicationServiceImpl applicationServiceImpl;
 
     @Override
-    public Mono<ResponseEntity<Resource>> getNpmPackageMeta(String applicationId, String name) {
-        return forwardToNodeService(applicationId, name, NPM_REGISTRY_METADATA);
+    public Mono<ResponseEntity<Resource>> getNpmPackageMeta(String applicationId, String path) {
+        return forwardToNodeService(applicationId, path, NPM_REGISTRY_METADATA);
     }
 
     @Override
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/npm/PrivateNpmRegistryEndpoint.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/npm/PrivateNpmRegistryEndpoint.java
@@ -21,8 +21,8 @@ public interface PrivateNpmRegistryEndpoint {
             summary = "Get NPM registry Metadata",
             description = "Retrieve the metadata of private NPM registry package."
     )
-    @GetMapping("/registry/{applicationId}/{name}")
-    public Mono<ResponseEntity<Resource>> getNpmPackageMeta(@PathVariable String applicationId, @PathVariable String name);
+    @GetMapping("/registry/{applicationId}/{*path}")
+    public Mono<ResponseEntity<Resource>> getNpmPackageMeta(@PathVariable String applicationId, @PathVariable String path);
 
     @Operation(
             tags = TAG_NPM_REGISTRY_MANAGEMENT,
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, null).collectList());
+                .then(folderApiService.getElements("folder02", null, null, 0, 0).collectList());
 
         StepVerifier.create(mono)
                 .assertNext(list -> {
diff --git a/server/node-service/src/plugins/openAi/index.ts b/server/node-service/src/plugins/openAi/index.ts
@@ -6,16 +6,27 @@ import { ConfigToType, DataSourcePlugin } from "lowcoder-sdk/dataSource";
 import { runOpenApi } from "../openApi";
 import { parseOpenApi, ParseOpenApiOptions } from "../openApi/parse";
 
-const spec = readYaml(path.join(__dirname, "./openAi.yaml"));
+const spec_1_2_0 = readYaml(path.join(__dirname, "./openAI_v1.2.0.yaml"));
+const spec_2_3_0 = readYaml(path.join(__dirname, "./openAI_v2.3.0.yaml"));
+
 const specs = {
-  "v1.0": spec as OpenAPIV3.Document,
+  "v1.0": spec_1_2_0,
+  "v2.3": spec_2_3_0,
 }
 
 const dataSourceConfig = {
   type: "dataSource",
   params: [
     {
-      key: "ApiKey.value",
+      key: "serverURL",
+      type: "textInput",
+      label: "Service URL",
+      rules: [{ required: true }],
+      placeholder: "https://<your-cloud-instance>",
+      tooltip: "Input the Service url of your OpenAI or compatible instance. For OpenAI, it is https://api.openai.com/v1",
+    },
+    {
+      key: "apiKey",
       type: "password",
       label: "API Key",
       rules: [{ required: true }],
@@ -28,7 +39,7 @@ const dataSourceConfig = {
       key: "specVersion",
       type: "select",
       tooltip: "Version of the spec file.",
-      placeholder: "v1.0",
+      placeholder: "v2.3",
       options: specsToOptions(specs)
     },
   ],
@@ -61,10 +72,13 @@ const openAiPlugin: DataSourcePlugin<any, DataSourceConfigType> = {
     };
   },
   run: function (actionData, dataSourceConfig): Promise<any> {
+    const { serverURL, apiKey } = dataSourceConfig;
     const runApiDsConfig = {
       url: "",
-      serverURL: "",
-      dynamicParamsConfig: dataSourceConfig,
+      serverURL: serverURL,
+      dynamicParamsConfig: {
+        "ApiKeyAuth.value": apiKey,
+      },
       specVersion: dataSourceConfig.specVersion,
     };
     return runOpenApi(actionData, runApiDsConfig, version2spec(specs, dataSourceConfig.specVersion) as OpenAPIV3.Document);
diff --git a/server/node-service/src/plugins/openAi/openAI_v1.2.0.yaml b/server/node-service/src/plugins/openAi/openAI_v1.2.0.yaml
diff --git a/server/node-service/src/plugins/openAi/openAI_v2.3.0.yaml b/server/node-service/src/plugins/openAi/openAI_v2.3.0.yaml
diff --git a/server/node-service/src/routes/apiRouter.ts b/server/node-service/src/routes/apiRouter.ts
diff --git a/server/node-service/yarn.lock b/server/node-service/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,7 @@ private Mono<Void> autoGrantPermissionsByFolderDefault(String applicationId, @Nu`
`170`	`170`
`171`	`171`	`@Override`
`172`	`172`	`public Flux<ApplicationInfoView> getRecycledApplications(String name) {`
`173`		`- return userHomeApiService.getAllAuthorisedApplications4CurrentOrgMember(null, ApplicationStatus.RECYCLED, false, name);`
	`173`	`+ return userHomeApiService.getAllAuthorisedApplications4CurrentOrgMember(null, ApplicationStatus.RECYCLED, false, name, 0, 0);`
`174`	`174`	`}`
`175`	`175`
`176`	`176`	`private Mono<Void> checkCurrentUserApplicationPermission(String applicationId, ResourceAction action) {`
Original file line number	Diff line number	Diff line change
`@@ -35,8 +35,8 @@ public class PrivateNpmRegistryController implements PrivateNpmRegistryEndpoint{`
`35`	`35`	`private final ApplicationServiceImpl applicationServiceImpl;`
`36`	`36`
`37`	`37`	`@Override`
`38`		`- public Mono<ResponseEntity<Resource>> getNpmPackageMeta(String applicationId, String name) {`
`39`		`- return forwardToNodeService(applicationId, name, NPM_REGISTRY_METADATA);`
	`38`	`+ public Mono<ResponseEntity<Resource>> getNpmPackageMeta(String applicationId, String path) {`
	`39`	`+ return forwardToNodeService(applicationId, path, NPM_REGISTRY_METADATA);`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`@Override`