Merge pull request #675 from actiontech/feature/optimize-permission-2

[feature](PipelineConfiguration): Add datasource column

Author: LZS911

packages/shared/lib/api/sqle/service/common.d.ts

@@ -3869,6 +3869,8 @@ export interface ICreatePipelineResData {
 export interface IPipelineDetail {
   address?: string;
 
+  data_sources?: string[];
+
   description?: string;
 
   id?: number;
@@ -3881,6 +3883,8 @@ export interface IPipelineDetail {
 export interface IPipelineDetailData {
   address?: string;
 
+  data_sources?: string[];
+
   description?: string;
 
   id?: number;

packages/shared/lib/features/usePermission/__tests__/__snapshots__/index.test.ts.snap

@@ -1624,7 +1624,6 @@ exports[`usePermission should match snapshot 2`] = `
       "admin",
       "systemAdministrator",
       "auditAdministrator",
-      "projectDirector",
     ],
     "type": "page",
   },
@@ -1645,7 +1644,6 @@ exports[`usePermission should match snapshot 2`] = `
       "admin",
       "systemAdministrator",
       "auditAdministrator",
-      "projectDirector",
     ],
     "type": "page",
   },
@@ -1673,7 +1671,6 @@ exports[`usePermission should match snapshot 2`] = `
       "admin",
       "systemAdministrator",
       "auditAdministrator",
-      "projectDirector",
     ],
     "type": "page",
   },
@@ -1693,7 +1690,6 @@ exports[`usePermission should match snapshot 2`] = `
       "admin",
       "systemAdministrator",
       "auditAdministrator",
-      "projectDirector",
     ],
     "type": "page",
   },
@@ -1704,7 +1700,6 @@ exports[`usePermission should match snapshot 2`] = `
       "admin",
       "systemAdministrator",
       "auditAdministrator",
-      "projectDirector",
     ],
     "type": "page",
   },
@@ -1743,7 +1738,6 @@ exports[`usePermission should match snapshot 2`] = `
       "admin",
       "systemAdministrator",
       "auditAdministrator",
-      "projectDirector",
     ],
     "type": "page",
   },
@@ -1788,7 +1782,6 @@ exports[`usePermission should match snapshot 2`] = `
       "admin",
       "systemAdministrator",
       "auditAdministrator",
-      "projectDirector",
     ],
     "type": "page",
   },

packages/shared/lib/features/usePermission/permissionManifest.ts

@@ -65,8 +65,7 @@ export const PERMISSION_MANIFEST: Record<
     role: [
       SystemRole.admin,
       SystemRole.systemAdministrator,
-      SystemRole.auditAdministrator,
-      SystemRole.projectDirector
+      SystemRole.auditAdministrator
     ],
     projectPermission: OpPermissionItemOpPermissionTypeEnum.manage_member
   },
@@ -76,8 +75,7 @@ export const PERMISSION_MANIFEST: Record<
     role: [
       SystemRole.admin,
       SystemRole.systemAdministrator,
-      SystemRole.auditAdministrator,
-      SystemRole.projectDirector
+      SystemRole.auditAdministrator
     ],
     projectPermission:
       OpPermissionItemOpPermissionTypeEnum.manage_project_data_source
@@ -144,8 +142,7 @@ export const PERMISSION_MANIFEST: Record<
     role: [
       SystemRole.admin,
       SystemRole.systemAdministrator,
-      SystemRole.auditAdministrator,
-      SystemRole.projectDirector
+      SystemRole.auditAdministrator
     ],
     projectPermission:
       OpPermissionItemOpPermissionTypeEnum.manage_audit_rule_template
@@ -156,8 +153,7 @@ export const PERMISSION_MANIFEST: Record<
     role: [
       SystemRole.admin,
       SystemRole.systemAdministrator,
-      SystemRole.auditAdministrator,
-      SystemRole.projectDirector
+      SystemRole.auditAdministrator
     ],
     projectPermission:
       OpPermissionItemOpPermissionTypeEnum.manage_approval_template
@@ -168,8 +164,7 @@ export const PERMISSION_MANIFEST: Record<
     role: [
       SystemRole.admin,
       SystemRole.systemAdministrator,
-      SystemRole.auditAdministrator,
-      SystemRole.projectDirector
+      SystemRole.auditAdministrator
     ],
     projectPermission: OpPermissionItemOpPermissionTypeEnum.manage_push_rule
   },
@@ -179,8 +174,7 @@ export const PERMISSION_MANIFEST: Record<
     role: [
       SystemRole.admin,
       SystemRole.systemAdministrator,
-      SystemRole.auditAdministrator,
-      SystemRole.projectDirector
+      SystemRole.auditAdministrator
     ],
     projectPermission:
       OpPermissionItemOpPermissionTypeEnum.manage_audit_sql_white_list
@@ -191,8 +185,7 @@ export const PERMISSION_MANIFEST: Record<
     role: [
       SystemRole.admin,
       SystemRole.systemAdministrator,
-      SystemRole.auditAdministrator,
-      SystemRole.projectDirector
+      SystemRole.auditAdministrator
     ],
     projectPermission:
       OpPermissionItemOpPermissionTypeEnum.manage_sql_mange_white_list

packages/shared/lib/testUtil/mockApi/sqle/pipeline/data.ts

@@ -14,11 +14,24 @@ export const mockPipelineListData: IPipelineDetail[] = [
     name: 'pipeline1',
     address: '127.0.0.1',
     description: 'desc',
-    node_count: 2
+    node_count: 2,
+    data_sources: ['mysql', 'postgresql', 'mysql-1', 'mysql-2']
   },
   {
     id: 2,
-    name: 'pipeline1',
+    name: 'pipeline2',
+    node_count: 2,
+    data_sources: ['mysql']
+  },
+  {
+    id: 3,
+    name: 'pipeline3',
+    node_count: 2,
+    data_sources: []
+  },
+  {
+    id: 4,
+    name: 'pipeline4',
     node_count: 2
   }
 ];
@@ -29,6 +42,7 @@ export const mockPipelineDetailData: IPipelineDetailData = {
   address: '127.0.0.1',
   description: 'desc',
   node_count: 2,
+  data_sources: ['mysql', 'postgresql', 'mysql-1', 'mysql-2'],
   nodes: [
     {
       audit_method: pipelineNodeDetailAuditMethodEnum.offline,

packages/sqle/src/locale/zh-CN/pipelineConfiguration.ts

@@ -16,6 +16,8 @@ export default {
     desc: '流水线描述',
     address: '关联流水线地址',
     nodeCount: '节点个数',
+    dataSources: '数据源',
+    viewAll: '查看全部',
     confirmDelete: '确认删除该流水线吗？',
     deleting: '正在删除流水线...',
     deleteSuccess: '删除流水线配置成功',