From 0a45da3c74cd1511e5cb7bd258516e50c305de7c Mon Sep 17 00:00:00 2001 From: xudaotutou <13435638964@163.com> Date: Wed, 27 Sep 2023 17:05:51 +0800 Subject: [PATCH] fix(costcenter): fix get price error (#4007) --- .../costcenter/src/components/billing/billingTable.tsx | 5 ++++- .../costcenter/src/pages/api/billing/getAppList.tsx | 4 ++-- frontend/providers/costcenter/src/pages/api/price/index.ts | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/frontend/providers/costcenter/src/components/billing/billingTable.tsx b/frontend/providers/costcenter/src/components/billing/billingTable.tsx index bad583578..a1e3a6725 100644 --- a/frontend/providers/costcenter/src/components/billing/billingTable.tsx +++ b/frontend/providers/costcenter/src/components/billing/billingTable.tsx @@ -122,7 +122,10 @@ export function CommonBillingTable({ data }: { data: BillingItem[] }) { orderId={item.order_id} time={item.time} appType={item.appType} - isDisabled={['TERMINAL', 'OTHER'].includes(item.appType)} + isDisabled={ + ['TERMINAL', 'OTHER'].includes(item.appType) || + item.type !== BillingType.CONSUME + } /> diff --git a/frontend/providers/costcenter/src/pages/api/billing/getAppList.tsx b/frontend/providers/costcenter/src/pages/api/billing/getAppList.tsx index 85ab79013..eea1f6e20 100644 --- a/frontend/providers/costcenter/src/pages/api/billing/getAppList.tsx +++ b/frontend/providers/costcenter/src/pages/api/billing/getAppList.tsx @@ -1,5 +1,5 @@ import { authSession } from '@/service/backend/auth'; -import { CRDMeta, GetCRD } from '@/service/backend/kubernetes'; +import { CRDMeta, GetCRD, GetUserDefaultNameSpace } from '@/service/backend/kubernetes'; import { jsonRes } from '@/service/backend/response'; import type { NextApiRequest, NextApiResponse } from 'next'; import { ApplyYaml } from '@/service/backend/kubernetes'; @@ -11,7 +11,7 @@ export default async function handler(req: NextApiRequest, resp: NextApiResponse if (user === null) { return jsonRes(resp, { code: 403, message: 'user null' }); } - const namespace = kc.getContexts()[0].namespace || 'ns-' + user.name; + const namespace = GetUserDefaultNameSpace(user.name); const name = new Date().getTime() + 'appquery'; const crdSchema = { apiVersion: `account.sealos.io/v1`, diff --git a/frontend/providers/costcenter/src/pages/api/price/index.ts b/frontend/providers/costcenter/src/pages/api/price/index.ts index 9079908a9..fafbf57cd 100644 --- a/frontend/providers/costcenter/src/pages/api/price/index.ts +++ b/frontend/providers/costcenter/src/pages/api/price/index.ts @@ -1,5 +1,5 @@ import { authSession } from '@/service/backend/auth'; -import { CRDMeta, GetCRD } from '@/service/backend/kubernetes'; +import { CRDMeta, GetCRD, GetUserDefaultNameSpace } from '@/service/backend/kubernetes'; import { jsonRes } from '@/service/backend/response'; import type { NextApiRequest, NextApiResponse } from 'next'; import { ApplyYaml } from '@/service/backend/kubernetes'; @@ -14,7 +14,7 @@ export default async function handler(req: NextApiRequest, resp: NextApiResponse if (user === null) { return jsonRes(resp, { code: 403, message: 'user null' }); } - const namespace = kc.getContexts()[0].namespace || 'ns-' + user.name; + const namespace = GetUserDefaultNameSpace(user.name); const name = 'price'; const crdSchema = { apiVersion: `account.sealos.io/v1`,