From ad94162019feff9052baacc3124f1f39740d4684 Mon Sep 17 00:00:00 2001
From: zees-dev <63374656+zees-dev@users.noreply.github.com>
Date: Wed, 22 Sep 2021 13:42:04 +1200
Subject: [PATCH] table settings propagated through nested tables (#5698)

---
 .../applications-datatable/applicationsDatatable.html           | 1 +
 .../datatables/applications-datatable/applicationsDatatable.js  | 1 +
 .../applications-datatable/applicationsDatatableController.js   | 2 +-
 app/kubernetes/views/applications/applications.html             | 1 +
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/kubernetes/components/datatables/applications-datatable/applicationsDatatable.html b/app/kubernetes/components/datatables/applications-datatable/applicationsDatatable.html
index 1f1d46fdd..e495e37ce 100644
--- a/app/kubernetes/components/datatables/applications-datatable/applicationsDatatable.html
+++ b/app/kubernetes/components/datatables/applications-datatable/applicationsDatatable.html
@@ -231,6 +231,7 @@
                   <kubernetes-applications-datatable
                     dataset="item.KubernetesApplications"
                     table-key="{{ item.Id }}_table"
+                    settings-key="{{ $ctrl.tableKey }}"
                     order-by="Name"
                     remove-action="$ctrl.removeAction"
                     refresh-callback="$ctrl.refreshCallback"
diff --git a/app/kubernetes/components/datatables/applications-datatable/applicationsDatatable.js b/app/kubernetes/components/datatables/applications-datatable/applicationsDatatable.js
index c47347cb0..375440396 100644
--- a/app/kubernetes/components/datatables/applications-datatable/applicationsDatatable.js
+++ b/app/kubernetes/components/datatables/applications-datatable/applicationsDatatable.js
@@ -8,6 +8,7 @@ angular.module('portainer.kubernetes').component('kubernetesApplicationsDatatabl
     titleIcon: '@',
     dataset: '<',
     tableKey: '@',
+    settingsKey: '@',
     orderBy: '@',
     reverseOrder: '<',
     removeAction: '<',
diff --git a/app/kubernetes/components/datatables/applications-datatable/applicationsDatatableController.js b/app/kubernetes/components/datatables/applications-datatable/applicationsDatatableController.js
index 55f260bae..a635285ab 100644
--- a/app/kubernetes/components/datatables/applications-datatable/applicationsDatatableController.js
+++ b/app/kubernetes/components/datatables/applications-datatable/applicationsDatatableController.js
@@ -147,7 +147,7 @@ angular.module('portainer.docker').controller('KubernetesApplicationsDatatableCo
         this.expandItems(storedExpandedItems);
       }
 
-      const storedSettings = DatatableService.getDataTableSettings(this.tableKey);
+      const storedSettings = DatatableService.getDataTableSettings(this.settingsKey);
       if (storedSettings !== null) {
         this.settings = storedSettings;
         this.settings.open = false;
diff --git a/app/kubernetes/views/applications/applications.html b/app/kubernetes/views/applications/applications.html
index 21dc32dbc..b3af3b112 100644
--- a/app/kubernetes/views/applications/applications.html
+++ b/app/kubernetes/views/applications/applications.html
@@ -15,6 +15,7 @@
               <kubernetes-applications-datatable
                 dataset="ctrl.state.applications"
                 table-key="kubernetes.applications"
+                settings-key="kubernetes.applications"
                 order-by="Name"
                 remove-action="ctrl.removeAction"
                 refresh-callback="ctrl.getApplications"