From 82f3d54bc3a3a05d8c03f579dbaabc69ffa1b2ac Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Fri, 8 Dec 2023 00:16:22 +0100
Subject: [PATCH] ui fixes

---
 app/Http/Controllers/ProjectController.php    |  1 -
 app/Livewire/Project/New/Select.php           |  2 +-
 bootstrap/helpers/remoteProcess.php           |  1 -
 bootstrap/helpers/shared.php                  |  4 ++
 ...e-ui-modal.php => wire-elements-modal.php} |  0
 .../livewire/project/new/select.blade.php     |  2 +-
 .../project/service/stack-form.blade.php      |  2 +-
 .../vendor/livewire-ui-modal/modal.blade.php  | 44 --------------
 .../wire-elements-modal/modal.blade.php       | 57 +++++++++++++++++++
 9 files changed, 64 insertions(+), 49 deletions(-)
 rename config/{livewire-ui-modal.php => wire-elements-modal.php} (100%)
 delete mode 100644 resources/views/vendor/livewire-ui-modal/modal.blade.php
 create mode 100644 resources/views/vendor/wire-elements-modal/modal.blade.php

diff --git a/app/Http/Controllers/ProjectController.php b/app/Http/Controllers/ProjectController.php
index 4e2fc5878..1e7d6b9cd 100644
--- a/app/Http/Controllers/ProjectController.php
+++ b/app/Http/Controllers/ProjectController.php
@@ -116,7 +116,6 @@ class ProjectController extends Controller
                     });
                 }
                 $service->parse(isNew: true);
