X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/de93a71c82562f2fdedfd485c5d0164651300140..25216cc7acedc987c26a159f0b640210c0ef101e:/src/websocket/websocket.ts

diff --git a/src/websocket/websocket.ts b/src/websocket/websocket.ts
index d45f3797..b1265808 100644
--- a/src/websocket/websocket.ts
+++ b/src/websocket/websocket.ts
@@ -2,31 +2,49 @@
 //
 // 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 { 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 { loadContainers } from '../store/processes/processes-actions';
-import { FilterBuilder } from '~/common/api/filter-builder';
+import { ResourceKind } from 'models/resource';
+import { loadProcess } from 'store/processes/processes-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 { 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) => {
-    const webSocketService = new WebSocketService(config.websocketUrl, authService);
-    webSocketService.setMessageListener(messageListener(store));
-    webSocketService.connect();
+    if (config.websocketUrl) {
+        const webSocketService = new WebSocketService(config.websocketUrl, authService);
+        webSocketService.setMessageListener(messageListener(store));
+        webSocketService.connect();
+    } else {
+        console.warn("WARNING: Websocket ExternalURL is not set on the cluster config.");
+    }
 };
 
 const messageListener = (store: RootStore) => (message: ResourceEventMessage) => {
-    switch (message.objectKind) {
-        case ResourceKind.CONTAINER_REQUEST:
-            return store.dispatch(loadProcess(message.objectUuid));
-        case ResourceKind.CONTAINER:
-            return store.dispatch(loadContainers(
-                new FilterBuilder().addIn('uuid', [message.objectUuid]).getFilters()
-            ));
-        default:
-            return;
+    if (message.eventType === LogEventType.CREATE || message.eventType === LogEventType.UPDATE) {
+        switch (message.objectKind) {
+            case ResourceKind.CONTAINER_REQUEST:
+                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(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 }>));
     }
 };