X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/f0a64666816383d2641d5fa7ea22019441ac4464..ef1017fbad2ff46f5a169bb3fc7d097b5bb746f3:/src/websocket/websocket.ts diff --git a/src/websocket/websocket.ts b/src/websocket/websocket.ts index d1041461..506b92c8 100644 --- a/src/websocket/websocket.ts +++ b/src/websocket/websocket.ts @@ -9,10 +9,12 @@ 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'; +import { allProcessesPanelActions } from '~/store/all-processes-panel/all-processes-panel-action'; export const initWebSocket = (config: Config, authService: AuthService, store: RootStore) => { if (config.websocketUrl) { @@ -28,15 +30,21 @@ const messageListener = (store: RootStore) => (message: ResourceEventMessage) => if (message.eventType === LogEventType.CREATE || message.eventType === LogEventType.UPDATE) { switch (message.objectKind) { case ResourceKind.CONTAINER_REQUEST: - return store.dispatch(loadProcess(message.objectUuid)); + 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: - return store.dispatch(loadContainers( - new FilterBuilder().addIn('uuid', [message.objectUuid]).getFilters() - )); + store.dispatch(subprocessPanelActions.REQUEST_ITEMS()); + store.dispatch(allProcessesPanelActions.REQUEST_ITEMS()); + if (message.objectOwnerUuid === getProjectPanelCurrentUuid(store.getState())) { + store.dispatch(projectPanelActions.REQUEST_ITEMS()); + } + return; default: return; } } else { - return store.dispatch(addProcessLogsPanelItem(message as ResourceEventMessage<{text: string}>)); + return store.dispatch(addProcessLogsPanelItem(message as ResourceEventMessage<{ text: string }>)); } };