mirror of
https://github.com/farion1231/cc-switch.git
synced 2026-07-24 12:44:18 +08:00
0fbba4267c
`modelCatalog` is a cc-switch-private field whose SSOT is the database; Live's config.toml only carries a lossy `model_catalog_json` projection. Proxy takeover/restore cycles and the official Codex.app rewriting config.toml can drop that projection, so `read_live_settings` reconstructs an empty catalog. Two paths then overwrote the stored mapping with that empty Live snapshot: - Switch-away backfill (`switch_normal` -> `restore_live_settings_for_provider_backfill`): now overlays the DB provider's `modelCatalog`, falling back to the Live-reconstructed one only when the DB has none. - Edit dialog (`EditProviderDialog`): when editing the active Codex provider it preferred Live over the DB SSOT; now keeps the DB `modelCatalog` so opening + saving no longer clears the mapping table. Add Rust backfill tests (preserve DB catalog when Live lacks it; keep Live catalog when DB has none) and a frontend regression test for the edit dialog.
157 lines
4.0 KiB
TypeScript
157 lines
4.0 KiB
TypeScript
import { fireEvent, render, screen, waitFor } from "@testing-library/react";
|
|
import { beforeEach, describe, expect, it, vi } from "vitest";
|
|
import type { Provider } from "@/types";
|
|
|
|
const apiMocks = vi.hoisted(() => ({
|
|
getCurrent: vi.fn(),
|
|
getLiveProviderSettings: vi.fn(),
|
|
getOpenClawLiveProvider: vi.fn(),
|
|
}));
|
|
|
|
vi.mock("@/lib/api", () => ({
|
|
providersApi: {
|
|
getCurrent: apiMocks.getCurrent,
|
|
},
|
|
vscodeApi: {
|
|
getLiveProviderSettings: apiMocks.getLiveProviderSettings,
|
|
},
|
|
openclawApi: {
|
|
getLiveProvider: apiMocks.getOpenClawLiveProvider,
|
|
},
|
|
}));
|
|
|
|
vi.mock("@/components/common/FullScreenPanel", () => ({
|
|
FullScreenPanel: ({
|
|
isOpen,
|
|
children,
|
|
footer,
|
|
}: {
|
|
isOpen: boolean;
|
|
children: React.ReactNode;
|
|
footer?: React.ReactNode;
|
|
}) =>
|
|
isOpen ? (
|
|
<div>
|
|
<div>{children}</div>
|
|
<div>{footer}</div>
|
|
</div>
|
|
) : null,
|
|
}));
|
|
|
|
vi.mock("@/components/providers/forms/ProviderForm", () => ({
|
|
ProviderForm: ({
|
|
initialData,
|
|
onSubmit,
|
|
}: {
|
|
initialData: {
|
|
name?: string;
|
|
websiteUrl?: string;
|
|
notes?: string;
|
|
settingsConfig?: Record<string, unknown>;
|
|
meta?: Record<string, unknown>;
|
|
icon?: string;
|
|
iconColor?: string;
|
|
};
|
|
onSubmit: (values: {
|
|
name: string;
|
|
websiteUrl: string;
|
|
notes?: string;
|
|
settingsConfig: string;
|
|
meta?: Record<string, unknown>;
|
|
icon?: string;
|
|
iconColor?: string;
|
|
}) => void;
|
|
}) => (
|
|
<form
|
|
id="provider-form"
|
|
onSubmit={(event) => {
|
|
event.preventDefault();
|
|
onSubmit({
|
|
name: initialData.name ?? "",
|
|
websiteUrl: initialData.websiteUrl ?? "",
|
|
notes: initialData.notes,
|
|
settingsConfig: JSON.stringify(initialData.settingsConfig ?? {}),
|
|
meta: initialData.meta,
|
|
icon: initialData.icon,
|
|
iconColor: initialData.iconColor,
|
|
});
|
|
}}
|
|
>
|
|
<output data-testid="settings-config">
|
|
{JSON.stringify(initialData.settingsConfig ?? {})}
|
|
</output>
|
|
</form>
|
|
),
|
|
}));
|
|
|
|
import { EditProviderDialog } from "@/components/providers/EditProviderDialog";
|
|
|
|
describe("EditProviderDialog", () => {
|
|
beforeEach(() => {
|
|
apiMocks.getCurrent.mockReset();
|
|
apiMocks.getLiveProviderSettings.mockReset();
|
|
apiMocks.getOpenClawLiveProvider.mockReset();
|
|
});
|
|
|
|
it("保留 Codex 数据库中的 modelCatalog,避免 live 配置缺字段时清空模型映射", async () => {
|
|
const dbModelCatalog = {
|
|
models: [
|
|
{
|
|
model: "deepseek-v4-flash",
|
|
displayName: "DeepSeek V4 Flash",
|
|
contextWindow: 1000000,
|
|
},
|
|
],
|
|
};
|
|
const provider: Provider = {
|
|
id: "deepseek",
|
|
name: "DeepSeek",
|
|
category: "aggregator",
|
|
settingsConfig: {
|
|
auth: {
|
|
OPENAI_API_KEY: "db-key",
|
|
},
|
|
config: 'model_provider = "custom"\nmodel = "deepseek-v4-flash"\n',
|
|
modelCatalog: dbModelCatalog,
|
|
},
|
|
};
|
|
const liveSettings = {
|
|
auth: {
|
|
OPENAI_API_KEY: "live-key",
|
|
},
|
|
config: 'model_provider = "custom"\nmodel = "deepseek-v4-pro"\n',
|
|
};
|
|
const handleSubmit = vi.fn().mockResolvedValue(undefined);
|
|
|
|
apiMocks.getCurrent.mockResolvedValue(provider.id);
|
|
apiMocks.getLiveProviderSettings.mockResolvedValue(liveSettings);
|
|
|
|
render(
|
|
<EditProviderDialog
|
|
open
|
|
provider={provider}
|
|
onOpenChange={vi.fn()}
|
|
onSubmit={handleSubmit}
|
|
appId="codex"
|
|
/>,
|
|
);
|
|
|
|
await waitFor(() => {
|
|
expect(
|
|
JSON.parse(screen.getByTestId("settings-config").textContent ?? "{}"),
|
|
).toEqual({
|
|
...liveSettings,
|
|
modelCatalog: dbModelCatalog,
|
|
});
|
|
});
|
|
|
|
fireEvent.click(screen.getByRole("button", { name: "common.save" }));
|
|
|
|
await waitFor(() => expect(handleSubmit).toHaveBeenCalledTimes(1));
|
|
expect(handleSubmit.mock.calls[0][0].provider.settingsConfig).toEqual({
|
|
...liveSettings,
|
|
modelCatalog: dbModelCatalog,
|
|
});
|
|
});
|
|
});
|