From 1dc3c77bc9d184f0976c9f73618561f4d7cb0afe Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Fri, 23 Jun 2023 13:13:02 +0200
Subject: [PATCH] Next channel updates

---
 app/Actions/Server/UpdateCoolify.php          | 12 +++++---
 app/Http/Livewire/Settings/Configuration.php  | 10 ++++---
 config/version.php                            |  2 +-
 ...2023_06_23_110548_next_channel_updates.php | 28 +++++++++++++++++++
 .../livewire/settings/configuration.blade.php |  5 ++--
 versions.json                                 |  2 +-
 6 files changed, 47 insertions(+), 12 deletions(-)
 create mode 100644 database/migrations/2023_06_23_110548_next_channel_updates.php

diff --git a/app/Actions/Server/UpdateCoolify.php b/app/Actions/Server/UpdateCoolify.php
index 7c1036b55..047a06e81 100644
--- a/app/Actions/Server/UpdateCoolify.php
+++ b/app/Actions/Server/UpdateCoolify.php
@@ -14,6 +14,7 @@ class UpdateCoolify
     public function __invoke(bool $force)
     {
         try {
+            $settings = InstanceSettings::get();
             ray('Running InstanceAutoUpdateJob');
             $localhost_name = 'localhost';
             if (isDev()) {
@@ -23,12 +24,15 @@ public function __invoke(bool $force)
             $this->latest_version = get_latest_version_of_coolify();
             $this->current_version = config('version');
             ray('latest version:' . $this->latest_version . " current version: " .  $this->current_version . ' force: ' . $force);
+            if ($settings->next_channel) {
+                ray('next channel enabled');
+                $force = true;
+                $this->latest_version = 'next';
+            }
             if ($force) {
                 $this->update();
             } else {
-                $instance_settings = InstanceSettings::get();
-                ray($instance_settings);
-                if (!$instance_settings->is_auto_update_enabled) {
+                if (!$settings->is_auto_update_enabled) {
                     throw new \Exception('Auto update is disabled');
                 }
                 if ($this->latest_version === $this->current_version) {
@@ -49,7 +53,7 @@ public function __invoke(bool $force)
     private function update()
     {
         if (isDev()) {
-            ray('Running update on local docker container');
+            ray("Running update on local docker container. Updating to $this->latest_version");
             remote_process([
                 "sleep 10"
             ], $this->server);
diff --git a/app/Http/Livewire/Settings/Configuration.php b/app/Http/Livewire/Settings/Configuration.php
index 9e901519d..4746cf299 100644
--- a/app/Http/Livewire/Settings/Configuration.php
+++ b/app/Http/Livewire/Settings/Configuration.php
@@ -12,9 +12,10 @@
 class Configuration extends Component
 {
     public ModelsInstanceSettings $settings;
-    public $do_not_track;
-    public $is_auto_update_enabled;
-    public $is_registration_enabled;
+    public bool $do_not_track;
+    public bool $is_auto_update_enabled;
+    public bool $is_registration_enabled;
+    public bool $next_channel;
     protected string $dynamic_config_path = '/data/coolify/proxy/dynamic';
     protected Server $server;
 
@@ -32,16 +33,17 @@ class Configuration extends Component
     ];
     public function mount()
     {
-        ray($this->settings);
         $this->do_not_track = $this->settings->do_not_track;
         $this->is_auto_update_enabled = $this->settings->is_auto_update_enabled;
         $this->is_registration_enabled = $this->settings->is_registration_enabled;
+        $this->next_channel = $this->settings->next_channel;
     }
     public function instantSave()
     {
         $this->settings->do_not_track = $this->do_not_track;
         $this->settings->is_auto_update_enabled = $this->is_auto_update_enabled;
         $this->settings->is_registration_enabled = $this->is_registration_enabled;
+        $this->settings->next_channel = $this->next_channel;
         $this->settings->save();
         $this->emit('success', 'Settings updated!');
     }
diff --git a/config/version.php b/config/version.php
index ad294318a..54ed072be 100644
--- a/config/version.php
+++ b/config/version.php
@@ -1,3 +1,3 @@
 <?php
 
-return '4.0.0-beta.11';
+return '4.0.0-beta.12';
diff --git a/database/migrations/2023_06_23_110548_next_channel_updates.php b/database/migrations/2023_06_23_110548_next_channel_updates.php
new file mode 100644
index 000000000..83c4dacf3
--- /dev/null
+++ b/database/migrations/2023_06_23_110548_next_channel_updates.php
@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('instance_settings', function (Blueprint $table) {
+            $table->boolean('next_channel')->default(false);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('instance_settings', function (Blueprint $table) {
+            $table->dropColumn('next_channel');
+        });
+    }
+};
diff --git a/resources/views/livewire/settings/configuration.blade.php b/resources/views/livewire/settings/configuration.blade.php
index d17435699..32f05272a 100644
--- a/resources/views/livewire/settings/configuration.blade.php
+++ b/resources/views/livewire/settings/configuration.blade.php
@@ -18,10 +18,11 @@
             </div> --}}
         </div>
     </form>
-
-    <div class="flex flex-col py-6 text-right w-52">
+    <h2 class="pt-6">Advanced</h2>
+    <div class="flex flex-col w-64 py-6 text-right">
         <x-forms.checkbox instantSave id="is_auto_update_enabled" label="Auto Update Coolify" />
         <x-forms.checkbox instantSave id="is_registration_enabled" label="Registration Allowed" />
         <x-forms.checkbox instantSave id="do_not_track" label="Do Not Track" />
+        <x-forms.checkbox instantSave id="next_channel" label="Enable beta (early) updates" />
     </div>
 </div>
diff --git a/versions.json b/versions.json
index 162dc9a54..c8927753c 100644
--- a/versions.json
+++ b/versions.json
@@ -4,7 +4,7 @@
             "version": "3.12.32"
         },
         "v4": {
-            "version": "4.0.0-beta.11"
+            "version": "4.0.0-beta.12"
         }
     }
 }
\ No newline at end of file