This is an automated email from the ASF dual-hosted git repository. mintsweet pushed a commit to branch release-v0.19-fix-6280 in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git
commit 2124cdffee2144c8583c7cf2e458da168911e23d Author: mintsweet <[email protected]> AuthorDate: Thu Oct 19 19:21:13 2023 +1300 fix(config-ui): missed namespace for data scope select --- config-ui/src/pages/blueprint/connection-detail/index.tsx | 3 ++- config-ui/src/plugins/components/data-scope-select/api.ts | 2 +- config-ui/src/plugins/components/data-scope-select/index.tsx | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/config-ui/src/pages/blueprint/connection-detail/index.tsx b/config-ui/src/pages/blueprint/connection-detail/index.tsx index 8147b718f..404200532 100644 --- a/config-ui/src/pages/blueprint/connection-detail/index.tsx +++ b/config-ui/src/pages/blueprint/connection-detail/index.tsx @@ -212,8 +212,9 @@ export const BlueprintConnectionDetailPage = () => { columns={[ { title: 'Data Scope', - dataIndex: 'name', + dataIndex: ['fullName', 'name'], key: 'name', + render: ({ fullName, name }) => fullName ?? name, }, { title: 'Scope Config', diff --git a/config-ui/src/plugins/components/data-scope-select/api.ts b/config-ui/src/plugins/components/data-scope-select/api.ts index 941dcbdc7..3e75b03df 100644 --- a/config-ui/src/plugins/components/data-scope-select/api.ts +++ b/config-ui/src/plugins/components/data-scope-select/api.ts @@ -23,7 +23,7 @@ type ParamsType = { } & Pagination; type ResponseType = { - scopes: Array<{ name: string }>; + scopes: Array<{ fullName?: string; name: string }>; count: number; }; diff --git a/config-ui/src/plugins/components/data-scope-select/index.tsx b/config-ui/src/plugins/components/data-scope-select/index.tsx index fdf64de6d..55f030c23 100644 --- a/config-ui/src/plugins/components/data-scope-select/index.tsx +++ b/config-ui/src/plugins/components/data-scope-select/index.tsx @@ -70,7 +70,7 @@ export const DataScopeSelect = ({ ...res.scopes.map((sc) => ({ parentId: null, id: getPluginScopeId(plugin, sc), - title: sc.name, + title: sc.fullName ?? sc.name, data: sc, })), ]);
