Ensure hidden blocks aren't hidden forever

cortezaproject · May 31, 2023 · c939015 · c939015
1 parent 0fcbec0
commit c939015
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 6 deletions.
diff --git a/client/web/compose/src/components/PageBlocks/TabsBase.vue b/client/web/compose/src/components/PageBlocks/TabsBase.vue
@@ -81,14 +81,18 @@ export default {
   computed: {
     tabbedBlocks () {
       return this.block.options.tabs.map(({ blockID, title }) => {
-        let block = this.blocks.find(b => fetchID(b) === blockID)
+        const unparsedBlock = this.blocks.find(b => fetchID(b) === blockID)
 
-        // Blocks should display as Plain, to avoid card shadow/border
-        if (block) {
-          block.style.wrap.kind = 'Plain'
-          block = compose.PageBlockMaker(block)
+        if (!unparsedBlock) {
+          return { title }
         }
 
+        let block = JSON.parse(JSON.stringify(unparsedBlock))
+
+        // Blocks should display as Plain, to avoid card shadow/border
+        block.style.wrap.kind = 'Plain'
+        block.style.border.enabled = false
+        block = compose.PageBlockMaker(block)
         return {
           block,
           title,

diff --git a/client/web/compose/src/views/Admin/Pages/Builder.vue b/client/web/compose/src/views/Admin/Pages/Builder.vue
@@ -600,7 +600,6 @@ export default {
         if (oldBlock.meta.hidden === true && this.editor.block.meta.hidden === false) {
           this.untabBlock(this.editor.block)
           this.calculateNewBlockPosition(block)
-          block.style.wrap.kind = 'Card'
         }
 
         this.blocks.splice(this.editor.index, 1, block)
@@ -623,13 +622,35 @@ export default {
 
           tabbedBlock.meta.hidden = true
         })
+        this.showUnusedHiddenBlocks()
       }
 
       if (this.editor.block.kind === block.kind) {
         this.editor = undefined
       }
     },
 
+    showUnusedHiddenBlocks () {
+      const allTabBlocks = this.blocks.filter(({ kind }) => kind === 'Tabs')
+
+      this.blocks.forEach(block => {
+        if (!block.meta.hidden) return
+
+        const hiddenBlockID = fetchID(block)
+
+        // Go through all hidden blocks to see if they are tabbed anywhere
+        const tabbed = allTabBlocks.some(({ options }) => {
+          const { tabs = [] } = options
+          return tabs.some(({ blockID }) => blockID === hiddenBlockID)
+        })
+
+        if (!tabbed) {
+          this.calculateNewBlockPosition(block)
+          block.meta.hidden = false
+        }
+      })
+    },
+
     cloneBlock (index) {
       this.appendBlock(this.blocks[index].clone(), this.$t('notification:page.cloneSuccess'))
     },