Merge pull request #4182 from coollabsio/next

v4.0.0-beta.362
2024-11-08 12:08:27 +01:00
parent e7306300b1 cca403b6f4
commit b96a84596d
13 changed files with 34 additions and 40 deletions
--- a/app/Livewire/Notifications/Email.php
+++ b/app/Livewire/Notifications/Email.php
@@ -50,22 +50,22 @@ class Email extends Component
    public ?int $smtpTimeout = null;

    #[Validate(['boolean'])]
-    public bool $smtpNotificationsTest;
+    public bool $smtpNotificationsTest = false;

    #[Validate(['boolean'])]
-    public bool $smtpNotificationsDeployments;
+    public bool $smtpNotificationsDeployments = false;

    #[Validate(['boolean'])]
-    public bool $smtpNotificationsStatusChanges;
+    public bool $smtpNotificationsStatusChanges = false;

    #[Validate(['boolean'])]
-    public bool $smtpNotificationsDatabaseBackups;
+    public bool $smtpNotificationsDatabaseBackups = false;

    #[Validate(['boolean'])]
-    public bool $smtpNotificationsScheduledTasks;
+    public bool $smtpNotificationsScheduledTasks = false;

    #[Validate(['boolean'])]
-    public bool $smtpNotificationsServerDiskUsage;
+    public bool $smtpNotificationsServerDiskUsage = false;

    #[Validate(['boolean'])]
    public bool $resendEnabled;
--- a/app/Livewire/Project/Database/BackupEdit.php
+++ b/app/Livewire/Project/Database/BackupEdit.php
@@ -46,8 +46,8 @@ class BackupEdit extends Component
    #[Validate(['required', 'boolean'])]
    public bool $saveS3 = false;

-    #[Validate(['required', 'integer'])]
-    public int $s3StorageId = 1;
+    #[Validate(['nullable', 'integer'])]
+    public ?int $s3StorageId = 1;

    #[Validate(['nullable', 'string'])]
    public ?string $databasesToBackup = null;
--- a/app/Livewire/Server/Show.php
+++ b/app/Livewire/Server/Show.php
@@ -5,6 +5,7 @@ namespace App\Livewire\Server;
 use App\Actions\Server\StartSentinel;
 use App\Actions\Server\StopSentinel;
 use App\Models\Server;
+use Livewire\Attributes\Locked;
 use Livewire\Attributes\Validate;
 use Livewire\Component;

@@ -16,7 +17,7 @@ class Show extends Component
    public string $name;

    #[Validate(['nullable'])]
-    public ?string $description;
+    public ?string $description = null;

    #[Validate(['required'])]
    public string $ip;
@@ -31,7 +32,7 @@ class Show extends Component
    public ?string $validationLogs = null;

    #[Validate(['nullable', 'url'])]
-    public ?string $wildcardDomain;
+    public ?string $wildcardDomain = null;

    #[Validate(['required'])]
    public bool $isReachable;
@@ -55,7 +56,7 @@ class Show extends Component
    public string $sentinelToken;

    #[Validate(['nullable'])]
-    public ?string $sentinelUpdatedAt;
+    public ?string $sentinelUpdatedAt = null;

    #[Validate(['required', 'integer', 'min:1'])]
    public int $sentinelMetricsRefreshRateSeconds;
@@ -67,7 +68,7 @@ class Show extends Component
    public int $sentinelPushIntervalSeconds;

    #[Validate(['nullable', 'url'])]
-    public ?string $sentinelCustomUrl;
+    public ?string $sentinelCustomUrl = null;

    #[Validate(['required'])]
    public bool $isSentinelEnabled;
@@ -78,6 +79,7 @@ class Show extends Component
    #[Validate(['required'])]
    public string $serverTimezone;

+    #[Locked]
    public array $timezones;

    public function getListeners()
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -113,7 +113,7 @@ services:
      retries: 10
      timeout: 2s
  soketi:
-    image: 'ghcr.io/coollabsio/coolify-realtime:1.0.3'
+    image: 'ghcr.io/coollabsio/coolify-realtime:1.0.4'
    ports:
      - "${SOKETI_PORT:-6001}:6001"
      - "6002:6002"
--- a/docker-compose.windows.yml
+++ b/docker-compose.windows.yml
@@ -103,7 +103,7 @@ services:
      retries: 10
      timeout: 2s
  soketi:
