From b5c59c898291560a84a21a361ab61ec08fde054d Mon Sep 17 00:00:00 2001
From: Felix Han <felix.han@portainer.io>
Date: Tue, 31 Aug 2021 15:39:44 +1200
Subject: [PATCH] updated API response to get IsComposeFormat and show
 appropriate text.

---
 .../create/createApplication.html             | 29 ++++++++++++++-----
 .../create/createApplicationController.js     |  5 ++--
 app/portainer/models/stack.js                 |  1 +
 3 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/app/kubernetes/views/applications/create/createApplication.html b/app/kubernetes/views/applications/create/createApplication.html
index 18e442413..ec9ed0002 100644
--- a/app/kubernetes/views/applications/create/createApplication.html
+++ b/app/kubernetes/views/applications/create/createApplication.html
@@ -72,14 +72,27 @@
               on-change="(ctrl.onChangeFileContent)"
             >
               <editor-description>
-                <p>
-                  <i class="fa fa-info-circle blue-icon" aria-hidden="true" style="margin-right: 2px;"></i>
-                  This feature allows you to deploy any kind of Kubernetes resource in this environment (Deployment, Secret, ConfigMap...).
-                </p>
-                <p>
-                  You can get more information about Kubernetes file format in the
-                  <a href="https://kubernetes.io/docs/concepts/overview/working-with-objects/kubernetes-objects/" target="_blank">official documentation</a>.
-                </p>
+                <span class="text-muted small" ng-show="ctrl.stack.IsComposeFormat">
+                  <p>
+                    <i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px;"></i>
+                    Portainer uses <a href="https://kompose.io/" target="_blank">Kompose</a> to convert your Compose manifest to a Kubernetes compliant manifest. Be wary that not
+                    all the Compose format options are supported by Kompose at the moment.
+                  </p>
+                  <p>
+                    You can get more information about Compose file format in the
+                    <a href="https://docs.docker.com/compose/compose-file/" target="_blank">official documentation</a>.
+                  </p>
+                </span>
+                <span class="text-muted small" ng-show="!ctrl.stack.IsComposeFormat">
+                  <p>
+                    <i class="fa fa-info-circle blue-icon" aria-hidden="true" style="margin-right: 2px;"></i>
+                    This feature allows you to deploy any kind of Kubernetes resource in this environment (Deployment, Secret, ConfigMap...).
+                  </p>
+                  <p>
+                    You can get more information about Kubernetes file format in the
+                    <a href="https://kubernetes.io/docs/concepts/overview/working-with-objects/kubernetes-objects/" target="_blank">official documentation</a>.
+                  </p>
+                </span>
               </editor-description>
             </web-editor-form>
             <!-- #endregion -->
diff --git a/app/kubernetes/views/applications/create/createApplicationController.js b/app/kubernetes/views/applications/create/createApplicationController.js
index 12953d6b9..bded4257f 100644
--- a/app/kubernetes/views/applications/create/createApplicationController.js
+++ b/app/kubernetes/views/applications/create/createApplicationController.js
@@ -1024,9 +1024,8 @@ class KubernetesCreateApplicationController {
           if (this.application.ApplicationKind) {
             this.state.appType = this.KubernetesDeploymentTypes[this.application.ApplicationKind.toUpperCase()];
             if (this.application.StackId) {
-              if (this.application.ApplicationKind === this.KubernetesDeploymentTypes.GIT) {
-                this.stack = await this.StackService.stack(this.application.StackId);
-              } else if (this.application.ApplicationKind === this.KubernetesDeploymentTypes.CONTENT) {
+              this.stack = await this.StackService.stack(this.application.StackId);
+              if (this.application.ApplicationKind === this.KubernetesDeploymentTypes.CONTENT) {
                 this.stackFileContent = await this.StackService.getStackFile(this.application.StackId);
               }
             }
diff --git a/app/portainer/models/stack.js b/app/portainer/models/stack.js
index 41c32f70f..118174d0a 100644
--- a/app/portainer/models/stack.js
+++ b/app/portainer/models/stack.js
@@ -7,6 +7,7 @@ export function StackViewModel(data) {
   this.EndpointId = data.EndpointId;
   this.SwarmId = data.SwarmId;
   this.Env = data.Env ? data.Env : [];
+  this.IsComposeFormat = data.IsComposeFormat;
   if (data.ResourceControl && data.ResourceControl.Id !== 0) {
     this.ResourceControl = new ResourceControlViewModel(data.ResourceControl);
   }