Refactor menu formatting and update layer queries

src/api/feedback.js

@@ -1,6 +1,7 @@
 import { datocmsRequest } from '../lib/datocms'
 import { withServerDefaults } from '../lib/with-server-defaults'
 import { buildMenuTree } from '../lib/build-menu-tree'
+import { formatMenusRecursive } from '../lib/format-menu'
 import * as EmailValidator from 'email-validator'
 import Mailjet from 'node-mailjet'
 
@@ -25,11 +26,13 @@ query viewersWithLayers ($first: IntType, $skip: IntType = 0) {
     feedbackContacts {
       ...FeedbackContact
     }
-    children: layers {
-      id
-      name
-      feedbackContacts {
-        ...FeedbackContact
+    children: viewerLayers {
+      layer {
+        id
+        name
+        feedbackContacts {
+          ...FeedbackContact
+        }
       }
     }
     parent {
@@ -117,8 +120,9 @@ export const handler = withServerDefaults(async (event, _) => {
   }
 
   const { menus } = await datocmsRequest({ query: viewersWithLayersQuery })
+  const formattedMenus = formatMenusRecursive(menus)
 
-  const menuTree = buildMenuTree(menus)
+  const menuTree = buildMenuTree(formattedMenus)
 
   const viewer = menuTree.find((viewer) => viewer.name === viewerName)
 

src/api/record-register.js

@@ -3,6 +3,7 @@ import { withServerDefaults } from '../lib/with-server-defaults'
 import { Geonetwork } from '../lib/geonetwork'
 import { resourceNotFound } from '../lib/constants'
 import { buildMenuTree } from '../lib/build-menu-tree'
+import { formatMenusRecursive } from '../lib/format-menu'
 import { findGeonetworkInstances } from '../lib/find-geonetwork-instances'
 
 const geonetworkUrl = 'geonetwork/srv'
@@ -17,8 +18,10 @@ query viewersWithLayers ($first: IntType, $skip: IntType = 0) {
       username
       password
     }
-    children: layers {
-      id
+    children: viewerLayers {
+      layer {
+        id
+      }
     }
     parent {
       id
@@ -47,8 +50,9 @@ export const handler = withServerDefaults(async (event, _) => {
   }
 
   const { menus } = await datocmsRequest({ query: viewersWithLayersQuery })
+  const formattedMenus = formatMenusRecursive(menus)
 
-  const menuTree = buildMenuTree(menus)
+  const menuTree = buildMenuTree(formattedMenus)
 
   const menu = menuTree.find((menu) => menu.name === viewer)
 

src/api/search.js

@@ -1,17 +1,20 @@
 import { datocmsRequest } from '../lib/datocms'
 import { withServerDefaults } from '../lib/with-server-defaults'
 import { buildChildrenTree } from '../lib/build-children-tree'
+import { formatMenusRecursive } from '../lib/format-menu'
 
 const datocmsQuery = /* graphql */ `
 query Layers ($first: IntType, $skip: IntType = 0) {
   menus: allMenus(first: $first, skip: $skip) {
     id
     name
-    children: layers {
-      id
-      name
-      description
-      indexableWfsProperties
+    children: viewerLayers {
+      layer {
+        id
+        name
+        description
+        indexableWfsProperties
+      }
     }
     parent {
       id
@@ -88,10 +91,11 @@ export const handler = withServerDefaults(async (event, _) => {
   }
 
   const { menus } = await datocmsRequest({ query: datocmsQuery })
+  const formattedMenus = formatMenusRecursive(menus)
 
-  buildChildrenTree(menus)
+  buildChildrenTree(formattedMenus)
 
-  const menu = menus.find((menu) => menu.name === viewer)
+  const menu = formattedMenus.find((menu) => menu.name === viewer)
 
   if (!menu) {
     return {

src/api/sync-layer-background.js

@@ -5,6 +5,7 @@ import { withServerDefaults } from '../lib/with-server-defaults'
 import { buildMenuTree } from '../lib/build-menu-tree'
 import { findGeonetworkInstances } from '../lib/find-geonetwork-instances'
 import { fetchLayerXML } from '../lib/fetch-layer-xml'
+import { formatMenusRecursive } from '../lib/format-menu'
 import Mailjet from 'node-mailjet'
 
 const mailjet = new Mailjet({
@@ -24,8 +25,10 @@ query viewersWithLayers ($first: IntType, $skip: IntType = 0) {
     errorNotificationContacts {
       email
     }
-    children: layers {
-      id
+    children: viewerLayers {
+      layers {
+        id
+      }
     }
     parent {
       id
@@ -61,8 +64,8 @@ export const handler = withServerDefaults(async (event, _) => {
   const { menus } = await datocmsRequest({
     query: viewersWithLayersQuery,
   })
-
-  const menuTree = buildMenuTree(menus)
+  const formattedMenus = formatMenusRecursive(menus)
+  const menuTree = buildMenuTree(formattedMenus)
 
   try {
     await syncLayers(menuTree, layerData.event_type, layerId)
@@ -181,7 +184,7 @@ function findEmailContactsForLayerId(menuTree, layerId) {
       if (children) {
         children.forEach((child) => {
 
-          if (child.id === layerId) {
+          if (child.layer.id === layerId) {
             const { errorNotificationContacts } = viewer
 
             if (errorNotificationContacts.length) {

src/lib/datocms.js

@@ -26,6 +26,8 @@ function executeFetch(query, variables = {}, preview = false) {
     headers: {
       'Content-Type': 'application/json',
       Authorization: process.env.DATO_API_TOKEN,
+      // TODO: remove this before going to production
+      'x-environment': 'layer-metadata'
     },
     body: JSON.stringify({ query, variables }),
   })

src/lib/format-menu.js

@@ -0,0 +1,28 @@
+export function formatMenu(menu) {
+  const formattedLayers = menu.children?.map(({ layer, ...metadataFields }) => {
+    return {
+      ...layer,
+      ...metadataFields
+    }
+  }) || [];
+
+  return {
+    ...menu,
+    children: formattedLayers
+  }
+}
+
+export function formatMenusRecursive(menus) {
+  if (!menus) {
+    return menus;
+  }
+
+  return menus.map((menu) => {
+    const formattedMenu = formatMenu(menu);
+
+    return {
+      ...formattedMenu,
+      children: formatMenusRecursive(formattedMenu.children) // Ensure we use the formatted children
+    };
+  });
+}

src/scripts/report-dead-layer-links.js

@@ -2,6 +2,7 @@ import path, { dirname } from 'path'
 import dotenv from 'dotenv'
 import { fileURLToPath } from 'url'
 import Mailjet from 'node-mailjet'
+import { formatMenusRecursive } from '../lib/format-menu'
 
 const __filename = fileURLToPath(import.meta.url)
 const __dirname = dirname(__filename)
@@ -32,11 +33,13 @@ query viewersWithLayers ($first: IntType, $skip: IntType = 0) {
     deadLinksReportContacts {
       email
     }
-    children: layers {
-      id
-      name
-      url
-      layer
+    children: viewerLayers {
+      layer {
+        id
+        name
+        url
+        layer
+      }
     }
     parent {
       id
@@ -52,8 +55,9 @@ async function report() {
     const { menus } = await datocmsRequest({
       query: viewersWithLayersQuery,
     })
+    const formattedMenus = formatMenusRecursive(menus)
 
-    const menuTree = buildMenuTree(menus)
+    const menuTree = buildMenuTree(formattedMenus)
 
     const deadLayerLinks = await findDeadLayerLinks(menuTree)