Add deployment config for Datasource

iamfaran · iamfaran · commit 8527dd918a4a · 2025-04-17T22:53:03.000+05:00
diff --git a/client/packages/lowcoder/src/pages/setting/environments/WorkspaceDetail.tsx b/client/packages/lowcoder/src/pages/setting/environments/WorkspaceDetail.tsx
@@ -1,7 +1,6 @@
 import React, { useEffect, useState } from "react";
 import { useParams, useHistory } from "react-router-dom";
 import history from "@lowcoder-ee/util/history";
-import DataSourcesList from './components/DataSourcesList';
 import { 
   Spin, 
   Typography, 
@@ -23,8 +22,6 @@ import {
 } from "@ant-design/icons";
 import { useEnvironmentContext } from "./context/EnvironmentContext";
 import { useWorkspace } from "./hooks/useWorkspace";
-import AppsTab from "./components/AppsTab";
-import DataSourcesTab from "./components/DataSourcesTab";
 import DeployableItemsTab from "./components/DeployableItemsTab";
 import { appsConfig } from "./config/apps.config";
 import { dataSourcesConfig } from "./config/data-sources.config";
diff --git a/client/packages/lowcoder/src/pages/setting/environments/components/DataSourcesList.tsx b/client/packages/lowcoder/src/pages/setting/environments/components/DataSourcesList.tsx
@@ -7,7 +7,6 @@ import { CloudUploadOutlined } from '@ant-design/icons';
 import { DataSource } from '../types/datasource.types';
 import { Environment } from '../types/environment.types';
 import { ColumnsType } from 'antd/lib/table';
-import DeployDataSourceModal from './DeployDataSourceModal';
 
 interface DataSourcesListProps {
   dataSources: DataSource[];
@@ -122,13 +121,13 @@ const DataSourcesList: React.FC<DataSourcesListProps> = ({
         }}
       />
       
-      <DeployDataSourceModal
+      {/* <DeployDataSourceModal
         visible={deployModalVisible}
         dataSource={selectedDataSource}
         currentEnvironment={environment}
         onClose={() => setDeployModalVisible(false)}
         onSuccess={onRefresh}
-      />
+      /> */}
     </>
   );
 };
diff --git a/client/packages/lowcoder/src/pages/setting/environments/components/DataSourcesTab.tsx b/client/packages/lowcoder/src/pages/setting/environments/components/DataSourcesTab.tsx
@@ -7,7 +7,6 @@ import { DatabaseOutlined, SyncOutlined } from '@ant-design/icons';
 import Title from 'antd/lib/typography/Title';
 import { Environment } from '../types/environment.types';
 import { useWorkspaceDataSources } from '../hooks/useWorkspaceDataSources';
-import DataSourcesList from './DataSourcesList';
 import { DataSource } from '../types/datasource.types';
 
 interface DataSourcesTabProps {
@@ -105,13 +104,13 @@ const DataSourcesTab: React.FC<DataSourcesTabProps> = ({ environment, workspaceI
         )}
       
       {/* Data Sources List */}
-      <DataSourcesList
+      {/* <DataSourcesList
         dataSources={dataSources}
         loading={loading && !error}
         error={error}
         environment={environment}
         onToggleManaged={handleToggleManagedDataSource}
-      />
+      /> */}
     </Card>
   );
 };
diff --git a/client/packages/lowcoder/src/pages/setting/environments/components/DeployDataSourceModal.tsx b/client/packages/lowcoder/src/pages/setting/environments/components/DeployDataSourceModal.tsx
diff --git a/client/packages/lowcoder/src/pages/setting/environments/config/data-sources.config.tsx b/client/packages/lowcoder/src/pages/setting/environments/config/data-sources.config.tsx
@@ -5,7 +5,7 @@ import { DatabaseOutlined, CloudUploadOutlined } from '@ant-design/icons';
 import { DeployableItemConfig } from '../types/deployable-item.types';
 import { DataSource, DataSourceStats } from '../types/datasource.types';
 import { Environment } from '../types/environment.types';
-import { getMergedWorkspaceDataSources } from '../services/datasources.service';
+import { getMergedWorkspaceDataSources, deployDataSource } from '../services/datasources.service';
 import { connectManagedDataSource, unconnectManagedDataSource } from '../services/enterprise.service';
 
 
@@ -144,5 +144,25 @@ export const dataSourcesConfig: DeployableItemConfig<DataSource, DataSourceStats
       console.error('Error toggling managed status:', error);
       return false;
     }
+  },
+  deploy: {
+    enabled: true,
+    fields: [
+      {
+        name: 'updateDependenciesIfNeeded',
+        label: 'Update Dependencies If Needed',
+        type: 'checkbox',
+        defaultValue: false
+      }
+    ],
+    prepareParams: (item: DataSource, values: any, sourceEnv: Environment, targetEnv: Environment) => {
+      return {
+        envId: sourceEnv.environmentId,
+        targetEnvId: targetEnv.environmentId,
+        datasourceId: item.id,
+        updateDependenciesIfNeeded: values.updateDependenciesIfNeeded
+      };
+    },
+    execute: (params: any) => deployDataSource(params)
   }
 };
diff --git a/client/packages/lowcoder/src/pages/setting/environments/services/datasources.service.ts b/client/packages/lowcoder/src/pages/setting/environments/services/datasources.service.ts
@@ -16,6 +16,12 @@ export interface MergedDataSourcesResult {
   stats: DataSourceStats;
 }
 
+export interface DeployDataSourceParams {
+  envId: string;
+  targetEnvId: string;
+  datasourceId: string;
+  updateDependenciesIfNeeded?: boolean;
+}
 // Get data sources for a workspace - using your correct implementation
 export async function getWorkspaceDataSources(
   workspaceId: string, 
@@ -144,34 +150,12 @@ export async function getMergedWorkspaceDataSources(
 }
 
 // Function to deploy a data source to another environment
-export interface DeployDataSourceParams {
-  envId: string;
-  targetEnvId: string;
-  datasourceId: string;
-  updateDependenciesIfNeeded?: boolean;
-}
-
-export const deployDataSource = async (
-  params: DeployDataSourceParams, 
-  apiServiceUrl: string
-): Promise<boolean> => {
+export async function deployDataSource(params: DeployDataSourceParams): Promise<boolean> {
   try {
-    const response = await axios.post(
-      `${apiServiceUrl}/api/plugins/enterprise/deploy-datasource`, 
-      null, 
-      { 
-        params: {
-          envId: params.envId,
-          targetEnvId: params.targetEnvId,
-          datasourceId: params.datasourceId,
-          updateDependenciesIfNeeded: params.updateDependenciesIfNeeded ?? false
-        }
-      }
-    );
-    
+    const response = await axios.post('/api/plugins/enterprise/datasource/deploy', params);
     return response.status === 200;
   } catch (error) {
     console.error('Error deploying data source:', error);
     throw error;
   }
-};
+}
