From 6c75df89771bd037d7680385ef7a5ad8908cd1de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C5=BEe=20Fortun?= <joze.fortun@gmail.com>
Date: Thu, 12 Dec 2024 15:52:53 +0100
Subject: [PATCH] Fix record not loading before blocks on record pages

---
 .../src/components/PageBlocks/ContentBase.vue | 44 ++++---------------
 client/web/compose/src/mixins/page.js         |  2 +-
 2 files changed, 9 insertions(+), 37 deletions(-)

diff --git a/client/web/compose/src/components/PageBlocks/ContentBase.vue b/client/web/compose/src/components/PageBlocks/ContentBase.vue
index b209461e5..e9e042a8e 100644
--- a/client/web/compose/src/components/PageBlocks/ContentBase.vue
+++ b/client/web/compose/src/components/PageBlocks/ContentBase.vue
@@ -3,22 +3,11 @@
     v-bind="$props"
     v-on="$listeners"
   >
-    <label
-      v-if="error"
-      class="text-primary p-3"
-    >
-      {{ error }}
-    </label>
-
     <div
-      v-else
+      :style="{ 'white-space': 'pre-wrap' }"
       class="rt-content p-3"
-    >
-      <p
-        :style="{ 'white-space': 'pre-wrap' }"
-        v-html="contentBody"
-      />
-    </div>
+      v-html="contentBody"
+    />
   </wrap>
 </template>
 <script>
@@ -29,30 +18,12 @@ import { NoID } from '@cortezaproject/corteza-js'
 export default {
   extends: base,
 
-  data () {
-    return {
-      error: null,
-      contentBody: '',
-    }
-  },
-
-  watch: {
-    'options.body': {
-      immediate: true,
-      handler () {
-        this.makeContentBody()
-      },
-    },
-  },
-
-  methods: {
-    makeContentBody () {
-      this.error = null
-
+  computed: {
+    contentBody () {
       try {
         const { body = '' } = this.options
 
-        this.contentBody = evaluatePrefilter(body, {
+        return evaluatePrefilter(body, {
           record: this.record,
           user: this.$auth.user || {},
           recordID: (this.record || {}).recordID || NoID,
@@ -60,7 +31,8 @@ export default {
           userID: (this.$auth.user || {}).userID || NoID,
         })
       } catch (e) {
-        this.error = this.getToastMessage(e)
+        this.toastErrorHandler(e)
+        return ''
       }
     },
   },
diff --git a/client/web/compose/src/mixins/page.js b/client/web/compose/src/mixins/page.js
index 86b9a0d6c..cf6a1c1d6 100644
--- a/client/web/compose/src/mixins/page.js
+++ b/client/web/compose/src/mixins/page.js
@@ -146,7 +146,7 @@ export default {
         document.title = [title, this.namespace.name, this.$t('general:label.app-name.public')].filter(v => v).join(' | ')
       }
 
-      await this.updateBlocks(variables)
+      this.updateBlocks(variables)
     },
 
     async updateBlocks (variables = {}) {