From fd09b5b30f0cac51dbe0d0256024c038deccc87c Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Wed, 26 Feb 2025 08:22:55 +0100
Subject: [PATCH] refactor(ui): Simplify file storage modal confirmations

---
 .../project/service/file-storage.blade.php    | 21 +++++++------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/resources/views/livewire/project/service/file-storage.blade.php b/resources/views/livewire/project/service/file-storage.blade.php
index b37137923..550b43c20 100644
--- a/resources/views/livewire/project/service/file-storage.blade.php
+++ b/resources/views/livewire/project/service/file-storage.blade.php
@@ -21,15 +21,6 @@
                     ]" confirmationText="{{ $fs_path }}"
                     confirmationLabel="Please confirm the execution of the actions by entering the Filepath below"
                     shortConfirmationLabel="Filepath" :confirmWithPassword="false" step2ButtonText="Convert to file" />
-            @else
-                <x-modal-confirmation 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.',
-                    ]" confirmationText="{{ $fs_path }}"
-                    confirmationLabel="Please confirm the execution of the actions by entering the Filepath below"
-                    shortConfirmationLabel="Filepath" :confirmWithPassword="false" step2ButtonText="Convert to directory" />
-            @endif
-            @if ($fileStorage->is_directory)
                 <x-modal-confirmation title="Confirm Directory Deletion?" buttonTitle="Delete Directory" isErrorButton
                     submitAction="delete" :checkboxes="$directoryDeletionCheckboxes" :actions="[
                         'The selected directory and all its contents will be permanently deleted from the container.',
@@ -37,13 +28,18 @@
                     confirmationLabel="Please confirm the execution of the actions by entering the Filepath below"
                     shortConfirmationLabel="Filepath" step3ButtonText="Permanently Delete" />
             @else
+                <x-modal-confirmation 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.',
+                    ]" confirmationText="{{ $fs_path }}"
+                    confirmationLabel="Please confirm the execution of the actions by entering the Filepath below"
+                    shortConfirmationLabel="Filepath" :confirmWithPassword="false" step2ButtonText="Convert to directory" />
                 <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 }}"
                     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)
+            {{-- @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
@@ -58,7 +54,7 @@
                             label="Permanently delete file from the server?"></x-forms.checkbox>
                     @endif
                 </x-modal-confirmation>
-            @endif
+            @endif --}}
         </div>
         @if (!$fileStorage->is_directory)
             @if (data_get($resource, 'settings.is_preserve_repository_enabled'))
@@ -75,6 +71,5 @@
                 <x-forms.button class="w-full" type="submit">Save</x-forms.button>
             @endif
         @endif
-
     </form>
 </div>