15803: toggleIsActive will use unsetup to deactivate user

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

diff --git a/src/websocket/websocket.ts b/src/websocket/websocket.ts
index 9ee2d17e225073e2f152404e55a15d961d40cbdb..d10414616a359982c1e9d77d010e8327062fe620 100644 (file)
--- a/src/websocket/websocket.ts
+++ b/src/websocket/websocket.ts
@@ -9,14 +9,19 @@ 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 { LogEventType } from '../models/log';
+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";
 
 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) => {
@@ -31,6 +36,7 @@ const messageListener = (store: RootStore) => (message: ResourceEventMessage) =>
             default:
                 return;
         }
+    } else {
+        return store.dispatch(addProcessLogsPanelItem(message as ResourceEventMessage<{text: string}>));
     }
-    return ;
 };