From 3c0c7cc93d1b8e8f9aee5c73a43ec9a17718c2fc Mon Sep 17 00:00:00 2001
From: Andras Bacsai <5845193+andrasbacsai@users.noreply.github.com>
Date: Mon, 19 Oct 2026 13:43:31 +0200
Subject: [PATCH] refactor(patches): move schedule and automatic updates into
 the Server patching section

The check frequency, automatic security updates, and maintenance window
are now fields of the first section, in one row, instead of two extra
boxes. The "not supported" note moved into the existing callout.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 .../server/security/patches.blade.php         | 179 +++++++++---------
 tests/Feature/Server/ServerPatchesTest.php    |   2 +-
 2 files changed, 86 insertions(+), 95 deletions(-)

diff --git a/resources/views/livewire/server/security/patches.blade.php b/resources/views/livewire/server/security/patches.blade.php
index 30a95ad2b3..e3f440cc65 100644
--- a/resources/views/livewire/server/security/patches.blade.php
+++ b/resources/views/livewire/server/security/patches.blade.php
@@ -33,66 +33,94 @@
         <x-server.sidebar :server="$server" activeMenu="security" activeSubMenu="patches" />
 
         <div class="application-settings-form flex w-full flex-col gap-6">
-            <x-application.settings-section id="server-patching-overview-section" title="Server patching"
-                helper="Discover and apply operating system package updates.">
-                <x-slot:actions>
-                    <x-status-badge status="Experimental" type="warning" />
-                    @if (isDev())
-                        <x-forms.button type="button" wire:click="sendTestEmail">
-                            Send test email
-                        </x-forms.button>
-                    @endif
-                    @can('update', $server)
-                        @if ($rebootRequired)
-                            <x-modal-confirmation title="Reboot server?" buttonTitle="Reboot server" isErrorButton
-                                submitAction="rebootServer" :actions="[
-                                    'The server reboots in a few seconds.',
-                                    'All containers on this server stop, and the containers with a restart policy start again after the reboot.',
-                                    'The server is not reachable for a few minutes.',
-                                ]"
-                                confirmationText="{{ $server->name }}"
-                                confirmationLabel="Enter the server name to confirm"
-                                shortConfirmationLabel="Server name" :confirmWithPassword="false"
-                                step2ButtonText="Reboot server" />
-                        @endif
-                        <x-forms.button type="button" wire:click="checkForUpdates" :disabled="$checking">
-                            <x-reicon name="refresh" class="size-3.5" />
-                            Check for updates
-                        </x-forms.button>
-                    @endcan
-                </x-slot:actions>
+            <form wire:submit="submit">
+                <x-unsaved-bar action="submit" />
 
-                <div class="flex flex-wrap items-center gap-2 text-sm text-neutral-600 dark:text-fg-dim">
-                    <span>
-                        Last checked:
-                        @if ($checkedAt)
-                            <span title="{{ $checkedAt->toDateTimeString() }}">{{ $checkedAt->diffForHumans() }}</span>
-                        @else
-                            never
+                <x-application.settings-section id="server-patching-overview-section" title="Server patching"
+                    helper="Discover and apply operating system package updates.">
+                    <x-slot:actions>
+                        <x-status-badge status="Experimental" type="warning" />
+                        @if (isDev())
+                            <x-forms.button type="button" wire:click="sendTestEmail">
+                                Send test email
+                            </x-forms.button>
                         @endif
