Merge branch 'staging' into dependabot/npm_and_yarn/eslint-plugin-jsdoc-31.0.8

Author: Greg Rickaby

api/wordpress/_global/getFrontendPage.js

@@ -1,6 +1,7 @@
-import queryDefaultSeo from '../_global/queryDefaultSeo'
 import formatDefaultSeoData from '@/functions/formatDefaultSeoData'
 import {initializeWpApollo} from '../connector'
+import queryDefaultPageData from './queryDefaultPageData'
+import getMenus from '../menus/getMenus'
 
 // Define SEO for Frontend routes.
 export const frontendPageSeo = {
@@ -30,9 +31,12 @@ export default async function getFrontendPage(route) {
 
   // Execute query.
   response.post = await apolloClient
-    .query({query: queryDefaultSeo})
+    .query({query: queryDefaultPageData})
     .then((res) => {
-      const {homepageSettings, siteSeo} = res.data
+      const {homepageSettings, siteSeo, menus} = res.data
+
+      // Retrieve menus.
+      response.menus = getMenus(menus)
 
       // Retrieve default SEO data.
       response.defaultSeo = formatDefaultSeoData({homepageSettings, siteSeo})

api/wordpress/_global/getPostTypeArchive.js

@@ -8,6 +8,7 @@ import queryTeamsArchive from '../teams/queryTeamsArchive'
 import queryPortfoliosArchive from '../portfolios/queryPortfoliosArchive'
 import queryTestimonialsArchive from '../testimonials/queryTestimonialsArchive'
 import formatDefaultSeoData from '@/functions/formatDefaultSeoData'
+import getMenus from '../menus/getMenus'
 
 // Define SEO for archives.
 export const archiveSeo = {
@@ -117,7 +118,10 @@ export default async function getPostTypeArchive(
   await apolloClient
     .query({query, variables})
     .then((archive) => {
-      const {homepageSettings, siteSeo, ...archiveData} = archive.data
+      const {homepageSettings, siteSeo, menus, ...archiveData} = archive.data
+
+      // Retrieve menus.
+      response.menus = getMenus(menus)
 
       // Retrieve default SEO data.
       response.defaultSeo = formatDefaultSeoData({homepageSettings, siteSeo})

api/wordpress/_global/getPostTypeById.js

@@ -10,6 +10,7 @@ import queryTeamById from '../teams/queryTeamById'
 import queryPortfolioById from '../portfolios/queryPortfolioById'
 import queryTestimonialById from '../testimonials/queryTestimonialById'
 import formatDefaultSeoData from '@/functions/formatDefaultSeoData'
+import getMenus from '../menus/getMenus'
 
 /**
  * Retrieve single post by specified identifier.
@@ -65,7 +66,10 @@ export default async function getPostTypeById(postType, id, idType = 'SLUG') {
   response.post = await apolloClient
     .query({query, variables: {id, idType}})
     .then((res) => {
-      const {homepageSettings, siteSeo, ...postData} = res.data
+      const {homepageSettings, siteSeo, menus, ...postData} = res.data
+
+      // Retrieve menus.
+      response.menus = getMenus(menus)
 
       // Retrieve default SEO data.
       response.defaultSeo = formatDefaultSeoData({homepageSettings, siteSeo})

api/wordpress/_global/getPostTypeStaticProps.js

@@ -2,8 +2,6 @@ import {algoliaIndexName} from '@/api/algolia/connector'
 import getPostTypeById from './getPostTypeById'
 import getPostTypeArchive from './getPostTypeArchive'
 import {addApolloState} from '@/api/apolloConfig'
-import getMenus from '@/api/wordpress/menus/getMenus'
-import config from '@/functions/config'
 import getFrontendPage, {frontendPageSeo} from './getFrontendPage'
 
 /**
@@ -20,15 +18,11 @@ export default async function getPostTypeStaticProps(
   // preview = false, // TODO - add preview handling.
   // previewData = null
 ) {
-  // Get WP Nav Menus.
-  const menus = await getMenus(config.menuLocations)
-
   // Set revalidate length (seconds).
   const revalidate = 60 * 5
 
   // Set sharedProps.
   const sharedProps = {
-    menus,
     algolia: {
       indexName: algoliaIndexName
     }

api/wordpress/_global/queryDefaultPageData.js

@@ -0,0 +1,11 @@
+import {gql} from '@apollo/client'
+import defaultPageData from '../_partials/defaultPageData'
+
+// Query: retrieve default SEO and other page data.
+const queryDefaultPageData = gql`
+  query GET_DEFAULT_SEO {
+    ${defaultPageData}
+  }
+`
+
+export default queryDefaultPageData

api/wordpress/_global/queryDefaultSeo.js

@@ -0,0 +1,20 @@
+// Query partial: retrieve all menus.
+const allMenus = `
+  menus {
+    nodes {
+      locations
+      menuItems {
+        nodes {
+          id
+          parentId
+          label
+          path
+          target
+          title
+        }
+      }
+    }
+  }
+`
+
+export default allMenus

api/wordpress/_partials/allMenus.js

@@ -0,0 +1,12 @@
+import defaultSeoFields from './defaultSeoFields'
+import allMenus from './allMenus'
+
+/**
+ * Query partial: retrieve default data for all frontend pages.
+ */
+const defaultPageData = `
+  ${defaultSeoFields}
+  ${allMenus}
+`
+
+export default defaultPageData

api/wordpress/_partials/defaultPageData.js

@@ -1,4 +1,4 @@
-const {default: seoPostFields} = require('./seoPostFields')
+import seoPostFields from './seoPostFields'
 
 // Query partial: retrieve homepage & site SEO fields.
 const defaultSeoFields = `

api/wordpress/_partials/defaultSeoFields.js

@@ -2,7 +2,7 @@ import globalPostFields from '../_partials/globalPostFields'
 import seoPostFields from '../_partials/seoPostFields'
 import featuredImagePostFields from '../_partials/featuredImagePostFields'
 import {gql} from '@apollo/client'
-import defaultSeoFields from '../_partials/defaultSeoFields'
+import defaultPageData from '../_partials/defaultPageData'
 
 // Fragment: retrieve single career fields.
 const singleCareerFragment = gql`
@@ -22,7 +22,7 @@ const queryCareerById = gql`
     $idType: CareerIdType = SLUG
     $imageSize: MediaItemSizeEnum = LARGE
   ) {
-    ${defaultSeoFields}
+    ${defaultPageData}
     career(id: $id, idType: $idType) {
       ...SingleCareerFields
     }