From 56f3bd8417ce321729df7d27ed7e8aba6184923b Mon Sep 17 00:00:00 2001
From: Prabhat Khera <91852476+prabhat-org@users.noreply.github.com>
Date: Wed, 18 Oct 2023 11:37:03 +1300
Subject: [PATCH] add name field for helm install in advance deployments
 (#10493)

---
 .../helm-templates.controller.js              |  2 +-
 .../helm/helm-templates/helm-templates.html   |  2 +-
 .../helm/helm-templates/helm-templates.js     |  1 +
 app/kubernetes/views/deploy/deploy.html       | 23 ++++++++++++++++---
 .../views/deploy/deployController.js          |  1 +
 5 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/app/kubernetes/components/helm/helm-templates/helm-templates.controller.js b/app/kubernetes/components/helm/helm-templates/helm-templates.controller.js
index fa46521d8..ef2e0b219 100644
--- a/app/kubernetes/components/helm/helm-templates/helm-templates.controller.js
+++ b/app/kubernetes/components/helm/helm-templates/helm-templates.controller.js
@@ -56,7 +56,7 @@ export default class HelmTemplatesController {
     this.state.actionInProgress = true;
     try {
       const payload = {
-        Name: this.stackName,
+        Name: this.name,
         Repo: this.state.chart.repo,
         Chart: this.state.chart.name,
         Values: this.state.values,
diff --git a/app/kubernetes/components/helm/helm-templates/helm-templates.html b/app/kubernetes/components/helm/helm-templates/helm-templates.html
index 521c9050d..296896fd1 100644
--- a/app/kubernetes/components/helm/helm-templates/helm-templates.html
+++ b/app/kubernetes/components/helm/helm-templates/helm-templates.html
@@ -82,7 +82,7 @@
           <button
             type="button"
             class="btn btn-primary btn-sm !ml-0"
-            ng-disabled="!$ctrl.state.resourcePool || $ctrl.state.loadingValues || $ctrl.state.actionInProgress"
+            ng-disabled="!$ctrl.state.resourcePool || $ctrl.state.loadingValues || $ctrl.state.actionInProgress || !$ctrl.name"
             ng-click="$ctrl.installHelmchart()"
             button-spinner="$ctrl.state.actionInProgress"
             data-cy="helm-install"
diff --git a/app/kubernetes/components/helm/helm-templates/helm-templates.js b/app/kubernetes/components/helm/helm-templates/helm-templates.js
index 8f62de04e..9cd4b1158 100644
--- a/app/kubernetes/components/helm/helm-templates/helm-templates.js
+++ b/app/kubernetes/components/helm/helm-templates/helm-templates.js
@@ -9,5 +9,6 @@ angular.module('portainer.kubernetes').component('helmTemplatesView', {
     namespace: '<',
     stackName: '<',
     onSelectHelmChart: '<',
+    name: '<',
   },
 });
diff --git a/app/kubernetes/views/deploy/deploy.html b/app/kubernetes/views/deploy/deploy.html
index 6927680e8..b9ce46f29 100644
--- a/app/kubernetes/views/deploy/deploy.html
+++ b/app/kubernetes/views/deploy/deploy.html
@@ -50,12 +50,28 @@
                 </div>
 
                 <div class="form-group">
-                  <label for="stack_name" class="col-lg-2 col-sm-3 control-label text-left">Name</label>
-                  <div class="col-sm-8"> Resource names specified in the manifest will be used </div>
+                  <label for="name" class="col-lg-2 col-sm-3 control-label text-left">Name</label>
+                  <div class="col-sm-8" ng-if="ctrl.state.BuildMethod !== ctrl.BuildMethods.HELM"> Resource names specified in the manifest will be used </div>
+                  <div class="col-sm-8" ng-if="ctrl.state.BuildMethod === ctrl.BuildMethods.HELM">
+                    <input
+                      type="text"
+                      class="form-control"
+                      ng-model="ctrl.formValues.Name"
+                      id="name"
+                      name="name"
+                      placeholder="name"
+                      required="ctrl.state.BuildMethod === ctrl.BuildMethods.HELM"
+                    />
+                    <div class="small text-warning mt-2">
+                      <div ng-messages="ctrl.deploymentForm.name.$error">
+                        <p ng-message="required"> <pr-icon icon="'alert-triangle'" mode="'warning'"></pr-icon> This field is required.</p>
+                      </div>
+                    </div>
+                  </div>
                 </div>
 
                 <kube-stack-name
-                  ng-if="!ctrl.deploymentOptions.hideStacksFunctionality"
+                  ng-if="!ctrl.deploymentOptions.hideStacksFunctionality && ctrl.state.BuildMethod !== ctrl.BuildMethods.HELM"
                   stack-name="ctrl.formValues.StackName"
                   set-stack-name="(ctrl.setStackName)"
                   is-admin="ctrl.currentUser.isAdmin"
@@ -180,6 +196,7 @@
                     endpoint="ctrl.endpoint"
                     namespace="ctrl.formValues.Namespace"
                     stack-name="ctrl.formValues.StackName"
+                    name="ctrl.formValues.Name"
                   ></helm-templates-view>
                 </div>
                 <!-- !Helm -->
diff --git a/app/kubernetes/views/deploy/deployController.js b/app/kubernetes/views/deploy/deployController.js
index 119ad49ac..65eaf729c 100644
--- a/app/kubernetes/views/deploy/deployController.js
+++ b/app/kubernetes/views/deploy/deployController.js
@@ -75,6 +75,7 @@ class KubernetesDeployController {
       Variables: {},
       AutoUpdate: parseAutoUpdateResponse(),
       TLSSkipVerify: false,
+      Name: '',
     };
 
     this.ManifestDeployTypes = KubernetesDeployManifestTypes;