From 83d96c8d114c51b63637d0dbac2a0c50354b7a2d Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Tue, 2 Jan 2024 17:14:52 +0100
Subject: [PATCH] Refactor custom labels handling in General.php and update
 Docker Compose Content label in general.blade.php

---
 app/Livewire/Project/Application/General.php      | 15 ++++++++++-----
 .../project/application/general.blade.php         |  2 +-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/app/Livewire/Project/Application/General.php b/app/Livewire/Project/Application/General.php
index 58dbed11e..798794e49 100644
--- a/app/Livewire/Project/Application/General.php
+++ b/app/Livewire/Project/Application/General.php
@@ -117,7 +117,9 @@ class General extends Component
         $this->isConfigurationChanged = $this->application->isConfigurationChanged();
         $this->customLabels = $this->application->parseContainerLabels();
         if (!$this->customLabels) {
-            $this->resetDefaultLabels(false);
+            $this->customLabels = str(implode(",", generateLabelsApplication($this->application)))->replace(',', "\n");
+            $this->application->custom_labels = base64_encode($this->customLabels);
+            $this->application->save();
         }
         $this->initialDockerComposeLocation = $this->application->docker_compose_location;
         $this->checkLabelUpdates();
@@ -204,7 +206,12 @@ class General extends Component
     public function submit($showToaster = true)
     {
         try {
-            ray($this->initialDockerComposeLocation, $this->application->docker_compose_location);
+            if (!$this->customLabels) {
+                $this->customLabels = str(implode(",", generateLabelsApplication($this->application)))->replace(',', "\n");
+                $this->application->custom_labels = base64_encode($this->customLabels);
+                $this->application->save();
+            }
+
             if ($this->application->build_pack === 'dockercompose' && $this->initialDockerComposeLocation !== $this->application->docker_compose_location) {
                 $this->loadComposeFile();
             }
@@ -212,9 +219,7 @@ class General extends Component
             if ($this->ports_exposes !== $this->application->ports_exposes) {
                 $this->resetDefaultLabels(false);
             }
-            if (!$this->customLabels) {
-                $this->resetDefaultLabels(false);
-            }
+
             if (data_get($this->application, 'build_pack') === 'dockerimage') {
                 $this->validate([
                     'application.docker_registry_image_name' => 'required',
diff --git a/resources/views/livewire/project/application/general.blade.php b/resources/views/livewire/project/application/general.blade.php
index 8d38aa189..3f6d3984f 100644
--- a/resources/views/livewire/project/application/general.blade.php
+++ b/resources/views/livewire/project/application/general.blade.php
@@ -189,7 +189,7 @@
                 <x-forms.button wire:click="loadComposeFile">Reload Compose File</x-forms.button>
                 @if ($application->settings->is_raw_compose_deployment_enabled)
                     <x-forms.textarea rows="10" readonly id="application.docker_compose_raw"
-                        label="Docker Compose Content" helper="You need to modify the docker compose file." />
+                        label="Docker Compose Content (applicationId: {{$application->id}})" helper="You need to modify the docker compose file." />
                 @else
                     <x-forms.textarea rows="10" readonly id="application.docker_compose"
                         label="Docker Compose Content" helper="You need to modify the docker compose file." />