From 815fa538da7f2c69fd79bfbef71c8060fe6988c8 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Thu, 8 Jun 2023 09:31:27 +0200
Subject: [PATCH] fix deployment

---
 app/Jobs/ApplicationDeploymentJob.php                    | 7 ++++---
 .../livewire/project/application/preview/form.blade.php  | 2 +-
 .../livewire/project/application/previews.blade.php      | 2 +-
 .../livewire/project/application/rollback.blade.php      | 9 +++------
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/app/Jobs/ApplicationDeploymentJob.php b/app/Jobs/ApplicationDeploymentJob.php
index 92c057a5f..d962fa6a6 100644
--- a/app/Jobs/ApplicationDeploymentJob.php
+++ b/app/Jobs/ApplicationDeploymentJob.php
@@ -565,13 +565,14 @@ COPY --from=$this->build_image_name /app/{$this->application->publish_directory}
         ]);
         $this->activity->save();
         if ($isDebuggable && !$this->application->settings->is_debug_enabled) {
+            ray('Debugging is disabled for this application. Skipping command.');
             $hideFromOutput = true;
         }
         $remote_process = resolve(RunRemoteProcess::class, [
             'activity' => $this->activity,
-            'hideFromOutput' => $hideFromOutput,
-            'isFinished' => $isFinished,
-            'ignoreErrors' => $ignoreErrors,
+            'hide_from_output' => $hideFromOutput,
+            'is_finished' => $isFinished,
+            'ingore_errors' => $ignoreErrors,
         ]);
         $result = $remote_process();
         if ($propertyName) {
diff --git a/resources/views/livewire/project/application/preview/form.blade.php b/resources/views/livewire/project/application/preview/form.blade.php
index 2518e4404..0cecf436e 100644
--- a/resources/views/livewire/project/application/preview/form.blade.php
+++ b/resources/views/livewire/project/application/preview/form.blade.php
@@ -2,7 +2,7 @@
     <div class="flex items-center gap-2">
         <h2>Previews Deployments</h2>
         <x-forms.button type="submit">Save</x-forms.button>
-        <x-forms.button wire:click="resetToDefault">Reset to default</x-forms.button>
+        <x-forms.button wire:click="resetToDefault">Reset template to default</x-forms.button>
     </div>
     <div class="pb-4 text-sm">Preview Deployments based on pull requests are here.</div>
     <div class="flex flex-col gap-2 pb-4">
diff --git a/resources/views/livewire/project/application/previews.blade.php b/resources/views/livewire/project/application/previews.blade.php
index 2033c6a28..0ce22c86b 100644
--- a/resources/views/livewire/project/application/previews.blade.php
+++ b/resources/views/livewire/project/application/previews.blade.php
@@ -3,7 +3,7 @@
     <div>
         <div class="flex items-center gap-2">
             <h3>Pull Requests on Git</h3>
-            <x-forms.button wire:click="load_prs">Load Pull Requests (open)
+            <x-forms.button wire:click="load_prs">Load (Open) Pull Requests
             </x-forms.button>
         </div>
         @isset($rate_limit_remaining)
diff --git a/resources/views/livewire/project/application/rollback.blade.php b/resources/views/livewire/project/application/rollback.blade.php
index c9cb0bec1..380b43d1e 100644
--- a/resources/views/livewire/project/application/rollback.blade.php
+++ b/resources/views/livewire/project/application/rollback.blade.php
@@ -4,9 +4,9 @@
         <x-forms.button wire:click='loadImages'>Reload Available Images</x-forms.button>
     </div>
     <div class="pb-4 text-sm">You can easily rollback to a previously built image quickly.</div>
-    <div wire:loading.remove wire:target='loadImages'>
+    <div wire:target='loadImages'>
         <div class="flex flex-wrap">
-            @forelse ($images as $image)
+            @foreach ($images as $image)
                 <div class="w-2/4 p-2">
                     <div class="rounded shadow-lg bg-coolgray-200">
                         <div class="p-2">
@@ -32,10 +32,7 @@
                         </div>
                     </div>
                 </div>
-            @empty
-                <div>No images found
-                </div>
-            @endforelse
+            @endforeach
         </div>
     </div>
 </div>