From 6591498ab94b602e1384aa7503e9fec73002cf48 Mon Sep 17 00:00:00 2001
From: xAt0mZ <xAt0mZ@users.noreply.github.com>
Date: Tue, 25 Jun 2019 01:22:45 +0200
Subject: [PATCH] feat(node-details): move engine labels from node-details
 panel to engine-details panel (#2966)

---
 .../engine-details-panel/engine-details-panel.html            | 4 ++++
 .../swarm-node-details-panel/swarm-node-details-panel.html    | 4 ----
 .../views/nodes/node-details/node-details-view-controller.js  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/docker/components/host-view-panels/engine-details-panel/engine-details-panel.html b/app/docker/components/host-view-panels/engine-details-panel/engine-details-panel.html
index 4eebf6bcd..036e4d7b7 100644
--- a/app/docker/components/host-view-panels/engine-details-panel/engine-details-panel.html
+++ b/app/docker/components/host-view-panels/engine-details-panel/engine-details-panel.html
@@ -29,6 +29,10 @@
               <td>Network Plugins</td>
               <td>{{ $ctrl.engine.networkPlugins | arraytostr: ', ' }}</td>
             </tr>
+            <tr ng-if="$ctrl.engine.engineLabels.length">
+              <td>Engine Labels</td>
+              <td>{{ $ctrl.engine.engineLabels | labelsToStr:', ' }}</td>
+            </tr>
           </tbody>
         </table>
       </rd-widget-body>
diff --git a/app/docker/components/host-view-panels/swarm-node-details-panel/swarm-node-details-panel.html b/app/docker/components/host-view-panels/swarm-node-details-panel/swarm-node-details-panel.html
index e99c5039b..d290cb2aa 100644
--- a/app/docker/components/host-view-panels/swarm-node-details-panel/swarm-node-details-panel.html
+++ b/app/docker/components/host-view-panels/swarm-node-details-panel/swarm-node-details-panel.html
@@ -26,10 +26,6 @@
               <td><span class="label label-{{ $ctrl.details.status | nodestatusbadge }}">{{
                   $ctrl.details.status }}</span></td>
             </tr>
-            <tr ng-if=" $ctrl.details.engineLabels.length">
-              <td>Engine Labels</td>
-              <td>{{ $ctrl.details.engineLabels | labelsToStr:', ' }}</td>
-            </tr>
             <tr>
               <td>
                 <div class="nopadding">
diff --git a/app/docker/views/nodes/node-details/node-details-view-controller.js b/app/docker/views/nodes/node-details/node-details-view-controller.js
index b4066a8f8..3cc0a6e90 100644
--- a/app/docker/views/nodes/node-details/node-details-view-controller.js
+++ b/app/docker/views/nodes/node-details/node-details-view-controller.js
@@ -62,7 +62,8 @@ angular.module('portainer.docker').controller('NodeDetailsViewController', [
       return {
         releaseVersion: node.EngineVersion,
         volumePlugins: transformPlugins(node.Plugins, 'Volume'),
-        networkPlugins: transformPlugins(node.Plugins, 'Network')
+        networkPlugins: transformPlugins(node.Plugins, 'Network'),
+        engineLabels: node.EngineLabels,
       };
     }
 
@@ -73,7 +74,6 @@ angular.module('portainer.docker').controller('NodeDetailsViewController', [
         managerAddress: node.ManagerAddr,
         availability: node.Availability,
         status: node.Status,
-        engineLabels: node.EngineLabels,
         nodeLabels: node.Labels
       };
     }