diff --git a/ui/litellm-dashboard/e2e_tests/tests/proxy-admin/keys.spec.ts b/ui/litellm-dashboard/e2e_tests/tests/proxy-admin/keys.spec.ts index 24e8d4f4b32..9c19bb9b88c 100644 --- a/ui/litellm-dashboard/e2e_tests/tests/proxy-admin/keys.spec.ts +++ b/ui/litellm-dashboard/e2e_tests/tests/proxy-admin/keys.spec.ts @@ -61,11 +61,16 @@ test.describe("Proxy Admin - Keys", () => { await expect(page.getByText("Back to Keys")).toBeVisible({ timeout: 10_000 }); await page.getByRole("button", { name: "Regenerate Key" }).click(); - await page.getByRole("button", { name: "Regenerate", exact: true }).click(); + + // Scope to the modal — the Regenerate button has an icon whose aria-label + // ("sync") is concatenated into the button's accessible name, and the + // "Regenerate Key" button is still in the DOM behind the modal. + const modal = page.locator(".ant-modal:visible"); + await modal.getByRole("button", { name: /Regenerate/ }).click(); // Success view shows the warning banner and a Copy button for the regenerated key - await expect(page.getByText("Save it now, you will not see it again")).toBeVisible({ timeout: 10_000 }); - await expect(page.getByRole("button", { name: /Copy/ })).toBeVisible({ timeout: 10_000 }); + await expect(modal.getByText("Save it now, you will not see it again")).toBeVisible({ timeout: 10_000 }); + await expect(modal.getByRole("button", { name: "Copy", exact: true })).toBeVisible({ timeout: 10_000 }); }); test("Update key TPM and RPM limits", async ({ page }) => { diff --git a/ui/litellm-dashboard/src/components/organisms/RegenerateKeyModal.test.tsx b/ui/litellm-dashboard/src/components/organisms/RegenerateKeyModal.test.tsx index 1cb77bb9afd..d6eb7dd55ac 100644 --- a/ui/litellm-dashboard/src/components/organisms/RegenerateKeyModal.test.tsx +++ b/ui/litellm-dashboard/src/components/organisms/RegenerateKeyModal.test.tsx @@ -10,14 +10,6 @@ vi.mock("../networking", () => ({ regenerateKeyCall: (...args: unknown[]) => mockRegenerateKeyCall(...args), })); -// Mock CopyToClipboard to render a simple button -vi.mock("react-copy-to-clipboard", () => ({ - CopyToClipboard: ({ children, onCopy }: { children: React.ReactElement; onCopy: () => void }) => { - const React = require("react"); - return React.cloneElement(children, { onClick: onCopy }); - }, -})); - const makeToken = (overrides: Partial = {}): KeyResponse => ({ token: "token-hash-123", @@ -71,12 +63,7 @@ describe("RegenerateKeyModal", () => { }); it("should display 'Never' when token has no expires", () => { - renderWithProviders( - , - ); + renderWithProviders(); expect(screen.getByText("Current expiry: Never")).toBeInTheDocument(); }); @@ -119,9 +106,7 @@ describe("RegenerateKeyModal", () => { it("should display grace period recommendation text", () => { renderWithProviders(); - expect( - screen.getByText("Recommended: 24h to 72h for production keys"), - ).toBeInTheDocument(); + expect(screen.getByText("Recommended: 24h to 72h for production keys")).toBeInTheDocument(); }); it("should call regenerateKeyCall and show success view on successful regeneration", async () => { @@ -222,12 +207,7 @@ describe("RegenerateKeyModal", () => { token: "new-token-hash", }); - renderWithProviders( - , - ); + renderWithProviders(); await user.click(screen.getByRole("button", { name: /Regenerate/ })); await waitFor(() => { @@ -237,9 +217,7 @@ describe("RegenerateKeyModal", () => { it("should not call regenerateKeyCall when selectedToken is null", async () => { const user = userEvent.setup(); - renderWithProviders( - , - ); + renderWithProviders(); // The form shouldn't even be populated, but we check the button doesn't trigger a call const regenerateBtn = screen.queryByRole("button", { name: /Regenerate/ }); diff --git a/ui/litellm-dashboard/src/components/organisms/RegenerateKeyModal.tsx b/ui/litellm-dashboard/src/components/organisms/RegenerateKeyModal.tsx index e888713fe05..c942832e9f4 100644 --- a/ui/litellm-dashboard/src/components/organisms/RegenerateKeyModal.tsx +++ b/ui/litellm-dashboard/src/components/organisms/RegenerateKeyModal.tsx @@ -1,16 +1,13 @@ import useAuthorized from "@/app/(dashboard)/hooks/useAuthorized"; -import { CopyOutlined, SyncOutlined } from "@ant-design/icons"; -import { Alert, Button, Col, Form, Input, InputNumber, Modal, Row, Space, Typography } from "antd"; +import { SyncOutlined } from "@ant-design/icons"; +import { Alert, Button, Col, Flex, Form, Input, InputNumber, Modal, Row, Space, Typography } from "antd"; import { add } from "date-fns"; import { useEffect, useState } from "react"; -import { CopyToClipboard } from "react-copy-to-clipboard"; import { KeyResponse } from "../key_team_helpers/key_list"; import NotificationManager from "../molecules/notifications_manager"; import { regenerateKeyCall } from "../networking"; -const { Text } = Typography; - - +const { Text, Paragraph } = Typography; interface RegenerateKeyModalProps { selectedToken: KeyResponse | null; @@ -174,54 +171,27 @@ export function RegenerateKeyModal({ selectedToken, visible, onClose, onKeyUpdat } > {regeneratedKey ? ( -
- + + -
-
Key Alias
-
- {selectedToken?.key_alias || "No alias set"} -
-
+ + + Key Alias + + {selectedToken?.key_alias || "No alias set"} + -
NotificationManager.success("Virtual Key copied to clipboard"), }} + style={{ marginBottom: 0, wordBreak: "break-all" }} > - - {regeneratedKey} - - NotificationManager.success("Virtual Key copied to clipboard")} - > - - -
-
+ {regeneratedKey} + + ) : (
+ - Current expiry: {selectedToken?.expires ? new Date(selectedToken.expires).toLocaleString() : "Never"} + Current expiry:{" "} + {selectedToken?.expires ? new Date(selectedToken.expires).toLocaleString() : "Never"} {newExpiryTime && ( -
- New expiry: {newExpiryTime} -
+ + New expiry: {newExpiryTime} + )} - +
} >