Fix variable assignment in Import.php and ApplicationDeploymentJob.php

arteons · Apr 11, 2024 · e71032a · e71032a
1 parent 484a3db
commit e71032a
Show file tree

Hide file tree

Showing 11 changed files with 93 additions and 52 deletions.
diff --git a/app/Actions/Database/StartClickhouse.php b/app/Actions/Database/StartClickhouse.php
@@ -116,8 +116,12 @@ private function generate_local_persistent_volumes()
     {
         $local_persistent_volumes = [];
         foreach ($this->database->persistentStorages as $persistentStorage) {
-            $volume_name = $persistentStorage->host_path ?? $persistentStorage->name;
-            $local_persistent_volumes[] = $volume_name . ':' . $persistentStorage->mount_path;
+            if ($persistentStorage->host_path !== '' && $persistentStorage->host_path !== null) {
+                $local_persistent_volumes[] = $persistentStorage->host_path . ':' . $persistentStorage->mount_path;
+            } else {
+                $volume_name = $persistentStorage->name;
+                $local_persistent_volumes[] = $volume_name . ':' . $persistentStorage->mount_path;
+            }
         }
         return $local_persistent_volumes;
     }

diff --git a/app/Actions/Database/StartDragonfly.php b/app/Actions/Database/StartDragonfly.php
@@ -124,8 +124,12 @@ private function generate_local_persistent_volumes()
     {
         $local_persistent_volumes = [];
         foreach ($this->database->persistentStorages as $persistentStorage) {
-            $volume_name = $persistentStorage->host_path ?? $persistentStorage->name;
-            $local_persistent_volumes[] = $volume_name . ':' . $persistentStorage->mount_path;
+            if ($persistentStorage->host_path !== '' && $persistentStorage->host_path !== null) {
+                $local_persistent_volumes[] = $persistentStorage->host_path . ':' . $persistentStorage->mount_path;
+            } else {
+                $volume_name = $persistentStorage->name;
+                $local_persistent_volumes[] = $volume_name . ':' . $persistentStorage->mount_path;
+            }
         }
         return $local_persistent_volumes;
     }

diff --git a/app/Actions/Database/StartKeydb.php b/app/Actions/Database/StartKeydb.php
@@ -121,8 +121,12 @@ private function generate_local_persistent_volumes()
     {
         $local_persistent_volumes = [];
         foreach ($this->database->persistentStorages as $persistentStorage) {
-            $volume_name = $persistentStorage->host_path ?? $persistentStorage->name;
-            $local_persistent_volumes[] = $volume_name . ':' . $persistentStorage->mount_path;
+            if ($persistentStorage->host_path !== '' && $persistentStorage->host_path !== null) {
+                $local_persistent_volumes[] = $persistentStorage->host_path . ':' . $persistentStorage->mount_path;
+            } else {
+                $volume_name = $persistentStorage->name;
+                $local_persistent_volumes[] = $volume_name . ':' . $persistentStorage->mount_path;
+            }
         }
         return $local_persistent_volumes;
     }

diff --git a/app/Actions/Database/StartMariadb.php b/app/Actions/Database/StartMariadb.php
@@ -114,8 +114,12 @@ private function generate_local_persistent_volumes()
     {
         $local_persistent_volumes = [];
         foreach ($this->database->persistentStorages as $persistentStorage) {
-            $volume_name = $persistentStorage->host_path ?? $persistentStorage->name;
-            $local_persistent_volumes[] = $volume_name . ':' . $persistentStorage->mount_path;
+            if ($persistentStorage->host_path !== '' && $persistentStorage->host_path !== null) {
+                $local_persistent_volumes[] = $persistentStorage->host_path . ':' . $persistentStorage->mount_path;
+            } else {
+                $volume_name = $persistentStorage->name;
+                $local_persistent_volumes[] = $volume_name . ':' . $persistentStorage->mount_path;
+            }
         }
         return $local_persistent_volumes;
     }

diff --git a/app/Actions/Database/StartMongodb.php b/app/Actions/Database/StartMongodb.php
@@ -130,8 +130,12 @@ private function generate_local_persistent_volumes()
     {
         $local_persistent_volumes = [];
         foreach ($this->database->persistentStorages as $persistentStorage) {
-            $volume_name = $persistentStorage->host_path ?? $persistentStorage->name;
-            $local_persistent_volumes[] = $volume_name . ':' . $persistentStorage->mount_path;
+            if ($persistentStorage->host_path !== '' && $persistentStorage->host_path !== null) {
+                $local_persistent_volumes[] = $persistentStorage->host_path . ':' . $persistentStorage->mount_path;
+            } else {
+                $volume_name = $persistentStorage->name;
+                $local_persistent_volumes[] = $volume_name . ':' . $persistentStorage->mount_path;
+            }
         }
         return $local_persistent_volumes;
     }

