From 8d54b040f816aad1d3cacb75fd633c1536936d69 Mon Sep 17 00:00:00 2001
From: Anthony Lapenna <anthony.lapenna@portainer.io>
Date: Thu, 2 Sep 2021 23:30:55 +1200
Subject: [PATCH] feat(kubernetes): replace advanced deployment action EE-1544
 (#5534)

---
 .../applicationsDatatable.html                     |  5 ++++-
 .../configurationsDatatable.html                   |  7 +++++--
 .../resourcePoolsDatatable.html                    |  7 +++++--
 .../volumes-datatable/volumesDatatable.html        |  3 +++
 .../templates/advancedDeploymentPanel.html         | 14 --------------
 .../views/applications/applications.html           |  2 --
 .../views/applications/applicationsController.js   |  2 --
 .../views/configurations/configurations.html       |  2 --
 .../configurations/configurationsController.js     |  2 --
 app/kubernetes/views/volumes/volumes.html          |  2 --
 app/kubernetes/views/volumes/volumesController.js  |  2 --
 11 files changed, 17 insertions(+), 31 deletions(-)
 delete mode 100644 app/kubernetes/templates/advancedDeploymentPanel.html

diff --git a/app/kubernetes/components/datatables/applications-datatable/applicationsDatatable.html b/app/kubernetes/components/datatables/applications-datatable/applicationsDatatable.html
index df78df98d..3a2517be6 100644
--- a/app/kubernetes/components/datatables/applications-datatable/applicationsDatatable.html
+++ b/app/kubernetes/components/datatables/applications-datatable/applicationsDatatable.html
@@ -73,7 +73,10 @@
           <i class="fa fa-trash-alt space-right" aria-hidden="true"></i>Remove
         </button>
         <button type="button" class="btn btn-sm btn-primary" ui-sref="kubernetes.applications.new" data-cy="k8sApp-addApplicationButton">
-          <i class="fa fa-plus space-right" aria-hidden="true"></i>Add application
+          <i class="fa fa-plus space-right" aria-hidden="true"></i>Add application with form
+        </button>
+        <button type="button" class="btn btn-sm btn-primary" ui-sref="kubernetes.deploy" data-cy="k8sApp-deployFromManifestButton">
+          <i class="fa fa-plus space-right" aria-hidden="true"></i>Create from manifest
         </button>
       </div>
       <div class="searchBar">
diff --git a/app/kubernetes/components/datatables/configurations-datatable/configurationsDatatable.html b/app/kubernetes/components/datatables/configurations-datatable/configurationsDatatable.html
index b6e050651..96a5cfc19 100644
--- a/app/kubernetes/components/datatables/configurations-datatable/configurationsDatatable.html
+++ b/app/kubernetes/components/datatables/configurations-datatable/configurationsDatatable.html
@@ -66,8 +66,11 @@
         >
           <i class="fa fa-trash-alt space-right" aria-hidden="true"></i>Remove
         </button>
-        <button type="button" class="btn btn-sm btn-primary" ui-sref="kubernetes.configurations.new" data-cy="k8sConfig-addConfigButton">
-          <i class="fa fa-plus space-right" aria-hidden="true"></i>Add configuration
+        <button type="button" class="btn btn-sm btn-primary" ui-sref="kubernetes.configurations.new" data-cy="k8sConfig-addConfigWithFormButton">
+          <i class="fa fa-plus space-right" aria-hidden="true"></i>Add configuration with form
+        </button>
+        <button type="button" class="btn btn-sm btn-primary" ui-sref="kubernetes.deploy" data-cy="k8sConfig-deployFromManifestButton">
+          <i class="fa fa-plus space-right" aria-hidden="true"></i>Create from manifest
         </button>
       </div>
       <div class="searchBar">
diff --git a/app/kubernetes/components/datatables/resource-pools-datatable/resourcePoolsDatatable.html b/app/kubernetes/components/datatables/resource-pools-datatable/resourcePoolsDatatable.html
index 2bf68bad8..880ad737f 100644
--- a/app/kubernetes/components/datatables/resource-pools-datatable/resourcePoolsDatatable.html
+++ b/app/kubernetes/components/datatables/resource-pools-datatable/resourcePoolsDatatable.html
@@ -60,8 +60,11 @@
         >
           <i class="fa fa-trash-alt space-right" aria-hidden="true"></i>Remove
         </button>
-        <button type="button" class="btn btn-sm btn-primary" ui-sref="kubernetes.resourcePools.new" data-cy="k8sNamespace-addNamespaceButton">
-          <i class="fa fa-plus space-right" aria-hidden="true"></i>Add namespace
+        <button type="button" class="btn btn-sm btn-primary" ui-sref="kubernetes.resourcePools.new" data-cy="k8sNamespace-addNamespaceWithFormButton">
+          <i class="fa fa-plus space-right" aria-hidden="true"></i>Add namespace with form
+        </button>
+        <button type="button" class="btn btn-sm btn-primary" ui-sref="kubernetes.deploy" data-cy="k8sNamespace-deployFromManifestButton">
+          <i class="fa fa-plus space-right" aria-hidden="true"></i>Create from manifest
         </button>
       </div>
       <div class="searchBar">
diff --git a/app/kubernetes/components/datatables/volumes-datatable/volumesDatatable.html b/app/kubernetes/components/datatables/volumes-datatable/volumesDatatable.html
index b740429e9..56958fc34 100644
--- a/app/kubernetes/components/datatables/volumes-datatable/volumesDatatable.html
+++ b/app/kubernetes/components/datatables/volumes-datatable/volumesDatatable.html
@@ -54,6 +54,9 @@
         <button type="button" class="btn btn-sm btn-danger" ng-disabled="$ctrl.state.selectedItemCount === 0" ng-click="$ctrl.removeAction($ctrl.state.selectedItems)">
           <i class="fa fa-trash-alt space-right" aria-hidden="true"></i>Remove
         </button>
+        <button type="button" class="btn btn-sm btn-primary" ui-sref="kubernetes.deploy" data-cy="k8sVolume-deployFromManifestButton">
+          <i class="fa fa-plus space-right" aria-hidden="true"></i>Create from manifest
+        </button>        
       </div>
       <div class="searchBar">
         <i class="fa fa-search searchIcon" aria-hidden="true"></i>
diff --git a/app/kubernetes/templates/advancedDeploymentPanel.html b/app/kubernetes/templates/advancedDeploymentPanel.html
deleted file mode 100644
index 6c06e1bf7..000000000
--- a/app/kubernetes/templates/advancedDeploymentPanel.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<information-panel title-text="Advanced deployment">
-  <span class="small">
-    <p class="text-muted">
-      <i class="fa fa-info-circle blue-icon" aria-hidden="true" style="margin-right: 2px;"></i>
-      Advanced deployment allows you to deploy any Kubernetes manifest inside your cluster.
-    </p>
-    <p>
-      <button type="button" class="btn btn-sm btn-primary" ui-sref="kubernetes.deploy" data-cy="k8sApp-advancedDeployButton">
-        <i class="fa fa-file-code space-right" aria-hidden="true"></i>
-        Advanced deployment
-      </button>
-    </p>
-  </span>
-</information-panel>
diff --git a/app/kubernetes/views/applications/applications.html b/app/kubernetes/views/applications/applications.html
index ec7916000..9308da6d4 100644
--- a/app/kubernetes/views/applications/applications.html
+++ b/app/kubernetes/views/applications/applications.html
@@ -5,8 +5,6 @@
 <kubernetes-view-loading view-ready="ctrl.state.viewReady"></kubernetes-view-loading>
 
 <div ng-if="ctrl.state.viewReady">
-  <div ng-include="'app/kubernetes/templates/advancedDeploymentPanel.html'"></div>
-
   <div class="row">
     <div class="col-sm-12" data-cy="k8sApp-appList">
       <rd-widget>
diff --git a/app/kubernetes/views/applications/applicationsController.js b/app/kubernetes/views/applications/applicationsController.js
index d7896d42d..be9e7dbf7 100644
--- a/app/kubernetes/views/applications/applicationsController.js
+++ b/app/kubernetes/views/applications/applicationsController.js
@@ -1,5 +1,3 @@
-require('../../templates/advancedDeploymentPanel.html');
-
 import angular from 'angular';
 import _ from 'lodash-es';
 import KubernetesStackHelper from 'Kubernetes/helpers/stackHelper';
diff --git a/app/kubernetes/views/configurations/configurations.html b/app/kubernetes/views/configurations/configurations.html
index 4e53089ef..8e55b4fc8 100644
--- a/app/kubernetes/views/configurations/configurations.html
+++ b/app/kubernetes/views/configurations/configurations.html
@@ -5,8 +5,6 @@
 <kubernetes-view-loading view-ready="ctrl.state.viewReady"></kubernetes-view-loading>
 
 <div ng-if="ctrl.state.viewReady">
-  <div ng-include="'app/kubernetes/templates/advancedDeploymentPanel.html'"></div>
-
   <div class="row">
     <div class="col-sm-12">
       <kubernetes-configurations-datatable
diff --git a/app/kubernetes/views/configurations/configurationsController.js b/app/kubernetes/views/configurations/configurationsController.js
index 86cfb62e8..931a7fac6 100644
--- a/app/kubernetes/views/configurations/configurationsController.js
+++ b/app/kubernetes/views/configurations/configurationsController.js
@@ -1,5 +1,3 @@
-require('../../templates/advancedDeploymentPanel.html');
-
 import angular from 'angular';
 import KubernetesConfigurationHelper from 'Kubernetes/helpers/configurationHelper';
 
diff --git a/app/kubernetes/views/volumes/volumes.html b/app/kubernetes/views/volumes/volumes.html
index 61693b24d..71a328591 100644
--- a/app/kubernetes/views/volumes/volumes.html
+++ b/app/kubernetes/views/volumes/volumes.html
@@ -5,8 +5,6 @@
 <kubernetes-view-loading view-ready="ctrl.state.viewReady"></kubernetes-view-loading>
 
 <div ng-if="ctrl.state.viewReady">
-  <div ng-include="'app/kubernetes/templates/advancedDeploymentPanel.html'"></div>
-
   <div class="row">
     <div class="col-sm-12">
       <rd-widget>
diff --git a/app/kubernetes/views/volumes/volumesController.js b/app/kubernetes/views/volumes/volumesController.js
index 0c55f2db2..cc8beb096 100644
--- a/app/kubernetes/views/volumes/volumesController.js
+++ b/app/kubernetes/views/volumes/volumesController.js
@@ -1,5 +1,3 @@
-require('../../templates/advancedDeploymentPanel.html');
-
 import _ from 'lodash-es';
 import filesizeParser from 'filesize-parser';
 import angular from 'angular';