Skip to content

Commit 2934db2

Browse files
iamfaraniamfaran
committed
setup data sources generic
1 parent ed1f8da commit 2934db2

File tree

3 files changed

+162
-2
lines changed

3 files changed

+162
-2
lines changed

‎client/packages/lowcoder/src/pages/setting/environments/WorkspaceDetail.tsx

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import AppsTab from "./components/AppsTab";
2727
import DataSourcesTab from "./components/DataSourcesTab";
2828
import DeployableItemsTab from "./components/DeployableItemsTab";
2929
import { appsConfig } from "./config/apps.config";
30+
import { dataSourcesConfig } from "./config/data-sources.config";
3031

3132
const { Title, Text } = Typography;
3233
const { TabPane } = Tabs;
@@ -127,7 +128,12 @@ const WorkspaceDetail: React.FC = () => {
127128
tab={<span><DatabaseOutlined /> Data Sources</span>}
128129
key="dataSources"
129130
>
130-
<DataSourcesTab environment={environment} workspaceId={workspaceId} />
131+
<DeployableItemsTab
132+
environment={environment}
133+
config={dataSourcesConfig}
134+
additionalParams={{ workspaceId }}
135+
title="Data Sources in this Workspace"
136+
/>
131137
</TabPane>
132138

133139
<TabPane

‎client/packages/lowcoder/src/pages/setting/environments/config/data-sources.config.tsx

Lines changed: 148 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,148 @@
1+
// config/data-sources.config.tsx
2+
import React from 'react';
3+
import { Row, Col, Statistic, Tag, Space, Button, Tooltip } from 'antd';
4+
import { DatabaseOutlined, CloudUploadOutlined } from '@ant-design/icons';
5+
import { DeployableItemConfig } from '../types/deployable-item.types';
6+
import { DataSource, DataSourceStats } from '../types/datasource.types';
7+
import { Environment } from '../types/environment.types';
8+
import { getMergedWorkspaceDataSources } from '../services/datasources.service';
9+
import { connectManagedDataSource, unconnectManagedDataSource } from '../services/enterprise.service';
10+
11+
12+
13+
export const dataSourcesConfig: DeployableItemConfig<DataSource, DataSourceStats> = {
14+
// Basic info
15+
type: 'dataSources',
16+
singularLabel: 'Data Source',
17+
pluralLabel: 'Data Sources',
18+
icon: <DatabaseOutlined />,
19+
idField: 'id',
20+
21+
// Navigation
22+
buildDetailRoute: (params) => "#",
23+
24+
// Configuration
25+
requiredEnvProps: ['environmentApikey', 'environmentApiServiceUrl'],
26+
27+
// Stats rendering
28+
renderStats: (stats) => (
29+
<Row gutter={16}>
30+
<Col span={8}>
31+
<Statistic title="Total Data Sources" value={stats.total} prefix={<DatabaseOutlined />} />
32+
</Col>
33+
<Col span={8}>
34+
<Statistic title="Managed Data Sources" value={stats.managed} prefix={<DatabaseOutlined />} />
35+
</Col>
36+
<Col span={8}>
37+
<Statistic title="Unmanaged Data Sources" value={stats.unmanaged} prefix={<DatabaseOutlined />} />
38+
</Col>
39+
</Row>
40+
),
41+
42+
// Stats calculation
43+
calculateStats: (dataSources) => {
44+
const total = dataSources.length;
45+
const managed = dataSources.filter(ds => ds.managed).length;
46+
47+
// Calculate counts by type
48+
const byType = dataSources.reduce((acc, ds) => {
49+
const type = ds.type || 'Unknown';
50+
acc[type] = (acc[type] || 0) + 1;
51+
return acc;
52+
}, {} as Record<string, number>);
53+
54+
return {
55+
total,
56+
managed,
57+
unmanaged: total - managed,
58+
byType
59+
};
60+
},
61+
62+
// Table configuration - Customize based on your existing UI
63+
columns: [
64+
{
65+
title: 'Name',
66+
dataIndex: 'name',
67+
key: 'name',
68+
},
69+
{
70+
title: 'Type',
71+
dataIndex: 'type',
72+
key: 'type',
73+
render: (type: string) => (
74+
<Tag color="blue">{type || 'Unknown'}</Tag>
75+
),
76+
},
77+
{
78+
title: 'Database',
79+
key: 'database',
80+
render: (_, record: DataSource) => (
81+
<span>{record.datasourceConfig?.database || 'N/A'}</span>
82+
),
83+
},
84+
{
85+
title: 'Status',
86+
dataIndex: 'datasourceStatus',
87+
key: 'status',
88+
render: (status: string) => (
89+
<Tag color={status === 'NORMAL' ? 'green' : 'red'}>
90+
{status}
91+
</Tag>
92+
),
93+
},
94+
{
95+
title: 'Actions',
96+
key: 'actions',
97+
render: (_, record: DataSource) => (
98+
<Space>
99+
<Tooltip title="Deploy to another environment">
100+
<Button
101+
icon={<CloudUploadOutlined />}
102+
onClick={(e) => {
103+
e.stopPropagation(); // Prevent row click navigation
104+
}}
105+
type="primary"
106+
ghost
107+
>
108+
Deploy
109+
</Button>
110+
</Tooltip>
111+
</Space>
112+
),
113+
}
114+
],
115+
116+
// Deployment options
117+
enableManaged: true,
118+
119+
// Service functions
120+
fetchItems: async ({ environment, workspaceId }) => {
121+
if (!workspaceId) {
122+
throw new Error("Workspace ID is required to fetch data sources");
123+
}
124+
125+
const result = await getMergedWorkspaceDataSources(
126+
workspaceId,
127+
environment.environmentId,
128+
environment.environmentApikey,
129+
environment.environmentApiServiceUrl!
130+
);
131+
132+
return result.dataSources;
133+
},
134+
135+
toggleManaged: async ({ item, checked, environment }) => {
136+
try {
137+
if (checked) {
138+
await connectManagedDataSource(environment.environmentId, item.name, item.gid);
139+
} else {
140+
await unconnectManagedDataSource(item.gid);
141+
}
142+
return true;
143+
} catch (error) {
144+
console.error('Error toggling managed status:', error);
145+
return false;
146+
}
147+
}
148+
};

‎client/packages/lowcoder/src/pages/setting/environments/types/datasource.types.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
/**
22
* Represents a DataSource configuration
33
*/
4+
5+
import { DeployableItem, BaseStats } from "./deployable-item.types";
46
export interface DataSourceConfig {
57
usingUri: boolean;
68
srvMode: boolean;
@@ -16,7 +18,7 @@ export interface DataSourceConfig {
1618
/**
1719
* Represents a DataSource entity
1820
*/
19-
export interface DataSource {
21+
export interface DataSource extends DeployableItem {
2022
id: string;
2123
createdBy: string;
2224
gid: string;
@@ -38,4 +40,8 @@ export interface DataSourceConfig {
3840
datasource: DataSource;
3941
edit: boolean;
4042
creatorName: string;
43+
}
44+
45+
export interface DataSourceStats extends BaseStats {
46+
byType: Record<string, number>; // Count by each type
4147
}

0 commit comments

Comments
 (0)