fix: page.router

update to query + add await
opengovsg · Jun 25, 2024 · b3acf31 · b3acf31
1 parent a76246b
commit b3acf31
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/apps/studio/src/features/editing-experience/components/Preview.tsx b/apps/studio/src/features/editing-experience/components/Preview.tsx
@@ -1,4 +1,5 @@
 import {
+  type IsomerComponent,
   type IsomerPageSchema,
   RenderEngine,
 } from '@opengovsg/isomer-components'
@@ -50,7 +51,8 @@ export default function Preview({ schema }: PreviewProps) {
         permalink: '/',
         lastModified: new Date().toISOString(),
       }}
-      content={renderSchema.content}
+      // TODO: remove this cast and add validation
+      content={data.content.content as IsomerComponent[]}
     />
   )
 }
diff --git a/apps/studio/src/server/modules/page/page.router.ts b/apps/studio/src/server/modules/page/page.router.ts
@@ -17,19 +17,17 @@ export const pageRouter = router({
     .input(getEditPageSchema)
     .query(async ({ input, ctx }) => {
       const { pageId } = input
+      // const page = await getFullPageById(pageId)
       const page = await getFullPageById(pageId)
       // TODO: Fill these in later
       const pageName: string = page.name
       const siteMeta = getSiteConfig(page.siteId)
-      const navbar = getNavBar(page.siteId)
-      const footer = getFooter(page.siteId)
+      const navbar = await getNavBar(page.siteId)
+      const footer = await getFooter(page.siteId)
       const { content } = page
 
       return {
         pageName,
-        // NOTE: might shift theme, isGovt, navbar, footer out into separate function?
-        // because this is shared across the whole site (site level props)
-        ...siteMeta,
         navbar,
         footer,
         content,