From f26d2e1d0b759ed6367303eb8e28330a2d968ba7 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Thu, 3 Oct 2024 23:26:32 +0200
Subject: [PATCH 1/3] chore: Update version to 4.0.0-beta.356

---
 config/sentry.php  | 2 +-
 config/version.php | 2 +-
 versions.json      | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/config/sentry.php b/config/sentry.php
index e9ccf0a32..14f8ff5f1 100644
--- a/config/sentry.php
+++ b/config/sentry.php
@@ -7,7 +7,7 @@ return [
 
     // The release version of your application
     // Example with dynamic git hash: trim(exec('git --git-dir ' . base_path('.git') . ' log --pretty="%h" -n1 HEAD'))
-    'release' => '4.0.0-beta.355',
+    'release' => '4.0.0-beta.356',
     // When left empty or `null` the Laravel environment will be used
     'environment' => config('app.env'),
 
diff --git a/config/version.php b/config/version.php
index 03fbf57ef..b33115d86 100644
--- a/config/version.php
+++ b/config/version.php
@@ -1,3 +1,3 @@
 <?php
 
-return '4.0.0-beta.355';
+return '4.0.0-beta.356';
diff --git a/versions.json b/versions.json
index 4d2f27e57..94d7327a6 100644
--- a/versions.json
+++ b/versions.json
@@ -1,10 +1,10 @@
 {
     "coolify": {
         "v4": {
-            "version": "4.0.0-beta.355"
+            "version": "4.0.0-beta.356"
         },
         "nightly": {
-            "version": "4.0.0-beta.356"
+            "version": "4.0.0-beta.357"
         },
         "helper": {
             "version": "1.0.1"

From 65aeebd9fab6ebddd9a16c8ecec3df20a7970b47 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Thu, 3 Oct 2024 23:27:23 +0200
Subject: [PATCH 2/3] fix: Reset description and subject fields after
 submitting feedback

---
 app/Livewire/Help.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/Livewire/Help.php b/app/Livewire/Help.php
index 68691c1cd..934e81661 100644
--- a/app/Livewire/Help.php
+++ b/app/Livewire/Help.php
@@ -61,6 +61,7 @@ class Help extends Component
                 send_user_an_email($mail, auth()->user()?->email, 'hi@coollabs.io');
             }
             $this->dispatch('success', 'Feedback sent.', 'We will get in touch with you as soon as possible.');
+            $this->reset('description', 'subject');
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }

From 2ca73695b3350255ef953410dc6fe7d5ddcf9bb9 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Fri, 4 Oct 2024 10:22:58 +0200
Subject: [PATCH 3/3] fix: tag mass redeployments

---
 resources/views/livewire/tags/index.blade.php | 20 ++++++++-----------
 resources/views/livewire/tags/show.blade.php  | 19 +++++++-----------
 2 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/resources/views/livewire/tags/index.blade.php b/resources/views/livewire/tags/index.blade.php
index 88c47cb7d..287e1da55 100644
--- a/resources/views/livewire/tags/index.blade.php
+++ b/resources/views/livewire/tags/index.blade.php
@@ -20,18 +20,14 @@
                             <div class="w-[500px]">
                                 <x-forms.input readonly label="Deploy Webhook URL" id="webhook" />
                             </div>
-                            <x-modal-confirmation 
-                            title="Redeploy all resources with this tag?"
-                            isHighlighted
-                            buttonTitle="Redeploy All"
-                            submitAction="redeploy_all"
-                            :actions="['All resources with this tag will be redeployed.', 'During redeploy resources will be temporarily unavailable.']"
-                            confirmationText="{{ $oneTag->name }}"
-                            confirmationLabel="Please confirm the execution of the actions by entering the Tag Name below"
-                            shortConfirmationLabel="Tag Name"
-                            :confirmWithPassword="false"
-                            step2ButtonText="Redeploy All"
-                            />
+                            <x-modal-confirmation title="Redeploy all resources with this tag?" isHighlighted
+                                buttonTitle="Redeploy All" submitAction="redeploy_all" :actions="[
+                                    'All resources with this tag will be redeployed.',
+                                    'During redeploy resources will be temporarily unavailable.',
+                                ]"
+                                confirmationText="{{ $tag }}"
+                                confirmationLabel="Please confirm the execution of the actions by entering the Tag Name below"
+                                shortConfirmationLabel="Tag Name" :confirmWithPassword="false" step2ButtonText="Redeploy All" />
                         </div>
                         <div class="grid grid-cols-1 gap-2 pt-4 lg:grid-cols-2 xl:grid-cols-3">
                             @foreach ($applications as $application)
diff --git a/resources/views/livewire/tags/show.blade.php b/resources/views/livewire/tags/show.blade.php
index 0b743a3e5..869b56dae 100644
--- a/resources/views/livewire/tags/show.blade.php
+++ b/resources/views/livewire/tags/show.blade.php
@@ -24,18 +24,13 @@
             <div class="w-[500px]">
                 <x-forms.input readonly label="Deploy Webhook URL" id="webhook" />
             </div>
-            <x-modal-confirmation 
-            title="Redeploy all resources with this tag?"
-            isHighlighted
-            buttonTitle="Redeploy All"
-            submitAction="redeploy_all"
-            :actions="['All resources with this tag will be redeployed.', 'During redeploy resources will be temporarily unavailable.']"
-            confirmationText="{{ $oneTag->name }}"
-            confirmationLabel="Please confirm the execution of the actions by entering the Tag Name below"
-            shortConfirmationLabel="Tag Name"
-            :confirmWithPassword="false"
-            step2ButtonText="Redeploy All"
-            />
+            <x-modal-confirmation title="Redeploy all resources with this tag?" isHighlighted buttonTitle="Redeploy All"
+                submitAction="redeploy_all" :actions="[
+                    'All resources with this tag will be redeployed.',
+                    'During redeploy resources will be temporarily unavailable.',
+                ]" confirmationText="{{ $tag }}"
+                confirmationLabel="Please confirm the execution of the actions by entering the Tag Name below"
+                shortConfirmationLabel="Tag Name" :confirmWithPassword="false" step2ButtonText="Redeploy All" />
         </div>
         <div class="grid grid-cols-1 gap-2 pt-4 lg:grid-cols-2 xl:grid-cols-3">
             @foreach ($applications as $application)