From bc78cbe9a2b87be48b32f1c1fc00f13fea3d1bac Mon Sep 17 00:00:00 2001 From: moe-berri Date: Sun, 15 Nov 2026 11:09:35 +0800 Subject: [PATCH] fix(ui): clarify customer usage periods and preserve date ranges (#51899) * fix(ui): clarify customer usage periods and preserve date ranges * fix(ui): preserve fixed customer dates with stale preset labels --- .../_components/CustomerBudgetSummary.tsx | 8 +- .../_components/CustomerHierarchyManager.tsx | 13 ++-- .../CustomerHierarchyNavigation.tsx | 32 ++++++-- .../_components/CustomerUsageHeader.tsx | 9 ++- .../_components/customerUsageRange.test.ts | 46 ++++++++++- .../_components/customerUsageRange.ts | 76 ++++++++++++++----- .../_components/useCustomerHierarchyUsage.ts | 32 ++++---- .../manage/page.integration.test.tsx | 16 ++++ .../customers/page.integration.test.tsx | 49 ++++++------ .../customers/usage/page.integration.test.tsx | 43 +++++++++-- .../app/(dashboard)/customers/usage/page.tsx | 6 +- 11 files changed, 242 insertions(+), 88 deletions(-) diff --git a/litellm/ui/litellm-dashboard/src/app/(dashboard)/customers/_components/CustomerBudgetSummary.tsx b/litellm/ui/litellm-dashboard/src/app/(dashboard)/customers/_components/CustomerBudgetSummary.tsx index 69c98d614ec..6384f14d5ab 100644 --- a/litellm/ui/litellm-dashboard/src/app/(dashboard)/customers/_components/CustomerBudgetSummary.tsx +++ b/litellm/ui/litellm-dashboard/src/app/(dashboard)/customers/_components/CustomerBudgetSummary.tsx @@ -1,6 +1,6 @@ import { useTranslation } from "react-i18next"; import type { CustomerUsageEntity } from "./customerUsageApi"; -import CustomerBudgetSpend, { CustomerBudgetWindow } from "./CustomerBudgetSpend"; +import { CustomerBudgetWindow } from "./CustomerBudgetSpend"; import { CUSTOMER_BUDGET_LABELS, customerBudgetPeriod, customerBudgetUsage } from "./customerBudgetUsage"; export default function CustomerBudgetSummary({ @@ -35,10 +35,10 @@ export default function CustomerBudgetSummary({ ); })} - {budgets.length === 0 && ( - + {budgets.length === 0 &&

{t("customerPortal.analytics.noBudget")}

} + {budgets.length > 0 && ( +

{t("customerPortal.analytics.budgetUsageHint")}

)} -

{t("customerPortal.analytics.budgetUsageHint")}

); } diff --git a/litellm/ui/litellm-dashboard/src/app/(dashboard)/customers/_components/CustomerHierarchyManager.tsx b/litellm/ui/litellm-dashboard/src/app/(dashboard)/customers/_components/CustomerHierarchyManager.tsx index ad75a9b62f5..f3d33f82db1 100644 --- a/litellm/ui/litellm-dashboard/src/app/(dashboard)/customers/_components/CustomerHierarchyManager.tsx +++ b/litellm/ui/litellm-dashboard/src/app/(dashboard)/customers/_components/CustomerHierarchyManager.tsx @@ -9,8 +9,7 @@ import { ErrorState } from "@/components/shared/ErrorState"; import { Button } from "@/components/ui/button"; import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table"; import { extractProxyErrorMessage } from "@/lib/http/client"; -import { uiHref } from "@/utils/uiHref"; -import CustomerHierarchyNavigation, { customerHierarchyHref } from "./CustomerHierarchyNavigation"; +import CustomerHierarchyNavigation, { useCustomerHierarchyLinks } from "./CustomerHierarchyNavigation"; import CustomerHierarchySettings from "./CustomerHierarchySettings"; import CustomerBudgetGroups from "./CustomerBudgetGroups"; import CustomerBudgetSummary from "./CustomerBudgetSummary"; @@ -39,6 +38,7 @@ const DESCRIPTION_KEYS = { function HierarchyHeader({ hierarchy, selected }: Pick) { const { t } = useTranslation(); + const { customerHierarchyHref, customersHref } = useCustomerHierarchyLinks(); const entity = selected.entity; const team = selected.team; const label = customerEntityLabel(entity); @@ -70,7 +70,7 @@ function HierarchyHeader({ hierarchy, selected }: Pick - + {t("customerPortal.entities.organizations")}