From 6ae0a972d4b5cc1217b6978e413a332c4f9c372a Mon Sep 17 00:00:00 2001 From: Ali <83188384+testA113@users.noreply.github.com> Date: Thu, 9 May 2024 12:01:13 +1200 Subject: [PATCH] fix(docker): surface node details docker error [EE-7054] (#11752) Co-authored-by: testa113 --- .../node-details-view-controller.js | 43 +++++++++++-------- 1 file changed, 24 insertions(+), 19 deletions(-) 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 74cae7222..d6002d4e6 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 @@ -5,7 +5,8 @@ angular.module('portainer.docker').controller('NodeDetailsViewController', [ 'StateManager', 'AgentService', 'Authentication', - function NodeDetailsViewController($q, $stateParams, NodeService, StateManager, AgentService, Authentication) { + 'Notifications', + function NodeDetailsViewController($q, $stateParams, NodeService, StateManager, AgentService, Authentication, Notifications) { var ctrl = this; ctrl.$onInit = initView; @@ -24,25 +25,29 @@ angular.module('portainer.docker').controller('NodeDetailsViewController', [ var nodeId = $stateParams.id; $q.all({ node: NodeService.node(nodeId), - }).then(function (data) { - var node = data.node; - ctrl.originalNode = node; - ctrl.hostDetails = buildHostDetails(node); - ctrl.engineDetails = buildEngineDetails(node); - ctrl.nodeDetails = buildNodeDetails(node); - if (ctrl.state.isAgent) { - var agentApiVersion = applicationState.endpoint.agentApiVersion; - ctrl.state.agentApiVersion = agentApiVersion; - if (agentApiVersion < 2 || !ctrl.state.enableHostManagementFeatures) { - return; - } + }) + .then(function (data) { + var node = data.node; + ctrl.originalNode = node; + ctrl.hostDetails = buildHostDetails(node); + ctrl.engineDetails = buildEngineDetails(node); + ctrl.nodeDetails = buildNodeDetails(node); + if (ctrl.state.isAgent) { + var agentApiVersion = applicationState.endpoint.agentApiVersion; + ctrl.state.agentApiVersion = agentApiVersion; + if (agentApiVersion < 2 || !ctrl.state.enableHostManagementFeatures) { + return; + } - AgentService.hostInfo(ctrl.endpoint.Id, node.Hostname).then(function onHostInfoLoad(agentHostInfo) { - ctrl.devices = agentHostInfo.PCIDevices; - ctrl.disks = agentHostInfo.PhysicalDisks; - }); - } - }); + AgentService.hostInfo(ctrl.endpoint.Id, node.Hostname).then(function onHostInfoLoad(agentHostInfo) { + ctrl.devices = agentHostInfo.PCIDevices; + ctrl.disks = agentHostInfo.PhysicalDisks; + }); + } + }) + .catch(function (err) { + Notifications.error('Failure', err, 'Unable to retrieve node details'); + }); } function buildHostDetails(node) {