@nocobase/plugin-data-source-manager 2.1.0-beta.9 → 2.2.0-alpha.1

package/dist/server/utils.js

@@ -30,13 +30,18 @@ __export(utils_exports, {
   mergeOptions: () => mergeOptions
 });
 module.exports = __toCommonJS(utils_exports);
+const nullableOverrideConfig = {
+  sort: ["scopeKey"]
+};
 function mergeOptions(fieldOptions, modelOptions) {
   const newOptions = {
     ...fieldOptions,
     ...modelOptions
   };
+  const fieldType = modelOptions.type || fieldOptions.type;
+  const nullableOverrideKeys = nullableOverrideConfig[fieldType] || [];
   for (const key of Object.keys(modelOptions)) {
-    if (modelOptions[key] === null && fieldOptions[key]) {
+    if (modelOptions[key] === null && fieldOptions[key] && !nullableOverrideKeys.includes(key)) {
       newOptions[key] = fieldOptions[key];
     }
   }
@@ -46,15 +51,18 @@ const mapDataSourceWithCollection = (app, dataSourceModel, appendCollections = t
   const plugin = app.pm.get("data-source-manager");
   const dataSource = app.dataSourceManager.dataSources.get(dataSourceModel.get("key"));
   const dataSourceStatus = plugin.dataSourceStatus[dataSourceModel.get("key")];
+  const publicOptions = dataSource == null ? void 0 : dataSource.publicOptions();
+  const collectionManager = dataSource == null ? void 0 : dataSource.collectionManager;
+  const db = collectionManager == null ? void 0 : collectionManager.db;
+  const isDBInstance = (db == null ? void 0 : db.isDBInstance) === false ? false : !!db;
   const item = {
     key: dataSourceModel.get("key"),
     displayName: dataSourceModel.get("displayName"),
     status: dataSourceStatus,
     type: dataSourceModel.get("type"),
     // @ts-ignore
-    isDBInstance: !!(dataSource == null ? void 0 : dataSource.collectionManager.db)
+    isDBInstance
   };
-  const publicOptions = dataSource == null ? void 0 : dataSource.publicOptions();
   if (publicOptions) {
     item["options"] = publicOptions;
   }

package/dist/swagger/index.d.ts

@@ -0,0 +1,326 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+declare const _default: {
+    openapi: string;
+    info: {
+        title: string;
+    };
+    paths: {
+        '/dataSources:listEnabled': {
+            get: {
+                tags: string[];
+                summary: string;
+                description: string;
+                parameters: {
+                    name: string;
+                    in: string;
+                    description: string;
+                    required: boolean;
+                    schema: {
+                        type: string;
+                    };
+                }[];
+                responses: {
+                    200: {
+                        description: string;
+                        content: {
+                            'application/json': {
+                                schema: {
+                                    type: string;
+                                    properties: {
+                                        data: {
+                                            type: string;
+                                            items: {
+                                                $ref: string;
+                                            };
+                                        };
+                                        meta: {
+                                            type: string;
+                                            additionalProperties: boolean;
+                                        };
+                                    };
+                                };
+                            };
+                        };
+                    };
+                };
+            };
+        };
+        '/dataSources/{associatedIndex}/collections:list': {
+            get: {
+                tags: string[];
+                summary: string;
+                description: string;
+                parameters: ({
+                    name: string;
+                    in: string;
+                    required: boolean;
+                    description: string;
+                    schema: {
+                        type: string;
+                        additionalProperties?: undefined;
+                    };
+                } | {
+                    name: string;
+                    in: string;
+                    required: boolean;
+                    description: string;
+                    schema: {
+                        type: string;
+                        additionalProperties: boolean;
+                    };
+                } | {
+                    name: string;
+                    in: string;
+                    required: boolean;
+                    schema: {
+                        type: string;
+                        additionalProperties?: undefined;
+                    };
+                    description?: undefined;
+                })[];
+                responses: {
+                    200: {
+                        description: string;
+                        content: {
+                            'application/json': {
+                                schema: {
+                                    type: string;
+                                    properties: {
+                                        data: {
+                                            type: string;
+                                            items: {
+                                                $ref: string;
+                                            };
+                                        };
+                                        meta: {
+                                            type: string;
+                                            additionalProperties: boolean;
+                                        };
+                                    };
+                                };
+                            };
+                        };
+                    };
+                };
+            };
+        };
+        '/dataSourcesCollections/{associatedIndex}/fields:list': {
+            get: {
+                tags: string[];
+                summary: string;
+                description: string;
+                parameters: {
+                    name: string;
+                    in: string;
+                    required: boolean;
+                    description: string;
+                    schema: {
+                        type: string;
+                    };
+                }[];
+                responses: {
+                    200: {
+                        description: string;
+                        content: {
+                            'application/json': {
+                                schema: {
+                                    type: string;
+                                    items: {
+                                        type: string;
+                                        additionalProperties: boolean;
+                                    };
+                                };
+                            };
+                        };
+                    };
+                };
+            };
+        };
+        '/dataSourcesCollections/{associatedIndex}/fields:apply': {
+            post: {
+                tags: string[];
+                summary: string;
+                description: string;
+                parameters: {
+                    name: string;
+                    in: string;
+                    required: boolean;
+                    description: string;
+                    schema: {
+                        type: string;
+                    };
+                }[];
+                requestBody: {
+                    content: {
+                        'application/json': {
+                            schema: {
+                                $ref: string;
+                            };
+                        };
+                    };
+                };
+                responses: {
+                    200: {
+                        description: string;
+                        content: {
+                            'application/json': {
+                                schema: {
+                                    type: string;
+                                    properties: {
+                                        data: {
+                                            $ref: string;
+                                        };
+                                    };
+                                };
+                            };
+                        };
+                    };
+                };
+            };
+        };
+    };
+    components: {
+        schemas: {
+            DataSourceInfo: {
+                type: string;
+                properties: {
+                    key: {
+                        type: string;
+                    };
+                    displayName: {
+                        type: string;
+                    };
+                    status: {
+                        type: string;
+                    };
+                    type: {
+                        type: string;
+                    };
+                    isDBInstance: {
+                        type: string;
+                    };
+                    options: {
+                        type: string;
+                        additionalProperties: boolean;
+                    };
+                    errorMessage: {
+                        type: string;
+                    };
+                    collections: {
+                        type: string;
+                        items: {
+                            $ref: string;
+                        };
+                    };
+                };
+                additionalProperties: boolean;
+            };
+            DataSourceCollectionInfo: {
+                type: string;
+                properties: {
+                    name: {
+                        type: string;
+                    };
+                    title: {
+                        type: string;
+                    };
+                    fields: {
+                        type: string;
+                        items: {
+                            type: string;
+                            additionalProperties: boolean;
+                        };
+                    };
+                    availableActions: {
+                        type: string;
+                        additionalProperties: boolean;
+                    };
+                    unavailableActions: {
+                        type: string;
+                        additionalProperties: boolean;
+                    };
+                };
+                additionalProperties: boolean;
+            };
+            DataSourceFieldApplyInput: {
+                type: string;
+                required: string[];
+                properties: {
+                    dataSourceKey: {
+                        type: string;
+                        description: string;
+                    };
+                    collectionName: {
+                        type: string;
+                        description: string;
+                    };
+                    name: {
+                        type: string;
+                    };
+                    title: {
+                        type: string;
+                    };
+                    interface: {
+                        type: string;
+                        description: string;
+                    };
+                    type: {
+                        type: string;
+                        description: string;
+                    };
+                    target: {
+                        type: string;
+                    };
+                    foreignKey: {
+                        type: string;
+                    };
+                    sourceKey: {
+                        type: string;
+                    };
+                    targetKey: {
+                        type: string;
+                    };
+                    through: {
+                        type: string;
+                    };
+                    otherKey: {
+                        type: string;
+                    };
+                    targetTitleField: {
+                        type: string;
+                    };
+                    titleField: {
+                        type: string;
+                    };
+                    uiSchema: {
+                        type: string;
+                        additionalProperties: boolean;
+                    };
+                    settings: {
+                        type: string;
+                        additionalProperties: boolean;
+                    };
+                };
+                additionalProperties: boolean;
+            };
+            DataSourceFieldApplyResult: {
+                type: string;
+                properties: {
+                    data: {
+                        type: string;
+                        additionalProperties: boolean;
+                    };
+                };
+                additionalProperties: boolean;
+            };
+        };
+    };
+};
+export default _default;