From cc8b474fe0c9327751cd317ee2afec28e56b3403 Mon Sep 17 00:00:00 2001
From: Tofandel <adrien.foulon@tukan.hu>
Date: Tue, 27 Feb 2024 17:10:52 +0100
Subject: [PATCH] Fix availableBlocks override eachother

---
 frontend/js/components/blocks/Blocks.vue    | 10 ++++++----
 frontend/js/components/blocks/BlocksList.js |  7 ++++---
 src/Services/Forms/InlineRepeater.php       |  2 +-
 src/View/Components/Fields/BlockEditor.php  |  1 +
 views/partials/form/_block_editor.blade.php |  6 ++++--
 5 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/frontend/js/components/blocks/Blocks.vue b/frontend/js/components/blocks/Blocks.vue
index 6462c3d43..5323875bf 100755
--- a/frontend/js/components/blocks/Blocks.vue
+++ b/frontend/js/components/blocks/Blocks.vue
@@ -1,5 +1,5 @@
 <template>
-  <a17-blocks-list :editor-name="editorName" v-slot="{ savedBlocks, availableBlocks, moveBlock, moveBlockToEditor, cloneBlock }">
+  <a17-blocks-list :editor-name="editorName" :availability-id="availabilityId" v-slot="{ savedBlocks, availableBlocks, moveBlock, moveBlockToEditor, cloneBlock }">
     <div class="blocks">
       <draggable class="blocks__container"
                  :value="savedBlocks"
@@ -163,6 +163,9 @@
       editorName: {
         type: String,
         required: true
+      },
+      availabilityId: {
+        type: String,
       }
     },
     data () {
@@ -179,9 +182,8 @@
       }),
       ...mapGetters([
         'blocks',
-        'fieldsByBlockId',
         'availableBlocks'
-      ])
+      ]),
     },
     methods: {
       setOpened: function () {
@@ -265,7 +267,7 @@
         }
       },
       checkIfBlockTypeIsAvailable (editorName, type) {
-        const availableBlocks = JSON.parse(JSON.stringify(this.availableBlocks(editorName)))
+        const availableBlocks = this.availableBlocks(editorName)
         const blockTypes = availableBlocks.map(block => block.component)
 
         return blockTypes.indexOf(type) !== -1
diff --git a/frontend/js/components/blocks/BlocksList.js b/frontend/js/components/blocks/BlocksList.js
index 193b849f2..b52f0cd1d 100644
--- a/frontend/js/components/blocks/BlocksList.js
+++ b/frontend/js/components/blocks/BlocksList.js
@@ -8,13 +8,14 @@ export default {
     editorName: {
       type: String,
       required: true
+    },
+    availabilityId: {
+      type: String,
     }
   },
   computed: {
     availableBlocks () {
-      const splitted = this.editorName.split('|')
-      const editorName = splitted[splitted.length - 1]
-      return this.getAvailableBlocks(editorName)
+      return this.getAvailableBlocks(this.availabilityId ? this.availabilityId : this.editorName.split('|').pop())
     },
     savedBlocks () {
       return this.blocks(this.editorName)
diff --git a/src/Services/Forms/InlineRepeater.php b/src/Services/Forms/InlineRepeater.php
index 0e7a19080..5d4e40801 100644
--- a/src/Services/Forms/InlineRepeater.php
+++ b/src/Services/Forms/InlineRepeater.php
@@ -203,7 +203,7 @@ public function render(): View
             $repeater->max($this->max);
         }
 
-        $repeater->renderForBlocks = $this->renderForBlocks ?? false;
+        $repeater->renderForBlocks($this->renderForBlocks ?? false);
         return $repeater->render();
     }
 
diff --git a/src/View/Components/Fields/BlockEditor.php b/src/View/Components/Fields/BlockEditor.php
index 9e0be88bf..4bcbca879 100644
--- a/src/View/Components/Fields/BlockEditor.php
+++ b/src/View/Components/Fields/BlockEditor.php
@@ -54,6 +54,7 @@ public function render(): View
                     'value' => $this->name,
                     'nested' => $this->renderForBlocks,
                 ],
+                'availabilityId' => uniqid($this->name . '-')
             ])
         );
     }
diff --git a/views/partials/form/_block_editor.blade.php b/views/partials/form/_block_editor.blade.php
index 174a9d9f0..b5b29479b 100644
--- a/views/partials/form/_block_editor.blade.php
+++ b/views/partials/form/_block_editor.blade.php
@@ -3,12 +3,14 @@
 @endunless
 
 <a17-blocks title="{{ $label }}"
+    availability-id="{{ $availabilityId }}"
     @if ($renderForBlocks) :editor-name="nestedEditorName('{{ $name }}')" @else editor-name="{{ $name }}" @endif
-    trigger="{{ $trigger }}" :is-settings="{{ (bool) $isSettings ? 'true' : 'false' }}">
+
+    trigger="{{ $trigger }}" :is-settings="{{ $isSettings ? 'true' : 'false' }}">
 </a17-blocks>
 
 @push('vuexStore')
-    window['{{ config('twill.js_namespace') }}'].STORE.form.availableBlocks['{{ $name }}'] =
+    window['{{ config('twill.js_namespace') }}'].STORE.form.availableBlocks['{{ $availabilityId }}'] =
     {!! json_encode(array_values($allowedBlocks)) !!}
     window['{{ config('twill.js_namespace') }}'].STORE.form.editorNames.push({!! json_encode($editorName) !!})
 @endpush