change to new camera websockets for argus

mxcube · Nov 25, 2024 · 42bff7a · 42bff7a
1 parent 7c5cfb1
commit 42bff7a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/demo/mxcube-web/server.yaml b/demo/mxcube-web/server.yaml
@@ -9,14 +9,15 @@ server:
   DEBUG: false
 
   ALLOWED_CORS_ORIGINS:
-    - http://localhost:8081
-    - http://127.0.0.1:8081
-    - http://localhost:5173
-    - http://127.0.0.1:5173
-    - ws://localhost:8000
-    - ws://127.0.0.1:8000
-    - "ws://localhost:9090"
-    - "http://localhost:9090"
+    - "http://localhost:8081"
+    - "http://127.0.0.1:8081"
+    - "http://localhost:5173"
+    - "http://127.0.0.1:5173"
+    - "ws://localhost:8000"
+    - "ws://127.0.0.1:8000"
+    - "ws://localhost:7000"
+    - "ws://127.0.0.1:7000"
+    - "http://localhost:7000"
 
 sso:
   USE_SSO: false

diff --git a/ui/src/components/BeamlineCamera/BeamlineCamera.jsx b/ui/src/components/BeamlineCamera/BeamlineCamera.jsx
@@ -32,14 +32,14 @@ function BeamlineCamera(props) {
 
   useEffect(() => {
     if (argusStreams) {
-      const argusCameras = Object.entries(argusStreams).map(([key, value]) => {
+      const argusCameras = Object.keys(argusStreams).map((key) => {
         return {
           description: null,
           format: null,
           height: 1280,
           width: 960,
           label: key,
-          url: value,
+          url: `ws://localhost:7000/ws/${key}`,
         };
       });
       if (cameraSetup && cameraSetup.components.length > 0) {

diff --git a/ui/src/components/BeamlineCamera/CameraCard.jsx b/ui/src/components/BeamlineCamera/CameraCard.jsx
@@ -32,6 +32,7 @@ export default function CameraCard(props) {
         preserveDrawingBuffer: false,
         protocols: [],
         autoplay: true,
+        displayGl: false,
       });
     }