diff --git a/config/routes.ts b/config/routes.ts index 0fb459aa..3aa1081b 100644 --- a/config/routes.ts +++ b/config/routes.ts @@ -179,6 +179,25 @@ const baseRoutes = [ access: 'canSeeOrgAdmin', hideInMenu: true, component: './benchmark/details' + }, + { + name: 'backendsList', + path: '/models/backends', + key: 'backendsList', + icon: 'icon-backend', + selectedIcon: 'icon-backend-filled', + defaultIcon: 'icon-backend', + access: 'canSeeOrgAdmin', + component: './backends/index' + }, + { + name: 'modelfiles', + path: '/models/modelfiles', + key: 'modelfiles', + icon: 'icon-files', + selectedIcon: 'icon-files-filled', + defaultIcon: 'icon-files', + component: './resources/components/model-files' } ] }, @@ -272,25 +291,6 @@ const baseRoutes = [ selectedIcon: 'icon-gpu-filled', defaultIcon: 'icon-gpu1', component: './resources/components/gpus' - }, - { - name: 'backendsList', - path: '/resources/backends', - key: 'backendsList', - icon: 'icon-backend', - selectedIcon: 'icon-backend-filled', - defaultIcon: 'icon-backend', - access: 'canSeeOrgAdmin', - component: './backends/index' - }, - { - name: 'modelfiles', - path: '/resources/modelfiles', - key: 'modelfiles', - icon: 'icon-files', - selectedIcon: 'icon-files-filled', - defaultIcon: 'icon-files', - component: './resources/components/model-files' } ] }, diff --git a/src/config/theme/light.ts b/src/config/theme/light.ts index 7e329365..537f61bb 100644 --- a/src/config/theme/light.ts +++ b/src/config/theme/light.ts @@ -57,7 +57,7 @@ export default { itemColor: 'rgba(0,0,0,1)', itemHoverBg: 'rgba(0,0,0,0.04)', itemActiveBg: 'rgba(0,0,0,0.04)', - menuItemSelectedBg: 'rgba(255, 255, 255, 0.9)' + menuItemSelectedBg: 'rgba(0, 0, 0, 0.06)' }, Progress: { lineBorderRadius: 3 diff --git a/src/layouts/sider-menu.tsx b/src/layouts/sider-menu.tsx index 5fae5386..f1a91d2c 100644 --- a/src/layouts/sider-menu.tsx +++ b/src/layouts/sider-menu.tsx @@ -43,7 +43,6 @@ const useStyles = createStyles( cursor: pointer; white-space: nowrap; padding: var(--ant-padding-xs) var(--ant-padding); - padding-left: 0px; font-size: 12px; padding-bottom: 4px; overflow: hidden; @@ -92,8 +91,6 @@ const useStyles = createStyles( height: ${Menu.itemHeight}px; line-height: ${Menu.itemHeight}px; color: var(--ant-color-text-tertiary); - border-radius: ${Menu.itemBorderRadius}px; - border: 1px solid transparent; &:hover { background-color: ${Menu.itemHoverBg}; color: ${Menu.itemHoverColor}; @@ -101,7 +98,6 @@ const useStyles = createStyles( &.menu-item-selected { background-color: ${Menu.menuItemSelectedBg}; color: ${Menu.itemSelectedColor}; - border: 1px solid var(--ant-color-border-secondary); .anticon { color: ${Menu.itemSelectedColor}; @@ -238,10 +234,10 @@ const SiderMenu: React.FC = (props) => { > {!collapsed ? ( + {item.name} - {item.name} ) : ( diff --git a/src/locales/en-US/menu.ts b/src/locales/en-US/menu.ts index 2b1d8e7c..ea3a0b86 100644 --- a/src/locales/en-US/menu.ts +++ b/src/locales/en-US/menu.ts @@ -27,7 +27,7 @@ export default { 'menu.users': 'Users', 'menu.resources.workers': 'Workers', 'menu.resources.gpus': 'GPUs', - 'menu.resources.modelfiles': 'Model Files', + 'menu.models.modelfiles': 'Model Files', 'menu.accessControl': 'Access Control', 'menu.accessControl.apikeys': 'API Keys', 'menu.accessControl.users': 'Users', @@ -40,7 +40,7 @@ export default { 'menu.clusterManagement.credentials': 'Cloud Credentials', 'menu.clusterManagement.clusterDetail': 'Cluster Detail', 'menu.clusterManagement.clusterCreate': 'Create Cluster', - 'menu.resources.backendsList': 'Inference Backends', + 'menu.models.backendsList': 'Inference Backends', 'menu.gpuService': 'GPU Service', 'menu.gpuService.instances': 'GPU Instances', 'menu.gpuService.templates': 'Instance Templates', diff --git a/src/locales/ja-JP/menu.ts b/src/locales/ja-JP/menu.ts index 981c50da..08be705f 100644 --- a/src/locales/ja-JP/menu.ts +++ b/src/locales/ja-JP/menu.ts @@ -30,7 +30,7 @@ export default { 'menu.settings': 'Settings', 'menu.resources.workers': 'Workers', 'menu.resources.gpus': 'GPUs', - 'menu.resources.modelfiles': 'Model Files', + 'menu.models.modelfiles': 'Model Files', 'menu.accessControl': 'Access Control', 'menu.accessControl.apikeys': 'API Keys', 'menu.accessControl.users': 'Users', @@ -40,7 +40,7 @@ export default { 'menu.models.userModels': 'My Models', 'menu.clusterManagement.clusterDetail': 'Cluster Detail', 'menu.clusterManagement.clusterCreate': 'Create Cluster', - 'menu.resources.backendsList': 'Inference Backends', + 'menu.models.backendsList': 'Inference Backends', 'menu.gpuService': 'GPU Service', 'menu.gpuService.instances': 'GPU Instances', 'menu.gpuService.templates': 'Instance Templates', @@ -53,7 +53,7 @@ export default { // 1. 'menu.models.deployment': 'Deployment', // 2. 'menu.resources.workers': 'Workers', // 3. 'menu.resources.gpus': 'GPUs', -// 4. 'menu.resources.modelfiles': 'Model Files', +// 4. 'menu.models.modelfiles': 'Model Files', // 5. 'menu.accessControl': 'Access Control', // 6. 'menu.accessControl.apikeys': 'API Keys', // 7. 'menu.accessControl.users': 'Users', @@ -63,7 +63,7 @@ export default { // 11. 'menu.models.userModels': 'My Models' // 12. 'menu.clusterManagement.clusterDetail': 'Cluster Detail', // 13. 'menu.clusterManagement.clusterCreate': 'Create Cluster', -// 14. 'menu.resources.backendsList': 'Inference Backends', +// 14. 'menu.models.backendsList': 'Inference Backends', // 15. 'menu.models.benchmark': 'Benchmarks', // 15. 'menu.models.provider': 'Provider', // 15. 'menu.models.providers': 'Provider', diff --git a/src/locales/ru-RU/menu.ts b/src/locales/ru-RU/menu.ts index 92da486e..20288a6e 100644 --- a/src/locales/ru-RU/menu.ts +++ b/src/locales/ru-RU/menu.ts @@ -29,7 +29,7 @@ export default { 'menu.404': 'Ошибка 404', 'menu.resources.workers': 'Воркеры', 'menu.resources.gpus': 'GPUs', - 'menu.resources.modelfiles': 'Файлы модлей', + 'menu.models.modelfiles': 'Файлы модлей', 'menu.accessControl': 'Управление доступом', 'menu.accessControl.apikeys': 'API Ключи', 'menu.accessControl.users': 'Пользователи', @@ -39,7 +39,7 @@ export default { 'menu.models.userModels': 'Мои модели', 'menu.clusterManagement.clusterDetail': 'Детали кластера', 'menu.clusterManagement.clusterCreate': 'Создать кластер', - 'menu.resources.backendsList': 'Бэкенды запуска', + 'menu.models.backendsList': 'Бэкенды запуска', 'menu.settings': 'Settings', 'menu.gpuService': 'GPU Service', 'menu.gpuService.instances': 'GPU Instances', diff --git a/src/locales/tr-TR/menu.ts b/src/locales/tr-TR/menu.ts index 9a1e99dd..4f9a91b3 100644 --- a/src/locales/tr-TR/menu.ts +++ b/src/locales/tr-TR/menu.ts @@ -25,7 +25,7 @@ export default { 'menu.users': 'Kullanıcılar', 'menu.resources.workers': 'İşçi Düğümler', 'menu.resources.gpus': "GPU'lar", - 'menu.resources.modelfiles': 'Model Dosyaları', + 'menu.models.modelfiles': 'Model Dosyaları', 'menu.accessControl': 'Erişim Kontrolü', 'menu.accessControl.apikeys': 'API Anahtarları', 'menu.accessControl.users': 'Kullanıcılar', @@ -38,7 +38,7 @@ export default { 'menu.clusterManagement.credentials': 'Bulut Kimlik Bilgileri', 'menu.clusterManagement.clusterDetail': 'Küme Detayı', 'menu.clusterManagement.clusterCreate': 'Küme Oluştur', - 'menu.resources.backendsList': 'Çıkarım Altyapıları', + 'menu.models.backendsList': 'Çıkarım Altyapıları', 'menu.models.instances': 'Instances', 'menu.settings': 'Settings', 'menu.gpuService': 'GPU Service', diff --git a/src/locales/zh-CN/menu.ts b/src/locales/zh-CN/menu.ts index 91c73333..c7994bd6 100644 --- a/src/locales/zh-CN/menu.ts +++ b/src/locales/zh-CN/menu.ts @@ -31,7 +31,7 @@ export default { 'menu.404': '404', 'menu.resources.workers': '节点', 'menu.resources.gpus': 'GPUs', - 'menu.resources.modelfiles': '模型文件', + 'menu.models.modelfiles': '模型文件', 'menu.accessControl': '访问控制', 'menu.accessControl.apikeys': 'API 密钥', 'menu.accessControl.users': '用户', @@ -40,7 +40,7 @@ export default { 'menu.clusterManagement.credentials': '云凭证', 'menu.clusterManagement.clusterDetail': '集群详情', 'menu.clusterManagement.clusterCreate': '创建集群', - 'menu.resources.backendsList': '推理后端', + 'menu.models.backendsList': '推理后端', 'menu.gpuService': 'GPU 服务', 'menu.gpuService.instances': 'GPU 实例', 'menu.gpuService.templates': '实例模板', diff --git a/src/pages/llmodels/forms/backend.tsx b/src/pages/llmodels/forms/backend.tsx index ea971199..71503119 100644 --- a/src/pages/llmodels/forms/backend.tsx +++ b/src/pages/llmodels/forms/backend.tsx @@ -245,7 +245,7 @@ const BackendFields: React.FC = () => { }, { link: ( - navigate('/resources/backends')}> + navigate('/models/backends')}> {intl.formatMessage({ id: 'backends.title' })} ) diff --git a/src/pages/llmodels/forms/lora-list-item.tsx b/src/pages/llmodels/forms/lora-list-item.tsx index ac7eb583..2048e791 100644 --- a/src/pages/llmodels/forms/lora-list-item.tsx +++ b/src/pages/llmodels/forms/lora-list-item.tsx @@ -85,7 +85,7 @@ const LoraListItem: React.FC = ({ !selectedRepoNames.has(child.value) || child.value === currentRepo ); const labelText = isLocal - ? intl.formatMessage({ id: 'menu.resources.modelfiles' }) + ? intl.formatMessage({ id: 'menu.models.modelfiles' }) : group.label; groups.push({ label: `${sourcePrefix}: ${labelText}`, @@ -101,7 +101,7 @@ const LoraListItem: React.FC = ({ if (!hasLocal) { groups.push({ - label: `${sourcePrefix}: ${intl.formatMessage({ id: 'menu.resources.modelfiles' })}`, + label: `${sourcePrefix}: ${intl.formatMessage({ id: 'menu.models.modelfiles' })}`, groupValue: modelSourceMap.local_path_value, options: [] });