diff --git a/app/Actions/Database/StartMysql.php b/app/Actions/Database/StartMysql.php
@@ -114,8 +114,12 @@ private function generate_local_persistent_volumes()
     {
         $local_persistent_volumes = [];
         foreach ($this->database->persistentStorages as $persistentStorage) {
-            $volume_name = $persistentStorage->host_path ?? $persistentStorage->name;
-            $local_persistent_volumes[] = $volume_name . ':' . $persistentStorage->mount_path;
+            if ($persistentStorage->host_path !== '' && $persistentStorage->host_path !== null) {
+                $local_persistent_volumes[] = $persistentStorage->host_path . ':' . $persistentStorage->mount_path;
+            } else {
+                $volume_name = $persistentStorage->name;
+                $local_persistent_volumes[] = $volume_name . ':' . $persistentStorage->mount_path;
+            }
         }
         return $local_persistent_volumes;
     }

diff --git a/app/Actions/Database/StartPostgresql.php b/app/Actions/Database/StartPostgresql.php
@@ -136,8 +136,12 @@ private function generate_local_persistent_volumes()
     {
         $local_persistent_volumes = [];
         foreach ($this->database->persistentStorages as $persistentStorage) {
-            $volume_name = $persistentStorage->host_path ?? $persistentStorage->name;
-            $local_persistent_volumes[] = $volume_name . ':' . $persistentStorage->mount_path;
+            if ($persistentStorage->host_path !== '' && $persistentStorage->host_path !== null) {
+                $local_persistent_volumes[] = $persistentStorage->host_path . ':' . $persistentStorage->mount_path;
+            } else {
+                $volume_name = $persistentStorage->name;
+                $local_persistent_volumes[] = $volume_name . ':' . $persistentStorage->mount_path;
+            }
         }
         return $local_persistent_volumes;
     }

diff --git a/app/Actions/Database/StartRedis.php b/app/Actions/Database/StartRedis.php
@@ -125,8 +125,12 @@ private function generate_local_persistent_volumes()
     {
         $local_persistent_volumes = [];
         foreach ($this->database->persistentStorages as $persistentStorage) {
-            $volume_name = $persistentStorage->host_path ?? $persistentStorage->name;
-            $local_persistent_volumes[] = $volume_name . ':' . $persistentStorage->mount_path;
+            if ($persistentStorage->host_path !== '' && $persistentStorage->host_path !== null) {
+                $local_persistent_volumes[] = $persistentStorage->host_path . ':' . $persistentStorage->mount_path;
+            } else {
+                $volume_name = $persistentStorage->name;
+                $local_persistent_volumes[] = $volume_name . ':' . $persistentStorage->mount_path;
+            }
         }
         return $local_persistent_volumes;
     }

