openchs-models 1.33.65 → 1.33.66

package/dist/AbstractEncounter.js

@@ -265,7 +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);
+    // 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;
   }
   replaceObservation(originalValue, newValue) {
     new _ObservationsHolder.default(this.observations).updateObservationBasedOnValue(originalValue, newValue);

package/dist/Individual.js

@@ -640,7 +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);
+    return new _ObservationsHolder.default(this.observations).replaceMediaObservation(originalValue, newValue, conceptUUID);
   }
   replaceObservation(originalValue, newValue) {
     new _ObservationsHolder.default(this.observations).updateObservationBasedOnValue(originalValue, newValue);

package/dist/ObservationsHolder.js

@@ -515,88 +515,39 @@ class ObservationsHolder {
     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 (_Concept.default.dataType.Media.includes(childObs.concept.datatype) && 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 (_Concept.default.dataType.Media.includes(obs.concept.datatype)) {
+        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,7 +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);
+    // 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;
   }
   replaceObservation(originalValue, newValue) {
     new _ObservationsHolder.default(this.observations).updateObservationBasedOnValue(originalValue, newValue);

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.66",
     "private": false,
     "repository": {
         "type": "git",