From 003f97af24714cf1fa052ace85b1abb29493117a Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Sat, 22 Jun 2024 12:55:26 +0200
Subject: [PATCH] fix: you can now add env variable from ui to services

---
 app/Models/Service.php                        | 19 +++++++++++---
 .../shared/environment-variable/all.blade.php | 25 ++++++++++++-------
 .../environment-variable/show.blade.php       |  4 +--
 3 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/app/Models/Service.php b/app/Models/Service.php
index 8adca3424..795b9a421 100644
--- a/app/Models/Service.php
+++ b/app/Models/Service.php
@@ -839,20 +839,33 @@ public function saveComposeConfigs()
         $commands[] = "cd $workdir";
 
         $json = Yaml::parse($this->docker_compose);
+        $envs_from_coolify = $this->environment_variables()->get();
         foreach ($json['services'] as $service => $config) {
             $envs = collect($config['environment']);
             $envs->push("COOLIFY_CONTAINER_NAME=$service-{$this->uuid}");
+            foreach ($envs_from_coolify as $env) {
+                $envs = $envs->map(function ($value) use ($env) {
+                    if (str($value)->startsWith($env->key)) {
+                        return "{$env->key}={$env->real_value}";
+                    }
+
+                    return $value;
+                });
+            }
+            $envs = $envs->unique();
             data_set($json, "services.$service.environment", $envs->toArray());
         }
+
         $this->docker_compose = Yaml::dump($json);
         $docker_compose_base64 = base64_encode($this->docker_compose);
+
         $commands[] = "echo $docker_compose_base64 | base64 -d | tee docker-compose.yml > /dev/null";
-        $envs = $this->environment_variables()->get();
         $commands[] = 'rm -f .env || true';
-        foreach ($envs as $env) {
+
+        foreach ($envs_from_coolify as $env) {
             $commands[] = "echo '{$env->key}={$env->real_value}' >> .env";
         }
-        if ($envs->count() === 0) {
+        if ($envs_from_coolify->count() === 0) {
             $commands[] = 'touch .env';
         }
         instant_remote_process($commands, $this->server);
diff --git a/resources/views/livewire/project/shared/environment-variable/all.blade.php b/resources/views/livewire/project/shared/environment-variable/all.blade.php
index 42a2b48a7..649d59a20 100644
--- a/resources/views/livewire/project/shared/environment-variable/all.blade.php
+++ b/resources/views/livewire/project/shared/environment-variable/all.blade.php
@@ -2,13 +2,11 @@
     <div>
         <div class="flex items-center gap-2">
             <h2>Environment Variables</h2>
-            @if ($resource->type() !== 'service')
-                <x-modal-input buttonTitle="+ Add" title="New Environment Variable">
-                    <livewire:project.shared.environment-variable.add />
-                </x-modal-input>
-                <x-forms.button
-                    wire:click='switch'>{{ $view === 'normal' ? 'Developer view' : 'Normal view' }}</x-forms.button>
-            @endif
+            <x-modal-input buttonTitle="+ Add" title="New Environment Variable">
+                <livewire:project.shared.environment-variable.add />
+            </x-modal-input>
+            <x-forms.button
+                wire:click='switch'>{{ $view === 'normal' ? 'Developer view' : 'Normal view' }}</x-forms.button>
         </div>
         <div>Environment variables (secrets) for this resource.</div>
         @if ($this->resourceClass === 'App\Models\Application' && data_get($this->resource, 'build_pack') !== 'dockercompose')
@@ -19,8 +17,17 @@
             </div>
         @endif
         @if ($resource->type() === 'service' || $resource?->build_pack === 'dockercompose')
-            <div class="pt-4 dark:text-warning text-coollabs">Hardcoded variables are not shown here.</div>
-            <div class="pb-4 dark:text-warning text-coollabs">If you would like to add a variable, you must add it to your compose file (General tab).</div>
+            <div class="flex items-center gap-1 pt-4 dark:text-warning text-coollabs">
+                <svg class="hidden w-4 h-4 dark:text-warning lg:block" viewBox="0 0 256 256"
+                    xmlns="http://www.w3.org/2000/svg">
+                    <path fill="currentColor"
+                        d="M240.26 186.1L152.81 34.23a28.74 28.74 0 0 0-49.62 0L15.74 186.1a27.45 27.45 0 0 0 0 27.71A28.31 28.31 0 0 0 40.55 228h174.9a28.31 28.31 0 0 0 24.79-14.19a27.45 27.45 0 0 0 .02-27.71m-20.8 15.7a4.46 4.46 0 0 1-4 2.2H40.55a4.46 4.46 0 0 1-4-2.2a3.56 3.56 0 0 1 0-3.73L124 46.2a4.77 4.77 0 0 1 8 0l87.44 151.87a3.56 3.56 0 0 1 .02 3.73M116 136v-32a12 12 0 0 1 24 0v32a12 12 0 0 1-24 0m28 40a16 16 0 1 1-16-16a16 16 0 0 1 16 16">
+                    </path>
+                </svg>
+                Hardcoded variables are not shown here.
+            </div>
+            {{-- <div class="pb-4 dark:text-warning text-coollabs">If you would like to add a variable, you must add it to
+                your compose file.</div> --}}
         @endif
     </div>
     @if ($view === 'normal')
diff --git a/resources/views/livewire/project/shared/environment-variable/show.blade.php b/resources/views/livewire/project/shared/environment-variable/show.blade.php
index b23148547..0b5e767c0 100644
--- a/resources/views/livewire/project/shared/environment-variable/show.blade.php
+++ b/resources/views/livewire/project/shared/environment-variable/show.blade.php
@@ -1,7 +1,7 @@
 <div>
     <form wire:submit='submit'
         class="flex flex-col items-center gap-4 p-4 bg-white border lg:items-start dark:bg-base dark:border-coolgray-300">
-        @if (!$env->isFoundInCompose && !$isSharedVariable)
+        {{-- @if (!$env->isFoundInCompose && !$isSharedVariable)
             <div class="flex items-center justify-center gap-2 dark:text-warning text-coollabs"> <svg
                     class="hidden w-4 h-4 dark:text-warning lg:block" viewBox="0 0 256 256"
                     xmlns="http://www.w3.org/2000/svg">
@@ -9,7 +9,7 @@ class="hidden w-4 h-4 dark:text-warning lg:block" viewBox="0 0 256 256"
                         d="M240.26 186.1L152.81 34.23a28.74 28.74 0 0 0-49.62 0L15.74 186.1a27.45 27.45 0 0 0 0 27.71A28.31 28.31 0 0 0 40.55 228h174.9a28.31 28.31 0 0 0 24.79-14.19a27.45 27.45 0 0 0 .02-27.71m-20.8 15.7a4.46 4.46 0 0 1-4 2.2H40.55a4.46 4.46 0 0 1-4-2.2a3.56 3.56 0 0 1 0-3.73L124 46.2a4.77 4.77 0 0 1 8 0l87.44 151.87a3.56 3.56 0 0 1 .02 3.73M116 136v-32a12 12 0 0 1 24 0v32a12 12 0 0 1-24 0m28 40a16 16 0 1 1-16-16a16 16 0 0 1 16 16">
                     </path>
                 </svg>This variable is not found in the compose file, so it won't be used.</div>
-        @endif
+        @endif --}}
         @if ($isLocked)
             <div class="flex flex-1 w-full gap-2">
                 <x-forms.input disabled id="env.key" />