Merge pull request #472 from CodeForAfrica/fix/charterafrica_navigati…

…on_data @/charterafrica Reduce navigation data
CodeForAfrica · Jun 30, 2023 · c6ce72c · c6ce72c · vercel · Jun 30, 2023
2 parents d50a064 + 6b0f74d
commit c6ce72c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/apps/charterafrica/src/components/NavBarDropdown/NavBarDropdown.js b/apps/charterafrica/src/components/NavBarDropdown/NavBarDropdown.js
@@ -19,9 +19,6 @@ const NavBarDropdown = React.forwardRef(function NavBarDropdown(props, ref) {
     e.stopPropagation();
     setOpen((prevOpen) => !prevOpen);
   };
-  // TODO(kilemensi): Since we current don't have any of the child pages, we
-  //                  have to manually hide the popup.
-  //                  SHOULD BE REMOVED ONCE CHILD PAGES ARE IMPLEMENTED.
   const handleClickMenuItem = () => {
     setOpen(false);
   };

diff --git a/apps/charterafrica/src/lib/data/common/index.js b/apps/charterafrica/src/lib/data/common/index.js
@@ -36,7 +36,19 @@ export async function getGlobalProps({ locale, defaultLocale }, api) {
       href: "/",
       priority: true,
     },
-    menus: menus ?? null,
+    menus:
+      menus?.map((originalMenu) => {
+        const { doc, ...menu } = originalMenu;
+        // Remove pages (doc) from menu and it's children
+        // This can also be done via afterRead global hook on navigation block
+        // but it may interfere with CMS functionality
+        if (menu.children) {
+          menu.children =
+            menu.children?.map(({ doc: _, ...other }) => ({ ...other })) ??
+            null;
+        }
+        return menu;
+      }) ?? null,
   };
   const footer = await api.findGlobal("footer", {
     locale,