From b6f856223141c46ce2b0b88a007666db20411610 Mon Sep 17 00:00:00 2001 From: Johnny Kessler <68814636+jhKessler@users.noreply.github.com> Date: Thu, 7 Nov 2024 18:09:47 +0100 Subject: [PATCH 01/35] chore: edit www helper --- resources/views/livewire/project/application/general.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/livewire/project/application/general.blade.php b/resources/views/livewire/project/application/general.blade.php index 6c93d25b7..3db633e6a 100644 --- a/resources/views/livewire/project/application/general.blade.php +++ b/resources/views/livewire/project/application/general.blade.php @@ -70,7 +70,7 @@
+ helper="You must need to add www and non-www as an A DNS record. Make sure the www domain is added under Domains."> From e69b0ca1a90ac80ca80aa4f3d05f911f61114efe Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Fri, 8 Nov 2024 09:18:43 +0100 Subject: [PATCH 02/35] disable tcp proxy notification --- app/Actions/Docker/GetContainersStatus.php | 2 +- app/Actions/Server/ServerCheck.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Actions/Docker/GetContainersStatus.php b/app/Actions/Docker/GetContainersStatus.php index 95c22efc1..26bd9f0b4 100644 --- a/app/Actions/Docker/GetContainersStatus.php +++ b/app/Actions/Docker/GetContainersStatus.php @@ -171,7 +171,7 @@ class GetContainersStatus })->first(); if (! $foundTcpProxy) { StartDatabaseProxy::run($database); - $this->server->team?->notify(new ContainerRestarted("TCP Proxy for {$database->name}", $this->server)); + // $this->server->team?->notify(new ContainerRestarted("TCP Proxy for {$database->name}", $this->server)); } } } else { diff --git a/app/Actions/Server/ServerCheck.php b/app/Actions/Server/ServerCheck.php index d9de1464e..c72f129d3 100644 --- a/app/Actions/Server/ServerCheck.php +++ b/app/Actions/Server/ServerCheck.php @@ -259,7 +259,7 @@ class ServerCheck })->first(); if (! $foundTcpProxy) { StartDatabaseProxy::run($database); - $this->server->team?->notify(new ContainerRestarted("TCP Proxy for {$database->name}", $this->server)); + // $this->server->team?->notify(new ContainerRestarted("TCP Proxy for {$database->name}", $this->server)); } } } From a2b6a61c4a2a4eff26eeadde8a48d4fbe6fcd78c Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Fri, 8 Nov 2024 09:43:46 +0100 Subject: [PATCH 03/35] fix: update last online with old function --- app/Actions/Docker/GetContainersStatus.php | 9 +++++++++ app/Actions/Server/ServerCheck.php | 2 +- app/Models/Server.php | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/app/Actions/Docker/GetContainersStatus.php b/app/Actions/Docker/GetContainersStatus.php index 26bd9f0b4..a08056837 100644 --- a/app/Actions/Docker/GetContainersStatus.php +++ b/app/Actions/Docker/GetContainersStatus.php @@ -107,6 +107,8 @@ class GetContainersStatus $statusFromDb = $preview->status; if ($statusFromDb !== $containerStatus) { $preview->update(['status' => $containerStatus]); + } else { + $preview->update(['last_online_at' => now()]); } } else { //Notify user that this container should not be there. @@ -118,6 +120,8 @@ class GetContainersStatus $statusFromDb = $application->status; if ($statusFromDb !== $containerStatus) { $application->update(['status' => $containerStatus]); + } else { + $application->update(['last_online_at' => now()]); } } else { //Notify user that this container should not be there. @@ -160,7 +164,10 @@ class GetContainersStatus $statusFromDb = $database->status; if ($statusFromDb !== $containerStatus) { $database->update(['status' => $containerStatus]); + } else { + $database->update(['last_online_at' => now()]); } + if ($isPublic) { $foundTcpProxy = $this->containers->filter(function ($value, $key) use ($uuid) { if ($this->server->isSwarm()) { @@ -202,6 +209,8 @@ class GetContainersStatus if ($statusFromDb !== $containerStatus) { // ray('Updating status: ' . $containerStatus); $service->update(['status' => $containerStatus]); + } else { + $service->update(['last_online_at' => now()]); } } } diff --git a/app/Actions/Server/ServerCheck.php b/app/Actions/Server/ServerCheck.php index c72f129d3..1dae03fd9 100644 --- a/app/Actions/Server/ServerCheck.php +++ b/app/Actions/Server/ServerCheck.php @@ -14,7 +14,7 @@ use App\Models\Service; use App\Models\ServiceApplication; use App\Models\ServiceDatabase; use App\Notifications\Container\ContainerRestarted; -use Arr; +use Illuminate\Support\Arr; use Lorisleiva\Actions\Concerns\AsAction; class ServerCheck diff --git a/app/Models/Server.php b/app/Models/Server.php index 0fcfd89ab..3076308ad 100644 --- a/app/Models/Server.php +++ b/app/Models/Server.php @@ -1238,7 +1238,7 @@ $schema://$host { StartSentinel::run($this, true); } } catch (\Throwable $e) { - return handleError($e, $this); + return handleError($e); } } From e7f22156527cd249e00330a147656be70c6231ba Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Fri, 8 Nov 2024 10:28:40 +0100 Subject: [PATCH 04/35] fix: seeder should not start sentinel --- app/Models/ServerSetting.php | 16 ++++++++++++---- database/seeders/SentinelSeeder.php | 4 ++-- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/app/Models/ServerSetting.php b/app/Models/ServerSetting.php index e72c8c444..995c52041 100644 --- a/app/Models/ServerSetting.php +++ b/app/Models/ServerSetting.php @@ -89,7 +89,7 @@ class ServerSetting extends Model }); } - public function generateSentinelToken(bool $save = true) + public function generateSentinelToken(bool $save = true, bool $shouldExecuteEvent = true) { $data = [ 'server_uuid' => $this->server->uuid, @@ -98,13 +98,17 @@ class ServerSetting extends Model $encrypted = encrypt($token); $this->sentinel_token = $encrypted; if ($save) { - $this->save(); + if ($shouldExecuteEvent) { + $this->saveQuietly(); + } else { + $this->save(); + } } return $token; } - public function generateSentinelUrl(bool $save = true) + public function generateSentinelUrl(bool $save = true, bool $shouldExecuteEvent = true) { $domain = null; $settings = InstanceSettings::get(); @@ -119,7 +123,11 @@ class ServerSetting extends Model } $this->sentinel_custom_url = $domain; if ($save) { - $this->save(); + if ($shouldExecuteEvent) { + $this->saveQuietly(); + } else { + $this->save(); + } } return $domain; diff --git a/database/seeders/SentinelSeeder.php b/database/seeders/SentinelSeeder.php index d61c2f55d..3f506edac 100644 --- a/database/seeders/SentinelSeeder.php +++ b/database/seeders/SentinelSeeder.php @@ -14,10 +14,10 @@ class SentinelSeeder extends Seeder foreach ($servers as $server) { try { if (str($server->settings->sentinel_token)->isEmpty()) { - $server->settings->generateSentinelToken(); + $server->settings->generateSentinelToken(shouldExecuteEvent: false); } if (str($server->settings->sentinel_custom_url)->isEmpty()) { - $url = $server->settings->generateSentinelUrl(); + $url = $server->settings->generateSentinelUrl(shouldExecuteEvent: false); if (str($url)->isEmpty()) { $server->settings->is_sentinel_enabled = false; $server->settings->save(); From 9d9ac5943e8c9f33c668a8d08139ccfbe4fb756b Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Fri, 8 Nov 2024 10:30:10 +0100 Subject: [PATCH 05/35] fix --- app/Models/ServerSetting.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Models/ServerSetting.php b/app/Models/ServerSetting.php index 995c52041..e44c4cd30 100644 --- a/app/Models/ServerSetting.php +++ b/app/Models/ServerSetting.php @@ -64,10 +64,10 @@ class ServerSetting extends Model static::creating(function ($setting) { try { if (str($setting->sentinel_token)->isEmpty()) { - $setting->generateSentinelToken(save: false); + $setting->generateSentinelToken(save: false, shouldExecuteEvent: false); } if (str($setting->sentinel_custom_url)->isEmpty()) { - $setting->generateSentinelUrl(save: false); + $setting->generateSentinelUrl(save: false, shouldExecuteEvent: false); } } catch (\Throwable $e) { Log::error('Error creating server setting: '.$e->getMessage()); From aa1e80ccae76d77a04b2f4cb9e54406c182bb3fc Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Fri, 8 Nov 2024 10:39:02 +0100 Subject: [PATCH 06/35] fix: start sentinel on seeder --- app/Models/ServerSetting.php | 12 ++++++------ database/seeders/SentinelSeeder.php | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/Models/ServerSetting.php b/app/Models/ServerSetting.php index e44c4cd30..fc2c5a0f4 100644 --- a/app/Models/ServerSetting.php +++ b/app/Models/ServerSetting.php @@ -64,10 +64,10 @@ class ServerSetting extends Model static::creating(function ($setting) { try { if (str($setting->sentinel_token)->isEmpty()) { - $setting->generateSentinelToken(save: false, shouldExecuteEvent: false); + $setting->generateSentinelToken(save: false, ignoreEvent: true); } if (str($setting->sentinel_custom_url)->isEmpty()) { - $setting->generateSentinelUrl(save: false, shouldExecuteEvent: false); + $setting->generateSentinelUrl(save: false, ignoreEvent: true); } } catch (\Throwable $e) { Log::error('Error creating server setting: '.$e->getMessage()); @@ -89,7 +89,7 @@ class ServerSetting extends Model }); } - public function generateSentinelToken(bool $save = true, bool $shouldExecuteEvent = true) + public function generateSentinelToken(bool $save = true, bool $ignoreEvent = false) { $data = [ 'server_uuid' => $this->server->uuid, @@ -98,7 +98,7 @@ class ServerSetting extends Model $encrypted = encrypt($token); $this->sentinel_token = $encrypted; if ($save) { - if ($shouldExecuteEvent) { + if ($ignoreEvent) { $this->saveQuietly(); } else { $this->save(); @@ -108,7 +108,7 @@ class ServerSetting extends Model return $token; } - public function generateSentinelUrl(bool $save = true, bool $shouldExecuteEvent = true) + public function generateSentinelUrl(bool $save = true, bool $ignoreEvent = false) { $domain = null; $settings = InstanceSettings::get(); @@ -123,7 +123,7 @@ class ServerSetting extends Model } $this->sentinel_custom_url = $domain; if ($save) { - if ($shouldExecuteEvent) { + if ($ignoreEvent) { $this->saveQuietly(); } else { $this->save(); diff --git a/database/seeders/SentinelSeeder.php b/database/seeders/SentinelSeeder.php index 3f506edac..3cf913933 100644 --- a/database/seeders/SentinelSeeder.php +++ b/database/seeders/SentinelSeeder.php @@ -14,10 +14,10 @@ class SentinelSeeder extends Seeder foreach ($servers as $server) { try { if (str($server->settings->sentinel_token)->isEmpty()) { - $server->settings->generateSentinelToken(shouldExecuteEvent: false); + $server->settings->generateSentinelToken(ignoreEvent: true); } if (str($server->settings->sentinel_custom_url)->isEmpty()) { - $url = $server->settings->generateSentinelUrl(shouldExecuteEvent: false); + $url = $server->settings->generateSentinelUrl(ignoreEvent: true); if (str($url)->isEmpty()) { $server->settings->is_sentinel_enabled = false; $server->settings->save(); From 390f2a0ff656bee1cff5a5e53a27aa19cbf60cc3 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Fri, 8 Nov 2024 10:52:24 +0100 Subject: [PATCH 07/35] fix expiration days to 3 --- config/constants.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/constants.php b/config/constants.php index 418326541..1bec2e3bf 100644 --- a/config/constants.php +++ b/config/constants.php @@ -19,7 +19,7 @@ return [ 'invitation' => [ 'link' => [ 'base_url' => '/invitations/', - 'expiration_days' => 0, + 'expiration_days' => 3, ], ], 'services' => [ From 2345a8b868706b5b7c144fded9f97602f52252f9 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Fri, 8 Nov 2024 11:04:20 +0100 Subject: [PATCH 08/35] fix for coolify-realtime release --- .github/workflows/coolify-realtime.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/coolify-realtime.yml b/.github/workflows/coolify-realtime.yml index 97bfd52eb..9654a21b0 100644 --- a/.github/workflows/coolify-realtime.yml +++ b/.github/workflows/coolify-realtime.yml @@ -8,6 +8,7 @@ on: - docker/coolify-realtime/Dockerfile - docker/coolify-realtime/terminal-server.js - docker/coolify-realtime/package.json + - docker/coolify-realtime/package-lock.json - docker/coolify-realtime/soketi-entrypoint.sh env: From 292f9354774fa06f6d76b04878b9a0657b4ae929 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Fri, 8 Nov 2024 11:06:57 +0100 Subject: [PATCH 09/35] fix production release --- .github/workflows/coolify-production-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/coolify-production-build.yml b/.github/workflows/coolify-production-build.yml index 531466cdc..4ee2344d2 100644 --- a/.github/workflows/coolify-production-build.yml +++ b/.github/workflows/coolify-production-build.yml @@ -41,7 +41,7 @@ jobs: - name: Get Version id: version run: | - echo "VERSION=$(docker run --rm -v "$(pwd):/app" -w /app php:8.2-alpine3.16 php bootstrap/getVersion.php)"|xargs >> $GITHUB_OUTPUT] + echo "VERSION=$(docker run --rm -v "$(pwd):/app" -w /app php:8.2-alpine3.16 php bootstrap/getVersion.php)"|xargs >> $GITHUB_OUTPUT - name: Build and Push Image uses: docker/build-push-action@v6 From 8eff8248c2b432c73190918584ef132d85294c26 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Fri, 8 Nov 2024 11:07:53 +0100 Subject: [PATCH 10/35] fix realtime-next workflow --- .github/workflows/coolify-realtime-next.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/coolify-realtime-next.yml b/.github/workflows/coolify-realtime-next.yml index 7e937d17a..ef247170f 100644 --- a/.github/workflows/coolify-realtime-next.yml +++ b/.github/workflows/coolify-realtime-next.yml @@ -8,6 +8,7 @@ on: - docker/coolify-realtime/Dockerfile - docker/coolify-realtime/terminal-server.js - docker/coolify-realtime/package.json + - docker/coolify-realtime/package-lock.json - docker/coolify-realtime/soketi-entrypoint.sh env: From 2d64c006e20e67dc65e8e9fd520e8e4074e70764 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Fri, 8 Nov 2024 11:11:31 +0100 Subject: [PATCH 11/35] just triggering the workflow (I'm such a pro developer 10x) --- docker/coolify-realtime/Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/docker/coolify-realtime/Dockerfile b/docker/coolify-realtime/Dockerfile index f0d6db906..9f94518f5 100644 --- a/docker/coolify-realtime/Dockerfile +++ b/docker/coolify-realtime/Dockerfile @@ -22,6 +22,4 @@ RUN /bin/sh -c "if [[ ${TARGETPLATFORM} == 'linux/arm64' ]]; then \ curl -L https://github.com/cloudflare/cloudflared/releases/download/${CLOUDFLARED_VERSION}/cloudflared-linux-arm64 -o /usr/local/bin/cloudflared && chmod +x /usr/local/bin/cloudflared \ ;fi" - - ENTRYPOINT ["/bin/sh", "/soketi-entrypoint.sh"] From 5d5ada130e7e45bcb2688f70e82d95d49c380cb6 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Fri, 8 Nov 2024 11:13:03 +0100 Subject: [PATCH 12/35] fix fix fix fix fix fix fix fix fix fix fix --- .github/workflows/coolify-production-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/coolify-production-build.yml b/.github/workflows/coolify-production-build.yml index 4ee2344d2..79dfc3fc0 100644 --- a/.github/workflows/coolify-production-build.yml +++ b/.github/workflows/coolify-production-build.yml @@ -76,7 +76,7 @@ jobs: - name: Get Version id: version run: | - echo "VERSION=$(docker run --rm -v "$(pwd):/app" -w /app php:8.2-alpine3.16 php bootstrap/getVersion.php)"|xargs >> $GITHUB_OUTPUT] + echo "VERSION=$(docker run --rm -v "$(pwd):/app" -w /app php:8.2-alpine3.16 php bootstrap/getVersion.php)"|xargs >> $GITHUB_OUTPUT - name: Build and Push Image uses: docker/build-push-action@v6 From 653cfcc766991bf478186f68f785351a8f1670bc Mon Sep 17 00:00:00 2001 From: peaklabs-dev <122374094+peaklabs-dev@users.noreply.github.com> Date: Fri, 8 Nov 2024 11:38:07 +0100 Subject: [PATCH 13/35] fix 2 advanced settings --- resources/views/livewire/settings/index.blade.php | 6 ------ 1 file changed, 6 deletions(-) diff --git a/resources/views/livewire/settings/index.blade.php b/resources/views/livewire/settings/index.blade.php index c41b0e641..45eda52dd 100644 --- a/resources/views/livewire/settings/index.blade.php +++ b/resources/views/livewire/settings/index.blade.php @@ -98,12 +98,6 @@ - -

Advanced

-
- - -

Update

@if (!is_null(env('AUTOUPDATE', null))) From 26e47d7553b81746bad9a40735c0567b10c50d90 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Fri, 8 Nov 2024 11:39:12 +0100 Subject: [PATCH 14/35] new versions --- docker-compose.prod.yml | 2 +- docker-compose.windows.yml | 2 +- other/nightly/versions.json | 2 +- versions.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index b15a109c3..80555e377 100644 --- 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" diff --git a/docker-compose.windows.yml b/docker-compose.windows.yml index ef2de82e9..d92dc6332 100644 --- 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 diff --git a/other/nightly/versions.json b/other/nightly/versions.json index dbb295590..1881b2e68 100644 --- a/other/nightly/versions.json +++ b/other/nightly/versions.json @@ -1,7 +1,7 @@ { "coolify": { "v4": { - "version": "4.0.0-beta.360" + "version": "4.0.0-beta.361" }, "nightly": { "version": "4.0.0-beta.362" diff --git a/versions.json b/versions.json index dbb295590..1881b2e68 100644 --- a/versions.json +++ b/versions.json @@ -1,7 +1,7 @@ { "coolify": { "v4": { - "version": "4.0.0-beta.360" + "version": "4.0.0-beta.361" }, "nightly": { "version": "4.0.0-beta.362" From f081ba762150ae6d2dde87dcf745ca16ba60dc46 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Fri, 8 Nov 2024 11:45:56 +0100 Subject: [PATCH 15/35] fix: notifications ui --- app/Livewire/Notifications/Email.php | 12 ++++++------ app/Livewire/Server/Show.php | 10 ++++++---- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/app/Livewire/Notifications/Email.php b/app/Livewire/Notifications/Email.php index b49638b48..28267331a 100644 --- 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; diff --git a/app/Livewire/Server/Show.php b/app/Livewire/Server/Show.php index 524e21908..aea07efe0 100644 --- 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() From c7daa32e217ef966c49802fa1c27f4dca8db0156 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Fri, 8 Nov 2024 11:48:15 +0100 Subject: [PATCH 16/35] ui fix --- app/Livewire/Project/Database/BackupEdit.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Livewire/Project/Database/BackupEdit.php b/app/Livewire/Project/Database/BackupEdit.php index bcf2f959e..b3a54f0ab 100644 --- 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; From 9f439e26722a44332aea0b1f771a2617d4467d2c Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Fri, 8 Nov 2024 11:51:06 +0100 Subject: [PATCH 17/35] fix: disable wire:navigate --- resources/views/components/navbar.blade.php | 2 +- .../views/components/notification/navbar.blade.php | 6 +++--- .../views/components/server/sidebar.blade.php | 14 +++++++------- .../views/livewire/destination/index.blade.php | 6 ++---- resources/views/livewire/tags/show.blade.php | 2 +- 5 files changed, 14 insertions(+), 16 deletions(-) diff --git a/resources/views/components/navbar.blade.php b/resources/views/components/navbar.blade.php index 8a2f4d5d6..f635a6787 100644 --- a/resources/views/components/navbar.blade.php +++ b/resources/views/components/navbar.blade.php @@ -148,7 +148,7 @@
  • + href="{{ route('destination.index') }}"> Get notified about your infrastructure.