@openmrs/ngx-formentry 3.0.1-pre.103 → 3.0.1-pre.105

package/bundles/openmrs-ngx-formentry.umd.js

@@ -2086,17 +2086,23 @@
                 return array.indexOf(members) !== -1;
             }
         };
-        /*
-         TODO make it possible to bootstrap expressions without control relations to make alternateControl optional as at the moment it required
-         if no other expression on the control as a relationship to another control*/
-        JsExpressionHelper.prototype.extractObsValue = function (rawEncounter, uuid, alternateControl) {
+        /**
+         * Takes a target control, an encounter and concept uuid. If the target control has a value it returns it
+         * otherwise it tries to find it in the encounter. Finally it returns null of it can't find either of them.
+         * @param targetControl
+         * @param rawEncounter
+         * @param uuid
+         * @returns
+         */
+        JsExpressionHelper.prototype.getObsFromControlOrEncounter = function (targetControl, rawEncounter, uuid) {
             var _a;
             var findObs = function (obs, uuid) {
                 var result;
-                obs === null || obs === void 0 ? void 0 : obs.some(function (o) { var _a; return result = ((_a = o === null || o === void 0 ? void 0 : o.concept) === null || _a === void 0 ? void 0 : _a.uuid) === uuid ? o : findObs(o.children || [], uuid); });
+                obs === null || obs === void 0 ? void 0 : obs.some(function (o) { var _a; return result = ((_a = o === null || o === void 0 ? void 0 : o.concept) === null || _a === void 0 ? void 0 : _a.uuid) === uuid ? o : findObs(o.groupMembers || [], uuid); });
                 return result;
             };
-            return ((_a = findObs(rawEncounter === null || rawEncounter === void 0 ? void 0 : rawEncounter.obs, uuid)) === null || _a === void 0 ? void 0 : _a.value) || alternateControl;
+            var obsValue = (_a = findObs(rawEncounter === null || rawEncounter === void 0 ? void 0 : rawEncounter.obs, uuid)) === null || _a === void 0 ? void 0 : _a.value;
+            return !!targetControl ? targetControl : typeof obsValue === 'object' ? obsValue.uuid : !!obsValue ? obsValue : null;
         };
         Object.defineProperty(JsExpressionHelper.prototype, "helperFunctions", {
             get: function () {
@@ -2111,7 +2117,7 @@
                     isEmpty: helper.isEmpty,
                     arrayContains: helper.arrayContains,
                     extractRepeatingGroupValues: helper.extractRepeatingGroupValues,
-                    extractObsValue: helper.extractObsValue
+                    getObsFromControlOrEncounter: helper.getObsFromControlOrEncounter
                 };
             },
             enumerable: false,