Skip to content

Beautiful Open-Source Form Builder

Fix Notion CMS page loading with new worker format

Julien Nahum101a3a433353
diff --git a/client/components/pages/notion/useNotionBlock.js b/client/components/pages/notion/useNotionBlock.js
index 763dbe042..18d55b029 100644
--- a/client/components/pages/notion/useNotionBlock.js
+++ b/client/components/pages/notion/useNotionBlock.js
@@ -8,7 +8,7 @@ export default function useNotionBlock (props) {
})
const value = computed(() => {
- return block.value?.value
+ return block.value?.value?.value || block.value?.value || block.value
})
const format = computed(() => {
diff --git a/client/stores/notion_cms.js b/client/stores/notion_cms.js
index 6d0b95388..b97df9910 100644
--- a/client/stores/notion_cms.js
+++ b/client/stores/notion_cms.js
@@ -15,6 +15,24 @@ function fetchNotionPageContent (pageId) {
return notionApiFetch(pageId, 'page')
}
+function normalizeNotionRecordMap (recordMap) {
+ if (!recordMap || typeof recordMap !== 'object') return recordMap
+
+ return Object.fromEntries(
+ Object.entries(recordMap).map(([id, record]) => {
+ if (!record || typeof record !== 'object') {
+ return [id, record]
+ }
+
+ if (record.value?.value) {
+ return [id, { ...record, value: record.value.value, role: record.value.role ?? record.role }]
+ }
+
+ return [id, record]
+ })
+ )
+}
+
export const useNotionCmsStore = defineStore('notion_cms', () => {
// State
@@ -57,7 +75,7 @@ export const useNotionCmsStore = defineStore('notion_cms', () => {
if (pageContents.value[pageId]) return resolve('in already here')
loading.value = true
return fetchNotionPageContent(pageId).then((response) => {
- pageContents.value[formatId(pageId)] = response.data.value
+ pageContents.value[formatId(pageId)] = normalizeNotionRecordMap(response.data.value)
loading.value = false
return resolve('in finishg')
}).catch((error) => {
@@ -70,7 +88,7 @@ export const useNotionCmsStore = defineStore('notion_cms', () => {
const loadPageBySlug = (slug) => {
if (!slugToIdMap.value[slug.toLowerCase()]) return
- loadPage(slugToIdMap.value[slug.toLowerCase()])
+ return loadPage(slugToIdMap.value[slug.toLowerCase()])
}
const formatId = (id) => id.replaceAll('-', '')