From d5829f21cb181ce2be312b6eeba84c0076fb4f90 Mon Sep 17 00:00:00 2001 From: Simon Howe Date: Mon, 5 Feb 2018 11:45:13 +0100 Subject: [PATCH] Fixes bug showing "container image status" on all resource types - It should only be visible on the kubernetes contoller node-details panels. - This fixes a bug where we were showing it on all node-details if you were on the controller topology. --- client/app/scripts/components/node-details.js | 1 + .../components/node-details/node-details-image-status.js | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/client/app/scripts/components/node-details.js b/client/app/scripts/components/node-details.js index 0f8de1209..2ceaae025 100644 --- a/client/app/scripts/components/node-details.js +++ b/client/app/scripts/components/node-details.js @@ -260,6 +260,7 @@ class NodeDetails extends React.Component { name={details.label} metadata={details.metadata} pseudo={details.pseudo} + topologyId={topologyId} /> diff --git a/client/app/scripts/components/node-details/node-details-image-status.js b/client/app/scripts/components/node-details/node-details-image-status.js index 2b46dbed6..167333691 100644 --- a/client/app/scripts/components/node-details/node-details-image-status.js +++ b/client/app/scripts/components/node-details/node-details-image-status.js @@ -39,8 +39,8 @@ class NodeDetailsImageStatus extends React.PureComponent { } shouldRender() { - const { pseudo, currentTopologyId } = this.props; - return !pseudo && currentTopologyId && topologyWhitelist.includes(currentTopologyId); + const { pseudo, topologyId } = this.props; + return !pseudo && topologyId && topologyWhitelist.includes(topologyId); } renderImages() { @@ -118,7 +118,6 @@ function mapStateToProps({ scope }, { metadata, name }) { return { isFetching, errors, - currentTopologyId: scope.get('currentTopologyId'), containers, serviceId };