diff --git a/sites/dev/components/navigation/primary.mjs b/sites/dev/components/navigation/primary.mjs index 5605405db33..d3294c90c01 100644 --- a/sites/dev/components/navigation/primary.mjs +++ b/sites/dev/components/navigation/primary.mjs @@ -225,7 +225,7 @@ export const ActiveSection = ({ app }) => (
{app.state.crumbs ? (
- +
) : null}
diff --git a/sites/dev/lib/load-navigation.mjs b/sites/dev/lib/load-navigation.mjs index 61b6dbe4c88..289fcf66071 100644 --- a/sites/dev/lib/load-navigation.mjs +++ b/sites/dev/lib/load-navigation.mjs @@ -2,9 +2,9 @@ import get from 'lodash.get' import { prebuildNavigation as pbn } from 'site/prebuild/navigation.mjs' import orderBy from 'lodash.orderby' -const createCrumbs = (saa) => - saa.map((crumb, i) => { - const entry = get(pbn.en, saa.slice(0, i + 1)) +const createCrumbs = (path) => + path.map((crumb, i) => { + const entry = get(pbn.en, path.slice(0, i + 1)) const val = { t: entry.t, s: entry.s } if (entry.o) val.o = entry.o @@ -23,16 +23,16 @@ const createSections = () => { return orderBy(sections, 'o') } -export const loadNavigation = (saa = []) => { +export const loadNavigation = (path = []) => { // Creat crumbs array - const crumbs = createCrumbs(saa) + const crumbs = createCrumbs(path) return { - saa, - slug: saa.join('/'), + path, + slug: path.join('/'), crumbs, sections: createSections(), - nav: saa.length > 1 ? get(pbn.en, saa[0]) : pbn.en[saa[0]], + nav: path.length > 1 ? get(pbn.en, path[0]) : pbn.en[path[0]], title: crumbs.slice(-1)[0].t, } } diff --git a/sites/dev/pages/[...mdxslug].mjs b/sites/dev/pages/[...mdxslug].mjs index 1d968ac6002..784169e050e 100644 --- a/sites/dev/pages/[...mdxslug].mjs +++ b/sites/dev/pages/[...mdxslug].mjs @@ -83,7 +83,7 @@ export async function getStaticProps({ params }) { toc, intro: intro.join(' '), page: { - saa: params.mdxslug, // slug as array (saa) + path: params.mdxslug, // path to page as array ...mdxMeta[params.mdxslug.join('/')], }, params, diff --git a/sites/shared/hooks/use-app.mjs b/sites/shared/hooks/use-app.mjs index 850cb41a918..54d87534187 100644 --- a/sites/shared/hooks/use-app.mjs +++ b/sites/shared/hooks/use-app.mjs @@ -20,7 +20,7 @@ const defaultState = { */ export function useApp(props = {}) { const { bugsnag = false, page = {}, loadState = {} } = props - const { saa = [] } = page + const { path = [] } = page const reportError = useBugsnag(props?.bugsnag) @@ -29,8 +29,8 @@ export function useApp(props = {}) { useEffect(() => { // Force update of navigation info (nav, title, crumbs) on each page change - if (saa.length > 0) setState({ ...state, ...loadNavigation(saa) }) - }, [saa, state.slug, state.title]) + if (path.length > 0) setState({ ...state, ...loadNavigation(path) }) + }, [path, state.slug, state.title]) /* * Helper methods for partial state updates