From a73cfd8b0924092e25a12cc3bd61f0e2945bd78d Mon Sep 17 00:00:00 2001
From: Andras Bacsai <5845193+andrasbacsai@users.noreply.github.com>
Date: Tue, 25 Mar 2025 09:49:38 +0100
Subject: [PATCH] refactor(modal): add ignoreWire attribute to
 modal-confirmation component

---
 .../components/modal-confirmation.blade.php   | 12 +++---
 .../project/service/file-storage.blade.php    | 37 ++++++-------------
 2 files changed, 18 insertions(+), 31 deletions(-)

diff --git a/resources/views/components/modal-confirmation.blade.php b/resources/views/components/modal-confirmation.blade.php
index cc15de99e..dae5a060b 100644
--- a/resources/views/components/modal-confirmation.blade.php
+++ b/resources/views/components/modal-confirmation.blade.php
@@ -21,6 +21,7 @@
     'dispatchEvent' => false,
     'dispatchEventType' => 'success',
     'dispatchEventMessage' => '',
+    'ignoreWire' => true,
 ])
 
 @php
@@ -28,7 +29,7 @@
     $disableTwoStepConfirmation = data_get(InstanceSettings::get(), 'disable_two_step_confirmation');
 @endphp
 
-<div wire:ignore x-data="{
+<div {{ $ignoreWire ? 'wire:ignore' : '' }} x-data="{
     modalOpen: false,
     step: {{ empty($checkboxes) ? 2 : 1 }},
     initialStep: {{ empty($checkboxes) ? 2 : 1 }},
@@ -98,8 +99,9 @@
             this.selectedActions.push(id);
         }
     }
-}" @keydown.escape.window="modalOpen = false; resetModal()"
-    :class="{ 'z-40': modalOpen }" class="relative w-auto h-auto">
+}"
+    @keydown.escape.window="modalOpen = false; resetModal()" :class="{ 'z-40': modalOpen }"
+    class="relative w-auto h-auto">
     @if ($customButton)
         @if ($buttonFullWidth)
             <x-forms.button @click="modalOpen=true" class="w-full">
@@ -247,9 +249,7 @@
                                     <h4 class="mb-2 text-lg font-semibold">Confirm Actions</h4>
                                     <p class="mb-2 text-sm">{{ $confirmationLabel }}</p>
                                     <div class="relative mb-2">
-                                        <x-forms.copy-button 
-                                            text="{{ $confirmationText }}"
-                                        />
+                                        <x-forms.copy-button text="{{ $confirmationText }}" />
                                     </div>
 
                                     <label for="userConfirmationText"
diff --git a/resources/views/livewire/project/service/file-storage.blade.php b/resources/views/livewire/project/service/file-storage.blade.php
index e17835429..6010000c4 100644
--- a/resources/views/livewire/project/service/file-storage.blade.php
+++ b/resources/views/livewire/project/service/file-storage.blade.php
@@ -15,21 +15,23 @@
     <form wire:submit='submit' class="flex flex-col gap-2">
         <div class="flex gap-2">
             @if ($fileStorage->is_directory)
-                <x-modal-confirmation title="Confirm Directory Conversion to File?" buttonTitle="Convert to file"
-                    submitAction="convertToFile" :actions="[
+                <x-modal-confirmation :ignoreWire="false" title="Confirm Directory Conversion to File?"
+                    buttonTitle="Convert to file" submitAction="convertToFile" :actions="[
                         'All files in this directory will be permanently deleted and an empty file will be created in its place.',
-                    ]" confirmationText="{{ $fs_path }}"
+                    ]"
+                    confirmationText="{{ $fs_path }}"
                     confirmationLabel="Please confirm the execution of the actions by entering the Filepath below"
                     shortConfirmationLabel="Filepath" :confirmWithPassword="false" step2ButtonText="Convert to file" />
-                <x-modal-confirmation title="Confirm Directory Deletion?" buttonTitle="Delete Directory" isErrorButton
-                    submitAction="delete" :checkboxes="$directoryDeletionCheckboxes" :actions="[
+                <x-modal-confirmation :ignoreWire="false" title="Confirm Directory Deletion?" buttonTitle="Delete"
+                    isErrorButton submitAction="delete" :checkboxes="$directoryDeletionCheckboxes" :actions="[
                         'The selected directory and all its contents will be permanently deleted from the container.',
-                    ]" confirmationText="{{ $fs_path }}"
+                    ]"
+                    confirmationText="{{ $fs_path }}"
                     confirmationLabel="Please confirm the execution of the actions by entering the Filepath below"
                     shortConfirmationLabel="Filepath" step3ButtonText="Permanently Delete" />
             @else
                 @if (!$fileStorage->is_binary)
-                    <x-modal-confirmation title="Confirm File Conversion to Directory?"
+                    <x-modal-confirmation :ignoreWire="false" title="Confirm File Conversion to Directory?"
                         buttonTitle="Convert to directory" submitAction="convertToDirectory" :actions="[
                             'The selected file will be permanently deleted and an empty directory will be created in its place.',
                         ]"
@@ -37,27 +39,12 @@
                         confirmationLabel="Please confirm the execution of the actions by entering the Filepath below"
                         shortConfirmationLabel="Filepath" :confirmWithPassword="false" step2ButtonText="Convert to directory" />
                 @endif
-                <x-modal-confirmation title="Confirm File Deletion?" buttonTitle="Delete File" isErrorButton
-                    submitAction="delete" :checkboxes="$fileDeletionCheckboxes" :actions="['The selected file will be permanently deleted from the container.']" confirmationText="{{ $fs_path }}"
+                <x-modal-confirmation :ignoreWire="false" title="Confirm File Deletion?" buttonTitle="Delete"
+                    isErrorButton submitAction="delete" :checkboxes="$fileDeletionCheckboxes" :actions="['The selected file will be permanently deleted from the container.']"
+                    confirmationText="{{ $fs_path }}"
                     confirmationLabel="Please confirm the execution of the actions by entering the Filepath below"
                     shortConfirmationLabel="Filepath" step3ButtonText="Permanently Delete" />
             @endif
-            {{-- @if (!$fileStorage->is_based_on_git)
-                <x-modal-confirmation isErrorButton buttonTitle="Delete">
-                    <div class="px-2">This storage will be deleted. It is not reversible. <strong
-                            class="text-error">Please
-                            think
-                            again.</strong><br><br></div>
-                    <h4>Actions</h4>
-                    @if ($fileStorage->is_directory)
-                        <x-forms.checkbox id="permanently_delete"
-                            label="Permanently delete directory from the server?"></x-forms.checkbox>
-                    @else
-                        <x-forms.checkbox id="permanently_delete"
-                            label="Permanently delete file from the server?"></x-forms.checkbox>
-                    @endif
-                </x-modal-confirmation>
-            @endif --}}
         </div>
         @if (!$fileStorage->is_directory)
             @if (data_get($resource, 'settings.is_preserve_repository_enabled'))