Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>
import { ResourceEventMessage } from './resource-event-message';
import { ResourceKind } from 'models/resource';
import { loadProcess } from 'store/processes/processes-actions';
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 { addProcessLogsPanelItem } from 'store/process-logs-panel/process-logs-panel-actions';
import { subprocessPanelActions } from "store/subprocess-panel/subprocess-panel-actions";
import { LogEventType } from 'models/log';
import { addProcessLogsPanelItem } from 'store/process-logs-panel/process-logs-panel-actions';
import { subprocessPanelActions } from "store/subprocess-panel/subprocess-panel-actions";
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 { 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) {
export const initWebSocket = (config: Config, authService: AuthService, store: RootStore) => {
if (config.websocketUrl) {
const messageListener = (store: RootStore) => (message: ResourceEventMessage) => {
if (message.eventType === LogEventType.CREATE || message.eventType === LogEventType.UPDATE) {
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 : '';
switch (message.objectKind) {
case ResourceKind.COLLECTION:
switch (message.objectKind) {
case ResourceKind.COLLECTION:
- const currentCollection = store.getState().collectionPanel.item;
+ const currentCollection = state.collectionPanel.item;
if (currentCollection && currentCollection.uuid === message.objectUuid) {
store.dispatch(loadCollection(message.objectUuid));
}
return;
case ResourceKind.CONTAINER_REQUEST:
if (currentCollection && currentCollection.uuid === message.objectUuid) {
store.dispatch(loadCollection(message.objectUuid));
}
return;
case ResourceKind.CONTAINER_REQUEST:
- if (store.getState().processPanel.containerRequestUuid === message.objectUuid) {
- store.dispatch(loadProcess(message.objectUuid));
+ if (matchProcessRoute(location)) {
+ if (state.processPanel.containerRequestUuid === message.objectUuid) {
+ store.dispatch(loadProcess(message.objectUuid));
+ }
+ 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());
+ return;
+ }
}
// fall through, this will happen for container requests as well.
case ResourceKind.CONTAINER:
}
// fall through, this will happen for container requests as well.
case ResourceKind.CONTAINER:
- store.dispatch(subprocessPanelActions.REQUEST_ITEMS());
- store.dispatch(allProcessesPanelActions.REQUEST_ITEMS());
- if (message.objectOwnerUuid === getProjectPanelCurrentUuid(store.getState())) {
+ if (matchProcessRoute(location)) {
+ // refresh only if this is a subprocess of the currently displayed process.
+ 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());
+ break;
+ }
+ }
+ }
+ if (matchAllProcessesRoute(location)) {
+ store.dispatch(allProcessesPanelActions.REQUEST_ITEMS());
+ }
+ if (matchProjectRoute(location) && message.objectOwnerUuid === getProjectPanelCurrentUuid(state)) {
store.dispatch(projectPanelActions.REQUEST_ITEMS());
}
return;
store.dispatch(projectPanelActions.REQUEST_ITEMS());
}
return;