[incubator-devlake] branch release-v0.19 updated: fix(config-ui): missed namespace for data scope select (#6282)

[klesh]

This is an automated email from the ASF dual-hosted git repository.

klesh pushed a commit to branch release-v0.19
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git


The following commit(s) were added to refs/heads/release-v0.19 by this push:
     new 972753ff0 fix(config-ui): missed namespace for data scope select 
(#6282)
972753ff0 is described below

commit 972753ff0a8a45e8100fd2ac4a2dab6b0934724a
Author: 青湛 <0x1304...@gmail.com>
AuthorDate: Thu Oct 19 20:57:11 2023 +1300

    fix(config-ui): missed namespace for data scope select (#6282)
---
 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,
       })),
     ]);