From 5cdcbbc604f4fa7fad8077c6b97d2820d1e30158 Mon Sep 17 00:00:00 2001
From: Maxime Bajeux <max.bajeux@gmail.com>
Date: Fri, 27 Nov 2020 02:34:16 +0100
Subject: [PATCH] fix(rbac): In the application details view, for a non admin
 user there is a link to the node details view (#118)

---
 .../application/containers-datatable/containersDatatable.html  | 3 ++-
 .../application/containers-datatable/containersDatatable.js    | 1 +
 app/kubernetes/views/applications/edit/application.html        | 1 +
 .../views/applications/edit/applicationController.js           | 1 +
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/kubernetes/components/datatables/application/containers-datatable/containersDatatable.html b/app/kubernetes/components/datatables/application/containers-datatable/containersDatatable.html
index ed104604c..6b69bc4fd 100644
--- a/app/kubernetes/components/datatables/application/containers-datatable/containersDatatable.html
+++ b/app/kubernetes/components/datatables/application/containers-datatable/containersDatatable.html
@@ -115,9 +115,10 @@
               >
               <td>
                 <span ng-if="item.Node">
-                  <a ui-sref="kubernetes.cluster.node({ name: item.Node })">
+                  <a ng-if="$ctrl.accessNode" ui-sref="kubernetes.cluster.node({ name: item.Node })">
                     {{ item.Node }}
                   </a>
+                  <span ng-if="!$ctrl.accessNode">{{ item.Node }}</span>
                 </span>
                 <span ng-if="!item.Node">-</span>
               </td>
diff --git a/app/kubernetes/components/datatables/application/containers-datatable/containersDatatable.js b/app/kubernetes/components/datatables/application/containers-datatable/containersDatatable.js
index 03ca5f637..837cbd230 100644
--- a/app/kubernetes/components/datatables/application/containers-datatable/containersDatatable.js
+++ b/app/kubernetes/components/datatables/application/containers-datatable/containersDatatable.js
@@ -9,5 +9,6 @@ angular.module('portainer.kubernetes').component('kubernetesContainersDatatable'
     orderBy: '@',
     refreshCallback: '<',
     showConsole: '<',
+    accessNode: '<',
   },
 });
diff --git a/app/kubernetes/views/applications/edit/application.html b/app/kubernetes/views/applications/edit/application.html
index 08a2cf579..377ceb1b4 100644
--- a/app/kubernetes/views/applications/edit/application.html
+++ b/app/kubernetes/views/applications/edit/application.html
@@ -560,6 +560,7 @@
         table-key="kubernetes.application.containers"
         order-by="PodName"
         show-console="ctrl.state.canShowConsole"
+        access-node="ctrl.state.canAccessNode"
       >
       </kubernetes-containers-datatable>
     </div>
diff --git a/app/kubernetes/views/applications/edit/applicationController.js b/app/kubernetes/views/applications/edit/applicationController.js
index 3f735483f..35381ace0 100644
--- a/app/kubernetes/views/applications/edit/applicationController.js
+++ b/app/kubernetes/views/applications/edit/applicationController.js
@@ -334,6 +334,7 @@ class KubernetesApplicationController {
       expandedNote: false,
       useIngress: false,
       isAuthorized: this.Authentication.hasAuthorizations(['K8sApplicationDetailsW']),
+      canAccessNode: this.Authentication.hasAuthorizations(['K8sClusterNodeR']),
       canShowConsole: this.Authentication.hasAuthorizations(['K8sApplicationConsoleRW']),
     };