- const working = progress && progress.working;
- return { ...getDataExplorer(state.dataExplorer, id), working };
+ const dataExplorerState = getDataExplorer(state.dataExplorer, id);
+ const currentRoute = state.router.location ? state.router.location.pathname : '';
+ const currentItemUuid = currentRoute === '/workflows' ? state.properties.workflowPanelDetailsUuid : state.detailsPanel.resourceUuid;
+
+ let loading = false;
+
+ if (dataExplorerState.items.length > 0 && data === dataExplorerState.items && href !== window.location.href) {
+ loading = true
+ } else {
+ href = window.location.href;
+ data = dataExplorerState.items;
+ }
+
+ const working = (progress && progress.working) || loading;
+
+ return { ...dataExplorerState, working, paperKey: currentRoute, currentItemUuid };