diff --git a/config/routes.ts b/config/routes.ts index c0490bf0..c7b5ebb4 100644 --- a/config/routes.ts +++ b/config/routes.ts @@ -14,9 +14,9 @@ export default [ }, { name: 'playground', - // icon: 'icon-experiment', - // selectedIcon: 'icon-experiment-filled', - // defaultIcon: 'icon-experiment', + icon: 'icon-experiment', + selectedIcon: 'icon-experiment-filled', + defaultIcon: 'icon-experiment', path: '/playground', key: 'playground', routes: [ @@ -84,7 +84,7 @@ export default [ routes: [ { path: '/models', - redirect: '/models/deployment' + redirect: '/models/deployments' }, { name: 'modelCatalog', @@ -98,7 +98,7 @@ export default [ }, { name: 'deployment', - path: '/models/deployment', + path: '/models/deployments', key: 'modelDeployments', icon: 'icon-model', selectedIcon: 'icon-model-filled', @@ -164,7 +164,6 @@ export default [ icon: 'icon-users', selectedIcon: 'icon-users-filled', defaultIcon: 'icon-users', - access: 'canSeeAdmin', component: './users' } ] diff --git a/src/layouts/index.tsx b/src/layouts/index.tsx index a4c7a67c..0c3ef090 100644 --- a/src/layouts/index.tsx +++ b/src/layouts/index.tsx @@ -326,14 +326,8 @@ export default (props: any) => { setCollapseKeys(new Set(collapseKeys)); }; - const onMenuItemClick = (menuItem) => { - navigate(menuItem.path); - }; - const menuContentRender = (menuProps, defaultDom) => { - return ( - - ); + return ; }; const actionRender = (layoutProps) => { @@ -531,8 +525,6 @@ export default (props: any) => { splitMenus={true} logo={collapsed ? SLogoIcon : LogoIcon} menuContentRender={menuContentRender} - menuItemRender={menuItemRender} - menuDataRender={menuDataRender} disableContentMargin fixSiderbar fixedHeader diff --git a/src/layouts/rightRender.tsx b/src/layouts/rightRender.tsx index 73ca8ab5..45f17c27 100644 --- a/src/layouts/rightRender.tsx +++ b/src/layouts/rightRender.tsx @@ -341,7 +341,6 @@ export const getRightRenderContent = (opts: { return ( <> - {/* */} void; } const useStyles = createStyles(({ css, token }) => { @@ -45,7 +44,6 @@ const useStyles = createStyles(({ css, token }) => { padding-bottom: 4px; overflow: hidden; height: 30px; - transtion: all var(--ant-motion-duration-slow); &:hover { .group-title-text { color: var(--ant-color-text); @@ -76,6 +74,8 @@ const useStyles = createStyles(({ css, token }) => { `, menuItemWrapper: css` display: flex; + align-items: center; + justify-content: flex-start; gap: 12px; cursor: pointer; position: relative; @@ -92,6 +92,9 @@ const useStyles = createStyles(({ css, token }) => { &.menu-item-selected { background-color: ${Menu.itemSelectedBg}; color: ${Menu.itemSelectedColor}; + .anticon { + color: ${Menu.itemSelectedColor}; + } } &:active { background-color: ${Menu.itemActiveBg}; @@ -117,7 +120,7 @@ const useStyles = createStyles(({ css, token }) => { }); const SiderMenu: React.FC = (props) => { - const { menuData, collapsed, onMenuItemClick } = props; + const { menuData, collapsed } = props; const { styles, cx } = useStyles(); const location = useLocation(); const [collapseKeys, setCollapseKeys] = useState>(new Set()); @@ -156,8 +159,9 @@ const SiderMenu: React.FC = (props) => { className={cx(styles.menuItemContent, 'menu-item-content')} key={key} > -
onMenuItemClick(menuItem)} + = (props) => { ) : ( <> - {menuItem.icon} + {menuItem.name} )} -
+ ); }; @@ -195,25 +205,23 @@ const SiderMenu: React.FC = (props) => {
{item.children && item.children.length > 0 ? ( <> - { -
handleToggleGroup(e, item)} - > - {!collapsed ? ( - - {item.name} - - - ) : ( - - )} -
- } +
handleToggleGroup(e, item)} + > + {!collapsed ? ( + + {item.name} + + + ) : ( + + )} +
= (props) => {
) : ( - <>{menuItemRender(item, item.key)} + menuItemRender(item, item.key) )}
))} diff --git a/src/locales/en-US/menu.ts b/src/locales/en-US/menu.ts index 4c61cbcb..8d605f41 100644 --- a/src/locales/en-US/menu.ts +++ b/src/locales/en-US/menu.ts @@ -11,7 +11,7 @@ export default { 'menu.models.modelList': 'Deploy & Manage', 'menu.models.modelCatalog': 'Catalog', 'menu.models.catalog': 'Model Catalog', - 'menu.models.deployment': 'Deployment', + 'menu.models.deployment': 'Deployments', 'menu.modelCatalog': 'Catalog', 'menu.resources': 'Resources', 'menu.apikeys': 'API Keys', diff --git a/src/pages/llmodels/components/table-list.tsx b/src/pages/llmodels/components/table-list.tsx index dcbf0a22..b0c9fa5d 100644 --- a/src/pages/llmodels/components/table-list.tsx +++ b/src/pages/llmodels/components/table-list.tsx @@ -753,7 +753,7 @@ const Models: React.FC = ({ className="models-page-container" ghost header={{ - title: intl.formatMessage({ id: 'models.title' }), + title: intl.formatMessage({ id: 'menu.models.deployment' }), style: { paddingInline: 'var(--layout-content-header-inlinepadding)' },