Merge branch 'feat/dataSource-manager' of github.com:nocobase/nocobase into feat/dataSource-manager

packages/core/data-source-manager/src/data-source-factory.ts

@@ -7,6 +7,10 @@ export class DataSourceFactory {
     this.collectionTypes.set(type, dataSourceClass);
   }
 
+  getClass(type: string): typeof DataSource {
+    return this.collectionTypes.get(type);
+  }
+
   create(type: string, options: any = {}): DataSource {
     const klass = this.collectionTypes.get(type);
     if (!klass) {

packages/core/data-source-manager/src/data-source.ts

@@ -28,6 +28,10 @@ export abstract class DataSource {
     return this.options.name;
   }
 
+  static testConnection(options?: any): Promise<boolean> {
+    return Promise.resolve(true);
+  }
+
   collectionToResourceMiddleware() {
     return async (ctx, next) => {
       const params = parseRequest(

packages/plugins/@nocobase/plugin-data-source-manager/src/server/plugin.ts

@@ -1,6 +1,5 @@
 import { Application, Plugin } from '@nocobase/server';
 import { resolve } from 'path';
-import { Database } from '@nocobase/database';
 import remoteCollectionsResourcer from './resourcers/data-sources-collections';
 import remoteFieldsResourcer from './resourcers/data-sources-collections-fields';
 import { DataSourcesCollectionModel } from './models/data-sources-collection-model';
@@ -56,17 +55,17 @@ export class PluginDataSourceManagerServer extends Plugin {
     });
 
     this.app.actions({
-      async ['databaseConnections:testConnection'](ctx, next) {
+      async ['dataSources:testConnection'](ctx, next) {
         const { values } = ctx.action.params;
 
-        const db = new Database(values);
+        const { options, type } = values;
+
+        const klass = this.app.dataSourceManager.factory.getClass(type);
 
         try {
-          await db.sequelize.authenticate();
+          await klass.testConnection(options);
         } catch (error) {
-          throw new Error(`Unable to connect to the database: ${error.message}`);
-        } finally {
-          await db.close();
+          throw new Error(`Test connection failed: ${error.message}`);
         }
 
         ctx.body = {
@@ -76,15 +75,15 @@ export class PluginDataSourceManagerServer extends Plugin {
         await next();
       },
 
-      async ['databaseConnections:refresh'](ctx, next) {
+      async ['dataSources:refresh'](ctx, next) {
         const { filterByTk } = ctx.action.params;
-        const databaseConnection = await ctx.db.getRepository('databaseConnections').findOne({
+        const dataSourceModel: DataSourceModel = await ctx.db.getRepository('dataSources').findOne({
           filter: {
-            name: filterByTk,
+            key: filterByTk,
           },
         });
 
-        await databaseConnection.loadIntoApplication({
+        await dataSourceModel.loadIntoApplication({
           app: ctx.app,
         });