From 64b7d6bb4f7dab56bb75c13f022f5213a0549d67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C5=BEe=20Fortun?= <joze.fortun@gmail.com>
Date: Wed, 19 Apr 2023 19:35:43 +0200
Subject: [PATCH] Fix record modal not showing page

---
 .../compose/src/components/Common/Grid.vue    | 23 ++++++++++++-------
 .../src/components/Public/Record/Modal.vue    | 10 ++++----
 .../src/views/Public/Pages/Records/View.vue   |  4 ++--
 .../compose/src/views/Public/Pages/View.vue   |  1 -
 4 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/client/web/compose/src/components/Common/Grid.vue b/client/web/compose/src/components/Common/Grid.vue
index 42a4048f9..636596c22 100644
--- a/client/web/compose/src/components/Common/Grid.vue
+++ b/client/web/compose/src/components/Common/Grid.vue
@@ -120,15 +120,22 @@ export default {
       immediate: true,
       deep: true,
       handler (blocks) {
-        this.layout = []
-
-        // Next tick is important, otherwise it can lead to overlapping blocks
-        this.$nextTick(() => {
-          this.layout = blocks.map(({ meta, xywh: [x, y, w, h] }, i) => {
-            // To avoid collision with hidden elements
-            return meta.hidden ? { i, x: 0, y: 0, w: 0, h: 0 } : { i, x, y, w, h }
-          })
+        blocks = blocks.map(({ meta, xywh: [x, y, w, h] }, i) => {
+          // To avoid collision with hidden elements
+          return meta.hidden ? { i, x: 0, y: 0, w: 0, h: 0 } : { i, x, y, w, h }
         })
+
+        // Only use next tick if previous layout exists
+        if (this.layout.length) {
+          this.layout = []
+
+          // Next tick is important, otherwise it can lead to overlapping blocks
+          this.$nextTick(() => {
+            this.layout = blocks
+          })
+        } else {
+          this.layout = blocks
+        }
       },
     },
   },
diff --git a/client/web/compose/src/components/Public/Record/Modal.vue b/client/web/compose/src/components/Public/Record/Modal.vue
index 9cbf58137..452cd50d7 100644
--- a/client/web/compose/src/components/Public/Record/Modal.vue
+++ b/client/web/compose/src/components/Public/Record/Modal.vue
@@ -22,7 +22,7 @@
       :page="page"
       :module="module"
       :record-i-d="recordID"
-      :show-record-modal="showModal"
+      show-record-modal
     />
 
     <template #modal-footer>
@@ -84,14 +84,14 @@ export default {
       immediate: true,
       handler (recordID, oldRecordID) {
         const { recordPageID } = this.$route.query
-        const { pageID: oldrecordPageID } = this.page || {}
+        const { pageID: oldRecordPageID } = this.page || {}
 
         if (!recordID) {
           this.showModal = false
           return
         }
 
-        if (recordPageID !== oldrecordPageID) {
+        if (recordPageID !== oldRecordPageID) {
           // If the page changed we need to clear the record pagination since its not relevant anymore
           if (this.recordPaginationUsable) {
             this.setRecordPaginationUsable(false)
@@ -116,9 +116,9 @@ export default {
           }
         }
 
-        setTimeout(() => {
+        this.$nextTick(() => {
           this.loadModal({ recordID, recordPageID })
-        }, 100)
+        })
       },
     },
   },
diff --git a/client/web/compose/src/views/Public/Pages/Records/View.vue b/client/web/compose/src/views/Public/Pages/Records/View.vue
index cd44f50f4..c6db3fdff 100644
--- a/client/web/compose/src/views/Public/Pages/Records/View.vue
+++ b/client/web/compose/src/views/Public/Pages/Records/View.vue
@@ -1,7 +1,6 @@
 <template>
   <div
-    :class="{ 'flex-column': showRecordModal }"
-    class="d-flex flex-grow-1 w-100 h-100"
+    class="d-flex flex-column flex-grow-1 w-100 h-100 overflow-auto"
   >
     <b-alert
       v-if="isDeleted"
@@ -31,6 +30,7 @@
       :record="record"
       :blocks="blocks"
       :mode="inEditing ? 'editor' : 'base'"
+      class="h-100"
       @reload="loadRecord()"
     />
 
diff --git a/client/web/compose/src/views/Public/Pages/View.vue b/client/web/compose/src/views/Public/Pages/View.vue
index 53553c752..959629974 100644
--- a/client/web/compose/src/views/Public/Pages/View.vue
+++ b/client/web/compose/src/views/Public/Pages/View.vue
@@ -55,7 +55,6 @@
         :namespace="namespace"
         :module="module"
         :page="page"
-        class="flex-grow-1 overflow-auto d-flex flex-column"
       />
 
       <div