fixes

app/Livewire/Project/Application/Heading.php

@@ -142,7 +142,7 @@ class Heading extends Component
     {
         return view('livewire.project.application.heading', [
             'checkboxes' => [
-                ['id' => 'docker_cleanup', 'label' => 'Docker cleanup will be run on the server which removes builder cache and unused images (the next deployment will take longer as the images have to be pulled again)'],
+                ['id' => 'docker_cleanup', 'label' => 'Cleanup docker build cache and unused images (next deployment could take longer).'],
             ],
         ]);
     }

app/Livewire/Project/Database/Heading.php

@@ -78,8 +78,8 @@ class Heading extends Component
     {
         return view('livewire.project.database.heading', [
             'checkboxes' => [
-                ['id' => 'docker_cleanup', 'label' => 'Docker cleanup will be run on the server which removes builder cache and unused images (the next deployment will take longer as the images have to be pulled again)'],
+                ['id' => 'docker_cleanup', 'label' => 'Cleanup docker build cache and unused images (next deployment could take longer).'],
-            ]
+            ],
         ]);
     }
 }

app/Livewire/Project/Service/ServiceApplicationView.php

@@ -3,9 +3,9 @@
 namespace App\Livewire\Project\Service;
 
 use App\Models\ServiceApplication;
-use Livewire\Component;
-use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Hash;
+use Livewire\Component;
 
 class ServiceApplicationView extends Component
 {
@@ -14,8 +14,8 @@ class ServiceApplicationView extends Component
     public $parameters;
 
     public $docker_cleanup = true;
-    public $delete_volumes = true;
 
+    public $delete_volumes = true;
 
     protected $rules = [
         'application.human_name' => 'nullable',
@@ -29,7 +29,7 @@ class ServiceApplicationView extends Component
         'application.is_stripprefix_enabled' => 'nullable|boolean',
     ];
 
-       public function updatedApplicationFqdn()
+    public function updatedApplicationFqdn()
     {
         $this->application->fqdn = str($this->application->fqdn)->replaceEnd(',', '')->trim();
         $this->application->fqdn = str($this->application->fqdn)->replaceStart(',', '')->trim();
@@ -59,8 +59,9 @@ class ServiceApplicationView extends Component
 
     public function delete($password)
     {
-        if (!Hash::check($password, Auth::user()->password)) {
+        if (! Hash::check($password, Auth::user()->password)) {
             $this->addError('password', 'The provided password is incorrect.');
+
             return;
         }
 
@@ -102,12 +103,12 @@ class ServiceApplicationView extends Component
     {
         return view('livewire.project.service.service-application-view', [
             'checkboxes' => [
-                ['id' => 'delete_volumes', 'label' => 'All associated volumes with this resource will be permanently deleted'],
+                ['id' => 'delete_volumes', 'label' => 'All associated volumes with this resource will be permanently deleted.'],
-                ['id' => 'docker_cleanup', 'label' => 'Docker cleanup will be run on the server which removes builder cache and unused images'],
+                ['id' => 'docker_cleanup', 'label' => 'Docker cleanup will be run on the server which removes builder cache and unused images.'],
                 // ['id' => 'delete_associated_backups_locally', 'label' => 'All backups associated with this Ressource will be permanently deleted from local storage.'],
                 // ['id' => 'delete_associated_backups_s3', 'label' => 'All backups associated with this Ressource will be permanently deleted from the selected S3 Storage.'],
                 // ['id' => 'delete_associated_backups_sftp', 'label' => 'All backups associated with this Ressource will be permanently deleted from the selected SFTP Storage.']
-            ]
+            ],
         ]);
     }
 }

resources/views/livewire/project/application/heading.blade.php

@@ -72,19 +72,13 @@
                                 </x-forms.button>
                             @endif
                         @endif
-                        <x-modal-confirmation 
+                        <x-modal-confirmation title="Confirm Application Stopping?" buttonTitle="Stop"
-                            title="Confirm Application Stopping?"
+                            submitAction="stop" :checkboxes="$checkboxes" :actions="[
-                            buttonTitle="Stop"
+                                'This application will be stopped.',
-                            submitAction="stop"
+                                'All non-persistent data of this application will be deleted.',
-                            :checkboxes="$checkboxes"
+                            ]" :confirmWithText="false" :confirmWithPassword="false"
-                            :actions="['This application will be stopped.', 'If the application is currently in use data could be lost.', 'All non-persistent data of this application (containers, networks, unused images) will be deleted (don\'t worry, no data is lost and you can start the application again).']"
+                            step1ButtonText="Continue" step2ButtonText="Confirm" :dispatchEvent="true"
-                            :confirmWithText="false"
+                            dispatchEventType="stopEvent">
-                            :confirmWithPassword="false"
-                            step1ButtonText="Continue Stopping Application"
-                            step2ButtonText="Stop Application"
-                            :dispatchEvent="true"
-                            dispatchEventType="stopEvent"
-                            >
                             <x-slot:button-title>
                                 <svg xmlns="http://www.w3.org/2000/svg" class="w-5 h-5 text-error" viewBox="0 0 24 24"
                                     stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round"