From ed2ccaf8aff2496864a2aa0b080066dec7b67d8c Mon Sep 17 00:00:00 2001
From: peaklabs-dev <122374094+peaklabs-dev@users.noreply.github.com>
Date: Tue, 17 Dec 2024 15:22:10 +0100
Subject: [PATCH] fix: Advanced server UI

---
 app/Livewire/Server/Advanced.php              | 27 ++++++++----
 .../views/livewire/server/advanced.blade.php  | 44 ++++++++++---------
 2 files changed, 42 insertions(+), 29 deletions(-)

diff --git a/app/Livewire/Server/Advanced.php b/app/Livewire/Server/Advanced.php
index 0650de9a0..577730f24 100644
--- a/app/Livewire/Server/Advanced.php
+++ b/app/Livewire/Server/Advanced.php
@@ -13,14 +13,11 @@ class Advanced extends Component
 
     public array $parameters = [];
 
-    #[Validate(['integer', 'min:1'])]
-    public int $concurrentBuilds = 1;
+    #[Validate(['string'])]
+    public string $serverDiskUsageCheckFrequency = '0 23 * * *';
 
-    #[Validate(['integer', 'min:1'])]
-    public int $dynamicTimeout = 1;
-
-    #[Validate('boolean')]
-    public bool $forceDockerCleanup = false;
+    #[Validate(['integer', 'min:1', 'max:99'])]
+    public int $serverDiskUsageNotificationThreshold = 50;
 
     #[Validate(['string', 'required'])]
     public string $dockerCleanupFrequency = '*/10 * * * *';
@@ -28,8 +25,8 @@ class Advanced extends Component
     #[Validate(['integer', 'min:1', 'max:99'])]
     public int $dockerCleanupThreshold = 10;
 
-    #[Validate(['integer', 'min:1', 'max:99'])]
-    public int $serverDiskUsageNotificationThreshold = 50;
+    #[Validate('boolean')]
+    public bool $forceDockerCleanup = false;
 
     #[Validate('boolean')]
     public bool $deleteUnusedVolumes = false;
@@ -37,6 +34,12 @@ class Advanced extends Component
     #[Validate('boolean')]
     public bool $deleteUnusedNetworks = false;
 
+    #[Validate(['integer', 'min:1'])]
+    public int $concurrentBuilds = 1;
+
+    #[Validate(['integer', 'min:1'])]
+    public int $dynamicTimeout = 1;
+
     public function mount(string $server_uuid)
     {
         try {
@@ -60,6 +63,7 @@ class Advanced extends Component
             $this->server->settings->server_disk_usage_notification_threshold = $this->serverDiskUsageNotificationThreshold;
             $this->server->settings->delete_unused_volumes = $this->deleteUnusedVolumes;
             $this->server->settings->delete_unused_networks = $this->deleteUnusedNetworks;
+            $this->server->settings->server_disk_usage_check_frequency = $this->serverDiskUsageCheckFrequency;
             $this->server->settings->save();
         } else {
             $this->concurrentBuilds = $this->server->settings->concurrent_builds;
@@ -70,6 +74,7 @@ class Advanced extends Component
             $this->serverDiskUsageNotificationThreshold = $this->server->settings->server_disk_usage_notification_threshold;
             $this->deleteUnusedVolumes = $this->server->settings->delete_unused_volumes;
             $this->deleteUnusedNetworks = $this->server->settings->delete_unused_networks;
+            $this->serverDiskUsageCheckFrequency = $this->server->settings->server_disk_usage_check_frequency;
         }
     }
 
@@ -100,6 +105,10 @@ class Advanced extends Component
                 $this->dockerCleanupFrequency = $this->server->settings->getOriginal('docker_cleanup_frequency');
                 throw new \Exception('Invalid Cron / Human expression for Docker Cleanup Frequency.');
             }
