From 0bade9add30e40cffea715d5f219029f2a37eab0 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Fri, 23 Jun 2023 14:20:47 +0200
Subject: [PATCH] Remove instance 404 redirect

---
 app/Http/Livewire/Server/Form.php             |  2 +-
 app/Http/Livewire/Settings/Configuration.php  |  5 +---
 .../DeployedWithErrorNotification.php         |  2 +-
 config/version.php                            |  2 +-
 ...efault_redirect_from_instance_settings.php | 28 +++++++++++++++++++
 .../views/livewire/server/form.blade.php      |  3 +-
 .../views/livewire/server/proxy.blade.php     |  7 ++---
 .../livewire/settings/configuration.blade.php |  2 --
 versions.json                                 |  2 +-
 9 files changed, 37 insertions(+), 16 deletions(-)
 create mode 100644 database/migrations/2023_06_23_114132_remove_default_redirect_from_instance_settings.php

diff --git a/app/Http/Livewire/Server/Form.php b/app/Http/Livewire/Server/Form.php
index 44a94e31e..72d32243f 100644
--- a/app/Http/Livewire/Server/Form.php
+++ b/app/Http/Livewire/Server/Form.php
@@ -21,7 +21,7 @@ class Form extends Component
         'server.port' => 'required',
         'server.settings.is_reachable' => 'required',
         'server.settings.is_part_of_swarm' => 'required',
