15672: Merge branch 'master' into 15672-subprocess-list-v2

[arvados.git] / src / websocket / websocket.ts

diff --git a/src/websocket/websocket.ts b/src/websocket/websocket.ts
index e367dba3e8f17fbf47fc420e3c7c419d48c6b966..7895644f6f46657547a8ca6d2c9cb83c5f42abb5 100644 (file)
--- a/src/websocket/websocket.ts
+++ b/src/websocket/websocket.ts
@@ -9,12 +9,11 @@ import { WebSocketService } from './websocket-service';
 import { ResourceEventMessage } from './resource-event-message';
 import { ResourceKind } from '~/models/resource';
 import { loadProcess } from '~/store/processes/processes-actions';
-// import { loadContainers } from '~/store/processes/processes-actions';
 import { LogEventType } from '~/models/log';
 import { addProcessLogsPanelItem } from '../store/process-logs-panel/process-logs-panel-actions';
-// import { FilterBuilder } from "~/services/api/filter-builder";
 import { subprocessPanelActions } from "~/store/subprocess-panel/subprocess-panel-actions";
 import { projectPanelActions } from "~/store/project-panel/project-panel-action";
+import { getProjectPanelCurrentUuid } from '~/store/project-panel/project-panel-action';
 
 export const initWebSocket = (config: Config, authService: AuthService, store: RootStore) => {
     if (config.websocketUrl) {
@@ -33,9 +32,12 @@ const messageListener = (store: RootStore) => (message: ResourceEventMessage) =>
                 if (store.getState().processPanel.containerRequestUuid === message.objectUuid) {
                     store.dispatch(loadProcess(message.objectUuid));
                 }
+            // fall through, this will happen for container requests as well.
             case ResourceKind.CONTAINER:
                 store.dispatch(subprocessPanelActions.REQUEST_ITEMS());
-                store.dispatch(projectPanelActions.REQUEST_ITEMS());
+                if (message.objectOwnerUuid === getProjectPanelCurrentUuid(store.getState())) {
+                    store.dispatch(projectPanelActions.REQUEST_ITEMS());
+                }
                 return;
             default:
                 return;