From a660dd8c83953c38fd5ed8105de490ea8337e602 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <5845193+andrasbacsai@users.noreply.github.com>
Date: Mon, 3 Nov 2025 08:57:52 +0100
Subject: [PATCH] fix: streamline helper version retrieval and improve
 migration clarity

---
 bootstrap/helpers/shared.php                  |   3 +-
 .../views/livewire/settings/index.blade.php   | 182 +++++++++---------
 2 files changed, 89 insertions(+), 96 deletions(-)

diff --git a/bootstrap/helpers/shared.php b/bootstrap/helpers/shared.php
index 68813cec2..560bc1ebb 100644
--- a/bootstrap/helpers/shared.php
+++ b/bootstrap/helpers/shared.php
@@ -2907,8 +2907,7 @@ function getHelperVersion(): string
         return $settings->dev_helper_version;
     }
 
-    // In production or when dev_helper_version is not set, use the configured helper_version
-    return $settings->helper_version ?? config('constants.coolify.helper_version');
+    return config('constants.coolify.helper_version');
 }
 
 function loadConfigFromGit(string $repository, string $branch, string $base_directory, int $server_id, int $team_id)
diff --git a/resources/views/livewire/settings/index.blade.php b/resources/views/livewire/settings/index.blade.php
index ac247f7bd..85c151399 100644
--- a/resources/views/livewire/settings/index.blade.php
+++ b/resources/views/livewire/settings/index.blade.php
@@ -1,28 +1,29 @@
 <div>
     <x-slot:title>
         Settings | Coolify
-    </x-slot>
-    <x-settings.navbar />
-    <div x-data="{ activeTab: window.location.hash ? window.location.hash.substring(1) : 'general' }" class="flex flex-col h-full gap-8 sm:flex-row">
-        <x-settings.sidebar activeMenu="general" />
-        <form wire:submit='submit' class="flex flex-col">
-            <div class="flex items-center gap-2">
-                <h2>General</h2>
-                <x-forms.button type="submit">
-                    Save
-                </x-forms.button>
-            </div>
-            <div class="pb-4">General configuration for your Coolify instance.</div>
+        </x-slot>
+        <x-settings.navbar />
+        <div x-data="{ activeTab: window.location.hash ? window.location.hash.substring(1) : 'general' }"
+            class="flex flex-col h-full gap-8 sm:flex-row">
+            <x-settings.sidebar activeMenu="general" />
+            <form wire:submit='submit' class="flex flex-col">
+                <div class="flex items-center gap-2">
+                    <h2>General</h2>
+                    <x-forms.button type="submit">
+                        Save
+                    </x-forms.button>
+                </div>
+                <div class="pb-4">General configuration for your Coolify instance.</div>
 
-            <div class="flex flex-col gap-2">
-                <div class="flex flex-wrap items-end gap-2">
-                    <div class="flex gap-2 md:flex-row flex-col w-full">
-                        <x-forms.input id="fqdn" label="Domain"
-                            helper="Enter the full domain name (FQDN) of the instance, including 'https://' if you want to secure the dashboard with HTTPS. Setting this will make the dashboard accessible via this domain, secured by HTTPS, instead of just the IP address."
-                            placeholder="https://coolify.yourdomain.com" />
-                        <x-forms.input id="instance_name" label="Name" placeholder="Coolify"
-                            helper="Custom name for your Coolify instance, shown in the URL." />
-                        <div class="w-full" x-data="{
+                <div class="flex flex-col gap-2">
+                    <div class="flex flex-wrap items-end gap-2">
+                        <div class="flex gap-2 md:flex-row flex-col w-full">
+                            <x-forms.input id="fqdn" label="Domain"
+                                helper="Enter the full domain name (FQDN) of the instance, including 'https://' if you want to secure the dashboard with HTTPS. Setting this will make the dashboard accessible via this domain, secured by HTTPS, instead of just the IP address."
+                                placeholder="https://coolify.yourdomain.com" />
+                            <x-forms.input id="instance_name" label="Name" placeholder="Coolify"
+                                helper="Custom name for your Coolify instance, shown in the URL." />
+                            <div class="w-full" x-data="{
                             open: false,
                             search: '{{ $settings->instance_timezone ?: '' }}',
                             timezones: @js($this->timezones),
