X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/4ec55841b965ae33aad66479bf4d4ad41e6a0b62..ee9d1e39b5d469a827be5a719c9c0860914ab2a8:/services/workbench2/src/websocket/websocket.ts diff --git a/services/workbench2/src/websocket/websocket.ts b/services/workbench2/src/websocket/websocket.ts index 39940ce5ac..1b74b11f3f 100644 --- a/services/workbench2/src/websocket/websocket.ts +++ b/services/workbench2/src/websocket/websocket.ts @@ -2,21 +2,21 @@ // // SPDX-License-Identifier: AGPL-3.0 -import { RootStore } from 'store/store'; -import { AuthService } from 'services/auth-service/auth-service'; -import { Config } from 'common/config'; -import { WebSocketService } from './websocket-service'; -import { ResourceEventMessage } from './resource-event-message'; -import { ResourceKind } from 'models/resource'; -import { loadProcess } from 'store/processes/processes-actions'; -import { getProcess, getSubprocesses } from 'store/processes/process'; -import { LogEventType } from 'models/log'; +import { RootStore } from "store/store"; +import { AuthService } from "services/auth-service/auth-service"; +import { Config } from "common/config"; +import { WebSocketService } from "./websocket-service"; +import { ResourceEventMessage } from "./resource-event-message"; +import { ResourceKind } from "models/resource"; +import { loadProcess } from "store/processes/processes-actions"; +import { getProcess, getSubprocesses } from "store/processes/process"; +import { LogEventType } from "models/log"; 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'; -import { loadCollection } from 'store/workbench/workbench-actions'; -import { matchAllProcessesRoute, matchProjectRoute, matchProcessRoute } from 'routes/routes'; +import { projectPanelActions } from "store/project-panel/project-panel-action-bind"; +import { getProjectPanelCurrentUuid } from "store/project-panel/project-panel-action"; +import { allProcessesPanelActions } from "store/all-processes-panel/all-processes-panel-action"; +import { loadCollection } from "store/workbench/workbench-actions"; +import { matchAllProcessesRoute, matchProjectRoute, matchProcessRoute } from "routes/routes"; export const initWebSocket = (config: Config, authService: AuthService, store: RootStore) => { if (config.websocketUrl) { @@ -31,7 +31,7 @@ export const initWebSocket = (config: Config, authService: AuthService, store: R const messageListener = (store: RootStore) => (message: ResourceEventMessage) => { if (message.eventType === LogEventType.CREATE || message.eventType === LogEventType.UPDATE) { const state = store.getState(); - const location = state.router.location ? state.router.location.pathname : ''; + const location = state.router.location ? state.router.location.pathname : ""; switch (message.objectKind) { case ResourceKind.COLLECTION: const currentCollection = state.collectionPanel.item; @@ -46,7 +46,7 @@ const messageListener = (store: RootStore) => (message: ResourceEventMessage) => } const proc = getProcess(state.processPanel.containerRequestUuid)(state.resources); if (proc && proc.container && proc.container.uuid === message.properties["new_attributes"]["requesting_container_uuid"]) { - store.dispatch(subprocessPanelActions.REQUEST_ITEMS()); + store.dispatch(subprocessPanelActions.REQUEST_ITEMS(false, true)); return; } } @@ -57,16 +57,16 @@ const messageListener = (store: RootStore) => (message: ResourceEventMessage) => const subproc = getSubprocesses(state.processPanel.containerRequestUuid)(state.resources); for (const sb of subproc) { if (sb.containerRequest.uuid === message.objectUuid || (sb.container && sb.container.uuid === message.objectUuid)) { - store.dispatch(subprocessPanelActions.REQUEST_ITEMS()); + store.dispatch(subprocessPanelActions.REQUEST_ITEMS(false, true)); break; } } } if (matchAllProcessesRoute(location)) { - store.dispatch(allProcessesPanelActions.REQUEST_ITEMS()); + store.dispatch(allProcessesPanelActions.REQUEST_ITEMS(false, true)); } if (matchProjectRoute(location) && message.objectOwnerUuid === getProjectPanelCurrentUuid(state)) { - store.dispatch(projectPanelActions.REQUEST_ITEMS()); + store.dispatch(projectPanelActions.REQUEST_ITEMS(false, true)); } return; default: