diff --git a/web/src/components/Settings/AISection.tsx b/web/src/components/Settings/AISection.tsx index 7e0fda61..459b2842 100644 --- a/web/src/components/Settings/AISection.tsx +++ b/web/src/components/Settings/AISection.tsx @@ -11,7 +11,6 @@ import { Input } from "@/components/ui/input"; import { Label } from "@/components/ui/label"; import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select"; import { useInstance } from "@/contexts/InstanceContext"; -import { handleError } from "@/lib/error"; import { InstanceSetting_AIProviderConfig, InstanceSetting_AIProviderConfigSchema, @@ -22,8 +21,10 @@ import { } from "@/types/proto/api/v1/instance_service_pb"; import { useTranslate } from "@/utils/i18n"; import SettingGroup from "./SettingGroup"; +import { SettingPanel } from "./SettingList"; import SettingSection from "./SettingSection"; import SettingTable from "./SettingTable"; +import useInstanceSettingUpdater, { buildInstanceSettingName } from "./useInstanceSettingUpdater"; type LocalAIProvider = { id: string; @@ -81,7 +82,8 @@ const toProviderConfig = (provider: LocalAIProvider) => const AISection = () => { const t = useTranslate(); - const { aiSetting: originalSetting, updateSetting, fetchSetting } = useInstance(); + const saveInstanceSetting = useInstanceSettingUpdater(); + const { aiSetting: originalSetting } = useInstance(); const [providers, setProviders] = useState(() => originalSetting.providers.map(toLocalProvider)); const [editingProvider, setEditingProvider] = useState(); const [deleteTarget, setDeleteTarget] = useState(); @@ -136,25 +138,19 @@ const AISection = () => { }; const handleSaveSetting = async () => { - try { - await updateSetting( - create(InstanceSettingSchema, { - name: `instance/settings/${InstanceSetting_Key[InstanceSetting_Key.AI]}`, - value: { - case: "aiSetting", - value: create(InstanceSetting_AISettingSchema, { - providers: providers.map(toProviderConfig), - }), - }, - }), - ); - await fetchSetting(InstanceSetting_Key.AI); - toast.success(t("message.update-succeed")); - } catch (error: unknown) { - handleError(error, toast.error, { - context: "Update AI providers", - }); - } + await saveInstanceSetting({ + key: InstanceSetting_Key.AI, + setting: create(InstanceSettingSchema, { + name: buildInstanceSettingName(InstanceSetting_Key.AI), + value: { + case: "aiSetting", + value: create(InstanceSetting_AISettingSchema, { + providers: providers.map(toProviderConfig), + }), + }, + }), + errorContext: "Update AI providers", + }); }; return ( @@ -167,7 +163,7 @@ const AISection = () => { } > -
+
@@ -185,7 +181,7 @@ const AISection = () => { ))}
-
+ { const t = useTranslate(); const customizeDialog = useDialog(); - const { generalSetting: originalSetting, profile, updateSetting, fetchSetting } = useInstance(); + const saveInstanceSetting = useInstanceSettingUpdater(); + const { generalSetting: originalSetting, profile } = useInstance(); const [instanceGeneralSetting, setInstanceGeneralSetting] = useState(originalSetting); const [identityProviderList, setIdentityProviderList] = useState([]); useEffect(() => { - setInstanceGeneralSetting((prev) => - create(InstanceSetting_GeneralSettingSchema, { - ...prev, - customProfile: originalSetting.customProfile, - }), - ); - }, [originalSetting.customProfile]); + setInstanceGeneralSetting(originalSetting); + }, [originalSetting]); const fetchIdentityProviderList = async () => { const { identityProviders } = await identityProviderServiceClient.listIdentityProviders({}); @@ -58,106 +53,111 @@ const InstanceSection = () => { }; const handleSaveGeneralSetting = async () => { - try { - await updateSetting( - create(InstanceSettingSchema, { - name: `instance/settings/${InstanceSetting_Key[InstanceSetting_Key.GENERAL]}`, - value: { - case: "generalSetting", - value: instanceGeneralSetting, - }, - }), - ); - await fetchSetting(InstanceSetting_Key.GENERAL); - } catch (error: unknown) { - await handleError(error, toast.error, { - context: "Update general settings", - }); - return; - } - toast.success(t("message.update-succeed")); + await saveInstanceSetting({ + key: InstanceSetting_Key.GENERAL, + setting: create(InstanceSettingSchema, { + name: buildInstanceSettingName(InstanceSetting_Key.GENERAL), + value: { + case: "generalSetting", + value: instanceGeneralSetting, + }, + }), + errorContext: "Update general settings", + }); }; return ( - - - - + + + + + + - - -