+            if (! validate_cron_expression($this->serverDiskUsageCheckFrequency)) {
+                $this->serverDiskUsageCheckFrequency = $this->server->settings->getOriginal('server_disk_usage_check_frequency');
+                throw new \Exception('Invalid Cron / Human expression for Disk Usage Check Frequency.');
+            }
             $this->syncData(true);
             $this->dispatch('success', 'Server updated.');
         } catch (\Throwable $e) {
diff --git a/resources/views/livewire/server/advanced.blade.php b/resources/views/livewire/server/advanced.blade.php
index 4d32d711c..40ff6c8b5 100644
--- a/resources/views/livewire/server/advanced.blade.php
+++ b/resources/views/livewire/server/advanced.blade.php
@@ -10,40 +10,44 @@
                 <div class="flex items-center gap-2">
                     <h2>Advanced</h2>
                     <x-forms.button type="submit">Save</x-forms.button>
-                    <x-modal-confirmation title="Confirm Docker Cleanup?" buttonTitle="Trigger Manual Cleanup"
-                        isHighlightedButton submitAction="manualCleanup" :actions="[
-                            'Permanently deletes all stopped containers managed by Coolify (as containers are non-persistent, no data will be lost)',
-                            'Permanently deletes all unused images',
-                            'Clears build cache',
-                            'Removes old versions of the Coolify helper image',
-                            'Optionally permanently deletes all unused volumes (if enabled in advanced options).',
-                            'Optionally permanently deletes all unused networks (if enabled in advanced options).',
-                        ]" :confirmWithText="false"
-                        :confirmWithPassword="false" step2ButtonText="Trigger Docker Cleanup" />
                 </div>
-                <div>Advanced configuration for your server.</div>
+                <div class="mt-3 mb-4">Advanced configuration for your server.</div>
             </div>
 
-            <div class="flex flex-col gap-4">
+            <h3>Disk Usage</h3>
+            <div class="flex flex-col gap-6">
                 <div class="flex flex-col">
                     <div class="flex flex-wrap gap-2 sm:flex-nowrap pt-4">
+                        <x-forms.input placeholder="0 23 * * *" id="serverDiskUsageCheckFrequency"
+                            label="Disk usage check frequency" required
+                            helper="Cron expression for disk usage check frequency.<br>You can use every_minute, hourly, daily, weekly, monthly, yearly.<br><br>Default is every night at 11:00 PM." />
                         <x-forms.input id="serverDiskUsageNotificationThreshold"
                             label="Server disk usage notification threshold (%)" required
                             helper="If the server disk usage exceeds this threshold, Coolify will send a notification to the team members." />
                     </div>
                 </div>
+
                 <div class="flex flex-col gap-2">
-                    <div class="flex items-center gap-2">
+                    <div class="flex gap-4">
                         <h3>Docker Cleanup</h3>
+                        <x-modal-confirmation title="Confirm Docker Cleanup?" buttonTitle="Trigger Manual Cleanup"
+                            isHighlightedButton submitAction="manualCleanup" :actions="[
+                                'Permanently deletes all stopped containers managed by Coolify (as containers are non-persistent, no data will be lost)',
+                                'Permanently deletes all unused images',
+                                'Clears build cache',
+                                'Removes old versions of the Coolify helper image',
+                                'Optionally permanently deletes all unused volumes (if enabled in advanced options).',
+                                'Optionally permanently deletes all unused networks (if enabled in advanced options).',
+                            ]" :confirmWithText="false"
+                            :confirmWithPassword="false" step2ButtonText="Trigger Docker Cleanup" />
                     </div>
                     <div class="flex flex-wrap items-center gap-4">
-                        @if ($forceDockerCleanup)
-                            <x-forms.input placeholder="*/10 * * * *" id="dockerCleanupFrequency"
-                                label="Docker cleanup frequency" required
-                                helper="Cron expression for Docker Cleanup.<br>You can use every_minute, hourly, daily, weekly, monthly, yearly.<br><br>Default is every night at midnight." />
-                        @else
-                            <x-forms.input id="dockerCleanupThreshold" label="Docker cleanup threshold (%)" required
-                                helper="The Docker cleanup tasks will run when the disk usage exceeds this threshold." />
+                        <x-forms.input placeholder="*/10 * * * *" id="dockerCleanupFrequency"
+                            label="Docker cleanup frequency" required
+                            helper="Cron expression for Docker Cleanup.<br>You can use every_minute, hourly, daily, weekly, monthly, yearly.<br><br>Default is every night at midnight." />
+                        @if (!$forceDockerCleanup)
+                        <x-forms.input id="dockerCleanupThreshold" label="Docker cleanup threshold (%)" required
+                            helper="The Docker cleanup tasks will run when the disk usage exceeds this threshold." />
                         @endif
                         <div class="w-96">
                             <x-forms.checkbox