fix: inconsistent validation errors

Author: pkulkark

branching_xblock/branching_xblock.py

@@ -992,7 +992,7 @@ def _validate_references(
                     node_client_id=node_client_id,
                     field_name="choiceDestinationByIndex",
                     index=choice_index,
-                    message="Selected destination is invalid.",
+                    message="Selected destination is pending deletion.",
                 )
                 self._add_node_error(
                     validation_errors,

branching_xblock/static/js/src/studio_editor.js

@@ -242,6 +242,12 @@ function BranchingStudioEditor(runtime, element, data) {
       .text(`${pendingCount} ${nodeWord} will be deleted when you save.`);
   }
 
+  function firstErroredNodeId() {
+    return editorState.draftNodes.find(
+      (node) => editorState.validationNodeErrorIds?.has(node.id)
+    )?.id || null;
+  }
+
   // Map backend structured errors into the editor's view model. This is the
   // canonical validation bridge from API contract -> per-field/per-node UI state.
   function applyServerValidation(res) {
@@ -483,6 +489,10 @@ function BranchingStudioEditor(runtime, element, data) {
   // Apply backend validation and move user to the most relevant step.
   function showErrors(res) {
     applyServerValidation(res);
+    const erroredNodeId = firstErroredNodeId();
+    if (erroredNodeId && !editorState.validationNodeErrorIds?.has(editorState.selectedNodeId)) {
+      editorState.selectedNodeId = erroredNodeId;
+    }
     renderSettings();
     renderNodeList();
     renderNodeEditor();
@@ -709,7 +719,6 @@ function BranchingStudioEditor(runtime, element, data) {
       }
       syncCurrentNodeFromDom();
       editorState.selectedNodeId = nodeId;
-      clearValidationState();
       renderNodeList();
       renderNodeEditor();
       updateFooterUi();

tests/test_branching_xblock.py

@@ -563,7 +563,7 @@ def test_studio_submit_rejects_deleting_referenced_node_with_node_action_errors(
     assert result["result"] == "error"
     assert (
         result["field_errors"]["node_input_errors"]["temp-1"]["choiceDestinationByIndex"]["0"]
-        == "Selected destination is invalid."
+        == "Selected destination is pending deletion."
     )
     node_errors = result["field_errors"]["node_action_errors"]
     assert node_errors["temp-2"]["title"] == "You can't delete this node"