fix bugs in global settings page (#761)

* fix bugs in global settings page

* change values in restore button

* set default values in form

web/src/pages/settings/components/GlobalSettings/components/BrandingSettings/BrandingSettings.tsx

@@ -3,7 +3,7 @@ import './styles.scss';
 import { zodResolver } from '@hookform/resolvers/zod';
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 import parse from 'html-react-parser';
-import { useEffect, useMemo } from 'react';
+import { useMemo } from 'react';
 import { SubmitHandler, useForm } from 'react-hook-form';
 import { useBreakpoint } from 'use-breakpoint';
 import { z } from 'zod';
@@ -117,16 +117,12 @@ export const BrandingSettings = () => {
     };
   }, [settings?.instance_name, settings?.main_logo_url, settings?.nav_logo_url]);
 
-  const { control, handleSubmit, reset } = useForm<Settings>({
+  const { control, handleSubmit, setValue } = useForm<Settings>({
     defaultValues,
     mode: 'all',
     resolver: zodResolver(zodSchema),
   });
 
-  useEffect(() => {
-    reset();
-  }, [reset, defaultValues]);
-
   const onSubmit: SubmitHandler<FormFields> = (submitted) => {
     mutate(mergeWithDefaults(submitted));
   };
@@ -156,7 +152,12 @@ export const BrandingSettings = () => {
             icon={<IconCheckmarkWhite />}
             styleVariant={ButtonStyleVariant.PRIMARY}
             loading={isLoading}
-            onClick={() => setDefaultBrandingMutation('1')}
+            onClick={() => {
+              setDefaultBrandingMutation('1');
+              setValue('instance_name', defaultSettings.instance_name);
+              setValue('main_logo_url', '');
+              setValue('nav_logo_url', '');
+            }}
           />
           <Button
             form="branding-form"

web/src/pages/settings/components/GlobalSettings/components/LicenseSettings/LicenseSettings.tsx

@@ -3,7 +3,7 @@ import './styles.scss';
 import { zodResolver } from '@hookform/resolvers/zod';
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 import { AxiosError } from 'axios';
-import { useEffect, useMemo } from 'react';
+import { useMemo } from 'react';
 import { SubmitHandler, useForm } from 'react-hook-form';
 import { useBreakpoint } from 'use-breakpoint';
 import { z } from 'zod';
@@ -78,16 +78,12 @@ export const LicenseSettings = () => {
     };
   }, [settings?.license]);
 
-  const { control, handleSubmit, reset } = useForm<Settings>({
+  const { control, handleSubmit } = useForm<Settings>({
     defaultValues,
     mode: 'all',
     resolver: zodResolver(zodSchema),
   });
 
-  useEffect(() => {
-    reset();
-  }, [reset, defaultValues]);
-
   const onSubmit: SubmitHandler<FormFields> = (submitted) => {
     mutate(submitted);
   };

web/src/shared/hooks/useApi.tsx

@@ -370,7 +370,7 @@ const useApi = (props?: HookProps): ApiHook => {
   const getAppInfo: ApiHook['getAppInfo'] = () => client.get('/info').then(unpackRequest);
 
   const setDefaultBranding: ApiHook['settings']['setDefaultBranding'] = (id: string) =>
-    client.get(`/settings/${id}`).then(unpackRequest);
+    client.put(`/settings/${id}`).then(unpackRequest);
 
   const downloadSupportData: ApiHook['support']['downloadSupportData'] = async () =>
     client.get<unknown>(`/support/configuration`).then((res) => res.data);