-                    </span>
-                    @if ($checkedAt && ! $error)
-                        @if ($totalUpdates === 0)
-                            <x-status-badge status="Up to date" type="success" />
-                        @else
-                            <x-status-badge :status="$totalUpdates . ' ' . Str::plural('update', $totalUpdates)" type="warning" />
-                        @endif
-                        @if ($securityUpdates > 0)
-                            <x-status-badge :status="$securityUpdates . ' ' . Str::plural('security update', $securityUpdates)" type="error" />
-                        @endif
-                        @if ($rebootRequired)
-                            <x-status-badge status="Reboot required" type="warning" />
-                        @endif
-                    @endif
-                </div>
+                        @can('update', $server)
+                            @if ($rebootRequired)
+                                <x-modal-confirmation title="Reboot server?" buttonTitle="Reboot server" isErrorButton
+                                    submitAction="rebootServer" :actions="[
+                                        'The server reboots in a few seconds.',
+                                        'All containers on this server stop, and the containers with a restart policy start again after the reboot.',
+                                        'The server is not reachable for a few minutes.',
+                                    ]"
+                                    confirmationText="{{ $server->name }}"
+                                    confirmationLabel="Enter the server name to confirm"
+                                    shortConfirmationLabel="Server name" :confirmWithPassword="false"
+                                    step2ButtonText="Reboot server" />
+                            @endif
+                            <x-forms.button type="button" wire:click="checkForUpdates" :disabled="$checking">
+                                <x-reicon name="refresh" class="size-3.5" />
+                                Check for updates
+                            </x-forms.button>
+                        @endcan
+                    </x-slot:actions>
 
-                <x-callout type="info" title="Supported package managers">
-                    Automated package discovery currently supports apk, apt, dnf, pacman, and zypper. Status
-                    notifications can be managed from
-                    <a class="font-medium underline" href="{{ route('notifications.email') }}"
-                        {{ wireNavigate() }}>notification settings</a>.
-                </x-callout>
-            </x-application.settings-section>
+                    <div class="flex flex-col gap-4">
+
+                        <div class="flex flex-wrap items-center gap-2 text-sm text-neutral-600 dark:text-fg-dim">
+                            <span>
+                                Last checked:
+                                @if ($checkedAt)
+                                    <span title="{{ $checkedAt->toDateTimeString() }}">{{ $checkedAt->diffForHumans() }}</span>
+                                @else
+                                    never
+                                @endif
+                            </span>
+                            @if ($checkedAt && ! $error)
+                                @if ($totalUpdates === 0)
+                                    <x-status-badge status="Up to date" type="success" />
+                                @else
+                                    <x-status-badge :status="$totalUpdates . ' ' . Str::plural('update', $totalUpdates)" type="warning" />
+                                @endif
+                                @if ($securityUpdates > 0)
+                                    <x-status-badge :status="$securityUpdates . ' ' . Str::plural('security update', $securityUpdates)" type="error" />
+                                @endif
+                                @if ($rebootRequired)
+                                    <x-status-badge status="Reboot required" type="warning" />
+                                @endif
+                            @endif
+                        </div>
+
+                        @php
+                            $autoUpdatesSupported = \App\Actions\Server\ConfigureAutomaticSecurityUpdates::supportFor($packageManager);
+                        @endphp
+                        <div @class(['grid gap-4', 'lg:grid-cols-3' => $autoUpdatesSupported])>
+                            <x-forms.input canGate="update" :canResource="$server" id="patchCheckFrequency"
+                                label="Check frequency" placeholder="weekly (default, on Sunday)"
+                                helper="Cron expression or preset such as daily, weekly, or monthly. Leave empty for the default: weekly, at a fixed time on Sunday. Coolify notifies your team when updates are available and when a check starts to fail." />
+                            @if ($autoUpdatesSupported)
+                                <x-forms.listbox canGate="update" :canResource="$server" id="autoSecurityUpdates"
+                                    label="Automatic security updates" :options="[
+                                        ['value' => false, 'label' => 'Off'],
+                                        ['value' => true, 'label' => 'Install security updates daily'],
+                                    ]"
+                                    helper="{{ $packageManager === 'apt' ? 'Configures unattended-upgrades for the security origins only.' : 'Configures dnf-automatic with upgrade_type = security.' }} Off removes the Coolify configuration and keeps the operating system default." />
+                                <x-forms.input canGate="update" :canResource="$server" id="autoSecurityUpdatesTime"
+                                    label="Maintenance window" placeholder="03:00"
+                                    helper="Daily start time (24-hour HH:MM) in the time zone of the server. Updates that need a reboot are installed, but the server is not rebooted." />
+                            @endif
+                        </div>
+
+                        <x-callout type="info" title="Supported package managers">
+                            Automated package discovery currently supports apk, apt, dnf, pacman, and zypper. Automatic
+                            security updates are available for apt and dnf (Debian, Ubuntu, and RHEL family)@if ($packageManager && ! $autoUpdatesSupported); this server uses {{ $packageManager }}@endif.
+                            Status notifications can be managed from
+                            <a class="font-medium underline" href="{{ route('notifications.email') }}"
+                                {{ wireNavigate() }}>notification settings</a>.
+                        </x-callout>
+                    </div>
+                </x-application.settings-section>
+            </form>
 
             @if ($checking)
                 <div wire:poll.10s="loadResult">
