From d73b162d16746aa8824284a06fbb1025316677cf Mon Sep 17 00:00:00 2001
From: Ali <83188384+testA113@users.noreply.github.com>
Date: Fri, 19 Apr 2024 17:33:26 +1200
Subject: [PATCH] fix(stacks): conditionally hide node and namespace stacks
 [EE-6949] (#11528)

---
 .../nodeApplicationsDatatable.html            |  2 +-
 .../nodeApplicationsDatatableController.js    | 62 ++++++++++---------
 .../resourcePoolApplicationsDatatable.html    |  4 +-
 ...urcePoolApplicationsDatatableController.js | 60 ++++++++++--------
 4 files changed, 70 insertions(+), 58 deletions(-)

diff --git a/app/kubernetes/components/datatables/node-applications-datatable/nodeApplicationsDatatable.html b/app/kubernetes/components/datatables/node-applications-datatable/nodeApplicationsDatatable.html
index dd20be274..15334c0f9 100644
--- a/app/kubernetes/components/datatables/node-applications-datatable/nodeApplicationsDatatable.html
+++ b/app/kubernetes/components/datatables/node-applications-datatable/nodeApplicationsDatatable.html
@@ -70,7 +70,7 @@
                   ng-click="$ctrl.changeOrderBy('Name')"
                 ></table-column-header>
               </th>
-              <th>
+              <th ng-if="!$ctrl.deploymentOptions.hideStacksFunctionality">
                 <table-column-header
                   col-title="'Stack'"
                   can-sort="true"
diff --git a/app/kubernetes/components/datatables/node-applications-datatable/nodeApplicationsDatatableController.js b/app/kubernetes/components/datatables/node-applications-datatable/nodeApplicationsDatatableController.js
index 3c9d19e24..79652119e 100644
--- a/app/kubernetes/components/datatables/node-applications-datatable/nodeApplicationsDatatableController.js
+++ b/app/kubernetes/components/datatables/node-applications-datatable/nodeApplicationsDatatableController.js
@@ -1,12 +1,14 @@
 import { KubernetesApplicationDeploymentTypes } from 'Kubernetes/models/application/models/appConstants';
 import KubernetesApplicationHelper from 'Kubernetes/helpers/application';
 import KubernetesNamespaceHelper from 'Kubernetes/helpers/namespaceHelper';
+import { getDeploymentOptions } from '@/react/portainer/environments/environment.service';
 
 angular.module('portainer.docker').controller('KubernetesNodeApplicationsDatatableController', [
   '$scope',
   '$controller',
+  '$async',
   'DatatableService',
-  function ($scope, $controller, DatatableService) {
+  function ($scope, $controller, $async, DatatableService) {
     angular.extend(this, $controller('GenericDatatableController', { $scope: $scope }));
 
     this.isSystemNamespace = function (item) {
@@ -18,37 +20,41 @@ angular.module('portainer.docker').controller('KubernetesNodeApplicationsDatatab
     };
 
     this.$onInit = function () {
-      this.KubernetesApplicationDeploymentTypes = KubernetesApplicationDeploymentTypes;
-      this.setDefaults();
-      this.prepareTableFromDataset();
+      return $async(async () => {
+        this.KubernetesApplicationDeploymentTypes = KubernetesApplicationDeploymentTypes;
+        this.setDefaults();
+        this.prepareTableFromDataset();
 
-      this.state.orderBy = this.orderBy;
-      var storedOrder = DatatableService.getDataTableOrder(this.tableKey);
-      if (storedOrder !== null) {
-        this.state.reverseOrder = storedOrder.reverse;
-        this.state.orderBy = storedOrder.orderBy;
-      }
+        this.deploymentOptions = await getDeploymentOptions();
 
-      var textFilter = DatatableService.getDataTableTextFilters(this.tableKey);
-      if (textFilter !== null) {
-        this.state.textFilter = textFilter;
-        this.onTextFilterChange();
-      }
+        this.state.orderBy = this.orderBy;
+        var storedOrder = DatatableService.getDataTableOrder(this.tableKey);
+        if (storedOrder !== null) {
+          this.state.reverseOrder = storedOrder.reverse;
+          this.state.orderBy = storedOrder.orderBy;
+        }
 
-      var storedFilters = DatatableService.getDataTableFilters(this.tableKey);
-      if (storedFilters !== null) {
-        this.filters = storedFilters;
-      }
-      if (this.filters && this.filters.state) {
-        this.filters.state.open = false;
-      }
+        var textFilter = DatatableService.getDataTableTextFilters(this.tableKey);
+        if (textFilter !== null) {
+          this.state.textFilter = textFilter;
+          this.onTextFilterChange();
+        }
 
-      var storedSettings = DatatableService.getDataTableSettings(this.tableKey);
-      if (storedSettings !== null) {
-        this.settings = storedSettings;
-        this.settings.open = false;
-      }
-      this.onSettingsRepeaterChange();
+        var storedFilters = DatatableService.getDataTableFilters(this.tableKey);
+        if (storedFilters !== null) {
+          this.filters = storedFilters;
+        }
+        if (this.filters && this.filters.state) {
+          this.filters.state.open = false;
+        }
+
+        var storedSettings = DatatableService.getDataTableSettings(this.tableKey);
+        if (storedSettings !== null) {
+          this.settings = storedSettings;
+          this.settings.open = false;
+        }
+        this.onSettingsRepeaterChange();
+      });
     };
   },
 ]);
diff --git a/app/kubernetes/components/datatables/resource-pool-applications-datatable/resourcePoolApplicationsDatatable.html b/app/kubernetes/components/datatables/resource-pool-applications-datatable/resourcePoolApplicationsDatatable.html
index babdb3e46..b93092079 100644
--- a/app/kubernetes/components/datatables/resource-pool-applications-datatable/resourcePoolApplicationsDatatable.html
+++ b/app/kubernetes/components/datatables/resource-pool-applications-datatable/resourcePoolApplicationsDatatable.html
@@ -68,9 +68,9 @@
                   ng-click="$ctrl.changeOrderBy('Name')"
                 ></table-column-header>
               </th>
-              <th>
+              <th ng-if="!$ctrl.deploymentOptions.hideStacksFunctionality">
                 <table-column-header
-                  col-title="'StackName'"
+                  col-title="'Stack'"
                   can-sort="true"
                   is-sorted="$ctrl.state.orderBy === 'StackName'"
                   is-sorted-desc="$ctrl.state.orderBy === 'StackName' && $ctrl.state.reverseOrder"
diff --git a/app/kubernetes/components/datatables/resource-pool-applications-datatable/resourcePoolApplicationsDatatableController.js b/app/kubernetes/components/datatables/resource-pool-applications-datatable/resourcePoolApplicationsDatatableController.js
index e97cf734d..b46464343 100644
--- a/app/kubernetes/components/datatables/resource-pool-applications-datatable/resourcePoolApplicationsDatatableController.js
+++ b/app/kubernetes/components/datatables/resource-pool-applications-datatable/resourcePoolApplicationsDatatableController.js
@@ -1,10 +1,12 @@
 import KubernetesApplicationHelper from 'Kubernetes/helpers/application';
+import { getDeploymentOptions } from '@/react/portainer/environments/environment.service';
 
 angular.module('portainer.docker').controller('KubernetesResourcePoolApplicationsDatatableController', [
   '$scope',
   '$controller',
+  '$async',
   'DatatableService',
-  function ($scope, $controller, DatatableService) {
+  function ($scope, $controller, $async, DatatableService) {
     angular.extend(this, $controller('GenericDatatableController', { $scope: $scope }));
 
     this.isExternalApplication = function (item) {
@@ -12,36 +14,40 @@ angular.module('portainer.docker').controller('KubernetesResourcePoolApplication
     };
 
     this.$onInit = function () {
-      this.setDefaults();
-      this.prepareTableFromDataset();
+      return $async(async () => {
+        this.setDefaults();
+        this.prepareTableFromDataset();
 
-      this.state.orderBy = this.orderBy;
-      var storedOrder = DatatableService.getDataTableOrder(this.tableKey);
-      if (storedOrder !== null) {
-        this.state.reverseOrder = storedOrder.reverse;
-        this.state.orderBy = storedOrder.orderBy;
-      }
+        this.deploymentOptions = await getDeploymentOptions();
 
-      var textFilter = DatatableService.getDataTableTextFilters(this.tableKey);
-      if (textFilter !== null) {
-        this.state.textFilter = textFilter;
-        this.onTextFilterChange();
-      }
+        this.state.orderBy = this.orderBy;
+        var storedOrder = DatatableService.getDataTableOrder(this.tableKey);
+        if (storedOrder !== null) {
+          this.state.reverseOrder = storedOrder.reverse;
+          this.state.orderBy = storedOrder.orderBy;
+        }
 
-      var storedFilters = DatatableService.getDataTableFilters(this.tableKey);
-      if (storedFilters !== null) {
-        this.filters = storedFilters;
-      }
-      if (this.filters && this.filters.state) {
-        this.filters.state.open = false;
-      }
+        var textFilter = DatatableService.getDataTableTextFilters(this.tableKey);
+        if (textFilter !== null) {
+          this.state.textFilter = textFilter;
+          this.onTextFilterChange();
+        }
 
-      var storedSettings = DatatableService.getDataTableSettings(this.tableKey);
-      if (storedSettings !== null) {
-        this.settings = storedSettings;
-        this.settings.open = false;
-      }
-      this.onSettingsRepeaterChange();
+        var storedFilters = DatatableService.getDataTableFilters(this.tableKey);
+        if (storedFilters !== null) {
+          this.filters = storedFilters;
+        }
+        if (this.filters && this.filters.state) {
+          this.filters.state.open = false;
+        }
+
+        var storedSettings = DatatableService.getDataTableSettings(this.tableKey);
+        if (storedSettings !== null) {
+          this.settings = storedSettings;
+          this.settings.open = false;
+        }
+        this.onSettingsRepeaterChange();
+      });
     };
   },
 ]);