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 @@