-
                 return redirect()->route('project.service.configuration', [
                     'service_uuid' => $service->uuid,
                     'environment_name' => $environment->name,
diff --git a/app/Livewire/Project/New/Select.php b/app/Livewire/Project/New/Select.php
index 90fa71914..e083642b0 100644
--- a/app/Livewire/Project/New/Select.php
+++ b/app/Livewire/Project/New/Select.php
@@ -47,7 +47,7 @@ class Select extends Component
     }
     public function render()
     {
-        if ($this->search) $this->loadServices();
+        $this->loadServices();
         return view('livewire.project.new.select');
     }
 
diff --git a/bootstrap/helpers/remoteProcess.php b/bootstrap/helpers/remoteProcess.php
index 56fcdbfec..2fe90415e 100644
--- a/bootstrap/helpers/remoteProcess.php
+++ b/bootstrap/helpers/remoteProcess.php
@@ -61,7 +61,6 @@ function remote_process(
 // }
 function savePrivateKeyToFs(Server $server)
 {
-    ray(data_get($server, 'privateKey.private_key'));
     if (data_get($server, 'privateKey.private_key') === null) {
         throw new \Exception("Server {$server->name} does not have a private key");
     }
diff --git a/bootstrap/helpers/shared.php b/bootstrap/helpers/shared.php
index 03de7c09d..4f0fda777 100644
--- a/bootstrap/helpers/shared.php
+++ b/bootstrap/helpers/shared.php
@@ -967,6 +967,10 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
                                 }
                             }
                         } else {
+                            $foundEnv = EnvironmentVariable::where([
+                                'key' => $key,
+                                'service_id' => $resource->id,
+                            ])->first();
                             if ($value->contains(':-')) {
                                 $key = $value->before(':');
                                 $defaultValue = $value->after(':-');
diff --git a/config/livewire-ui-modal.php b/config/wire-elements-modal.php
similarity index 100%
rename from config/livewire-ui-modal.php
rename to config/wire-elements-modal.php
diff --git a/resources/views/livewire/project/new/select.blade.php b/resources/views/livewire/project/new/select.blade.php
index 7fdf8a619..6b81debcc 100644
--- a/resources/views/livewire/project/new/select.blade.php
+++ b/resources/views/livewire/project/new/select.blade.php
@@ -156,7 +156,7 @@
                 <x-forms.button wire:click='loadServices'>Reload Services List</x-forms.button>
                 <input
                     class="w-full text-white rounded input input-sm bg-coolgray-200 disabled:bg-coolgray-200/50 disabled:border-none placeholder:text-coolgray-500 read-only:text-neutral-500 read-only:bg-coolgray-200/50"
-                    wire:model.debounce.200ms="search" placeholder="Search..."></input>
+                    wire:model.live.debounce.200ms="search" placeholder="Search...">
             </div>
             <div class="grid justify-start grid-cols-1 gap-2 text-left xl:grid-cols-3">
                 @if ($loadingServices)
diff --git a/resources/views/livewire/project/service/stack-form.blade.php b/resources/views/livewire/project/service/stack-form.blade.php
index e9b704d11..2dc54012d 100644
--- a/resources/views/livewire/project/service/stack-form.blade.php
+++ b/resources/views/livewire/project/service/stack-form.blade.php
@@ -6,7 +6,7 @@
         </div>
         <x-forms.button type="submit">Save</x-forms.button>
         <x-forms.button class="w-64"
-            onclick="Livewire.dispatch('openModal', {component: {component: 'modals.edit-compose', arguments: arguments: {{ json_encode(['serviceId' => $service->id]) }} } })">Edit
+            onclick="Livewire.dispatch('openModal', {component: 'modal.edit-compose', arguments:  {{ json_encode(['serviceId' => $service->id]) }}  })">Edit
             Compose
             File</x-forms.button>
     </div>
diff --git a/resources/views/vendor/livewire-ui-modal/modal.blade.php b/resources/views/vendor/livewire-ui-modal/modal.blade.php
deleted file mode 100644
index 36e32406f..000000000
--- a/resources/views/vendor/livewire-ui-modal/modal.blade.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<div>
-    @isset($jsPath)
-        <script>
-            {!! file_get_contents($jsPath) !!}
-        </script>
-    @endisset
-    @isset($cssPath)
-        <style>
-            {!! file_get_contents($cssPath) !!}
-        </style>
-    @endisset
-
-    <div x-data="LivewireUIModal()" x-init="init()" x-on:close.stop="setShowPropertyTo(false)"
-        x-on:keydown.escape.window="closeModalOnEscape()" x-show="show" class="fixed inset-0 z-40 overflow-y-auto"
-        style="display: none;">
-        <div class="flex items-end justify-center px-4 pt-4 pb-10 text-center sm:block sm:p-0">
-            <div x-show="show" x-on:click="closeModalOnClickAway()" x-transition:enter="ease-out duration-300"
-                x-transition:enter-start="opacity-0" x-transition:enter-end="opacity-100"
-                x-transition:leave="ease-in duration-200" x-transition:leave-start="opacity-100"
-                x-transition:leave-end="opacity-0" class="fixed inset-0 transition-all transform">
-                <div class="absolute inset-0 bg-black opacity-70"></div>
-            </div>
-
-            {{-- <span class="hidden sm:inline-block sm:align-middle sm:h-screen" aria-hidden="true">&#8203;</span> --}}
-
-            <div x-show="show && showActiveComponent" x-transition:enter="ease-out duration-200"
-                x-transition:enter-start="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
-                x-transition:enter-end="opacity-100 translate-y-0 sm:scale-100"
-                x-transition:leave="ease-in duration-200"
-                x-transition:leave-start="opacity-100 translate-y-0 sm:scale-100"
-                x-transition:leave-end="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
-                class="w-full overflow-hidden text-left align-bottom transition-all transform sm:my-8 sm:align-middle sm:w-full"
-                id="modal-container" x-trap.noscroll.inert="show && showActiveComponent" aria-modal="true">
-                @forelse($components as $id => $component)
-                    <div class="sm:mx-20" x-show.immediate="activeComponent == '{{ $id }}'"
-                        x-ref="{{ $id }}" wire:key="{{ $id }}">
-                        @livewire($component['name'], $component['attributes'], key($id))
-                    </div>
-                @empty
-                @endforelse
-            </div>
-        </div>
-    </div>
-</div>
diff --git a/resources/views/vendor/wire-elements-modal/modal.blade.php b/resources/views/vendor/wire-elements-modal/modal.blade.php
new file mode 100644
index 000000000..960a4260a
--- /dev/null
+++ b/resources/views/vendor/wire-elements-modal/modal.blade.php
@@ -0,0 +1,57 @@
+<div>
+    @isset($jsPath)
+        <script>{!! file_get_contents($jsPath) !!}</script>
+    @endisset
+    @isset($cssPath)
+        <style>{!! file_get_contents($cssPath) !!}</style>
+    @endisset
+
+    <div
+            x-data="LivewireUIModal()"
+            x-on:close.stop="setShowPropertyTo(false)"
+            x-on:keydown.escape.window="closeModalOnEscape()"
+            x-show="show"
+            class="fixed inset-0 z-10 overflow-y-auto"
+            style="display: none;"
+    >
+        <div class="flex items-end justify-center min-h-screen px-4 pt-4 pb-10 text-center sm:block sm:p-0">
+            <div
+                    x-show="show"
+                    x-on:click="closeModalOnClickAway()"
+                    x-transition:enter="ease-out duration-300"
+                    x-transition:enter-start="opacity-0"
+                    x-transition:enter-end="opacity-100"
+                    x-transition:leave="ease-in duration-200"
+                    x-transition:leave-start="opacity-100"
+                    x-transition:leave-end="opacity-0"
+                    class="fixed inset-0 transition-all transform"
+            >
+                <div class="absolute inset-0 bg-black opacity-70"></div>
+            </div>
+
+            {{-- <span class="hidden sm:inline-block sm:align-middle sm:h-screen" aria-hidden="true">&#8203;</span> --}}
+
+            <div
+                    x-show="show && showActiveComponent"
+                    x-transition:enter="ease-out duration-300"
+                    x-transition:enter-start="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
+                    x-transition:enter-end="opacity-100 translate-y-0 sm:scale-100"
+                    x-transition:leave="ease-in duration-200"
+                    x-transition:leave-start="opacity-100 translate-y-0 sm:scale-100"
+                    x-transition:leave-end="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
+                    x-bind:class="modalWidth"
+                    class="w-full overflow-hidden text-left align-bottom transition-all transform sm:align-middle sm:w-full"
+                    id="modal-container"
+                    x-trap.noscroll.inert="show && showActiveComponent"
+                    aria-modal="true"
+            >
+                @forelse($components as $id => $component)
+                    <div class="sm:mx-20 sm:my-8" x-show.immediate="activeComponent == '{{ $id }}'" x-ref="{{ $id }}" wire:key="{{ $id }}">
+                        @livewire($component['name'], $component['arguments'], key($id))
+                    </div>
+                @empty
+                @endforelse
+            </div>
+        </div>
+    </div>
+</div>