@@ -35,82 +36,75 @@
                                 })
                             }
                         }">
-                            <div class="flex items-center mb-1">
-                                <label for="instance_timezone">Instance
-                                    Timezone</label>
-                                <x-helper class="ml-2"
-                                    helper="Timezone for the Coolify instance. This is used for the update check and automatic update frequency." />
-                            </div>
-                            <div class="relative">
-                                <div class="inline-flex relative items-center w-full">
-                                    <input autocomplete="off"
-                                        wire:dirty.class.remove='dark:focus:ring-coolgray-300 dark:ring-coolgray-300'
-                                        wire:dirty.class="dark:focus:ring-warning dark:ring-warning" x-model="search"
-                                        @focus="open = true" @click.away="open = false" @input="open = true"
-                                        class="w-full input" :placeholder="placeholder" wire:model="instance_timezone">
-                                    <svg class="absolute right-0 mr-2 w-4 h-4" xmlns="http://www.w3.org/2000/svg"
-                                        fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor"
-                                        @click="open = true">
-                                        <path stroke-linecap="round" stroke-linejoin="round"
-                                            d="M8.25 15L12 18.75 15.75 15m-7.5-6L12 5.25 15.75 9" />
-                                    </svg>
+                                <div class="flex items-center mb-1">
+                                    <label for="instance_timezone">Instance
+                                        Timezone</label>
+                                    <x-helper class="ml-2"
+                                        helper="Timezone for the Coolify instance. This is used for the update check and automatic update frequency." />
                                 </div>
-                                <div x-show="open"
-                                    class="overflow-auto overflow-x-hidden absolute z-50 mt-1 w-full max-h-60 bg-white rounded-md border shadow-lg dark:bg-coolgray-100 dark:border-coolgray-200 scrollbar">
-                                    <template
-                                        x-for="timezone in timezones.filter(tz => tz.toLowerCase().includes(search.toLowerCase()))"
-                                        :key="timezone">
-                                        <div @click="search = timezone; open = false; $wire.set('instance_timezone', timezone); $wire.submit()"
-                                            class="px-4 py-2 text-gray-800 cursor-pointer hover:bg-gray-100 dark:hover:bg-coolgray-300 dark:text-gray-200"
-                                            x-text="timezone"></div>
-                                    </template>
+                                <div class="relative">
+                                    <div class="inline-flex relative items-center w-full">
+                                        <input autocomplete="off"
+                                            wire:dirty.class.remove='dark:focus:ring-coolgray-300 dark:ring-coolgray-300'
+                                            wire:dirty.class="dark:focus:ring-warning dark:ring-warning"
+                                            x-model="search" @focus="open = true" @click.away="open = false"
+                                            @input="open = true" class="w-full input" :placeholder="placeholder"
+                                            wire:model="instance_timezone">
+                                        <svg class="absolute right-0 mr-2 w-4 h-4" xmlns="http://www.w3.org/2000/svg"
+                                            fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor"
+                                            @click="open = true">
+                                            <path stroke-linecap="round" stroke-linejoin="round"
+                                                d="M8.25 15L12 18.75 15.75 15m-7.5-6L12 5.25 15.75 9" />
+                                        </svg>
+                                    </div>
+                                    <div x-show="open"
+                                        class="overflow-auto overflow-x-hidden absolute z-50 mt-1 w-full max-h-60 bg-white rounded-md border shadow-lg dark:bg-coolgray-100 dark:border-coolgray-200 scrollbar">
+                                        <template
+                                            x-for="timezone in timezones.filter(tz => tz.toLowerCase().includes(search.toLowerCase()))"
+                                            :key="timezone">
+                                            <div @click="search = timezone; open = false; $wire.set('instance_timezone', timezone); $wire.submit()"
+                                                class="px-4 py-2 text-gray-800 cursor-pointer hover:bg-gray-100 dark:hover:bg-coolgray-300 dark:text-gray-200"
+                                                x-text="timezone"></div>
+                                        </template>
+                                    </div>
                                 </div>
                             </div>
                         </div>
