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

klesh 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 aa25007e0 fix(config-ui): some bugs (#5543)
aa25007e0 is described below

commit aa25007e0b48dbea1f06fc4b3ff2676c5da1f7b4
Author: 青湛 <[email protected]>
AuthorDate: Wed Jun 21 13:18:37 2023 +0800

    fix(config-ui): some bugs (#5543)
    
    * fix(config-ui): hide the plugin teambition
    
    * fix(config-ui): remove unused params from menu
    
    * chore(config-ui): lint warning message
---
 config-ui/src/layouts/base/base.tsx                  | 5 ++---
 config-ui/src/layouts/base/use-menu.ts               | 4 +---
 config-ui/src/plugins/register/teambition/config.tsx | 2 +-
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/config-ui/src/layouts/base/base.tsx 
b/config-ui/src/layouts/base/base.tsx
index b067af969..f1cc1ac77 100644
--- a/config-ui/src/layouts/base/base.tsx
+++ b/config-ui/src/layouts/base/base.tsx
@@ -19,7 +19,7 @@
 import { useState, useEffect, useRef } from 'react';
 import { useLocation } from 'react-router-dom';
 import { CSSTransition } from 'react-transition-group';
-import { Menu, MenuItem, Tag, Navbar, Intent, Alignment } from 
'@blueprintjs/core';
+import { Menu, MenuItem, Navbar, Alignment } from '@blueprintjs/core';
 
 import { PageLoading, Logo, ExternalLink, IconButton } from '@/components';
 import { useTips, useRefreshData } from '@/hooks';
@@ -108,10 +108,9 @@ export const Layout = ({ children }: Props) => {
                     text={
                       <S.SiderMenuItem>
                         <span>{cit.title}</span>
-                        {cit.isBeta && <Tag intent={Intent.WARNING}>beta</Tag>}
                       </S.SiderMenuItem>
                     }
-                    icon={cit.icon ?? <img src={cit.iconUrl} width={16} alt="" 
/>}
+                    icon={cit.icon}
                     active={pathname.includes(cit.path)}
                     disabled={cit.disabled}
                     onClick={() => handlePushPath(cit)}
diff --git a/config-ui/src/layouts/base/use-menu.ts 
b/config-ui/src/layouts/base/use-menu.ts
index 9e87a25c4..3b0d356a3 100644
--- a/config-ui/src/layouts/base/use-menu.ts
+++ b/config-ui/src/layouts/base/use-menu.ts
@@ -23,12 +23,10 @@ export type MenuItemType = {
   key: string;
   title: string;
   icon?: IconName;
-  iconUrl?: string;
   path: string;
   children?: MenuItemType[];
   target?: boolean;
-  isBeta?: boolean;
-  disabled?: boolean;
+  disabled: boolean;
 };
 
 export const useMenu = () => {
diff --git a/config-ui/src/plugins/register/teambition/config.tsx 
b/config-ui/src/plugins/register/teambition/config.tsx
index 8bae32a86..0f11d2c59 100644
--- a/config-ui/src/plugins/register/teambition/config.tsx
+++ b/config-ui/src/plugins/register/teambition/config.tsx
@@ -23,7 +23,7 @@ import Icon from './assets/icon.svg';
 import { ConnectionTenantId, ConnectionTenantType } from './connection-fields';
 
 export const TeambitionConfig: PluginConfigType = {
-  type: PluginType.Connection,
+  type: PluginType.Pipeline,
   plugin: 'teambition',
   name: 'Teambition',
   isBeta: true,

Reply via email to