You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@devlake.apache.org by ly...@apache.org on 2024/01/03 06:01:08 UTC

(incubator-devlake) branch main updated: fix(config-ui): some bugs (#6724)

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

lynwee pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git


The following commit(s) were added to refs/heads/main by this push:
     new def103ba9 fix(config-ui): some bugs (#6724)
def103ba9 is described below

commit def103ba9e2250bf2620459d2a7888772b392a2a
Author: 青湛 <0x...@gmail.com>
AuthorDate: Wed Jan 3 19:01:04 2024 +1300

    fix(config-ui): some bugs (#6724)
    
    * fix(config-ui): jira task name error
    
    * fix(config-ui): search remote show scope full name
    
    * fix(config-ui): remove body margin
    
    * fix(config-ui): change menu function onSelect to onClick
---
 config-ui/src/index.css                                              | 1 +
 config-ui/src/plugins/components/data-scope-remote/search-remote.tsx | 2 +-
 config-ui/src/routes/layout/layout.tsx                               | 2 +-
 config-ui/src/routes/pipeline/components/task.tsx                    | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/config-ui/src/index.css b/config-ui/src/index.css
index 046bb278e..e87706c30 100644
--- a/config-ui/src/index.css
+++ b/config-ui/src/index.css
@@ -18,6 +18,7 @@
 
 body {
   color: #292b3f;
+  margin: 0;
 }
 
 h1,
diff --git a/config-ui/src/plugins/components/data-scope-remote/search-remote.tsx b/config-ui/src/plugins/components/data-scope-remote/search-remote.tsx
index 9593e68ca..5c891adee 100644
--- a/config-ui/src/plugins/components/data-scope-remote/search-remote.tsx
+++ b/config-ui/src/plugins/components/data-scope-remote/search-remote.tsx
@@ -133,7 +133,7 @@ export const SearchRemote = ({ plugin, connectionId, config, disabledScope, sele
 
     const newItems = (res.children ?? []).map((it) => ({
       ...it,
-      title: it.name,
+      title: it.fullName ?? it.name,
     }));
 
     setSearch((s) => ({
diff --git a/config-ui/src/routes/layout/layout.tsx b/config-ui/src/routes/layout/layout.tsx
index 6bcd62ea8..779961f6c 100644
--- a/config-ui/src/routes/layout/layout.tsx
+++ b/config-ui/src/routes/layout/layout.tsx
@@ -104,7 +104,7 @@ export const Layout = () => {
                 items={menuItems}
                 openKeys={openKeys}
                 selectedKeys={selectedKeys}
-                onSelect={({ key }) => navigate(key)}
+                onClick={({ key }) => navigate(key)}
                 onOpenChange={(keys) => setOpenKeys(keys)}
               />
               <div style={{ position: 'absolute', right: 0, bottom: 20, left: 0, color: '#fff', textAlign: 'center' }}>
diff --git a/config-ui/src/routes/pipeline/components/task.tsx b/config-ui/src/routes/pipeline/components/task.tsx
index c423f64ae..900b68dab 100644
--- a/config-ui/src/routes/pipeline/components/task.tsx
+++ b/config-ui/src/routes/pipeline/components/task.tsx
@@ -65,7 +65,7 @@ export const PipelineTask = ({ task }: Props) => {
         name = `${name}:${options.workspaceId}`;
         break;
       case ['jira', 'jenkins'].includes(config.plugin):
-        name = `${name}:${options.scopeId}`;
+        name = `${name}:${options.boardId}`;
         break;
       case ['sonarqube'].includes(config.plugin):
         name = `${name}:${options.projectKey}`;