openchs-models 1.33.65 → 1.33.67

package/dist/AbstractEncounter.js

@@ -265,11 +265,10 @@ class AbstractEncounter extends _BaseEntity.default {
     return (0, _Media.findMediaObservations)(_ObservationsHolder.default.clone(this.observations), _ObservationsHolder.default.clone(this.cancelObservations));
   }
   replaceMediaObservation(originalValue, newValue, conceptUUID) {
-    new _ObservationsHolder.default(this.observations).replaceMediaObservation(originalValue, newValue, conceptUUID);
-  }
-  replaceObservation(originalValue, newValue) {
-    new _ObservationsHolder.default(this.observations).updateObservationBasedOnValue(originalValue, newValue);
-    new _ObservationsHolder.default(this.cancelObservations).updateObservationBasedOnValue(originalValue, newValue);
+    // Both collections, no short-circuit — findMediaObservations enqueues from both.
+    const inObservations = new _ObservationsHolder.default(this.observations).replaceMediaObservation(originalValue, newValue, conceptUUID);
+    const inCancelObservations = new _ObservationsHolder.default(this.cancelObservations).replaceMediaObservation(originalValue, newValue, conceptUUID);
+    return inObservations || inCancelObservations;
   }
   getEntityTypeName() {
     return this.encounterType.name;

package/dist/Individual.js

@@ -640,10 +640,7 @@ class Individual extends _BaseEntity.default {
     return (0, _Media.findMediaObservations)(this.observations);
   }
   replaceMediaObservation(originalValue, newValue, conceptUUID) {
-    new _ObservationsHolder.default(this.observations).replaceMediaObservation(originalValue, newValue, conceptUUID);
-  }
-  replaceObservation(originalValue, newValue) {
-    new _ObservationsHolder.default(this.observations).updateObservationBasedOnValue(originalValue, newValue);
+    return new _ObservationsHolder.default(this.observations).replaceMediaObservation(originalValue, newValue, conceptUUID);
   }
 
   //TODO use polymorphism to avoid if checks based on this

package/dist/ObservationsHolder.js

@@ -24,46 +24,6 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-// Helper function to find media observation by value
-const findMediaObservationByValue = (observations, targetValue) => {
-  if (!observations || !Array.isArray(observations)) return null;
-  return _lodash.default.find(observations, obs => {
-    // Check direct value
-    if (obs.getValue && obs.getValue() === targetValue) return true;
-
-    // Check coded values (for MultipleCodedValues)
-    const valueJSON = obs.valueJSON;
-    if (valueJSON && valueJSON.answer && Array.isArray(valueJSON.answer)) {
-      return valueJSON.answer.includes(targetValue);
-    }
-    return false;
-  });
-};
-
-// Helper function to update media value
-const updateMediaValue = (mediaObs, oldVal, newVal) => {
-  if (!mediaObs) return false;
-
-  // For coded values, we need to update the array content
-  if (mediaObs.valueJSON && mediaObs.valueJSON.answer && Array.isArray(mediaObs.valueJSON.answer)) {
-    const answerIndex = mediaObs.valueJSON.answer.indexOf(oldVal);
-    if (answerIndex >= 0) {
-      mediaObs.valueJSON.answer[answerIndex] = newVal;
-      return true;
-    }
-  } else {
-    // Regular value update
-    mediaObs.setValue(mediaObs.concept.getValueWrapperFor(newVal));
-    return true;
-  }
-  return false;
-};
-
-// Process each question group observation
-const processQuestionGroupObservations = (observations, oldVal, newVal) => {
-  const mediaObs = findMediaObservationByValue(observations, oldVal);
-  return mediaObs ? updateMediaValue(mediaObs, oldVal, newVal) : false;
-};
 class ObservationsHolder {
   constructor(observations) {
     this.observations = observations;
@@ -84,9 +44,6 @@ class ObservationsHolder {
   getObservation(concept) {
     return this.findObservation(concept);
   }
-  findObservationByValue(value) {
-    return _lodash.default.find(this.observations, observation => observation.getValue() === value);
-  }
 
   /*
   Called from the wizard on changes done by the user for primitive fields (including Date)
@@ -431,49 +388,6 @@ class ObservationsHolder {
     }
   }
 
-  //private
-  updateObservationBasedOnValue(oldValue, newValue) {
-    // Try to find at top level first
-    const observation = this.findObservationByValue(oldValue);
-    if (observation) {
-      observation.setValue(observation.concept.getValueWrapperFor(newValue));
-      return true;
-    }
-
-    // Search in nested structures if not found at top level
-    let updated = false;
-
-    // Iterate through all observations
-    _lodash.default.forEach(this.observations, obs => {
-      // Skip non-question group observations
-      if (obs.concept.datatype !== _Concept.default.dataType.QuestionGroup) return;
-      const valueWrapper = obs.getValueWrapper && obs.getValueWrapper();
-      if (!valueWrapper) return;
-
-      // Handle RepeatableQuestionGroup
-      if (valueWrapper.isRepeatable && valueWrapper.isRepeatable()) {
-        const allGroups = valueWrapper.getAllQuestionGroupObservations && valueWrapper.getAllQuestionGroupObservations();
-        if (allGroups && allGroups.length) {
-          // Check each group in the repeatable question group
-          allGroups.forEach(group => {
-            const groupObservations = group.getValue && group.getValue();
-            if (processQuestionGroupObservations(groupObservations, oldValue, newValue)) {
-              updated = true;
-            }
-          });
-        }
-      }
-      // Handle regular QuestionGroup
-      else {
-        const groupObservations = valueWrapper.getValue && valueWrapper.getValue();
-        if (processQuestionGroupObservations(groupObservations, oldValue, newValue)) {
-          updated = true;
-        }
-      }
-    });
-    return updated;
-  }
-
   // Helper method to update media value in an observation
   _updateMediaValueInObservation(observation, oldValue, newValue) {
     if (!observation) return false;
@@ -482,7 +396,13 @@ class ObservationsHolder {
 
     // Handle ImageV2 type
     if (observation.concept.datatype === _Concept.default.dataType.ImageV2) {
-      const mediaObjects = JSON.parse(valueWrapper.getValue());
+      let mediaObjects;
+      try {
+        mediaObjects = JSON.parse(valueWrapper.getValue());
+      } catch (e) {
+        // A malformed value can't reference the file; one bad obs must not crash the whole scan.
+        return false;
+      }
       let updated = false;
       const newAnswers = _lodash.default.map(mediaObjects, mediaObject => {
         if (mediaObject.uri === oldValue) {
@@ -492,111 +412,62 @@ class ObservationsHolder {
         return mediaObject;
       });
       if (updated) {
-        observation.valueJSON = new _PrimitiveValue.default(JSON.stringify(newAnswers), _Concept.default.dataType.ImageV2);
+        observation.valueJSON = new _PrimitiveValue.default(JSON.stringify(newAnswers), _Concept.default.dataType.ImageV2, valueWrapper.answerSource);
         return true;
       }
     }
     // Handle multiple coded values
     else if (valueWrapper.isMultipleCoded) {
       const answers = valueWrapper.getValue();
-      const oldValueIndex = _lodash.default.indexOf(answers, oldValue);
-      if (oldValueIndex >= 0) {
-        const newAnswers = _lodash.default.reject(answers, answer => answer === oldValue);
-        newAnswers.splice(oldValueIndex, 0, newValue);
-        observation.valueJSON = new _MultipleCodedValues.default(newAnswers);
+      if (_lodash.default.includes(answers, oldValue)) {
+        const newAnswers = _lodash.default.map(answers, answer => answer === oldValue ? newValue : answer);
+        observation.valueJSON = new _MultipleCodedValues.default(newAnswers, valueWrapper.answerSource);
         return true;
       }
     }
     // Handle single coded value
     else if (valueWrapper.getValue() === oldValue) {
-      observation.valueJSON = new _SingleCodedValue.default(newValue);
+      const newWrapper = observation.concept.getValueWrapperFor(newValue);
+      newWrapper.answerSource = valueWrapper.answerSource;
+      observation.valueJSON = newWrapper;
       return true;
     }
     return false;
   }
 
-  // Helper to find and update media in question group
-  _updateMediaInQuestionGroup(questionGroup, conceptUUID, oldValue, newValue) {
-    if (!questionGroup || !questionGroup.getValue) return false;
-    const groupObservations = questionGroup.getValue();
-    if (!groupObservations || !Array.isArray(groupObservations)) return false;
-
-    // Find media observation either by concept UUID or by value
-    const mediaObs = _lodash.default.find(groupObservations, obs => obs.concept.uuid === conceptUUID || _Concept.default.dataType.Media.includes(obs.concept.datatype) && obs.getValue && obs.getValue() === oldValue);
-
-    // Update if found
-    return this._updateMediaValueInObservation(mediaObs, oldValue, newValue);
-  }
-
-  // Helper to find and update media in repeatable question group
-  _updateMediaInRepeatableQuestionGroup(repeatableGroup, conceptUUID, oldValue, newValue) {
-    if (!repeatableGroup || !repeatableGroup.getAllQuestionGroupObservations) return false;
-    const allGroups = repeatableGroup.getAllQuestionGroupObservations();
-    if (!allGroups || !allGroups.length) return false;
-
-    // Check each group in the repeatable question group
+  // Replaces oldValue in every matching media child of a question-group wrapper (regular or
+  // repeatable) — every group/row, every child; does not stop at the first match.
+  _replaceMediaInGroupWrapper(wrapper, oldValue, newValue) {
+    const groups = wrapper.isRepeatable && wrapper.isRepeatable() ? wrapper.getAllQuestionGroupObservations ? wrapper.getAllQuestionGroupObservations() : [] : [wrapper];
     let updated = false;
-    allGroups.forEach(group => {
-      if (this._updateMediaInQuestionGroup(group, conceptUUID, oldValue, newValue)) {
-        updated = true;
-      }
+    _lodash.default.forEach(groups, group => {
+      const groupObservations = group && group.getValue && group.getValue();
+      if (!Array.isArray(groupObservations)) return;
+      _lodash.default.forEach(groupObservations, childObs => {
+        if (childObs.concept.isMediaConcept() && this._updateMediaValueInObservation(childObs, oldValue, newValue)) {
+          updated = true;
+        }
+      });
     });
     return updated;
   }
 
-  // Helper to process a question group (regular or repeatable) and update media within it
-  _processQuestionGroupWrapper(wrapper, conceptUUID, oldValue, newValue, sourceName) {
-    if (!wrapper) return false;
-
-    // Determine if it's a repeatable question group or regular question group
-    const isRepeatable = wrapper.isRepeatable && wrapper.isRepeatable();
-
-    // Process the appropriate group type
-    return isRepeatable ? this._updateMediaInRepeatableQuestionGroup(wrapper, conceptUUID, oldValue, newValue) : this._updateMediaInQuestionGroup(wrapper, conceptUUID, oldValue, newValue);
-  }
+  // Replaces oldValue with newValue in EVERY observation referencing it — top-level media
+  // observations and those inside (repeatable) question groups. The same media value can be
+  // referenced by multiple concepts with different select types (e.g. a rule-copied read-only
+  // display element), so the scan is value-driven; conceptUUID is retained only for caller
+  // compatibility. Returns true if at least one observation was updated.
   replaceMediaObservation(oldValue, newValue, conceptUUID) {
-    console.log(`[INFO] Replacing media: ${oldValue} → ${newValue}`);
-
-    // Since conceptUUID is always provided in practice, optimize for that case first
-    // Try to find direct top-level observation with matching concept UUID
-    const directObservation = _lodash.default.find(this.observations, obs => obs.concept.uuid === conceptUUID);
-    if (directObservation) {
-      // Direct media observation
-      if (_Concept.default.dataType.Media.includes(directObservation.concept.datatype)) {
-        if (this._updateMediaValueInObservation(directObservation, oldValue, newValue)) {
-          console.log(`[INFO] Updated media in direct observation`);
-          return true;
-        }
-      }
-      // Question Group containing the media
-      else if (directObservation.concept.datatype === _Concept.default.dataType.QuestionGroup) {
-        const valueWrapper = directObservation.getValueWrapper();
-        if (this._processQuestionGroupWrapper(valueWrapper, conceptUUID, oldValue, newValue)) {
-          console.log(`[INFO] Updated media in question group`);
-          return true;
-        }
-      }
-    }
-
-    // Check nested structures (this works both with and without conceptUUID)
     let updated = false;
     _lodash.default.forEach(this.observations, obs => {
-      // Only process question groups
-      if (obs.concept.datatype !== _Concept.default.dataType.QuestionGroup) return;
-      const valueWrapper = obs.getValueWrapper && obs.getValueWrapper();
-      if (!valueWrapper) return;
-      if (this._processQuestionGroupWrapper(valueWrapper, conceptUUID, oldValue, newValue)) {
-        updated = true;
+      if (obs.concept.isMediaConcept()) {
+        if (this._updateMediaValueInObservation(obs, oldValue, newValue)) updated = true;
+      } else if (obs.concept.datatype === _Concept.default.dataType.QuestionGroup) {
+        const wrapper = obs.getValueWrapper && obs.getValueWrapper();
+        if (wrapper && this._replaceMediaInGroupWrapper(wrapper, oldValue, newValue)) updated = true;
       }
     });
-    if (updated) {
-      console.log(`[INFO] Updated media in nested structure`);
-      return true;
-    }
-
-    // As a fallback, use value-based replacement if we couldn't find it by concept
-    // This ensures backward compatibility and handles edge cases
-    return this.updateObservationBasedOnValue(oldValue, newValue);
+    return updated;
   }
   toString(I18n) {
     let display = "";

package/dist/ProgramEnrolment.js

@@ -455,11 +455,10 @@ class ProgramEnrolment extends _BaseEntity.default {
     return (0, _Media.findMediaObservations)(_ObservationsHolder.default.clone(this.observations), _ObservationsHolder.default.clone(this.programExitObservations));
   }
   replaceMediaObservation(originalValue, newValue, conceptUUID) {
-    new _ObservationsHolder.default(this.observations).replaceMediaObservation(originalValue, newValue, conceptUUID);
-  }
-  replaceObservation(originalValue, newValue) {
-    new _ObservationsHolder.default(this.observations).updateObservationBasedOnValue(originalValue, newValue);
-    new _ObservationsHolder.default(this.programExitObservations).updateObservationBasedOnValue(originalValue, newValue);
+    // Both collections, no short-circuit — findMediaObservations enqueues from both.
+    const inObservations = new _ObservationsHolder.default(this.observations).replaceMediaObservation(originalValue, newValue, conceptUUID);
+    const inExitObservations = new _ObservationsHolder.default(this.programExitObservations).replaceMediaObservation(originalValue, newValue, conceptUUID);
+    return inObservations || inExitObservations;
   }
   getName() {
     return "ProgramEnrolment";

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "openchs-models",
     "description": "OpenCHS data model to be used by front end clients",
-    "version": "1.33.65",
+    "version": "1.33.67",
     "private": false,
     "repository": {
         "type": "git",