From e18e7be7136f15fa997e2378998e173d2b3ce179 Mon Sep 17 00:00:00 2001
From: crazywoola <li.zheng@dentsplysirona.com>
Date: Fri, 19 May 2023 14:56:24 +0800
Subject: [PATCH] fix: nav select icon missing

---
 web/app/components/header/index.tsx                  | 12 ++++++++----
 web/app/components/header/nav/nav-selector/index.tsx |  6 ++++--
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/web/app/components/header/index.tsx b/web/app/components/header/index.tsx
index f188eaf1ca..d968f7b49b 100644
--- a/web/app/components/header/index.tsx
+++ b/web/app/components/header/index.tsx
@@ -69,11 +69,13 @@ const Header: FC<IHeaderProps> = ({ appItems, curApp, userProfile, onLogout, lan
             text={t('common.menus.apps')}
             activeSegment={['apps', 'app']}
             link='/apps'
-            curNav={curApp && { id: curApp.id, name: curApp.name }}
+            curNav={curApp && { id: curApp.id, name: curApp.name ,icon: curApp.icon, icon_background: curApp.icon_background}}
             navs={appItems.map(item => ({
               id: item.id,
               name: item.name,
-              link: `/app/${item.id}/overview`
+              link: `/app/${item.id}/overview`,
+              icon: item.icon,
+              icon_background: item.icon_background
             }))}
             createText={t('common.menus.newApp')}
             onCreate={() => setShowNewAppDialog(true)}
@@ -91,11 +93,13 @@ const Header: FC<IHeaderProps> = ({ appItems, curApp, userProfile, onLogout, lan
             text={t('common.menus.datasets')}
             activeSegment='datasets'
             link='/datasets'
-            curNav={currentDataset && { id: currentDataset.id, name: currentDataset.name }}
+            curNav={currentDataset && { id: currentDataset.id, name: currentDataset.name, icon: currentDataset.icon, icon_background: currentDataset.icon_background }}
             navs={datasets.map(dataset => ({
               id: dataset.id,
               name: dataset.name,
-              link: `/datasets/${dataset.id}/documents`
+              link: `/datasets/${dataset.id}/documents`,
+              icon: dataset.icon,
+              icon_background: dataset.icon_background
             }))}
             createText={t('common.menus.newDataset')}
             onCreate={() => router.push('/datasets/create')}
diff --git a/web/app/components/header/nav/nav-selector/index.tsx b/web/app/components/header/nav/nav-selector/index.tsx
index ed2bb99668..ee0b630cd5 100644
--- a/web/app/components/header/nav/nav-selector/index.tsx
+++ b/web/app/components/header/nav/nav-selector/index.tsx
@@ -10,6 +10,8 @@ type NavItem = {
   id: string
   name: string
   link: string
+  icon: string
+  icon_background: string
 }
 export interface INavSelectorProps {
   navs: NavItem[]
@@ -66,7 +68,7 @@ const NavSelector = ({ curNav, navs, createText, onCreate }: INavSelectorProps)
                   <Menu.Item key={nav.id}>
                     <div className={itemClassName} onClick={() => router.push(nav.link)}>
                       <div className='relative w-6 h-6 mr-2 bg-[#D5F5F6] rounded-[6px]'>
-                        <AppIcon size='tiny' />
+                        <AppIcon size='tiny' icon={nav.icon} background={nav.icon_background}/>
                         <div className='flex justify-center items-center absolute -right-0.5 -bottom-0.5 w-2.5 h-2.5 bg-white rounded'>
                           <Indicator />
                         </div>
@@ -102,4 +104,4 @@ const NavSelector = ({ curNav, navs, createText, onCreate }: INavSelectorProps)
   )
 }
 
-export default NavSelector
\ No newline at end of file
+export default NavSelector