feat(indexfield): add pageId to onRender cb

This change makes it possible to get the id of the page it is implemented. This is useful when no fixedSlug is used and the pageId is autogenerated, thus not predictable. re #37
snek-at · Oct 10, 2021 · 4204c62 · 4204c62
1 parent 2a548a2
commit 4204c62
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/examples/my-gatsby-site/src/templates/SamplePage.tsx b/examples/my-gatsby-site/src/templates/SamplePage.tsx
@@ -25,7 +25,7 @@ const SamplePage: JaenTemplate = () => {
       <Box maxW="sm" borderWidth="1px" borderRadius="lg" overflow="hidden">
         <h1>IndexField</h1>
         <fields.IndexField
-          onRender={page => <div> {Object.keys(page.children)}</div>}
+          onRender={(page, pageId) => <div> {Object.keys(page.children)}</div>}
         />
       </Box>
       <Box maxW="sm" borderWidth="1px" borderRadius="lg" overflow="hidden">

diff --git a/packages/jaen-pages/src/containers/fields/IndexField/index.tsx b/packages/jaen-pages/src/containers/fields/IndexField/index.tsx
@@ -5,18 +5,19 @@ import {withRedux} from '@store/withRedux'
 
 interface IndexFieldProps {
   fixedSlug?: string
-  onRender: (page: ResolvedPageType) => JSX.Element
+  onRender: (page: ResolvedPageType, pageId: string) => JSX.Element
 }
 
 const IndexField: React.FC<IndexFieldProps> = props => {
   const {jaenPageContext} = useTemplate()
-  const page = useResolvedPage(props.fixedSlug || jaenPageContext.id)
+  const pageId = props.fixedSlug || jaenPageContext.id
+  const page = useResolvedPage(pageId)
 
   if (!page) {
-    throw new Error(`Page not found: ${props.fixedSlug || jaenPageContext.id}`)
+    throw new Error(`Page not found!: ${pageId}`)
   }
 
-  return props.onRender(page)
+  return props.onRender(page, pageId)
 }
 
 export default withRedux(IndexField)
diff --git a/packages/jaen-pages/src/contexts/cms.tsx b/packages/jaen-pages/src/contexts/cms.tsx
@@ -234,6 +234,7 @@ export const CMSProvider: React.FC<CMSProviderType> = ({
           const id = jaenPageContext?.id || node.id
 
           site.allSitePage.nodes[id] = {
+            id,
             parent: jaenPageContext?.parent || null,
             children: jaenPageContext?.children || [],
             path: node.path,

diff --git a/packages/jaen-pages/src/types.ts b/packages/jaen-pages/src/types.ts
@@ -98,6 +98,7 @@ export type PageMetadata = {
 }
 
 type BasePageType = {
+  id: string
   slug: string
   pageMetadata?: PageMetadata
   images: {