diff --git a/client/app/scripts/actions/app-actions.js b/client/app/scripts/actions/app-actions.js index 03350c590..ca72bba06 100644 --- a/client/app/scripts/actions/app-actions.js +++ b/client/app/scripts/actions/app-actions.js @@ -618,14 +618,15 @@ export function receiveNodes(nodes) { export function jumpToTime(timestamp) { return (dispatch, getState) => { + const getScopeState = () => getState().scope || getState(); dispatch({ type: ActionTypes.JUMP_TO_TIME, timestamp, }); - getTopologies(getState, dispatch); - getNodes(getState, dispatch); - if (isResourceViewModeSelector(getState())) { - getResourceViewNodesSnapshot(getState(), dispatch); + getNodes(getScopeState, dispatch); + getTopologies(getScopeState, dispatch); + if (isResourceViewModeSelector(getScopeState())) { + getResourceViewNodesSnapshot(getScopeState(), dispatch); } }; } @@ -640,14 +641,15 @@ export function receiveNodesForTopology(nodes, topologyId) { export function receiveTopologies(topologies) { return (dispatch, getState) => { - const firstLoad = !getState().get('topologiesLoaded'); + const getScopeState = () => getState().scope || getState(); + const firstLoad = !getScopeState().get('topologiesLoaded'); dispatch({ type: ActionTypes.RECEIVE_TOPOLOGIES, topologies }); - getNodes(getState, dispatch); + getNodes(getScopeState, dispatch); // Populate search matches on first load - const state = getState(); + const state = getScopeState(); if (firstLoad && state.get('searchQuery')) { dispatch(focusSearch()); } diff --git a/client/app/scripts/components/app.js b/client/app/scripts/components/app.js index 332722a8e..15c5d251a 100644 --- a/client/app/scripts/components/app.js +++ b/client/app/scripts/components/app.js @@ -11,6 +11,7 @@ import Logo from './logo'; import Footer from './footer'; import Sidebar from './sidebar'; import HelpPanel from './help-panel'; +import CloudFeature from './cloud-feature'; import TroubleshootingMenu from './troubleshooting-menu'; import Search from './search'; import Status from './status'; @@ -191,7 +192,10 @@ class App extends React.Component { {showingDetails &&
}
- + + + +
{!isIframe && diff --git a/client/app/scripts/components/time-travel-wrapper.js b/client/app/scripts/components/time-travel-wrapper.js index 992e362fa..c694ea636 100644 --- a/client/app/scripts/components/time-travel-wrapper.js +++ b/client/app/scripts/components/time-travel-wrapper.js @@ -62,7 +62,8 @@ class TimeTravelWrapper extends React.Component {