Open record fields in modal if you're already in a modal

client/web/compose/src/components/ModuleFields/Editor/base.vue

@@ -136,6 +136,13 @@ export default {
 
       return edit || view
     },
+
+    // detect when a page block is opened in a modal through magnification or record open type
+    inModal () {
+      const { recordPageID, magnifiedBlockID } = this.$route.query
+
+      return !!recordPageID || !!magnifiedBlockID
+    },
   },
 }
 </script>

client/web/compose/src/components/ModuleFields/Viewer/Record.vue

@@ -198,7 +198,7 @@ export default {
     onRecordSelectorClick (e, route) {
       e.preventDefault()
 
-      if (this.extraOptions.recordSelectorDisplayOption === 'modal') {
+      if (this.extraOptions.recordSelectorDisplayOption === 'modal' || this.inModal) {
         this.$root.$emit('show-record-modal', {
           recordID: route.params.recordID,
           recordPageID: route.params.pageID,

client/web/compose/src/components/ModuleFields/Viewer/base.vue

@@ -76,6 +76,13 @@ export default {
     options () {
       return this.field.options
     },
+
+    // detect when a page block is opened in a modal through magnification or record open type
+    inModal () {
+      const { recordPageID, magnifiedBlockID } = this.$route.query
+
+      return !!recordPageID || !!magnifiedBlockID
+    },
   },
 }
 </script>

client/web/compose/src/components/PageBlocks/CalendarBase.vue

@@ -382,18 +382,13 @@ export default {
 
       const route = { name: 'page.record', params: { recordID, pageID: page.pageID } }
 
-      if (this.inModal) {
+      if (this.options.eventDisplayOption === 'modal' || this.inModal) {
         this.$root.$emit('show-record-modal', {
           recordID,
           recordPageID: page.pageID,
         })
       } else if (this.options.eventDisplayOption === 'newTab') {
         window.open(this.$router.resolve(route).href)
-      } else if (this.options.eventDisplayOption === 'modal') {
-        this.$root.$emit('show-record-modal', {
-          recordID,
-          recordPageID: page.pageID,
-        })
       } else {
         this.$router.push(route)
       }

client/web/compose/src/components/PageBlocks/GeometryBase.vue

@@ -255,18 +255,13 @@ export default {
 
       const route = { name: 'page.record', params: { recordID, pageID: page.pageID } }
 
-      if (this.inModal) {
+      if (this.options.displayOption === 'modal' || this.inModal) {
         this.$root.$emit('show-record-modal', {
           recordID,
           recordPageID: page.pageID,
         })
       } else if (this.options.displayOption === 'newTab') {
         window.open(this.$router.resolve(route).href)
-      } else if (this.options.displayOption === 'modal') {
-        this.$root.$emit('show-record-modal', {
-          recordID,
-          recordPageID: page.pageID,
-        })
       } else {
         this.$router.push(route)
       }

client/web/compose/src/components/PageBlocks/RecordOrganizerBase.vue

@@ -349,7 +349,7 @@ export default {
         values[groupField] = group
       }
 
-      if (this.inModal) {
+      if (this.options.displayOption === 'modal' || this.inModal) {
         this.$root.$emit('show-record-modal', {
           recordID: NoID,
           recordPageID: (this.roRecordPage || {}).pageID,