-        'wildcard_domain' => 'nullable|string'
+        'wildcard_domain' => 'nullable|url',
     ];
     protected $validationAttributes = [
         'server.name' => 'name',
diff --git a/app/Http/Livewire/Settings/Configuration.php b/app/Http/Livewire/Settings/Configuration.php
index 4746cf299..d0ce9435e 100644
--- a/app/Http/Livewire/Settings/Configuration.php
+++ b/app/Http/Livewire/Settings/Configuration.php
@@ -23,13 +23,11 @@ class Configuration extends Component
         'settings.fqdn' => 'nullable',
         'settings.public_port_min' => 'required',
         'settings.public_port_max' => 'required',
-        'settings.default_redirect_404' => 'nullable',
     ];
     protected $validationAttributes = [
         'settings.fqdn' => 'FQDN',
         'settings.public_port_min' => 'Public port min',
         'settings.public_port_max' => 'Public port max',
-        'settings.default_redirect_404' => 'Default redirect 404',
     ];
     public function mount()
     {
@@ -139,8 +137,7 @@ class Configuration extends Component
 
         $this->server = Server::findOrFail(0);
         $this->setup_instance_fqdn();
-        setup_default_redirect_404(redirect_url: $this->settings->default_redirect_404, server: $this->server);
-        if ($this->settings->fqdn || $this->settings->default_redirect_404) {
+        if ($this->settings->fqdn) {
             dispatch(new InstanceProxyCheckJob());
         }
         $this->emit('success', 'Instance settings updated successfully!');
diff --git a/app/Notifications/Notifications/Application/DeployedWithErrorNotification.php b/app/Notifications/Notifications/Application/DeployedWithErrorNotification.php
index ef4c81770..1418b7e8e 100644
--- a/app/Notifications/Notifications/Application/DeployedWithErrorNotification.php
+++ b/app/Notifications/Notifications/Application/DeployedWithErrorNotification.php
@@ -24,7 +24,7 @@ class DeployedWithErrorNotification extends Notification implements ShouldQueue
     public string|null $deployment_url = null;
     public string $project_uuid;
     public string $environment_name;
-    public string $fqdn;
+    public string|null $fqdn;
 
     public function __construct(Application $application, string $deployment_uuid, ApplicationPreview|null $preview)
     {
diff --git a/config/version.php b/config/version.php
index 300506ef5..b343fad81 100644
--- a/config/version.php
+++ b/config/version.php
@@ -1,3 +1,3 @@
 <?php
 
-return '4.0.0-beta.13';
+return '4.0.0-beta.14';
diff --git a/database/migrations/2023_06_23_114132_remove_default_redirect_from_instance_settings.php b/database/migrations/2023_06_23_114132_remove_default_redirect_from_instance_settings.php
new file mode 100644
index 000000000..9c14b7c39
--- /dev/null
+++ b/database/migrations/2023_06_23_114132_remove_default_redirect_from_instance_settings.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->dropColumn('default_redirect_404');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('instance_settings', function (Blueprint $table) {
+            $table->string('default_redirect_404')->nullable();
+        });
+    }
+};
diff --git a/resources/views/livewire/server/form.blade.php b/resources/views/livewire/server/form.blade.php
index d6d02489f..4a88910ac 100644
--- a/resources/views/livewire/server/form.blade.php
+++ b/resources/views/livewire/server/form.blade.php
@@ -16,9 +16,8 @@
             <div class="flex flex-col w-full gap-2 lg:flex-row">
                 <x-forms.input id="server.name" label="Name" required />
                 <x-forms.input id="server.description" label="Description" />
-                <x-forms.input id="wildcard_domain" label="Wildcard Domain"
+                <x-forms.input placeholder="https://example.com" id="wildcard_domain" label="Wildcard Domain"
                     helper="Wildcard domain for your applications. If you set this, you will get a random generated domain for your new applications.<br><span class='font-bold text-white'>Example</span>In case you set:<span class='text-helper'>https://example.com</span>your applications will get: <span class='text-helper'>https://randomId.example.com</span>" />
-
                 {{-- <x-forms.checkbox disabled type="checkbox" id="server.settings.is_part_of_swarm"
                     label="Is it part of a Swarm cluster?" /> --}}
             </div>
diff --git a/resources/views/livewire/server/proxy.blade.php b/resources/views/livewire/server/proxy.blade.php
index c009183c4..42b62c6ff 100644
--- a/resources/views/livewire/server/proxy.blade.php
+++ b/resources/views/livewire/server/proxy.blade.php
@@ -27,10 +27,9 @@
                                         configs.
                                     </div>
                                 @endif
-                                @if ($server->id !== 0)
-                                    <x-forms.input id="redirect_url" label="Default redirect"
-                                        placeholder="https://coolify.io" />
-                                @endif
+                                <x-forms.input placeholder="https://coolify.io" id="redirect_url"
+                                    label="Default Redirect 404"
+                                    helper="All urls that has no service available will be redirected to this domain.<span class='text-helper'>You can set to your main marketing page or your social media link.</span>" />
                                 <div class="container w-full mx-auto">
                                     <livewire:activity-monitor :header="true" />
                                 </div>
diff --git a/resources/views/livewire/settings/configuration.blade.php b/resources/views/livewire/settings/configuration.blade.php
index fa2736e1e..2a52c1116 100644
--- a/resources/views/livewire/settings/configuration.blade.php
+++ b/resources/views/livewire/settings/configuration.blade.php
@@ -9,8 +9,6 @@
         <div class="flex flex-col gap-2">
             <div class="flex gap-2">
                 <x-forms.input id="settings.fqdn" label="Coolify's Domain" />
-                <x-forms.input id="settings.default_redirect_404" label="Default Redirect 404"
-                    helper="All urls that has no service available will be redirected to this domain.<span class='text-helper'>You can set to your main marketing page or your social media link.</span>" />
             </div>
             {{-- <div class="flex gap-2 ">
                 <x-forms.input type="number" id="settings.public_port_min" label="Public Port Min" />
diff --git a/versions.json b/versions.json
index 1b4ae8856..8baf727d0 100644
--- a/versions.json
+++ b/versions.json
@@ -4,7 +4,7 @@
             "version": "3.12.32"
         },
         "v4": {
-            "version": "4.0.0-beta.13"
+            "version": "4.0.0-beta.14"
         }
     }
 }
\ No newline at end of file