diff --git a/src/pages/usage/apis/resource.ts b/src/pages/usage/apis/resource.ts index c1302970..ebbc8d42 100644 --- a/src/pages/usage/apis/resource.ts +++ b/src/pages/usage/apis/resource.ts @@ -287,9 +287,15 @@ function flattenItem( // The chart series legend can't render a tag, so it carries the deleted // marker as text (" [Deleted.]"); the tables render a DeletedTag off // ``flat.deleted`` + the id and so keep the clean name. - const deletedWord = getIntl().formatMessage({ id: 'usage.table.deleted' }); const key = - rawKey != null ? withDeletedMark(rawKey, deleted, deletedWord, id) : rawKey; + rawKey != null + ? withDeletedMark( + rawKey, + deleted, + deleted ? getIntl().formatMessage({ id: 'usage.table.deleted' }) : '', + id + ) + : rawKey; // Generic group label — for a compound (date + dim) trend row the key is the // sub-group value (the switch below targets single-dimension table rows). if (rawKey != null) flat.group = key; diff --git a/src/pages/usage/hooks/use-apikeys-columns.tsx b/src/pages/usage/hooks/use-apikeys-columns.tsx index a55a8549..4f540354 100644 --- a/src/pages/usage/hooks/use-apikeys-columns.tsx +++ b/src/pages/usage/hooks/use-apikeys-columns.tsx @@ -5,7 +5,7 @@ import { useMemo } from 'react'; import DeletedTag from '../components/deleted-tag'; import { BreakdownItem as ListItem } from '../config/types'; -const useModelsColumns = () => { +const useAPIKeysColumns = () => { const intl = useIntl(); return useMemo(() => { @@ -113,4 +113,4 @@ const useModelsColumns = () => { }, [intl]); }; -export default useModelsColumns; +export default useAPIKeysColumns; diff --git a/src/pages/usage/hooks/use-users-columns.tsx b/src/pages/usage/hooks/use-users-columns.tsx index 60aad3ba..c34e060f 100644 --- a/src/pages/usage/hooks/use-users-columns.tsx +++ b/src/pages/usage/hooks/use-users-columns.tsx @@ -9,7 +9,7 @@ interface ColumnsHookProps { sortOrder: string[]; } -const useModelsColumns = () => { +const useUsersColumns = () => { const intl = useIntl(); return useMemo(() => { @@ -123,4 +123,4 @@ const useModelsColumns = () => { }, [intl]); }; -export default useModelsColumns; +export default useUsersColumns; diff --git a/src/pages/usage/utils/deleted-label.ts b/src/pages/usage/utils/deleted-label.ts index baca7951..8fc70356 100644 --- a/src/pages/usage/utils/deleted-label.ts +++ b/src/pages/usage/utils/deleted-label.ts @@ -9,9 +9,13 @@ * strings. */ export const withDeletedMark = ( - label: string, + label: string | undefined | null, deleted: boolean | undefined | null, deletedWord: string, id?: string | number | null -): string => - deleted ? `${label} [${deletedWord}${id != null ? `.#${id}` : ''}]` : label; +): string => { + const safeLabel = label || ''; + if (!deleted) return safeLabel; + const suffix = `[${deletedWord}${id != null ? `.#${id}` : ''}]`; + return safeLabel ? `${safeLabel} ${suffix}` : suffix; +};