fix: expect the possibility of settingsobject being null (#4157)

webiny · Jun 7, 2024 · 38eee1c · 38eee1c
1 parent f5b2367
commit 38eee1c
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 14 deletions.
diff --git a/packages/app-page-builder/src/modules/WebsiteSettings/settingsGroups/DefaultPages.tsx b/packages/app-page-builder/src/modules/WebsiteSettings/settingsGroups/DefaultPages.tsx
@@ -1,4 +1,4 @@
-import React from "react";
+import React, { useCallback } from "react";
 import { Bind } from "@webiny/form";
 import { ButtonIcon, ButtonPrimary } from "@webiny/ui/Button";
 import { AddPbWebsiteSettings } from "../AddPbWebsiteSettings";
@@ -10,14 +10,21 @@ const { Group, Element } = AddPbWebsiteSettings;
 
 const Homepage = () => {
     const { settings, editPage } = usePbWebsiteSettings();
+    const homePage = settings.pages?.home;
+
+    const editButtonClickHandler = useCallback(() => {
+        if (homePage) {
+            editPage(homePage);
+        }
+    }, [homePage]);
 
     return (
         <Bind name={"pages.home"}>
             <PagesAutocomplete
                 label={"Homepage"}
                 description={`To set a different page, start typing its title and select it from the dropdown menu. Note that the page must be published in order to appear.`}
                 trailingIcon={
-                    <ButtonPrimary small onClick={() => editPage(settings.pages.home)}>
+                    <ButtonPrimary small disabled={!homePage} onClick={editButtonClickHandler}>
                         <ButtonIcon icon={<EditIcon />} />
                         Edit
                     </ButtonPrimary>
@@ -29,14 +36,21 @@ const Homepage = () => {
 
 const NotFoundPage = () => {
     const { settings, editPage } = usePbWebsiteSettings();
+    const notFoundPage = settings.pages?.notFound;
+
+    const editButtonClickHandler = useCallback(() => {
+        if (notFoundPage) {
+            editPage(notFoundPage);
+        }
+    }, [notFoundPage]);
 
     return (
         <Bind name={"pages.notFound"}>
             <PagesAutocomplete
                 label={"Not found (404) page"}
                 description={`To set a different page, start typing its title and select it from the dropdown menu. Note that the page must be published in order to appear.`}
                 trailingIcon={
-                    <ButtonPrimary small onClick={() => editPage(settings.pages.notFound)}>
+                    <ButtonPrimary small disabled={!notFoundPage} onClick={editButtonClickHandler}>
                         <ButtonIcon icon={<EditIcon />} />
                         Edit
                     </ButtonPrimary>

diff --git a/packages/app-page-builder/src/modules/WebsiteSettings/usePbWebsiteSettings.ts b/packages/app-page-builder/src/modules/WebsiteSettings/usePbWebsiteSettings.ts
@@ -27,17 +27,9 @@ export function usePbWebsiteSettings() {
     const [error, setError] = useState<PbErrorResponse | null>(null);
 
     const { data, loading: queryInProgress } = useQuery<GetSettingsQueryResponse>(GET_SETTINGS);
-    const settings = get(
-        data,
-        "pageBuilder.getSettings.data",
-        {}
-    ) as unknown as GetSettingsResponseData;
-
-    const defaultSettings = get(
-        data,
-        "pageBuilder.getDefaultSettings.data",
-        {}
-    ) as unknown as GetSettingsResponseData;
+    const settings: Partial<GetSettingsResponseData> = data?.pageBuilder.getSettings.data || {};
+    const defaultSettings: Partial<GetSettingsResponseData> =
+        data?.pageBuilder.getDefaultSettings.data || {};
 
     const [update, { loading: mutationInProgress }] = useMutation<
         UpdateSettingsMutationResponse,