Merge branch 'master' into 13860-process-statuses-filters

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

diff --git a/src/websocket/websocket.ts b/src/websocket/websocket.ts
index d45f379795d72ef3ffe9a7578c54bd1b5e1045c0..634fa8f979b4387b0acdc8c23740ce33459e4ddc 100644 (file)
--- a/src/websocket/websocket.ts
+++ b/src/websocket/websocket.ts
@@ -11,6 +11,8 @@ 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 { LogEventType } from '../models/log';
+import { addProcessLogsPanelItem } from '../store/process-logs-panel/process-logs-panel-actions';
 
 export const initWebSocket = (config: Config, authService: AuthService, store: RootStore) => {
     const webSocketService = new WebSocketService(config.websocketUrl, authService);
@@ -19,14 +21,18 @@ export const initWebSocket = (config: Config, authService: AuthService, store: R
 };
 
 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:
+                return store.dispatch(loadProcess(message.objectUuid));
+            case ResourceKind.CONTAINER:
+                return store.dispatch(loadContainers(
+                    new FilterBuilder().addIn('uuid', [message.objectUuid]).getFilters()
+                ));
+            default:
+                return;
+        }
+    } else {
+        return store.dispatch(addProcessLogsPanelItem(message as ResourceEventMessage<{text: string}>));
     }
 };