Two different fixes, one for typing and one for an issue

OpenCyphal · Nov 22, 2023 · c8dabdb · c8dabdb
1 parent fb8024b
commit c8dabdb
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 2 deletions.
diff --git a/yukon/services/enhanced_json_encoder.py b/yukon/services/enhanced_json_encoder.py
@@ -33,7 +33,7 @@
 _logger = logging.getLogger(__name__)
 
 # Flask has some broken code around this, making my own
-def jsonify(obj: typing.Any):
+def jsonify(obj: typing.Any) -> Response:
     return Response(json.dumps(obj, cls=EnhancedJSONEncoder), mimetype="application/json")
 
 class EnhancedJSONEncoder(json.JSONEncoder):

diff --git a/yukon/web/modules/context-menu.module.js b/yukon/web/modules/context-menu.module.js
@@ -563,6 +563,12 @@ export function make_context_menus(yukon_state) {
                     click: async (e, elementOpenedOn) => {
                         const portNr = parseInt(elementOpenedOn.getAttribute("data-port"));
                         const datatypes = await getDatatypesForPort(portNr, "pub", yukon_state);
+                        if(!datatypes[0]) {
+                            console.error(```
+                            Please make sure that registers exist for data type names for publication/subscription/client/server.
+                            https://github.com/OpenCyphal/public_regulated_data_types/blob/935973babe11755d8070e67452b3508b4b6833e2/uavcan/register/384.Access.1.0.dsdl#L154-L162
+                            ```);
+                        }
                         const response = await yukon_state.zubax_apij.make_simple_publisher_with_datatype_and_port_id(datatypes[0], portNr);
                         const portType = elementOpenedOn.getAttribute("data-port-type"); // sub or pub or cln or srv
                         if (response && response.success) {

diff --git a/yukon/web/modules/panels/monitor2/monitor2.module.js b/yukon/web/modules/panels/monitor2/monitor2.module.js
@@ -477,7 +477,16 @@ async function update_monitor2(containerElement, monitor2Div, yukon_state, force
                         currentLinkDsdlDatatype = currentLinkObject.name + ":" + currentLinkDsdlDatatype;
                     }
                 } else {
-                    currentLinkDsdlDatatype = fixed_datatype_full || "There is no info about this link";
+                    currentLinkDsdlDatatype = fixed_datatype_full;
+                }
+                if(currentLinkDsdlDatatype) {
+                    currentLinkDsdlDatatype = fixed_datatype_full;
+                } else {
+                    // Handling a special case where the developer of a Cyphal node hasn't got registers set up for data type names
+                    // https://github.com/OpenCyphal/public_regulated_data_types/blob/935973babe11755d8070e67452b3508b4b6833e2/uavcan/register/384.Access.1.0.dsdl#L154-L162
+                    // https://forum.opencyphal.org/t/developing-pico-node-using-yukon/1978
+                    // addHorizontalElements is going to give this a message and also make it clickable and hinted so that the link can be had from the label.
+                    currentLinkDsdlDatatype = null;
                 }
                 let isLast = false;
                 // If this is the last iteration of the loop, set a variable to true
@@ -989,6 +998,16 @@ function addHorizontalElements(monitor2Div, matchingPort, currentLinkDsdlDatatyp
     if (currentLinkDsdlDatatype.endsWith(".Response") || currentLinkDsdlDatatype.endsWith(".Request")) {
         currentLinkDsdlDatatype = currentLinkDsdlDatatype.replace(".Response", "").replace(".Request", "");
     }
+    if(!currentLinkDsdlDatatype) {
+        horizontal_line_label.addEventListener("mousedown", () => {
+            console.error(```
+                            Please make sure that registers exist for data type names for publication/subscription/client/server.
+                            https://github.com/OpenCyphal/public_regulated_data_types/blob/935973babe11755d8070e67452b3508b4b6833e2/uavcan/register/384.Access.1.0.dsdl#L154-L162
+                            ```);
+        });
+        horizontal_line_label.title = "Click for more information in console."
+        currentLinkDsdlDatatype = "Missing data type name registers.";
+    }
     horizontal_line_label.innerHTML = currentLinkDsdlDatatype;
     horizontal_line_label.style.zIndex = "3";
     // horizontal_line_label.style.backgroundColor = settings["LinkLabelColor"];