From bc7ad7a78a113ade23f269de9242c4d699ac267e Mon Sep 17 00:00:00 2001 From: Filip Barl Date: Tue, 1 Aug 2017 12:40:08 +0200 Subject: [PATCH] Always take timestamp into account in Node Details when time travelling (#2775) --- client/app/scripts/utils/web-api-utils.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/client/app/scripts/utils/web-api-utils.js b/client/app/scripts/utils/web-api-utils.js index 88406b709..328b9c412 100644 --- a/client/app/scripts/utils/web-api-utils.js +++ b/client/app/scripts/utils/web-api-utils.js @@ -288,10 +288,14 @@ export function getNodeDetails(getState, dispatch) { if (obj && topologyUrlsById.has(obj.topologyId)) { const topologyUrl = topologyUrlsById.get(obj.topologyId); let urlComponents = [getApiPath(), topologyUrl, '/', encodeURIComponent(obj.id)]; - if (currentTopologyId === obj.topologyId) { - // Only forward filters for nodes in the current topology - const optionsQuery = buildUrlQuery(activeTopologyOptionsSelector(state), state); - urlComponents = urlComponents.concat(['?', optionsQuery]); + + // Only forward filters for nodes in the current topology. + const topologyOptions = currentTopologyId === obj.topologyId + ? activeTopologyOptionsSelector(state) : makeMap(); + + const query = buildUrlQuery(topologyOptions, state); + if (query) { + urlComponents = urlComponents.concat(['?', query]); } const url = urlComponents.join('');