You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@devlake.apache.org by mi...@apache.org on 2023/08/23 02:37:29 UTC
[incubator-devlake] branch feat-5640 updated: refactor(config-ui): update plugin config about data scope
This is an automated email from the ASF dual-hosted git repository.
mintsweet pushed a commit to branch feat-5640
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git
The following commit(s) were added to refs/heads/feat-5640 by this push:
new e496015c0 refactor(config-ui): update plugin config about data scope
e496015c0 is described below
commit e496015c0ecd1a66a869d51feb84b3727d41b0d6
Author: mintsweet <0x...@gmail.com>
AuthorDate: Wed Aug 23 14:37:14 2023 +1200
refactor(config-ui): update plugin config about data scope
---
config-ui/src/plugins/register/azure/config.tsx | 5 +----
config-ui/src/plugins/register/bamboo/config.ts | 6 +-----
config-ui/src/plugins/register/bitbucket/config.tsx | 7 ++-----
config-ui/src/plugins/register/github/config.tsx | 14 +++-----------
config-ui/src/plugins/register/gitlab/config.tsx | 12 +++---------
.../src/plugins/register/jenkins/{config.ts => config.tsx} | 6 ++----
config-ui/src/plugins/register/jenkins/data-scope.tsx | 14 +-------------
config-ui/src/plugins/register/jira/config.tsx | 6 +-----
config-ui/src/plugins/register/pagerduty/config.tsx | 5 +----
config-ui/src/plugins/register/sonarqube/config.ts | 5 +----
config-ui/src/plugins/register/teambition/config.tsx | 5 +----
config-ui/src/plugins/register/zentao/config.tsx | 7 ++-----
config-ui/src/plugins/types.ts | 13 +++----------
config-ui/src/plugins/utils.ts | 5 +----
14 files changed, 23 insertions(+), 87 deletions(-)
diff --git a/config-ui/src/plugins/register/azure/config.tsx b/config-ui/src/plugins/register/azure/config.tsx
index 256660bea..7fc9a95cf 100644
--- a/config-ui/src/plugins/register/azure/config.tsx
+++ b/config-ui/src/plugins/register/azure/config.tsx
@@ -58,10 +58,7 @@ export const AzureConfig: PluginConfigType = {
],
},
dataScope: {
- millerColumns: {
- title: 'Add Repositories by Selecting from the Directory',
- subTitle: 'The following directory lists out all repositories in your organizations.',
- },
+ title: 'Repositories',
},
scopeConfig: {
entities: ['CODE', 'CODEREVIEW', 'CROSS', 'CICD'],
diff --git a/config-ui/src/plugins/register/bamboo/config.ts b/config-ui/src/plugins/register/bamboo/config.ts
index c827aadce..10ccbf44b 100644
--- a/config-ui/src/plugins/register/bamboo/config.ts
+++ b/config-ui/src/plugins/register/bamboo/config.ts
@@ -48,11 +48,7 @@ export const BambooConfig: PluginConfigType = {
],
},
dataScope: {
- millerColumns: {
- title: 'Add Repositories by Selecting from the Directory',
- subTitle: 'The following directory lists out all repositories in your organizations.',
- columnCount: 1,
- },
+ title: 'Repositories',
},
scopeConfig: {
entities: ['CICD', 'CROSS'],
diff --git a/config-ui/src/plugins/register/bitbucket/config.tsx b/config-ui/src/plugins/register/bitbucket/config.tsx
index 32b6d52d6..b7e4fc7a5 100644
--- a/config-ui/src/plugins/register/bitbucket/config.tsx
+++ b/config-ui/src/plugins/register/bitbucket/config.tsx
@@ -61,11 +61,8 @@ export const BitBucketConfig: PluginConfigType = {
],
},
dataScope: {
- millerColumns: {
- title: 'Repositories *',
- subTitle: 'Select the repositories you would like to sync.',
- columnCount: 2,
- },
+ title: 'Repositories',
+ millerColumnCount: 2,
},
scopeConfig: {
entities: ['CODE', 'TICKET', 'CODEREVIEW', 'CROSS', 'CICD'],
diff --git a/config-ui/src/plugins/register/github/config.tsx b/config-ui/src/plugins/register/github/config.tsx
index 1379e4340..ac5ddef8b 100644
--- a/config-ui/src/plugins/register/github/config.tsx
+++ b/config-ui/src/plugins/register/github/config.tsx
@@ -100,17 +100,9 @@ export const GitHubConfig: PluginConfigType = {
],
},
dataScope: {
- millerColumns: {
- title: 'Select Repositories *',
- subTitle: 'You can either add repositories by searching or selecting from the following directory.',
- firstColumnTitle: 'Organizations/Owners',
- columnCount: 2,
- },
- search: {
- title: 'Add Repositories by Searching',
- subTitle:
- 'If you would like to add repositories outside of your organizations, you can add them through this method.',
- },
+ title: 'Repositories',
+ millerColumnCount: 2,
+ millerFirstTitle: 'Organizations/Owners',
},
scopeConfig: {
entities: ['CODE', 'TICKET', 'CODEREVIEW', 'CROSS', 'CICD'],
diff --git a/config-ui/src/plugins/register/gitlab/config.tsx b/config-ui/src/plugins/register/gitlab/config.tsx
index 6206972e1..49d1f5ebe 100644
--- a/config-ui/src/plugins/register/gitlab/config.tsx
+++ b/config-ui/src/plugins/register/gitlab/config.tsx
@@ -68,15 +68,9 @@ export const GitLabConfig: PluginConfigType = {
],
},
dataScope: {
- millerColumns: {
- title: 'Projects *',
- subTitle: 'Select the project you would like to sync.',
- firstColumnTitle: 'Subgroups/Projects',
- },
- search: {
- title: 'Add repositories outside of your projects',
- subTitle: 'Search for repositories and add to them',
- },
+ title: 'Projects',
+ millerColumnCount: 2.5,
+ millerFirstTitle: 'Subgroups/Projects',
},
scopeConfig: {
entities: ['CODE', 'TICKET', 'CODEREVIEW', 'CROSS', 'CICD'],
diff --git a/config-ui/src/plugins/register/jenkins/config.ts b/config-ui/src/plugins/register/jenkins/config.tsx
similarity index 94%
rename from config-ui/src/plugins/register/jenkins/config.ts
rename to config-ui/src/plugins/register/jenkins/config.tsx
index dd984e3ec..170341a3b 100644
--- a/config-ui/src/plugins/register/jenkins/config.ts
+++ b/config-ui/src/plugins/register/jenkins/config.tsx
@@ -22,6 +22,7 @@ import type { PluginConfigType } from '../../types';
import { PluginType } from '../../types';
import Icon from './assets/icon.svg';
+import { DataScope } from './data-scope';
export const JenkinsConfig: PluginConfigType = {
type: PluginType.Connection,
@@ -51,10 +52,7 @@ export const JenkinsConfig: PluginConfigType = {
],
},
dataScope: {
- millerColumns: {
- title: 'Jobs *',
- subTitle: 'Select the jobs you would like to sync.',
- },
+ render: ({ ...props }) => <DataScope {...props} />,
},
scopeConfig: {
entities: ['CICD'],
diff --git a/config-ui/src/plugins/register/jenkins/data-scope.tsx b/config-ui/src/plugins/register/jenkins/data-scope.tsx
index 2dbb9003b..d7f5be39c 100644
--- a/config-ui/src/plugins/register/jenkins/data-scope.tsx
+++ b/config-ui/src/plugins/register/jenkins/data-scope.tsx
@@ -16,8 +16,6 @@
*
*/
-import { useMemo } from 'react';
-
import { DataScopeMillerColumns } from '@/plugins';
import type { ScopeItemType } from './types';
@@ -29,17 +27,7 @@ interface Props {
onChangeItems: (selectedItems: ScopeItemType[]) => void;
}
-export const JenkinsDataScope = ({ connectionId, onChangeItems, ...props }: Props) => {
- const selectedItems = useMemo(
- () => props.selectedItems.map((it) => ({ id: `${it.jobFullName}`, name: it.name, data: it })),
- [props.selectedItems],
- );
-
- const disabledItems = useMemo(
- () => (props.disabledItems ?? []).map((it) => ({ id: `${it.jobFullName}`, name: it.name, data: it })),
- [props.disabledItems],
- );
-
+export const DataScope = ({ connectionId, disabledItems, selectedItems, onChangeItems }: Props) => {
return (
<>
<h3>Jobs *</h3>
diff --git a/config-ui/src/plugins/register/jira/config.tsx b/config-ui/src/plugins/register/jira/config.tsx
index c39ea5723..3daa049f5 100644
--- a/config-ui/src/plugins/register/jira/config.tsx
+++ b/config-ui/src/plugins/register/jira/config.tsx
@@ -57,11 +57,7 @@ export const JiraConfig: PluginConfigType = {
],
},
dataScope: {
- millerColumns: {
- title: 'Boards *',
- subTitle: 'Select the boards you would like to sync.',
- columnCount: 1,
- },
+ title: 'Boards',
},
scopeConfig: {
entities: ['TICKET', 'CROSS'],
diff --git a/config-ui/src/plugins/register/pagerduty/config.tsx b/config-ui/src/plugins/register/pagerduty/config.tsx
index e1d414586..5c115711f 100644
--- a/config-ui/src/plugins/register/pagerduty/config.tsx
+++ b/config-ui/src/plugins/register/pagerduty/config.tsx
@@ -56,9 +56,6 @@ export const PagerDutyConfig: PluginConfigType = {
],
},
dataScope: {
- millerColumns: {
- title: 'PagerDuty Services *',
- subTitle: 'You can either add services by searching or selecting from the following directory.',
- },
+ title: 'Services',
},
};
diff --git a/config-ui/src/plugins/register/sonarqube/config.ts b/config-ui/src/plugins/register/sonarqube/config.ts
index 26722e2f3..db6bfe17e 100644
--- a/config-ui/src/plugins/register/sonarqube/config.ts
+++ b/config-ui/src/plugins/register/sonarqube/config.ts
@@ -50,9 +50,6 @@ export const SonarQubeConfig: PluginConfigType = {
],
},
dataScope: {
- millerColumns: {
- title: 'Add Repositories by Selecting from the Directory',
- subTitle: 'The following directory lists out all projects from SonarQube.',
- },
+ title: 'Repositories',
},
};
diff --git a/config-ui/src/plugins/register/teambition/config.tsx b/config-ui/src/plugins/register/teambition/config.tsx
index bd6284c9d..079ca4d1a 100644
--- a/config-ui/src/plugins/register/teambition/config.tsx
+++ b/config-ui/src/plugins/register/teambition/config.tsx
@@ -88,10 +88,7 @@ export const TeambitionConfig: PluginConfigType = {
],
},
dataScope: {
- millerColumns: {
- title: '',
- subTitle: '',
- },
+ title: '',
},
scopeConfig: {
entities: ['TICKET'],
diff --git a/config-ui/src/plugins/register/zentao/config.tsx b/config-ui/src/plugins/register/zentao/config.tsx
index 2e4756967..288d8832a 100644
--- a/config-ui/src/plugins/register/zentao/config.tsx
+++ b/config-ui/src/plugins/register/zentao/config.tsx
@@ -60,10 +60,7 @@ export const ZenTaoConfig: PluginConfigType = {
],
},
dataScope: {
- millerColumns: {
- title: 'Repositories *',
- subTitle: 'Select the repositories you would like to sync.',
- columnCount: 2,
- },
+ title: 'Repositories',
+ millerColumnCount: 2,
},
};
diff --git a/config-ui/src/plugins/types.ts b/config-ui/src/plugins/types.ts
index 71a90f64b..589ea9038 100644
--- a/config-ui/src/plugins/types.ts
+++ b/config-ui/src/plugins/types.ts
@@ -34,16 +34,9 @@ export type PluginConfigType = {
fields: any[];
};
dataScope: {
- millerColumns?: {
- title: string;
- subTitle: string;
- firstColumnTitle?: string;
- columnCount?: number;
- };
- search?: {
- title?: string;
- subTitle?: string;
- };
+ title?: string;
+ millerColumnCount?: number;
+ millerFirstTitle?: string;
render?: (props: any) => React.ReactNode;
};
scopeConfig?: {
diff --git a/config-ui/src/plugins/utils.ts b/config-ui/src/plugins/utils.ts
index 37abe4575..210147619 100644
--- a/config-ui/src/plugins/utils.ts
+++ b/config-ui/src/plugins/utils.ts
@@ -57,10 +57,7 @@ export const getPluginConfig = (name: string): PluginConfigType => {
fields: [],
},
dataScope: {
- millerColumns: {
- title: '',
- subTitle: '',
- },
+ title: '',
},
};
}