github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-03-03 02:00:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes images in details-panel after service -> resources change

Browse Source
This commit is contained in:
Simon Howe
2017-10-11 12:41:18 +02:00
parent 5173b9c981
commit 7dcdc8db12
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
client/app/scripts/actions/app-actions.js
View File

@@ -825,7 +825,8 @@ export function getImagesForService(orgId, serviceId) {
serviceId
});
api.getFluxImages(orgId, serviceId)
// Use the fluxv2 api
api.getFluxImages(orgId, serviceId, 2)
.then((services) => {
dispatch({
type: ActionTypes.RECEIVE_SERVICE_IMAGES,

5
client/app/scripts/components/node-details/node-details-image-status.js
View File

@@ -6,7 +6,7 @@ import { CircularProgress } from 'weaveworks-ui-components';
import { getImagesForService } from '../../actions/app-actions';
const topologyWhitelist = ['services', 'deployments'];
const topologyWhitelist = ['kube-controllers'];
function getNewImages(images, currentId) {
// Assume that the current image is always in the list of all available images.
@@ -107,7 +107,8 @@ class NodeDetailsImageStatus extends React.PureComponent {
function mapStateToProps({ scope }, { metadata, name }) {
const namespace = find(metadata, d => d.id === 'kubernetes_namespace');
const serviceId = namespace ? `${namespace.value}/${name}` : null;
const nodeType = find(metadata, d => d.id === 'kubernetes_node_type');
const serviceId = (namespace && nodeType) ? `${namespace.value}:${nodeType.value.toLowerCase()}/${name}` : null;
const { containers, isFetching, errors } = scope.getIn(['serviceImages', serviceId]) || {};
return {