-                    </div>
-                    <div class="flex gap-2 md:flex-row flex-col w-full">
-                        <x-forms.input id="public_ipv4" type="password" label="Instance's Public IPv4"
-                            helper="Enter the IPv4 address of the instance.<br><br>It is useful if you have several IPv4 addresses and Coolify could not detect the correct one."
-                            placeholder="1.2.3.4" autocomplete="new-password" />
-                        <x-forms.input id="public_ipv6" type="password" label="Instance's Public IPv6"
-                            helper="Enter the IPv6 address of the instance.<br><br>It is useful if you have several IPv6 addresses and Coolify could not detect the correct one."
-                            placeholder="2001:db8::1" autocomplete="new-password" />
-                    </div>
-                    @if(isDev())
-                    <div class="flex gap-2 md:flex-row flex-col w-full">
-                        <div class="flex-1">
-                            <x-forms.input id="dev_helper_version" label="Dev Helper Version (Development Only)"
-                                helper="Override the default coolify-helper image version. Leave empty to use the default version from config ({{ config('constants.coolify.helper_version') }}). Examples: 1.0.11, latest, dev"
-                                placeholder="{{ config('constants.coolify.helper_version') }}" />
+                        <div class="flex gap-2 md:flex-row flex-col w-full">
+                            <x-forms.input id="public_ipv4" type="password" label="Instance's Public IPv4"
+                                helper="Enter the IPv4 address of the instance.<br><br>It is useful if you have several IPv4 addresses and Coolify could not detect the correct one."
+                                placeholder="1.2.3.4" autocomplete="new-password" />
+                            <x-forms.input id="public_ipv6" type="password" label="Instance's Public IPv6"
+                                helper="Enter the IPv6 address of the instance.<br><br>It is useful if you have several IPv6 addresses and Coolify could not detect the correct one."
+                                placeholder="2001:db8::1" autocomplete="new-password" />
                         </div>
-                        <div class="flex items-end">
-                            <x-forms.button wire:click="buildHelperImage" type="button">
-                                Build Image
-                            </x-forms.button>
-                        </div>
-                    </div>
-                    @if($buildActivityId)
-                    <div class="w-full mt-4">
-                        <livewire:activity-monitor header="Building Helper Image" :activityId="$buildActivityId" :fullHeight="false" />
-                    </div>
-                    @endif
-                    @endif
+
+                        @if($buildActivityId)
+                            <div class="w-full mt-4">
+                                <livewire:activity-monitor header="Building Helper Image" :activityId="$buildActivityId"
+                                    :fullHeight="false" />
+                            </div>
+                        @endif
+                        @if(isDev())
+
+                                <x-forms.input id="dev_helper_version" label="Dev Helper Version (Development Only)"
+                                    helper="Override the default coolify-helper image version. Leave empty to use the default version from config ({{ config('constants.coolify.helper_version') }}). Examples: 1.0.11, latest, dev"
+                                    placeholder="{{ config('constants.coolify.helper_version') }}" />
+                            </div>
+                        @endif
                 </div>
-            </div>
-        </form>
-        
-        <x-domain-conflict-modal 
-            :conflicts="$domainConflicts" 
-            :showModal="$showDomainConflictModal" 
-            confirmAction="confirmDomainUsage">
-            <x-slot:consequences>
-                <ul class="mt-2 ml-4 list-disc">
-                    <li>The Coolify instance domain will conflict with existing resources</li>
-                    <li>SSL certificates might not work correctly</li>
-                    <li>Routing behavior will be unpredictable</li>
-                    <li>You may not be able to access the Coolify dashboard properly</li>
-                </ul>
-            </x-slot:consequences>
-        </x-domain-conflict-modal>
-    </div>
-</div>
+            </form>
+
+            <x-domain-conflict-modal :conflicts="$domainConflicts" :showModal="$showDomainConflictModal"
+                confirmAction="confirmDomainUsage">
+                <x-slot:consequences>
+                    <ul class="mt-2 ml-4 list-disc">
+                        <li>The Coolify instance domain will conflict with existing resources</li>
+                        <li>SSL certificates might not work correctly</li>
+                        <li>Routing behavior will be unpredictable</li>
+                        <li>You may not be able to access the Coolify dashboard properly</li>
+                    </ul>
+                </x-slot:consequences>
+            </x-domain-conflict-modal>
+        </div>
+</div>
\ No newline at end of file