Skip to content

Commit 62b072d

Browse files
committed
Merge branch 'litellm_internal_staging' into litellm_cost_tracking_removal_pending_state
2 parents 4974290 + c9917cb commit 62b072d

15 files changed

Lines changed: 1531 additions & 1383 deletions

File tree

tests/e2e/ui/tests/proxy-admin/teams.spec.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@ test.describe("Proxy Admin - Teams", () => {
4747
// Fill Team Name — the input has id="team_alias"
4848
await dialog.locator("#team_alias").fill(uniqueAlias);
4949

50-
// Select models — the models multi-select is inside the modal
51-
// Click to open dropdown, select "All Proxy Models"
52-
await dialog.locator(".ant-select-selection-overflow").first().click();
53-
await page.locator(".ant-select-dropdown:visible").getByText("All Proxy Models").click();
50+
// Select models — the models multi-select is inside the modal. Its popup is
51+
// portaled to the body, so scope the option lookup to the page, not the dialog.
52+
await dialog.getByTestId("create-team-models-select").getByRole("combobox").click();
53+
await page.getByRole("option", { name: "All Proxy Models", exact: true }).click();
5454
await page.keyboard.press("Escape");
5555

5656
// Submit — click the submit button inside the dialog (not the header button)
@@ -191,11 +191,11 @@ test.describe("Proxy Admin - Teams", () => {
191191
const modelsSelect = page.locator("[data-testid='models-select']");
192192
await expect(modelsSelect).toBeVisible({ timeout: 10_000 });
193193

194-
const anthropicTag = modelsSelect
195-
.locator(".ant-select-selection-item")
194+
const anthropicChip = modelsSelect
195+
.locator('[data-slot="combobox-chip"]')
196196
.filter({ hasText: "fake-anthropic-claude" });
197-
await expect(anthropicTag).toBeVisible({ timeout: 5_000 });
198-
await anthropicTag.locator(".ant-select-selection-item-remove").click();
197+
await expect(anthropicChip).toBeVisible({ timeout: 5_000 });
198+
await anthropicChip.locator('[data-slot="combobox-chip-remove"]').click();
199199

200200
await page.getByRole("button", { name: "Save Changes" }).click();
201201

ui/litellm-dashboard/eslint-suppressions.json

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1393,9 +1393,6 @@
13931393
"no-nested-ternary": {
13941394
"count": 1
13951395
},
1396-
"no-restricted-imports": {
1397-
"count": 2
1398-
},
13991396
"prefer-const": {
14001397
"count": 2
14011398
}
@@ -1721,11 +1718,6 @@
17211718
"count": 1
17221719
}
17231720
},
1724-
"src/components/BetaBadge.tsx": {
1725-
"no-restricted-imports": {
1726-
"count": 1
1727-
}
1728-
},
17291721
"src/components/CloudZeroCostTracking/CloudZeroCreateModal.tsx": {
17301722
"no-restricted-imports": {
17311723
"count": 1
@@ -1744,11 +1736,6 @@
17441736
"count": 1
17451737
}
17461738
},
1747-
"src/components/DeprecationBanner.tsx": {
1748-
"no-restricted-imports": {
1749-
"count": 1
1750-
}
1751-
},
17521739
"src/components/EntityUsageExport/ExportSummary.tsx": {
17531740
"no-restricted-imports": {
17541741
"count": 1
@@ -1785,21 +1772,13 @@
17851772
"src/components/GuardrailsMonitor/LogViewer.tsx": {
17861773
"no-nested-ternary": {
17871774
"count": 1
1788-
},
1789-
"no-restricted-imports": {
1790-
"count": 1
17911775
}
17921776
},
17931777
"src/components/HelpLink.test.tsx": {
17941778
"unused-imports/no-unused-imports": {
17951779
"count": 1
17961780
}
17971781
},
1798-
"src/components/ModelSelect/ModelSelect.tsx": {
1799-
"no-restricted-imports": {
1800-
"count": 1
1801-
}
1802-
},
18031782
"src/components/Navbar/BlogDropdown/BlogDropdown.test.tsx": {
18041783
"max-nested-callbacks": {
18051784
"count": 12
@@ -1917,11 +1896,6 @@
19171896
"count": 1
19181897
}
19191898
},
1920-
"src/components/Settings/RouterSettings/Fallbacks/EditFallbacks.tsx": {
1921-
"no-restricted-imports": {
1922-
"count": 1
1923-
}
1924-
},
19251899
"src/components/Settings/RouterSettings/Fallbacks/FallbackGroupConfig.tsx": {
19261900
"local/no-complex-jsx-arrow": {
19271901
"count": 1
@@ -1939,9 +1913,6 @@
19391913
}
19401914
},
19411915
"src/components/Settings/RouterSettings/Fallbacks/Fallbacks.tsx": {
1942-
"no-restricted-imports": {
1943-
"count": 2
1944-
},
19451916
"prefer-const": {
19461917
"count": 2
19471918
}
@@ -2260,9 +2231,6 @@
22602231
}
22612232
},
22622233
"src/components/claude_code_plugins/MakeSkillPublicForm.tsx": {
2263-
"no-restricted-imports": {
2264-
"count": 2
2265-
},
22662234
"react-hooks/set-state-in-effect": {
22672235
"count": 1
22682236
}
@@ -2781,9 +2749,6 @@
27812749
},
27822750
"max-lines": {
27832751
"count": 1
2784-
},
2785-
"no-restricted-imports": {
2786-
"count": 2
27872752
}
27882753
},
27892754
"src/components/query_param_input.tsx": {

ui/litellm-dashboard/src/app/(dashboard)/router-settings/_components/general_settings.test.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,8 @@ const settingsRow = async (fieldName: string) => {
6262
return row as HTMLElement;
6363
};
6464

65+
const numericValueIn = (row: HTMLElement) => Number((within(row).getByRole("spinbutton") as HTMLInputElement).value);
66+
6567
describe("GeneralSettings General tab", () => {
6668
beforeEach(() => {
6769
vi.mocked(getGeneralSettingsCall).mockResolvedValue([...SETTINGS_FIXTURE.map((s) => ({ ...s }))]);
@@ -87,15 +89,15 @@ describe("GeneralSettings General tab", () => {
8789

8890
await user.click(screen.getByText("General"));
8991
const row = await settingsRow("max_ui_session_budget");
90-
expect(within(row).getByRole("spinbutton")).toHaveValue("7.50");
92+
expect(numericValueIn(row)).toBe(7.5);
9193

9294
const actionCell = row.querySelectorAll("td")[3];
9395
const resetIcon = actionCell.querySelector("svg");
9496
expect(resetIcon).not.toBeNull();
9597
await user.click(resetIcon as unknown as Element);
9698

9799
expect(deleteConfigFieldSetting).toHaveBeenCalledWith("token", "max_ui_session_budget");
98-
expect(within(row).getByRole("spinbutton")).toHaveValue("1.00");
100+
expect(numericValueIn(row)).toBe(1);
99101
});
100102
});
101103

0 commit comments

Comments
 (0)