-    image: 'ghcr.io/coollabsio/coolify-realtime:1.0.0'
+    image: 'ghcr.io/coollabsio/coolify-realtime:1.0.4'
    pull_policy: always
    container_name: coolify-realtime
    restart: always
--- a/other/nightly/versions.json
+++ b/other/nightly/versions.json
@@ -1,10 +1,10 @@
 {
    "coolify": {
        "v4": {
-            "version": "4.0.0-beta.360"
+            "version": "4.0.0-beta.362"
        },
        "nightly": {
-            "version": "4.0.0-beta.362"
+            "version": "4.0.0-beta.363"
        },
        "helper": {
            "version": "1.0.3"
--- a/resources/views/components/navbar.blade.php
+++ b/resources/views/components/navbar.blade.php
@@ -148,7 +148,7 @@
                    <li>
                        <a title="Destinations"
                            class="{{ request()->is('destination*') ? 'menu-item-active menu-item' : 'menu-item' }}"
-                            href="{{ route('destination.index') }}" wire:navigate>
+                            href="{{ route('destination.index') }}">

                            <svg xmlns="http://www.w3.org/2000/svg" class="icon" viewBox="0 0 24 24">
                                <path fill="none" stroke="currentColor" stroke-linecap="round"
--- a/resources/views/components/notification/navbar.blade.php
+++ b/resources/views/components/notification/navbar.blade.php
@@ -3,15 +3,15 @@
    <div class="subtitle">Get notified about your infrastructure.</div>
    <div class="navbar-main">
        <nav class="flex items-center gap-6 min-h-10">
-            <a wire:navigate class="{{ request()->routeIs('notifications.email') ? 'dark:text-white' : '' }}"
+            <a class="{{ request()->routeIs('notifications.email') ? 'dark:text-white' : '' }}"
                href="{{ route('notifications.email') }}">
                <button>Email</button>
            </a>
-            <a wire:navigate class="{{ request()->routeIs('notifications.telegram') ? 'dark:text-white' : '' }}"
+            <a class="{{ request()->routeIs('notifications.telegram') ? 'dark:text-white' : '' }}"
                href="{{ route('notifications.telegram') }}">
                <button>Telegram</button>
            </a>
-            <a wire:navigate class="{{ request()->routeIs('notifications.discord') ? 'dark:text-white' : '' }}"
+            <a class="{{ request()->routeIs('notifications.discord') ? 'dark:text-white' : '' }}"
                href="{{ route('notifications.discord') }}">
                <button>Discord</button>
            </a>
--- a/resources/views/components/server/sidebar.blade.php
+++ b/resources/views/components/server/sidebar.blade.php
@@ -1,29 +1,29 @@
 <div class="flex flex-col items-start gap-2 min-w-fit">
    <a class="menu-item {{ $activeMenu === 'general' ? 'menu-item-active' : '' }}"
-        href="{{ route('server.show', ['server_uuid' => $server->uuid]) }}" wire:navigate>General</a>
+        href="{{ route('server.show', ['server_uuid' => $server->uuid]) }}">General</a>
    @if ($server->isFunctional())
        <a class="menu-item {{ $activeMenu === 'advanced' ? 'menu-item-active' : '' }}"
-            href="{{ route('server.advanced', ['server_uuid' => $server->uuid]) }}" wire:navigate>Advanced
+            href="{{ route('server.advanced', ['server_uuid' => $server->uuid]) }}">Advanced
        </a>
    @endif
    <a class="menu-item {{ $activeMenu === 'private-key' ? 'menu-item-active' : '' }}"
-        href="{{ route('server.private-key', ['server_uuid' => $server->uuid]) }}" wire:navigate>Private Key
+        href="{{ route('server.private-key', ['server_uuid' => $server->uuid]) }}">Private Key
    </a>
    @if ($server->isFunctional())
        <a class="menu-item {{ $activeMenu === 'cloudflare-tunnels' ? 'menu-item-active' : '' }}"
-            href="{{ route('server.cloudflare-tunnels', ['server_uuid' => $server->uuid]) }}" wire:navigate>Cloudflare
+            href="{{ route('server.cloudflare-tunnels', ['server_uuid' => $server->uuid]) }}">Cloudflare
            Tunnels</a>
        <a class="menu-item {{ $activeMenu === 'destinations' ? 'menu-item-active' : '' }}"
-            href="{{ route('server.destinations', ['server_uuid' => $server->uuid]) }}" wire:navigate>Destinations
+            href="{{ route('server.destinations', ['server_uuid' => $server->uuid]) }}">Destinations
        </a>
        <a class="menu-item {{ $activeMenu === 'log-drains' ? 'menu-item-active' : '' }}"
-            href="{{ route('server.log-drains', ['server_uuid' => $server->uuid]) }}" wire:navigate>Log
+            href="{{ route('server.log-drains', ['server_uuid' => $server->uuid]) }}">Log
            Drains</a>
        <a class="menu-item {{ $activeMenu === 'metrics' ? 'menu-item-active' : '' }}"
            href="{{ route('server.charts', ['server_uuid' => $server->uuid]) }}">Metrics</a>
    @endif
    @if (!$server->isLocalhost())
        <a class="menu-item {{ $activeMenu === 'danger' ? 'menu-item-active' : '' }}"
-            href="{{ route('server.delete', ['server_uuid' => $server->uuid]) }}" wire:navigate>Danger</a>
+            href="{{ route('server.delete', ['server_uuid' => $server->uuid]) }}">Danger</a>
    @endif
 </div>
--- a/resources/views/livewire/destination/index.blade.php
+++ b/resources/views/livewire/destination/index.blade.php
@@ -16,8 +16,7 @@
            @forelse ($server->destinations() as $destination)
                @if ($destination->getMorphClass() === 'App\Models\StandaloneDocker')
                    <a class="box group"
-                        href="{{ route('destination.show', ['destination_uuid' => data_get($destination, 'uuid')]) }}"
-                        wire:navigate>
+                        href="{{ route('destination.show', ['destination_uuid' => data_get($destination, 'uuid')]) }}">
                        <div class="flex flex-col mx-6">
                            <div class="box-title">{{ $destination->name }}</div>
                            <div class="box-description">Server: {{ $destination->server->name }}</div>
@@ -26,8 +25,7 @@
                @endif
                @if ($destination->getMorphClass() === 'App\Models\SwarmDocker')
                    <a class="box group"
-                        href="{{ route('destination.show', ['destination_uuid' => data_get($destination, 'uuid')]) }}"
-                        wire:navigate>
+                        href="{{ route('destination.show', ['destination_uuid' => data_get($destination, 'uuid')]) }}">
                        <div class="flex flex-col mx-6">
                            <div class="box-title">{{ $destination->name }}</div>
                            <div class="box-description">server: {{ $destination->server->name }}</div>
--- a/resources/views/livewire/settings/index.blade.php
+++ b/resources/views/livewire/settings/index.blade.php
@@ -98,12 +98,6 @@
        <x-forms.input id="allowed_ips" label="Allowed IPs"
            helper="Allowed IP lists for the API. A comma separated list of IPs. Empty means you allow from everywhere."
            placeholder="1.1.1.1,8.8.8.8" />
-
-        <h4 class="pt-6">Advanced</h4>
-        <div class="text-right md:w-96">
-            <x-forms.checkbox instantSave id="is_registration_enabled" label="Registration Allowed" />
-            <x-forms.checkbox instantSave id="do_not_track" label="Do Not Track" />
-        </div>
        <h4 class="pt-6">Update</h4>
        <div class="text-right md:w-96">
            @if (!is_null(env('AUTOUPDATE', null)))
--- a/resources/views/livewire/tags/show.blade.php
+++ b/resources/views/livewire/tags/show.blade.php
@@ -7,7 +7,7 @@
    </div>
    <div class="flex flex-wrap gap-2 ">
        @forelse ($tags as $oneTag)
-            <a wire:navigate :class="{{ $tag?->id == $oneTag->id }} && 'dark:bg-coollabs hover:bg-coollabs-100'"
+            <a :class="{{ $tag?->id == $oneTag->id }} && 'dark:bg-coollabs hover:bg-coollabs-100'"
                class="w-64 box-without-bg dark:bg-coolgray-100 dark:text-white font-bold"
                href="{{ route('tags.show', ['tagName' => $oneTag->name]) }}">{{ $oneTag->name }}</a>
        @empty
--- a/versions.json
+++ b/versions.json
@@ -1,10 +1,10 @@
 {
    "coolify": {
        "v4": {
-            "version": "4.0.0-beta.360"
+            "version": "4.0.0-beta.362"
        },
        "nightly": {
-            "version": "4.0.0-beta.362"
+            "version": "4.0.0-beta.363"
        },
        "helper": {
            "version": "1.0.3"