Adjusted according to review discussion

rubenthoms · Oct 13, 2023 · 5f09194 · 5f09194
1 parent daf4d0a
commit 5f09194
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 27 deletions.
diff --git a/frontend/src/framework/GuiMessageBroker.ts b/frontend/src/framework/GuiMessageBroker.ts
@@ -2,6 +2,8 @@ import React from "react";
 
 import { Point } from "@lib/utils/geometry";
 
+import { GlobalCursor } from "./internal/GlobalCursor";
+
 export enum DrawerContent {
     ModuleSettings = "ModuleSettings",
     ModulesList = "ModulesList",
@@ -84,15 +86,21 @@ export class GuiMessageBroker {
     private _eventListeners: Map<GuiEvent, Set<(event: any) => void>>;
     private _stateSubscribers: Map<GuiState, Set<(state: any) => void>>;
     private _storedValues: Map<GuiState, any>;
+    private _globalCursor: GlobalCursor;
 
     constructor() {
         this._eventListeners = new Map();
         this._stateSubscribers = new Map();
         this._storedValues = defaultStates;
+        this._globalCursor = new GlobalCursor();
 
         this.loadPersistentStates();
     }
 
+    getGlobalCursor(): GlobalCursor {
+        return this._globalCursor;
+    }
+
     private loadPersistentStates() {
         persistentStates.forEach((state) => {
             const value = localStorage.getItem(state);

diff --git a/frontend/src/framework/ModuleContext.ts b/frontend/src/framework/ModuleContext.ts
@@ -16,18 +16,6 @@ export class ModuleContext<S extends StateBaseType> {
         this._stateStore = stateStore;
     }
 
-    getInputChannel(name: string): BroadcastChannel | null {
-        return this._moduleInstance.getInputChannel(name);
-    }
-
-    setInputChannel(inputName: string, channelName: string): void {
-        this._moduleInstance.setInputChannel(inputName, channelName);
-    }
-
-    getInputChannelDef(name: string): InputBroadcastChannelDef | undefined {
-        return this._moduleInstance.getInputChannelDefs().find((channelDef) => channelDef.name === name);
-    }
-
     getInstanceIdString(): string {
         return this._moduleInstance.getId();
     }
@@ -63,10 +51,6 @@ export class ModuleContext<S extends StateBaseType> {
         return keyArr;
     }
 
-    getChannel(channelName: string): BroadcastChannel {
-        return this._moduleInstance.getBroadcastChannel(channelName);
-    }
-
     setInstanceTitle(title: string): void {
         this._moduleInstance.setTitle(title);
     }
@@ -75,6 +59,22 @@ export class ModuleContext<S extends StateBaseType> {
         return this._moduleInstance.getStatusController();
     }
 
+    getChannel(channelName: string): BroadcastChannel {
+        return this._moduleInstance.getBroadcastChannel(channelName);
+    }
+
+    getInputChannel(name: string): BroadcastChannel | null {
+        return this._moduleInstance.getInputChannel(name);
+    }
+
+    setInputChannel(inputName: string, channelName: string): void {
+        this._moduleInstance.setInputChannel(inputName, channelName);
+    }
+
+    getInputChannelDef(name: string): InputBroadcastChannelDef | undefined {
+        return this._moduleInstance.getInputChannelDefs().find((channelDef) => channelDef.name === name);
+    }
+
     useInputChannel(name: string, initialSettings?: InitialSettings): BroadcastChannel | null {
         const [channel, setChannel] = React.useState<BroadcastChannel | null>(null);
 

diff --git a/frontend/src/framework/Workbench.ts b/frontend/src/framework/Workbench.ts
@@ -36,7 +36,6 @@ export class Workbench {
     private _workbenchSettings: PrivateWorkbenchSettings;
     private _broadcaster: Broadcaster;
     private _guiMessageBroker: GuiMessageBroker;
-    private _globalCursor: GlobalCursor;
     private _subscribersMap: { [key: string]: Set<() => void> };
     private _layout: LayoutElement[];
     private _perModuleRunningInstanceNumber: Record<string, number>;
@@ -48,7 +47,6 @@ export class Workbench {
         this._workbenchSettings = new PrivateWorkbenchSettings();
         this._broadcaster = new Broadcaster();
         this._guiMessageBroker = new GuiMessageBroker();
-        this._globalCursor = new GlobalCursor();
         this._subscribersMap = {};
         this._layout = [];
         this._perModuleRunningInstanceNumber = {};
@@ -87,10 +85,6 @@ export class Workbench {
         return this._guiMessageBroker;
     }
 
-    getGlobalCursor(): GlobalCursor {
-        return this._globalCursor;
-    }
-
     private notifySubscribers(event: WorkbenchEvents): void {
         const subscribers = this._subscribersMap[event];
         if (!subscribers) return;

diff --git a/...ontent/private-components/DataChannelVisualizationLayer/dataChannelVisualizationLayer.tsx b/...ontent/private-components/DataChannelVisualizationLayer/dataChannelVisualizationLayer.tsx
@@ -67,7 +67,7 @@ export const DataChannelVisualizationLayer: React.FC<DataChannelVisualizationPro
             };
             setVisible(true);
             setOriginPoint(localCurrentOriginPoint);
-            props.workbench.getGlobalCursor().setOverrideCursor(GlobalCursorType.Crosshair);
+            guiMessageBroker.getGlobalCursor().setOverrideCursor(GlobalCursorType.Crosshair);
             localMousePressed = true;
             setCurrentPointerPosition(localCurrentOriginPoint);
             setCurrentChannelName(null);
@@ -100,7 +100,7 @@ export const DataChannelVisualizationLayer: React.FC<DataChannelVisualizationPro
             setVisible(false);
             setEditDataChannelConnectionsForModuleInstanceId(null);
             setShowDataChannelConnections(false);
-            props.workbench.getGlobalCursor().restoreOverrideCursor();
+            guiMessageBroker.getGlobalCursor().restoreOverrideCursor();
             setDataChannelConnectionsLayerVisible(false);
         }
 
@@ -136,15 +136,15 @@ export const DataChannelVisualizationLayer: React.FC<DataChannelVisualizationPro
         function handleNodeHover(payload: GuiEventPayloads[GuiEvent.DataChannelNodeHover]) {
             if (!localEditDataChannelConnections) {
                 if (payload.connectionAllowed) {
-                    props.workbench.getGlobalCursor().changeOverrideCursor(GlobalCursorType.Copy);
+                    guiMessageBroker.getGlobalCursor().changeOverrideCursor(GlobalCursorType.Copy);
                 } else {
-                    props.workbench.getGlobalCursor().changeOverrideCursor(GlobalCursorType.NotAllowed);
+                    guiMessageBroker.getGlobalCursor().changeOverrideCursor(GlobalCursorType.NotAllowed);
                 }
             }
         }
 
         function handleNodeUnhover() {
-            props.workbench.getGlobalCursor().restoreOverrideCursor();
+            guiMessageBroker.getGlobalCursor().restoreOverrideCursor();
         }
 
         function handleEditDataChannelConnectionsRequest(