Merge branch 'dev'

DefGuard · Jan 24, 2024 · b3ea027 · b3ea027
2 parents 470e18a + a5687e1
commit b3ea027
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 14 deletions.
diff --git a/web/src/components/AppLoader.tsx b/web/src/components/AppLoader.tsx
@@ -68,7 +68,7 @@ export const AppLoader = () => {
   });
 
   const { isLoading: settingsLoading, data: essentialSettings } = useQuery(
-    [QueryKeys.FETCH_ESSENTAIL_SETTINGS],
+    [QueryKeys.FETCH_ESSENTIAL_SETTINGS],
     getEssentialSettings,
     {
       refetchOnWindowFocus: true,

diff --git a/...pages/settings/components/GlobalSettings/components/BrandingSettings/BrandingSettings.tsx b/...pages/settings/components/GlobalSettings/components/BrandingSettings/BrandingSettings.tsx
@@ -39,6 +39,21 @@ const defaultSettings: FormFields = {
   nav_logo_url: '/svg/defguard-nav-logo.svg',
 };
 
+const mergeWithDefaults = (values: FormFields): FormFields => ({
+  instance_name:
+    values.instance_name && values.instance_name.length > 0
+      ? values.instance_name
+      : defaultSettings.instance_name,
+  main_logo_url:
+    values.main_logo_url && values.main_logo_url.length > 0
+      ? values.main_logo_url
+      : defaultSettings.main_logo_url,
+  nav_logo_url:
+    values.nav_logo_url && values.nav_logo_url.length > 0
+      ? values.nav_logo_url
+      : defaultSettings.nav_logo_url,
+});
+
 export const BrandingSettings = () => {
   const { LL } = useI18nContext();
   const toaster = useToaster();
@@ -53,7 +68,7 @@ export const BrandingSettings = () => {
 
   const { mutate, isLoading } = useMutation(patchSettings, {
     onSuccess: () => {
-      const keys = [QueryKeys.FETCH_SETTINGS, QueryKeys.FETCH_ESSENTAIL_SETTINGS];
+      const keys = [QueryKeys.FETCH_SETTINGS, QueryKeys.FETCH_ESSENTIAL_SETTINGS];
       keys.forEach((key) => {
         queryClient.invalidateQueries([key]);
       });
@@ -116,16 +131,8 @@ export const BrandingSettings = () => {
     reset();
   }, [reset, defaultValues]);
 
-  const onSubmit: SubmitHandler<FormFields> = ({
-    instance_name,
-    main_logo_url,
-    nav_logo_url,
-  }) => {
-    mutate({
-      instance_name,
-      main_logo_url,
-      nav_logo_url,
-    });
+  const onSubmit: SubmitHandler<FormFields> = (submitted) => {
+    mutate(mergeWithDefaults(submitted));
   };
 
   return (

diff --git a/...c/pages/settings/components/GlobalSettings/components/ModulesSettings/ModulesSettings.tsx b/...c/pages/settings/components/GlobalSettings/components/ModulesSettings/ModulesSettings.tsx
@@ -27,7 +27,7 @@ export const ModulesSettings = () => {
 
   const { mutate, isLoading } = useMutation([MutationKeys.EDIT_SETTINGS], patchSettings, {
     onSuccess: () => {
-      queryClient.invalidateQueries([QueryKeys.FETCH_ESSENTAIL_SETTINGS]);
+      queryClient.invalidateQueries([QueryKeys.FETCH_ESSENTIAL_SETTINGS]);
       queryClient.invalidateQueries([QueryKeys.FETCH_SETTINGS]);
       toaster.success(LL.settingsPage.messages.editSuccess());
     },

diff --git a/web/src/shared/queries.ts b/web/src/shared/queries.ts
@@ -16,7 +16,7 @@ export const QueryKeys = {
   FETCH_NETWORK_USERS_STATS: 'FETCH_NETWORK_USERS_STATS',
   FETCH_LICENSE: 'FETCH_LICENSE',
   FETCH_WORKER_TOKEN: 'FETCH_WORKER_TOKEN',
-  FETCH_ESSENTAIL_SETTINGS: 'FETCH_ESSENTAIL_SETTINGS',
+  FETCH_ESSENTIAL_SETTINGS: 'FETCH_ESSENTIAL_SETTINGS',
   FETCH_SETTINGS: 'FETCH_SETTINGS',
   FETCH_GATEWAY_STATUS: 'FETCH_GATEWAY_STATUS',
   FETCH_APP_INFO: 'FETCH_APP_INFO',