From 2de8cd1d6f8f8a4e4b6aaab874817a1c9e4c3216 Mon Sep 17 00:00:00 2001
From: w3cj <cj@null.computer>
Date: Fri, 12 Apr 2024 14:49:26 -0600
Subject: [PATCH 1/3] fix #1975: add wire:key to edit-domain

---
 .../views/livewire/project/service/configuration.blade.php      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/livewire/project/service/configuration.blade.php b/resources/views/livewire/project/service/configuration.blade.php
index e90d2d605..3d85d9ee5 100644
--- a/resources/views/livewire/project/service/configuration.blade.php
+++ b/resources/views/livewire/project/service/configuration.blade.php
@@ -88,7 +88,7 @@
                                                     </span>
                                                 </x-slot:content>
                                                 <livewire:project.service.edit-domain
-                                                    applicationId="{{ $application->id }}" />
+                                                    applicationId="{{ $application->id }}" wire:key="edit-domain-{{ $application->id }}" />
                                             </x-modal-input>
                                         </span>
                                     @endif

From d444211c68ae237de25c50644db22694922838af Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Fri, 12 Apr 2024 23:12:15 +0200
Subject: [PATCH 2/3] Update version numbers and fix domain editing

---
 config/sentry.php                                         | 2 +-
 config/version.php                                        | 2 +-
 .../livewire/project/service/configuration.blade.php      | 8 +++++---
 .../views/livewire/project/service/edit-domain.blade.php  | 3 ++-
 versions.json                                             | 2 +-
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/config/sentry.php b/config/sentry.php
index e0a923f0b..c399f7933 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.257',
+    'release' => '4.0.0-beta.258',
     // 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 f395ea35c..d0fd506d3 100644
--- a/config/version.php
+++ b/config/version.php
@@ -1,3 +1,3 @@
 <?php
 
-return '4.0.0-beta.257';
+return '4.0.0-beta.258';
diff --git a/resources/views/livewire/project/service/configuration.blade.php b/resources/views/livewire/project/service/configuration.blade.php
index e90d2d605..dbc9bc803 100644
--- a/resources/views/livewire/project/service/configuration.blade.php
+++ b/resources/views/livewire/project/service/configuration.blade.php
@@ -71,10 +71,12 @@
                                     @endif
                                     @if ($application->fqdn)
                                         <span class="flex gap-1 text-xs">{{ Str::limit($application->fqdn, 60) }}
-                                            <x-modal-input title="Edit Domains">
+                                            <x-modal-input wire:key="application-{{ $application->name }}"
+                                                title="Edit Domains">
                                                 <x-slot:content>
                                                     <span class="cursor-pointer">
-                                                        <svg xmlns="http://www.w3.org/2000/svg" class="w-4 h-4 dark:text-warning text-coollabs"
+                                                        <svg xmlns="http://www.w3.org/2000/svg"
+                                                            class="w-4 h-4 dark:text-warning text-coollabs"
                                                             viewBox="0 0 24 24">
                                                             <g fill="none" stroke="currentColor"
                                                                 stroke-linecap="round" stroke-linejoin="round"
@@ -84,10 +86,10 @@
                                                                 <path d="M9 7.07A7 7 0 0 0 10 21a7 7 0 0 0 6.929-6" />
                                                             </g>
                                                         </svg>
-
                                                     </span>
                                                 </x-slot:content>
                                                 <livewire:project.service.edit-domain
+                                                    wire:key="application-{{ $application->uuid }}"
                                                     applicationId="{{ $application->id }}" />
                                             </x-modal-input>
                                         </span>
diff --git a/resources/views/livewire/project/service/edit-domain.blade.php b/resources/views/livewire/project/service/edit-domain.blade.php
index 909d02169..3237edb06 100644
--- a/resources/views/livewire/project/service/edit-domain.blade.php
+++ b/resources/views/livewire/project/service/edit-domain.blade.php
@@ -1,5 +1,6 @@
 <form wire:submit.prevent='submit' class="flex flex-col w-full gap-2">
-    <x-forms.input  required placeholder="https://app.coolify.io" label="Domains" id="application.fqdn"
+    <div class="pb-2">Note: If a service has a defined port, do not delete it. <br>If you want to use your custom domain, you can add it with a port.</div>
+    <x-forms.input required placeholder="https://app.coolify.io" label="Domains" id="application.fqdn"
         helper="You can specify one domain with path or more with comma. You can specify a port to bind the domain to.<br><br><span class='text-helper'>Example</span><br>- http://app.coolify.io, https://cloud.coolify.io/dashboard<br>- http://app.coolify.io/api/v3<br>- http://app.coolify.io:3000 -> app.coolify.io will point to port 3000 inside the container. "></x-forms.input>
     <x-forms.button type="submit">Save</x-forms.button>
 </form>
diff --git a/versions.json b/versions.json
index ccb225d96..aa96c1ea9 100644
--- a/versions.json
+++ b/versions.json
@@ -1,7 +1,7 @@
 {
     "coolify": {
         "v4": {
-            "version": "4.0.0-beta.257"
+            "version": "4.0.0-beta.258"
         }
     }
 }

From 3328d20b2ddd9242cde38fa390d9a543d16fe65c Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Fri, 12 Apr 2024 23:13:17 +0200
Subject: [PATCH 3/3] Refactor domain editing in service configuration view

---
 .../livewire/project/service/configuration.blade.php      | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/resources/views/livewire/project/service/configuration.blade.php b/resources/views/livewire/project/service/configuration.blade.php
index dbc9bc803..e90d2d605 100644
--- a/resources/views/livewire/project/service/configuration.blade.php
+++ b/resources/views/livewire/project/service/configuration.blade.php
@@ -71,12 +71,10 @@
                                     @endif
                                     @if ($application->fqdn)
                                         <span class="flex gap-1 text-xs">{{ Str::limit($application->fqdn, 60) }}
-                                            <x-modal-input wire:key="application-{{ $application->name }}"
-                                                title="Edit Domains">
+                                            <x-modal-input title="Edit Domains">
                                                 <x-slot:content>
                                                     <span class="cursor-pointer">
-                                                        <svg xmlns="http://www.w3.org/2000/svg"
-                                                            class="w-4 h-4 dark:text-warning text-coollabs"
+                                                        <svg xmlns="http://www.w3.org/2000/svg" class="w-4 h-4 dark:text-warning text-coollabs"
                                                             viewBox="0 0 24 24">
                                                             <g fill="none" stroke="currentColor"
                                                                 stroke-linecap="round" stroke-linejoin="round"
@@ -86,10 +84,10 @@
                                                                 <path d="M9 7.07A7 7 0 0 0 10 21a7 7 0 0 0 6.929-6" />
                                                             </g>
                                                         </svg>
+
                                                     </span>
                                                 </x-slot:content>
                                                 <livewire:project.service.edit-domain
-                                                    wire:key="application-{{ $application->uuid }}"
                                                     applicationId="{{ $application->id }}" />
                                             </x-modal-input>
                                         </span>