diff --git a/app/Jobs/ApplicationDeploymentJob.php b/app/Jobs/ApplicationDeploymentJob.php
@@ -1340,7 +1340,11 @@ private function generate_local_persistent_volumes()
     {
         $local_persistent_volumes = [];
         foreach ($this->application->persistentStorages as $persistentStorage) {
-            $volume_name = $persistentStorage->host_path ?? $persistentStorage->name;
+            if ($persistentStorage->host_path !== '' && $persistentStorage->host_path !== null) {
+                $volume_name = $persistentStorage->host_path;
+            } else {
+                $volume_name = $persistentStorage->name;
+            }
             if ($this->pull_request_id !== 0) {
                 $volume_name = $volume_name . '-pr-' . $this->pull_request_id;
             }

diff --git a/app/Livewire/Project/Database/Import.php b/app/Livewire/Project/Database/Import.php
@@ -8,7 +8,7 @@
 
 class Import extends Component
 {
-
+    public bool $unsupported = false;
     public $resource;
     public $parameters;
     public $containers;
@@ -65,7 +65,7 @@ public function getContainers()
             $this->resource->getMorphClass() == 'App\Models\StandaloneClickhouse' ||
             $this->resource->getMorphClass() == 'App\Models\StandaloneMongodb'
         ) {
-            $this->dispatch('error', 'Import is not supported for this resource.');
+            $this->unsupported = true;
         }
     }
 

diff --git a/resources/views/livewire/project/database/import.blade.php b/resources/views/livewire/project/database/import.blade.php
@@ -37,41 +37,46 @@
         </script>
     @endscript
     <h2>Import Backup</h2>
-    <div class="mt-2 mb-4 rounded alert-error">
-        <svg xmlns="http://www.w3.org/2000/svg" class="w-6 h-6 stroke-current shrink-0" fill="none" viewBox="0 0 24 24">
-            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
-                d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-3L13.732 4c-.77-1.333-2.694-1.333-3.464 0L3.34 16c-.77 1.333.192 3 1.732 3z" />
-        </svg>
-        <span>This is a destructive action, existing data will be replaced!</span>
-    </div>
+    @if ($unsupported)
+        <div>Database restore is not supported.</div>
+    @else
+        <div class="mt-2 mb-4 rounded alert-error">
+            <svg xmlns="http://www.w3.org/2000/svg" class="w-6 h-6 stroke-current shrink-0" fill="none"
+                viewBox="0 0 24 24">
+                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
+                    d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-3L13.732 4c-.77-1.333-2.694-1.333-3.464 0L3.34 16c-.77 1.333.192 3 1.732 3z" />
+            </svg>
+            <span>This is a destructive action, existing data will be replaced!</span>
+        </div>
+        @if (str(data_get($resource, 'status'))->startsWith('running'))
 
-    @if (str(data_get($resource, 'status'))->startsWith('running'))
-        @if ($resource->type() === 'standalone-postgresql')
-            <x-forms.input class="mb-2" label="Custom Import Command"
-                wire:model='postgresqlRestoreCommand'></x-forms.input>
-        @elseif ($resource->type() === 'standalone-mysql')
-            <x-forms.input class="mb-2" label="Custom Import Command"
-                wire:model='mysqlRestoreCommand'></x-forms.input>
-        @elseif ($resource->type() === 'standalone-mariadb')
-            <x-forms.input class="mb-2" label="Custom Import Command"
-                wire:model='mariadbRestoreCommand'></x-forms.input>
-        @endif
+            @if ($resource->type() === 'standalone-postgresql')
+                <x-forms.input class="mb-2" label="Custom Import Command"
+                    wire:model='postgresqlRestoreCommand'></x-forms.input>
+            @elseif ($resource->type() === 'standalone-mysql')
+                <x-forms.input class="mb-2" label="Custom Import Command"
+                    wire:model='mysqlRestoreCommand'></x-forms.input>
+            @elseif ($resource->type() === 'standalone-mariadb')
+                <x-forms.input class="mb-2" label="Custom Import Command"
+                    wire:model='mariadbRestoreCommand'></x-forms.input>
+            @endif
 
-        <div x-show="isUploading">
-            <progress max="100" x-bind:value="progress" class="progress progress-warning"></progress>
-        </div>
-        <div x-show="filename && !error">
-            <div>File: <span x-text="filename ?? 'N/A'"></span> <span x-text="filesize">/ </span></div>
-            <x-forms.button class="w-full my-4" wire:click='runImport'>Restore Backup</x-forms.button>
-        </div>
-        <form action="/upload/backup/{{ $resource->uuid }}" class="dropzone" id="my-dropzone">
-            @csrf
-        </form>
+            <div x-show="isUploading">
+                <progress max="100" x-bind:value="progress" class="progress progress-warning"></progress>
+            </div>
+            <div x-show="filename && !error">
+                <div>File: <span x-text="filename ?? 'N/A'"></span> <span x-text="filesize">/ </span></div>
+                <x-forms.button class="w-full my-4" wire:click='runImport'>Restore Backup</x-forms.button>
+            </div>
+            <form action="/upload/backup/{{ $resource->uuid }}" class="dropzone" id="my-dropzone">
+                @csrf
+            </form>
 
-        <div class="container w-full mx-auto">
-            <livewire:activity-monitor header="Database restore output" />
-        </div>
-    @else
-        <div>Database must be running to restore a backup.</div>
+            <div class="container w-full mx-auto">
+                <livewire:activity-monitor header="Database Restore Output" />
+            </div>
+        @else
+            <div>Database must be running to restore a backup.</div>
+        @endif
     @endif
 </div>