@@ -198,43 +226,6 @@
                 </x-application.settings-section>
             @endif
 
-            <form wire:submit="submit" class="flex flex-col gap-6">
-                <x-unsaved-bar action="submit" />
-
-                <x-application.settings-section id="server-patching-schedule-section" title="Schedule"
-                    helper="Control when Coolify checks this server for package updates.">
-                    <x-forms.input canGate="update" :canResource="$server" id="patchCheckFrequency"
-                        label="Check frequency" placeholder="weekly (default, on Sunday)"
-                        helper="Cron expression or preset such as daily, weekly, or monthly. Leave empty for the default: weekly, at a fixed time on Sunday. Coolify notifies your team when updates are available and when a check starts to fail." />
-                </x-application.settings-section>
-
-                <x-application.settings-section id="server-patching-automatic-section"
-                    title="Automatic security updates"
-                    helper="Let the server install security updates by itself every day, in a maintenance window.">
-                    @if (\App\Actions\Server\ConfigureAutomaticSecurityUpdates::supportFor($packageManager))
-                        <div class="grid gap-4 lg:grid-cols-2">
-                            <x-forms.listbox canGate="update" :canResource="$server" id="autoSecurityUpdates"
-                                label="Automatic security updates" :options="[
-                                    ['value' => false, 'label' => 'Off'],
-                                    ['value' => true, 'label' => 'Install security updates daily'],
-                                ]"
-                                helper="{{ $packageManager === 'apt' ? 'Configures unattended-upgrades for the security origins only.' : 'Configures dnf-automatic with upgrade_type = security.' }} Off removes the Coolify configuration and keeps the operating system default." />
-                            <x-forms.input canGate="update" :canResource="$server" id="autoSecurityUpdatesTime"
-                                label="Maintenance window" placeholder="03:00"
-                                helper="Daily start time (24-hour HH:MM) in the time zone of the server. Updates that need a reboot are installed, but the server is not rebooted." />
-                        </div>
-                    @elseif ($packageManager)
-                        <x-callout type="info" title="Not supported">
-                            Automatic security updates are available for Debian, Ubuntu, and RHEL-family servers
-                            (apt and dnf). This server uses {{ $packageManager }}.
-                        </x-callout>
-                    @else
-                        <x-callout type="info" title="Check for updates first">
-                            Coolify needs one successful check to know the package manager of this server.
-                        </x-callout>
-                    @endif
-                </x-application.settings-section>
-            </form>
         </div>
     </div>
 </div>
diff --git a/tests/Feature/Server/ServerPatchesTest.php b/tests/Feature/Server/ServerPatchesTest.php
index 4e2786cde4..db1b6d18c2 100644
--- a/tests/Feature/Server/ServerPatchesTest.php
+++ b/tests/Feature/Server/ServerPatchesTest.php
@@ -388,7 +388,7 @@ describe('automatic security updates', function () {
         ConfigureAutomaticSecurityUpdates::shouldRun()->never();
 
         Livewire::test(Patches::class, ['server_uuid' => $this->server->uuid])
-            ->assertSee('This server uses pacman')
+            ->assertSee('this server uses pacman')
             ->set('autoSecurityUpdates', true)
             ->call('submit')
             ->assertDispatched('error');