Fix displayImage command and validation

mxcubeweb/core/adapter/detector_adapter.py

@@ -36,7 +36,7 @@ def _state_change(self, *args, **kwargs):
     def state(self):
         return self._ho.get_state().name.upper()
 
-    def display_image(self, path: str, img_num) -> dict:
+    def display_image(self, path: str, img_num: int) -> dict:
         """Notify ADXV and/or Braggy of the image to display."""
         res = {"image_url": ""}
 

mxcubeweb/core/server/resource_handler.py

@@ -28,15 +28,18 @@ def valid_object_id(object_id: str) -> bool:
 
 
 def validate_input_str(input_string: str) -> bool:
-    """Validate that input string contains only alphanumeric characters and/or dot (.).
+    """Validate input string.
+
+    Ensure that input string contains only alphanumeric characters and/or
+    posix path characters such as dot (.), backslash (/) and dash (-).
 
     Args:
         input_string (str): The string to validate.
 
     Returns:
         bool: True if the string is valid, False otherwise.
     """
-    pattern = r"^[a-zA-Z0-9._]*$"
+    pattern = r"^[a-zA-Z0-9._/-]*$"
     return bool(re.match(pattern, input_string))
 
 

ui/src/actions/general.js

@@ -42,7 +42,7 @@ export function displayImage(path, imgNum) {
       'detector',
       'detector',
       'display_image',
-      { path, imgNum },
+      { path, img_num: imgNum },
     );
     window.open(data.image_url, 'braggy');
   };