mirror of
https://github.com/farion1231/cc-switch.git
synced 2026-08-01 04:02:02 +08:00
refactor(types): rename AppType to AppId for semantic clarity
Rename `AppType` to `AppId` across the entire frontend codebase to better reflect its purpose as an application identifier rather than a type category. This aligns frontend naming with backend command parameter conventions. Changes: - Rename type `AppType` to `AppId` in src/lib/api/types.ts - Remove `AppType` export from src/lib/api/index.ts - Update all component props from `appType` to `appId` (43 files) - Update all variable names from `appType` to `appId` - Synchronize documentation (CHANGELOG, refactoring plans) - Update test files and MSW mocks BREAKING CHANGE: `AppType` type is no longer exported. Use `AppId` instead. All component props have been renamed from `appType` to `appId`.
This commit is contained in:
+14
-14
@@ -1,10 +1,10 @@
|
||||
import { useMutation, useQueryClient } from "@tanstack/react-query";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { toast } from "sonner";
|
||||
import { providersApi, settingsApi, type AppType } from "@/lib/api";
|
||||
import { providersApi, settingsApi, type AppId } from "@/lib/api";
|
||||
import type { Provider, Settings } from "@/types";
|
||||
|
||||
export const useAddProviderMutation = (appType: AppType) => {
|
||||
export const useAddProviderMutation = (appId: AppId) => {
|
||||
const queryClient = useQueryClient();
|
||||
const { t } = useTranslation();
|
||||
|
||||
@@ -15,11 +15,11 @@ export const useAddProviderMutation = (appType: AppType) => {
|
||||
id: crypto.randomUUID(),
|
||||
createdAt: Date.now(),
|
||||
};
|
||||
await providersApi.add(newProvider, appType);
|
||||
await providersApi.add(newProvider, appId);
|
||||
return newProvider;
|
||||
},
|
||||
onSuccess: async () => {
|
||||
await queryClient.invalidateQueries({ queryKey: ["providers", appType] });
|
||||
await queryClient.invalidateQueries({ queryKey: ["providers", appId] });
|
||||
await providersApi.updateTrayMenu();
|
||||
toast.success(
|
||||
t("notifications.providerAdded", {
|
||||
@@ -38,17 +38,17 @@ export const useAddProviderMutation = (appType: AppType) => {
|
||||
});
|
||||
};
|
||||
|
||||
export const useUpdateProviderMutation = (appType: AppType) => {
|
||||
export const useUpdateProviderMutation = (appId: AppId) => {
|
||||
const queryClient = useQueryClient();
|
||||
const { t } = useTranslation();
|
||||
|
||||
return useMutation({
|
||||
mutationFn: async (provider: Provider) => {
|
||||
await providersApi.update(provider, appType);
|
||||
await providersApi.update(provider, appId);
|
||||
return provider;
|
||||
},
|
||||
onSuccess: async () => {
|
||||
await queryClient.invalidateQueries({ queryKey: ["providers", appType] });
|
||||
await queryClient.invalidateQueries({ queryKey: ["providers", appId] });
|
||||
toast.success(
|
||||
t("notifications.updateSuccess", {
|
||||
defaultValue: "供应商更新成功",
|
||||
@@ -66,16 +66,16 @@ export const useUpdateProviderMutation = (appType: AppType) => {
|
||||
});
|
||||
};
|
||||
|
||||
export const useDeleteProviderMutation = (appType: AppType) => {
|
||||
export const useDeleteProviderMutation = (appId: AppId) => {
|
||||
const queryClient = useQueryClient();
|
||||
const { t } = useTranslation();
|
||||
|
||||
return useMutation({
|
||||
mutationFn: async (providerId: string) => {
|
||||
await providersApi.delete(providerId, appType);
|
||||
await providersApi.delete(providerId, appId);
|
||||
},
|
||||
onSuccess: async () => {
|
||||
await queryClient.invalidateQueries({ queryKey: ["providers", appType] });
|
||||
await queryClient.invalidateQueries({ queryKey: ["providers", appId] });
|
||||
await providersApi.updateTrayMenu();
|
||||
toast.success(
|
||||
t("notifications.deleteSuccess", {
|
||||
@@ -94,21 +94,21 @@ export const useDeleteProviderMutation = (appType: AppType) => {
|
||||
});
|
||||
};
|
||||
|
||||
export const useSwitchProviderMutation = (appType: AppType) => {
|
||||
export const useSwitchProviderMutation = (appId: AppId) => {
|
||||
const queryClient = useQueryClient();
|
||||
const { t } = useTranslation();
|
||||
|
||||
return useMutation({
|
||||
mutationFn: async (providerId: string) => {
|
||||
return await providersApi.switch(providerId, appType);
|
||||
return await providersApi.switch(providerId, appId);
|
||||
},
|
||||
onSuccess: async () => {
|
||||
await queryClient.invalidateQueries({ queryKey: ["providers", appType] });
|
||||
await queryClient.invalidateQueries({ queryKey: ["providers", appId] });
|
||||
await providersApi.updateTrayMenu();
|
||||
toast.success(
|
||||
t("notifications.switchSuccess", {
|
||||
defaultValue: "切换供应商成功",
|
||||
appName: t(`apps.${appType}`, { defaultValue: appType }),
|
||||
appName: t(`apps.${appId}`, { defaultValue: appId }),
|
||||
}),
|
||||
);
|
||||
},
|
||||
|
||||
+11
-11
@@ -3,7 +3,7 @@ import {
|
||||
type UseQueryResult,
|
||||
keepPreviousData,
|
||||
} from "@tanstack/react-query";
|
||||
import { providersApi, settingsApi, usageApi, type AppType } from "@/lib/api";
|
||||
import { providersApi, settingsApi, usageApi, type AppId } from "@/lib/api";
|
||||
import type { Provider, Settings, UsageResult } from "@/types";
|
||||
|
||||
const sortProviders = (
|
||||
@@ -35,33 +35,33 @@ export interface ProvidersQueryData {
|
||||
}
|
||||
|
||||
export const useProvidersQuery = (
|
||||
appType: AppType,
|
||||
appId: AppId,
|
||||
): UseQueryResult<ProvidersQueryData> => {
|
||||
return useQuery({
|
||||
queryKey: ["providers", appType],
|
||||
queryKey: ["providers", appId],
|
||||
placeholderData: keepPreviousData,
|
||||
queryFn: async () => {
|
||||
let providers: Record<string, Provider> = {};
|
||||
let currentProviderId = "";
|
||||
|
||||
try {
|
||||
providers = await providersApi.getAll(appType);
|
||||
providers = await providersApi.getAll(appId);
|
||||
} catch (error) {
|
||||
console.error("获取供应商列表失败:", error);
|
||||
}
|
||||
|
||||
try {
|
||||
currentProviderId = await providersApi.getCurrent(appType);
|
||||
currentProviderId = await providersApi.getCurrent(appId);
|
||||
} catch (error) {
|
||||
console.error("获取当前供应商失败:", error);
|
||||
}
|
||||
|
||||
if (Object.keys(providers).length === 0) {
|
||||
try {
|
||||
const success = await providersApi.importDefault(appType);
|
||||
const success = await providersApi.importDefault(appId);
|
||||
if (success) {
|
||||
providers = await providersApi.getAll(appType);
|
||||
currentProviderId = await providersApi.getCurrent(appType);
|
||||
providers = await providersApi.getAll(appId);
|
||||
currentProviderId = await providersApi.getCurrent(appId);
|
||||
}
|
||||
} catch (error) {
|
||||
console.error("导入默认配置失败:", error);
|
||||
@@ -85,12 +85,12 @@ export const useSettingsQuery = (): UseQueryResult<Settings> => {
|
||||
|
||||
export const useUsageQuery = (
|
||||
providerId: string,
|
||||
appType: AppType,
|
||||
appId: AppId,
|
||||
enabled: boolean = true,
|
||||
): UseQueryResult<UsageResult> => {
|
||||
return useQuery({
|
||||
queryKey: ["usage", providerId, appType],
|
||||
queryFn: async () => usageApi.query(providerId, appType),
|
||||
queryKey: ["usage", providerId, appId],
|
||||
queryFn: async () => usageApi.query(providerId, appId),
|
||||
enabled: enabled && !!providerId,
|
||||
refetchOnWindowFocus: false,
|
||||
staleTime: 5 * 60 * 1000, // 5分钟
|
||||
|
||||
Reference in New Issue
Block a user