From 7d36c6ac4a96b5d6381176e57ace350ffc2e4b90 Mon Sep 17 00:00:00 2001 From: jialin Date: Tue, 16 Jun 2026 15:21:52 +0800 Subject: [PATCH] revert: show model name from api directly in apikeys --- src/locales/en-US/billing.ts | 2 +- src/locales/ja-JP/billing.ts | 2 +- src/locales/ru-RU/billing.ts | 2 +- src/locales/tr-TR/billing.ts | 2 +- src/locales/zh-CN/billing.ts | 3 +-- .../api-keys/components/add-apikey-modal/allow-models.tsx | 4 +--- src/pages/billing/index.tsx | 1 + 7 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/locales/en-US/billing.ts b/src/locales/en-US/billing.ts index 5fa6c7c9..fce9470a 100644 --- a/src/locales/en-US/billing.ts +++ b/src/locales/en-US/billing.ts @@ -1,7 +1,7 @@ export default { 'billing.upsell.title': 'Billing is an Enterprise feature', 'billing.upsell.subtitle': - 'Track spend, generate invoices, and enforce budgets across teams. Upgrade to GPUStack Enterprise to manage billing.', + 'Upgrade to GPUStack Enterprise to manage billing.', 'billing.upsell.featuresTitle': 'What you get in Enterprise', 'billing.upsell.feature.usage': 'See cost breakdowns by organization, user, and model', diff --git a/src/locales/ja-JP/billing.ts b/src/locales/ja-JP/billing.ts index 5fa6c7c9..fce9470a 100644 --- a/src/locales/ja-JP/billing.ts +++ b/src/locales/ja-JP/billing.ts @@ -1,7 +1,7 @@ export default { 'billing.upsell.title': 'Billing is an Enterprise feature', 'billing.upsell.subtitle': - 'Track spend, generate invoices, and enforce budgets across teams. Upgrade to GPUStack Enterprise to manage billing.', + 'Upgrade to GPUStack Enterprise to manage billing.', 'billing.upsell.featuresTitle': 'What you get in Enterprise', 'billing.upsell.feature.usage': 'See cost breakdowns by organization, user, and model', diff --git a/src/locales/ru-RU/billing.ts b/src/locales/ru-RU/billing.ts index 5fa6c7c9..fce9470a 100644 --- a/src/locales/ru-RU/billing.ts +++ b/src/locales/ru-RU/billing.ts @@ -1,7 +1,7 @@ export default { 'billing.upsell.title': 'Billing is an Enterprise feature', 'billing.upsell.subtitle': - 'Track spend, generate invoices, and enforce budgets across teams. Upgrade to GPUStack Enterprise to manage billing.', + 'Upgrade to GPUStack Enterprise to manage billing.', 'billing.upsell.featuresTitle': 'What you get in Enterprise', 'billing.upsell.feature.usage': 'See cost breakdowns by organization, user, and model', diff --git a/src/locales/tr-TR/billing.ts b/src/locales/tr-TR/billing.ts index 5fa6c7c9..fce9470a 100644 --- a/src/locales/tr-TR/billing.ts +++ b/src/locales/tr-TR/billing.ts @@ -1,7 +1,7 @@ export default { 'billing.upsell.title': 'Billing is an Enterprise feature', 'billing.upsell.subtitle': - 'Track spend, generate invoices, and enforce budgets across teams. Upgrade to GPUStack Enterprise to manage billing.', + 'Upgrade to GPUStack Enterprise to manage billing.', 'billing.upsell.featuresTitle': 'What you get in Enterprise', 'billing.upsell.feature.usage': 'See cost breakdowns by organization, user, and model', diff --git a/src/locales/zh-CN/billing.ts b/src/locales/zh-CN/billing.ts index 71e9e8b7..935cbd3d 100644 --- a/src/locales/zh-CN/billing.ts +++ b/src/locales/zh-CN/billing.ts @@ -1,7 +1,6 @@ export default { 'billing.upsell.title': '计费是企业版功能', - 'billing.upsell.subtitle': - '在团队间跟踪花费、生成账单并执行预算。升级到 GPUStack 企业版即可管理计费。', + 'billing.upsell.subtitle': '升级到 GPUStack 企业版即可管理计费。', 'billing.upsell.featuresTitle': '企业版包含的能力', 'billing.upsell.feature.usage': '按组织、用户与模型查看成本明细', 'billing.upsell.feature.invoices': '生成账单并导出计费报表', diff --git a/src/pages/api-keys/components/add-apikey-modal/allow-models.tsx b/src/pages/api-keys/components/add-apikey-modal/allow-models.tsx index 5f50cfab..eeb42b2d 100644 --- a/src/pages/api-keys/components/add-apikey-modal/allow-models.tsx +++ b/src/pages/api-keys/components/add-apikey-modal/allow-models.tsx @@ -1,7 +1,6 @@ import { PageAction } from '@/config'; import { PageActionType } from '@/config/types'; import { queryMyModels } from '@/pages/llmodels/apis'; -import useOpenPlayground from '@/pages/model-routes/hooks/use-open-playground'; import { SelectPanel, useAppUtils } from '@gpustack/core-ui'; import { useIntl } from '@umijs/max'; import { Checkbox, Divider, Form, Radio } from 'antd'; @@ -23,7 +22,6 @@ const AllowModelsForm: React.FC<{ onValuesChange?: (changedValues: any, allValues: any) => void; }> = ({ currentData, action, onValuesChange }) => { const intl = useIntl(); - const { generateModelName } = useOpenPlayground(); const { getRuleMessage } = useAppUtils(); const form = Form.useFormInstance(); const allowedModelNames = Form.useWatch( @@ -41,7 +39,7 @@ const AllowModelsForm: React.FC<{ const res = await queryMyModels({ page: -1 }); - const options = res.items.map((item) => generateModelName(item)); + const options = res.items.map((item) => item.name); if (action === PageAction.EDIT && currentData) { const list = new Set([ ...options, diff --git a/src/pages/billing/index.tsx b/src/pages/billing/index.tsx index 4e9263a5..ecb0e477 100644 --- a/src/pages/billing/index.tsx +++ b/src/pages/billing/index.tsx @@ -38,6 +38,7 @@ const Billing: React.FC = () => { /> } title={intl.formatMessage({ id: 'billing.upsell.title' })} + subTitle={intl.formatMessage({ id: 'billing.upsell.subtitle' })} extra={