primary_care_admin_binder 0.1.201 → 0.1.203

package/dist/index.cjs.js

@@ -2383,6 +2383,35 @@ var getBinderEnv = function getBinderEnv(key) {
   }
   return fallback;
 };
+function isAbsoluteUrl(value) {
+  // Scheme-agnostic on purpose - covers http(s):// as well as ws(s):// and
+  // anything else shaped like "scheme://...".
+  return /^[a-z][a-z0-9+.-]*:\/\//i.test(value || "");
+}
+
+// When REACT_APP_BASE_URL is configured, each service's own env var (e.g.
+// REACT_APP_KEY_CLOCK_API) holds only that service's path instead of a full
+// origin, and the two are joined here. If the value is already an absolute
+// URL (today's per-service-domain setup, no shared base), it's used as-is -
+// the shared base is only applied to bare paths, so this is safe to call
+// unconditionally regardless of environment.
+function withSharedBase(rawValue) {
+  if (!rawValue) return "";
+  var base = getBinderEnv("REACT_APP_BASE_URL");
+  if (!base || isAbsoluteUrl(rawValue)) return rawValue;
+  var trimmedBase = base.replace(/\/+$/, "");
+  var path = rawValue.startsWith("/") ? rawValue : "/".concat(rawValue);
+  return "".concat(trimmedBase).concat(path);
+}
+
+// Base-aware lookup for vars that ARE a full URL or a full path on their
+// own (e.g. REACT_APP_KEY_CLOCK_API) - used for every per-service endpoint
+// base below. Not used for getBinderEnv's other callers (REACT_APP_APPNAME,
+// REACT_APP_TENANTID, REACT_APP_BASE_URL_HOST, etc.) since those aren't URLs
+// or paths and joining them with a shared base would corrupt them.
+function getBinderServiceUrl(key) {
+  return withSharedBase(getBinderEnv(key));
+}
 var _dbName = "";
 var _dbNameNg = "";
 var _ruleDBName = "";
@@ -2394,14 +2423,14 @@ var _tenantId = "";
  * Builds all Binder URLs dynamically from runtime env
  */
 function getBinderUrls() {
-  var commonApi = getBinderEnv("REACT_APP_AIQOE_COMMON_API_URL");
-  var keyClockApi = getBinderEnv("REACT_APP_KEY_CLOCK_API");
-  var nifiApi = getBinderEnv("REACT_APP_NIFI_API");
-  var tokenApi = getBinderEnv("REACT_APP_TOKEN_URL");
-  var registrationApi = getBinderEnv("REACT_APP_REGISTRATION_API");
-  var appointmentApi = getBinderEnv("REACT_APP_APPOINTMENT_API");
-  getBinderEnv("REACT_APP_VHC_INTEGRATION_URL");
-  var getMohUserDetailUrl = getBinderEnv("REACT_APP_GET_MOH_USER_DETAIL_URL");
+  var commonApi = getBinderServiceUrl("REACT_APP_AIQOE_COMMON_API_URL");
+  var keyClockApi = getBinderServiceUrl("REACT_APP_KEY_CLOCK_API");
+  var nifiApi = getBinderServiceUrl("REACT_APP_NIFI_API");
+  var tokenApi = getBinderServiceUrl("REACT_APP_TOKEN_URL");
+  var registrationApi = getBinderServiceUrl("REACT_APP_REGISTRATION_API");
+  var appointmentApi = getBinderServiceUrl("REACT_APP_APPOINTMENT_API");
+  getBinderServiceUrl("REACT_APP_VHC_INTEGRATION_URL");
+  var getMohUserDetailUrl = getBinderServiceUrl("REACT_APP_GET_MOH_USER_DETAIL_URL");
   return {
     // Database & Metadata
     dbtype: getBinderEnv("REACT_APP_BASE_URL_HOST").split(".")[0],
@@ -10463,7 +10492,7 @@ var query$a = {
         facilityid: "",
         lang: ""
       },
-      requestid: qdm_query_ids.gmLoadQuery
+      requestid: query_ids.gmLoadQuery
     };
   },
   gender: function gender() {
@@ -10475,7 +10504,7 @@ var query$a = {
         facilityid: "",
         lang: ""
       },
-      requestid: qdm_query_ids.gmLoadQuery
+      requestid: query_ids.gmLoadQuery
     };
   },
   specialityCodeOrgId: function specialityCodeOrgId(data) {
@@ -10487,7 +10516,7 @@ var query$a = {
         facilityid: "",
         lang: ""
       },
-      requestid: qdm_query_ids.gmLoadQuery
+      requestid: query_ids.gmLoadQuery
     };
   },
   specialityCode: function specialityCode() {
@@ -10499,7 +10528,7 @@ var query$a = {
         facilityid: "",
         lang: ""
       },
-      requestid: qdm_query_ids.gmLoadQuery
+      requestid: query_ids.gmLoadQuery
     };
   },
   diagnosis: function diagnosis() {
@@ -10551,13 +10580,10 @@ var query$a = {
     };
   },
   editVitalApplicable: function editVitalApplicable(id) {
-    var idStr = String(id || "");
-    var idx = idStr.lastIndexOf("/");
-    var key = idx !== -1 ? idStr.slice(idx + 1) : idStr;
     return {
       appcode: _dbName,
       filter: {
-        _id: key || id
+        _id: id
       },
       requestid: query_ids.vitalsApplicableEdit
     };
@@ -10637,65 +10663,58 @@ var generateApplicableResJson = function generateApplicableResJson(data, state)
     return (a === null || a === void 0 ? void 0 : a.createddate) - (b === null || b === void 0 ? void 0 : b.createddate);
   });
   var list = TableData.map(function (val) {
-    // Look up gender from state if it is a raw ID string
+    // ── gender ──────────────────────────────────────────────────────────────
+    // API may return a fully-populated object OR a raw ID string.
     var genderVal = "";
     if (val.gender) {
-      if (typeof val.gender === "string") {
+      if (_typeof(val.gender) === "object" && !Array.isArray(val.gender)) {
+        // Populated object: { display, shortdesc, code, _id, … }
+        genderVal = val.gender.display || val.gender.shortdesc || val.gender.code || "";
+      } else if (Array.isArray(val.gender) && val.gender.length > 0) {
+        var _g$coding;
+        var g = val.gender[0];
+        genderVal = _typeof(g) === "object" ? g.display || g.shortdesc || ((_g$coding = g.coding) === null || _g$coding === void 0 || (_g$coding = _g$coding[0]) === null || _g$coding === void 0 ? void 0 : _g$coding.display) || "" : String(g);
+      } else if (typeof val.gender === "string") {
         var _state$gender;
+        // Legacy: raw ID — look up label from state
         var genderObj = state === null || state === void 0 || (_state$gender = state.gender) === null || _state$gender === void 0 || (_state$gender = _state$gender.data) === null || _state$gender === void 0 ? void 0 : _state$gender.find(function (sys) {
           return String(val.gender).indexOf(String(sys.value)) > -1;
         });
-        genderVal = genderObj ? {
-          display: genderObj.label,
-          value: genderObj.value
-        } : val.gender;
-      } else if (Array.isArray(val.gender) && val.gender.length > 0) {
-        var _val$gender$;
-        genderVal = ((_val$gender$ = val.gender[0]) === null || _val$gender$ === void 0 || (_val$gender$ = _val$gender$.coding) === null || _val$gender$ === void 0 ? void 0 : _val$gender$[0]) || "";
-      } else {
-        genderVal = val.gender;
+        genderVal = genderObj ? genderObj.label : val.gender;
       }
     }
 
-    // Look up specialty from state if it is a raw ID string
+    // ── specialty ────────────────────────────────────────────────────────────
     var specialtyVal = "";
     if (val.spltycode) {
-      if (typeof val.spltycode === "string") {
-        var _state$speciality_cod;
-        var specialtyObj = state === null || state === void 0 || (_state$speciality_cod = state.speciality_code) === null || _state$speciality_cod === void 0 || (_state$speciality_cod = _state$speciality_cod.data) === null || _state$speciality_cod === void 0 ? void 0 : _state$speciality_cod.find(function (sys) {
-          return String(val.spltycode).indexOf(String(sys.value)) > -1;
-        });
-        specialtyVal = specialtyObj ? specialtyObj.label : val.spltycode;
-      } else if (Array.isArray(val.spltycode) && val.spltycode.length > 0) {
-        var _val$spltycode$, _val$spltycode$2;
-        specialtyVal = ((_val$spltycode$ = val.spltycode[0]) === null || _val$spltycode$ === void 0 || (_val$spltycode$ = _val$spltycode$.coding) === null || _val$spltycode$ === void 0 || (_val$spltycode$ = _val$spltycode$[0]) === null || _val$spltycode$ === void 0 ? void 0 : _val$spltycode$.display) || ((_val$spltycode$2 = val.spltycode[0]) === null || _val$spltycode$2 === void 0 ? void 0 : _val$spltycode$2.display) || "";
-      } else {
-        var _val$spltycode;
-        specialtyVal = ((_val$spltycode = val.spltycode) === null || _val$spltycode === void 0 ? void 0 : _val$spltycode.display) || "";
+      if (_typeof(val.spltycode) === "object" && !Array.isArray(val.spltycode)) {
+        // Populated object: { display, shortdesc, _id, … }
+        specialtyVal = val.spltycode.shortdesc || val.spltycode.display || "";
       }
     }
 
-    // Look up ageRange from state if it is a raw ID string
+    // ── age range ────────────────────────────────────────────────────────────
     var ageRangeVal = "";
     if (val.agerangecode) {
-      if (typeof val.agerangecode === "string" || typeof val.agerangecode === "number") {
+      if (_typeof(val.agerangecode) === "object" && !Array.isArray(val.agerangecode)) {
+        // Populated object: { shortdesc, longdesc, agerangecode, _id, … }
+        ageRangeVal = val.agerangecode.shortdesc || val.agerangecode.longdesc || val.agerangecode.agerangecode || "";
+      } else if (typeof val.agerangecode === "string" || typeof val.agerangecode === "number") {
         var _state$ageranges_code;
         var ageRangeObj = state === null || state === void 0 || (_state$ageranges_code = state.ageranges_code) === null || _state$ageranges_code === void 0 || (_state$ageranges_code = _state$ageranges_code.data) === null || _state$ageranges_code === void 0 ? void 0 : _state$ageranges_code.find(function (sys) {
           return String(val.agerangecode).indexOf(String(sys.value)) > -1;
         });
         ageRangeVal = ageRangeObj ? ageRangeObj.label : String(val.agerangecode);
-      } else {
-        var _val$agerangecode;
-        ageRangeVal = ((_val$agerangecode = val.agerangecode) === null || _val$agerangecode === void 0 ? void 0 : _val$agerangecode.agerangecode) || "";
       }
     }
 
-    // Look up ageCategory from state if it is a raw ID string
+    // ── age category ─────────────────────────────────────────────────────────
     var ageCategoryVal = "";
     if (val.agecategorycode && val.agecategorycode.length > 0) {
       var firstCat = val.agecategorycode[0];
-      if (_typeof(firstCat) === "object") {
-        ageCategoryVal = firstCat.code || firstCat.display || "";
+      if (_typeof(firstCat) === "object" && firstCat !== null) {
+        // Populated object: { description, code, _id, … }
+        ageCategoryVal = firstCat.description || firstCat.code || firstCat._id || "";
       } else {
         ageCategoryVal = String(firstCat);
       }
@@ -10754,43 +10773,77 @@ var generateApplicableReadResJson = function generateApplicableReadResJson() {
   var data = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
   var state = arguments.length > 1 ? arguments[1] : undefined;
   var list = (data || []).map(function (v) {
-    var _state$entity_name, _state$entity_type;
-    // organization_id is a string like "10002" in QDM response
-    var orgIdStr = _typeof(v.organization_id) === "object" && v.organization_id !== null ? v.organization_id._id || v.organization_id.id || "" : String(v.organization_id || "");
-
-    // Look up org name from the entity_name dropdown list loaded in state
-    var orgEntry = state === null || state === void 0 || (_state$entity_name = state.entity_name) === null || _state$entity_name === void 0 || (_state$entity_name = _state$entity_name.data) === null || _state$entity_name === void 0 ? void 0 : _state$entity_name.find(function (sys) {
-      return getRawId$3(sys.value) === orgIdStr || getRawId$3(sys._id) === orgIdStr;
-    });
-    var orgName = (orgEntry === null || orgEntry === void 0 ? void 0 : orgEntry.label) || (orgEntry === null || orgEntry === void 0 ? void 0 : orgEntry.name) || orgIdStr;
+    // ── organization_id ───────────────────────────────────────────────────────
+    // API may return a fully-populated object OR a raw ID string.
+    var orgIdStr = "";
+    var orgName = "";
+    if (_typeof(v.organization_id) === "object" && v.organization_id !== null) {
+      // Populated object: { name, _id, _key, … }
+      orgIdStr = getRawId$3(v.organization_id._id || v.organization_id._key || "");
+      orgName = v.organization_id.name || v.organization_id.label || orgIdStr;
+    } else {
+      var _state$entity_name;
+      orgIdStr = getRawId$3(String(v.organization_id || ""));
+      // Fallback: look up label from state dropdown
+      var orgEntry = state === null || state === void 0 || (_state$entity_name = state.entity_name) === null || _state$entity_name === void 0 || (_state$entity_name = _state$entity_name.data) === null || _state$entity_name === void 0 ? void 0 : _state$entity_name.find(function (sys) {
+        return getRawId$3(sys.value) === orgIdStr || getRawId$3(sys._id) === orgIdStr;
+      });
+      orgName = (orgEntry === null || orgEntry === void 0 ? void 0 : orgEntry.label) || (orgEntry === null || orgEntry === void 0 ? void 0 : orgEntry.name) || orgIdStr;
+    }
 
-    // orgentitytype: QDM returns lowercase "orgentitytype", value is a string ID like "10010"
+    // ── orgEntityType ─────────────────────────────────────────────────────────
     var orgTypeRaw = v.orgentitytype || v.orgEntityType || v.OrgEntityType;
-    var orgTypeId = _typeof(orgTypeRaw) === "object" && orgTypeRaw !== null ? orgTypeRaw._id || orgTypeRaw.value || "" : String(orgTypeRaw || "");
-    var entityTypeVal = orgTypeId ? (state === null || state === void 0 || (_state$entity_type = state.entity_type) === null || _state$entity_type === void 0 || (_state$entity_type = _state$entity_type.data) === null || _state$entity_type === void 0 ? void 0 : _state$entity_type.find(function (sys) {
-      return getRawId$3(sys.value) === getRawId$3(orgTypeId);
-    })) || {
-      _id: orgTypeId,
-      value: orgTypeId,
-      label: orgTypeId
-    } : null;
-
-    // specialty code
+    var entityTypeVal = null;
+    if (_typeof(orgTypeRaw) === "object" && orgTypeRaw !== null) {
+      var _state$entity_type;
+      // Populated object: { display, shortdesc, _id, … }
+      var orgTypeId = getRawId$3(orgTypeRaw._id || orgTypeRaw._key || "");
+      var orgTypeLabel = orgTypeRaw.display || orgTypeRaw.shortdesc || orgTypeId;
+      // Try to match against the state dropdown for a complete option object
+      entityTypeVal = (state === null || state === void 0 || (_state$entity_type = state.entity_type) === null || _state$entity_type === void 0 || (_state$entity_type = _state$entity_type.data) === null || _state$entity_type === void 0 ? void 0 : _state$entity_type.find(function (sys) {
+        return getRawId$3(sys.value) === orgTypeId;
+      })) || {
+        _id: orgTypeId,
+        value: orgTypeId,
+        label: orgTypeLabel
+      };
+    } else if (orgTypeRaw) {
+      var _state$entity_type2;
+      var _orgTypeId = getRawId$3(String(orgTypeRaw));
+      entityTypeVal = _orgTypeId ? (state === null || state === void 0 || (_state$entity_type2 = state.entity_type) === null || _state$entity_type2 === void 0 || (_state$entity_type2 = _state$entity_type2.data) === null || _state$entity_type2 === void 0 ? void 0 : _state$entity_type2.find(function (sys) {
+        return getRawId$3(sys.value) === _orgTypeId;
+      })) || {
+        _id: _orgTypeId,
+        value: _orgTypeId,
+        label: _orgTypeId
+      } : null;
+    }
+
+    // ── specialty code ────────────────────────────────────────────────────────
     var specialCodeVal = null;
     var splyRaw = v.spltycodeId || v.spltycode;
     if (splyRaw) {
       var firstSply = Array.isArray(splyRaw) ? splyRaw[0] : splyRaw;
       if (_typeof(firstSply) === "object" && firstSply !== null) {
-        specialCodeVal = {
-          _id: String(firstSply._id || firstSply.value || ""),
-          value: firstSply._id || firstSply.value || "",
-          label: String(firstSply.display || firstSply.label || firstSply._id || "")
+        var _state$speciality_cod, _state$speciality_cod2;
+        // Populated object: { display, shortdesc, _id, … }
+        var spId = getRawId$3(firstSply._id || firstSply._key || "");
+        var spLabel = firstSply.shortdesc || firstSply.display || firstSply.label || spId;
+        specialCodeVal = (state === null || state === void 0 || (_state$speciality_cod = state.speciality_code_org) === null || _state$speciality_cod === void 0 || (_state$speciality_cod = _state$speciality_cod.data) === null || _state$speciality_cod === void 0 ? void 0 : _state$speciality_cod.find(function (sys) {
+          return getRawId$3(sys.value) === spId;
+        })) || (state === null || state === void 0 || (_state$speciality_cod2 = state.speciality_code) === null || _state$speciality_cod2 === void 0 || (_state$speciality_cod2 = _state$speciality_cod2.data) === null || _state$speciality_cod2 === void 0 ? void 0 : _state$speciality_cod2.find(function (sys) {
+          return getRawId$3(sys.value) === spId;
+        })) || {
+          _id: spId,
+          value: spId,
+          label: spLabel
         };
       } else {
-        var _state$speciality_cod2, _state$speciality_cod3;
-        var foundSp = (state === null || state === void 0 || (_state$speciality_cod2 = state.speciality_code_org) === null || _state$speciality_cod2 === void 0 || (_state$speciality_cod2 = _state$speciality_cod2.data) === null || _state$speciality_cod2 === void 0 ? void 0 : _state$speciality_cod2.find(function (sys) {
+        var _state$speciality_cod3, _state$speciality_cod4;
+        // Legacy: raw ID string
+        var foundSp = (state === null || state === void 0 || (_state$speciality_cod3 = state.speciality_code_org) === null || _state$speciality_cod3 === void 0 || (_state$speciality_cod3 = _state$speciality_cod3.data) === null || _state$speciality_cod3 === void 0 ? void 0 : _state$speciality_cod3.find(function (sys) {
           return getRawId$3(sys.value) === getRawId$3(firstSply);
-        })) || (state === null || state === void 0 || (_state$speciality_cod3 = state.speciality_code) === null || _state$speciality_cod3 === void 0 || (_state$speciality_cod3 = _state$speciality_cod3.data) === null || _state$speciality_cod3 === void 0 ? void 0 : _state$speciality_cod3.find(function (sys) {
+        })) || (state === null || state === void 0 || (_state$speciality_cod4 = state.speciality_code) === null || _state$speciality_cod4 === void 0 || (_state$speciality_cod4 = _state$speciality_cod4.data) === null || _state$speciality_cod4 === void 0 ? void 0 : _state$speciality_cod4.find(function (sys) {
           return getRawId$3(sys.value) === getRawId$3(firstSply);
         }));
         specialCodeVal = foundSp || (firstSply ? {
@@ -10801,46 +10854,61 @@ var generateApplicableReadResJson = function generateApplicableReadResJson() {
       }
     }
 
-    // gender: QDM returns gender as a code (e.g. "ACS004"), genderId as the _id (e.g. "11189")
+    // ── gender ────────────────────────────────────────────────────────────────
+    // API may return a fully-populated object (with _id, code, display) or a raw
+    // ID / code string. Match against the state dropdown for a consistent option.
     var genderVal = null;
     var rawGender = v.genderId || v.gender;
-    var firstGender = Array.isArray(rawGender) ? rawGender[0] : _typeof(rawGender) === "object" ? rawGender : null;
-    var genderId = firstGender ? firstGender._id || firstGender.id || firstGender.code || firstGender.value : rawGender;
-    if (genderId) {
-      var _state$gender2;
-      var gIdStr = String(genderId).toLowerCase();
-      genderVal = (state === null || state === void 0 || (_state$gender2 = state.gender) === null || _state$gender2 === void 0 || (_state$gender2 = _state$gender2.data) === null || _state$gender2 === void 0 ? void 0 : _state$gender2.find(function (sys) {
-        return getRawId$3(sys.value).toLowerCase() === gIdStr || String(sys.code).toLowerCase() === gIdStr || String(sys.label).toLowerCase() === gIdStr;
-      })) || null;
-      // Fallback: try matching by gender code if genderId doesn't match
-      var genderCodeStr = (firstGender === null || firstGender === void 0 ? void 0 : firstGender.code) || (firstGender === null || firstGender === void 0 ? void 0 : firstGender.display) || v.gender;
-      if (!genderVal && genderCodeStr) {
+    if (rawGender) {
+      var firstGender = Array.isArray(rawGender) ? rawGender[0] : _typeof(rawGender) === "object" ? rawGender : null;
+      if (firstGender && _typeof(firstGender) === "object") {
+        var _state$gender2;
+        // Populated object — try matching by _id first, then by code
+        var gId = getRawId$3(firstGender._id || firstGender._key || "");
+        var gCode = (firstGender.code || "").toLowerCase();
+        var gDisplay = (firstGender.display || firstGender.shortdesc || "").toLowerCase();
+        genderVal = (state === null || state === void 0 || (_state$gender2 = state.gender) === null || _state$gender2 === void 0 || (_state$gender2 = _state$gender2.data) === null || _state$gender2 === void 0 ? void 0 : _state$gender2.find(function (sys) {
+          return getRawId$3(sys.value) === gId || String(sys.code || "").toLowerCase() === gCode || String(sys.label || "").toLowerCase() === gDisplay;
+        })) || {
+          _id: gId,
+          value: gId,
+          label: firstGender.display || firstGender.shortdesc || gId
+        };
+      } else {
         var _state$gender3;
-        var gCodeStr = String(genderCodeStr).toLowerCase();
+        // Legacy: raw ID / code string
+        var gIdStr = String(rawGender).toLowerCase();
         genderVal = (state === null || state === void 0 || (_state$gender3 = state.gender) === null || _state$gender3 === void 0 || (_state$gender3 = _state$gender3.data) === null || _state$gender3 === void 0 ? void 0 : _state$gender3.find(function (sys) {
-          return getRawId$3(sys.value).toLowerCase() === gCodeStr || String(sys.code).toLowerCase() === gCodeStr || String(sys.label).toLowerCase() === gCodeStr;
-        })) || null;
-      }
-      // If still not found, fallback to 'Other' option from the list
-      if (!genderVal) {
-        var _state$gender4;
-        genderVal = (state === null || state === void 0 || (_state$gender4 = state.gender) === null || _state$gender4 === void 0 || (_state$gender4 = _state$gender4.data) === null || _state$gender4 === void 0 ? void 0 : _state$gender4.find(function (sys) {
-          return String(sys.code).toLowerCase() === "other" || String(sys.label).toLowerCase() === "other";
+          return getRawId$3(sys.value).toLowerCase() === gIdStr || String(sys.code || "").toLowerCase() === gIdStr || String(sys.label || "").toLowerCase() === gIdStr;
         })) || null;
       }
     }
 
-    // ageRange: QDM returns agerangecode as a code (e.g. "AGEMONTHTEST"), agerangeId as the _id (e.g. "10004")
+    // ── age range ─────────────────────────────────────────────────────────────
     var ageRangeIdRaw = v.agerangeId || v.agerangecode;
     var ageRangeVal = null;
     if (ageRangeIdRaw) {
-      var firstAgeRange = _typeof(ageRangeIdRaw) === "object" && ageRangeIdRaw !== null ? ageRangeIdRaw._id || ageRangeIdRaw.value || ageRangeIdRaw.id || ageRangeIdRaw.agerangecode || "" : ageRangeIdRaw;
-      var cleanAgeRangeId = getRawId$3(firstAgeRange);
-      if (cleanAgeRangeId) {
+      var cleanAgeRangeId = "";
+      if (_typeof(ageRangeIdRaw) === "object" && ageRangeIdRaw !== null) {
         var _state$ageranges_code2;
+        // Populated object: { _id, agerangecode, shortdesc, … }
+        cleanAgeRangeId = getRawId$3(ageRangeIdRaw._id || ageRangeIdRaw._key || ageRangeIdRaw.agerangecode || "");
+        var arLabel = ageRangeIdRaw.shortdesc || ageRangeIdRaw.longdesc || ageRangeIdRaw.agerangecode || cleanAgeRangeId;
         ageRangeVal = (state === null || state === void 0 || (_state$ageranges_code2 = state.ageranges_code) === null || _state$ageranges_code2 === void 0 || (_state$ageranges_code2 = _state$ageranges_code2.data) === null || _state$ageranges_code2 === void 0 ? void 0 : _state$ageranges_code2.find(function (sys) {
           return getRawId$3(sys.value) === cleanAgeRangeId;
-        })) || null;
+        })) || {
+          _id: cleanAgeRangeId,
+          value: cleanAgeRangeId,
+          label: arLabel
+        };
+      } else {
+        cleanAgeRangeId = getRawId$3(String(ageRangeIdRaw));
+        if (cleanAgeRangeId) {
+          var _state$ageranges_code3;
+          ageRangeVal = (state === null || state === void 0 || (_state$ageranges_code3 = state.ageranges_code) === null || _state$ageranges_code3 === void 0 || (_state$ageranges_code3 = _state$ageranges_code3.data) === null || _state$ageranges_code3 === void 0 ? void 0 : _state$ageranges_code3.find(function (sys) {
+            return getRawId$3(sys.value) === cleanAgeRangeId;
+          })) || null;
+        }
       }
     }
     return {
@@ -10870,14 +10938,15 @@ var getDiagGroup = function getDiagGroup(data) {
   var arrData = Array.isArray(data) ? data : [data];
   return arrData.map(function (v) {
     if (_typeof(v) === "object" && v !== null) {
+      var cleanId = v._id ? getRawId$3(v._id) : "";
       return {
         label: String(v.icdname || v.label || v._id || v.value || ""),
-        value: v._id || v.value || ""
+        value: cleanId
       };
     } else {
       return {
         label: String(v),
-        value: String(v)
+        value: getRawId$3(String(v))
       };
     }
   });
@@ -11386,10 +11455,6 @@ var READ_VITAL_APPLICABLE = createAsyncThunk("vitalApplicableApiSlice/vitalsappl
     state,
     ccState,
     data,
-    rawList,
-    resVal,
-    firstKey,
-    innerVal,
     res,
     _args1 = arguments,
     _t1;
@@ -11408,28 +11473,7 @@ var READ_VITAL_APPLICABLE = createAsyncThunk("vitalApplicableApiSlice/vitalsappl
         }, __baseUrl__$1);
       case 2:
         data = _context1.v;
-        rawList = [];
-        if (Array.isArray(data)) {
-          rawList = data;
-        } else if (data) {
-          rawList = [data];
-        }
-        if (rawList.length > 0 && rawList[0]) {
-          if (rawList[0].result !== undefined) {
-            resVal = rawList[0].result;
-            rawList = Array.isArray(resVal) ? resVal : [resVal];
-          } else {
-            firstKey = Object.keys(rawList[0])[0];
-            if (firstKey && firstKey.startsWith("vitalsApplicable")) {
-              innerVal = rawList[0][firstKey];
-              rawList = Array.isArray(innerVal) ? innerVal : [innerVal];
-            }
-          }
-        }
-        if (Array.isArray(rawList[0])) {
-          rawList = rawList[0];
-        }
-        res = generateApplicableResJson(rawList, ccState);
+        res = generateApplicableResJson(data, ccState);
         return _context1.a(2, _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
           data: res
         }));
@@ -12933,10 +12977,10 @@ var vitalsMasterSectionActions = {
 var vitalsMasterSectionSlice$1 = vitalsMasterSectionSlice.reducer;
 
 var getActiveDbName$1 = function getActiveDbName() {
-  return dbName || _dbName || getBinderEnv("REACT_APP_DATABASE_NAME");
+  return dbName || _dbName || getBinderEnv("REACT_APP_APPNAME");
 };
 var getActiveMetadataDbName$1 = function getActiveMetadataDbName() {
-  return metaDatadbName$1 || getBinderEnv("REACT_APP_METADATA_DB_NAME");
+  return metaDatadbName$1 || getBinderEnv("REACT_APP_META_APP_NAME");
 };
 var getActiveMetadataId$1 = function getActiveMetadataId() {
   return metaDataId$1 || getBinderEnv("REACT_APP_METADATAID");
@@ -13019,14 +13063,15 @@ var queries$n = {
       metadata_dbname: getActiveMetadataDbName$1()
     }, doc)];
   },
-  locationtree: function locationtree(search, page, perPage) {
+  locationtree: function locationtree(search, page, perPage, facilityid) {
     return {
       appcode: getActiveDbName$1(),
       requestid: query_ids.location_tree,
       filter: {
         search: search ? "%".concat(search, "%") : "",
         page: page,
-        perPage: perPage
+        perPage: perPage,
+        facilityid: facilityid || ""
       }
     };
   },
@@ -13397,6 +13442,8 @@ var LOCATION_TREE_READ = createAsyncThunk("locationApiSlice/locationtree", /*#__
     page,
     _payload$perPage,
     perPage,
+    _payload$facilityid,
+    facilityid,
     data,
     _args4 = arguments,
     _t4;
@@ -13406,16 +13453,17 @@ var LOCATION_TREE_READ = createAsyncThunk("locationApiSlice/locationtree", /*#__
         payload = _args4.length > 0 && _args4[0] !== undefined ? _args4[0] : {};
         _ref8 = _args4.length > 1 ? _args4[1] : undefined, rejectWithValue = _ref8.rejectWithValue;
         _context4.p = 1;
-        _payload$search = payload.search, search = _payload$search === void 0 ? "" : _payload$search, _payload$page = payload.page, page = _payload$page === void 0 ? 0 : _payload$page, _payload$perPage = payload.perPage, perPage = _payload$perPage === void 0 ? 10 : _payload$perPage;
+        _payload$search = payload.search, search = _payload$search === void 0 ? "" : _payload$search, _payload$page = payload.page, page = _payload$page === void 0 ? 0 : _payload$page, _payload$perPage = payload.perPage, perPage = _payload$perPage === void 0 ? 10 : _payload$perPage, _payload$facilityid = payload.facilityid, facilityid = _payload$facilityid === void 0 ? "" : _payload$facilityid;
         _context4.n = 2;
         return fetchData({
-          body: JSON.stringify(queries$n.locationtree(search, page, perPage))
+          body: JSON.stringify(queries$n.locationtree(search, page, perPage, facilityid))
         }, __baseUrl__$1);
       case 2:
         data = _context4.v;
         return _context4.a(2, _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
           data: data,
-          page: page
+          page: page,
+          facilityid: facilityid
         }));
       case 3:
         _context4.p = 3;
@@ -13493,10 +13541,19 @@ var locationSlice = createSlice({
     builder.addCase(LOCATION_TREE_READ.fulfilled, function (state, action) {
       state.location_tree.loading = false;
       state.location_tree.error = false;
+      var facilityid = action.payload.facilityid;
+      if (facilityid) {
+        // Facility drill-down (triggered by expanding one node): the result
+        // belongs to that one node only. It is consumed directly from this
+        // thunk's resolved payload by whichever component requested it -
+        // the shared top-level tree list is deliberately left untouched here,
+        // so a single expand can never affect any other facility's data.
+        return;
+      }
+      var currentData = state.location_tree.data || [];
+      var newData = action.payload.data || [];
       var isLoadMore = action.payload.page > 0;
       if (isLoadMore) {
-        var currentData = state.location_tree.data || [];
-        var newData = action.payload.data || [];
         var mergedData = _toConsumableArray(currentData);
         newData.forEach(function (newOrgObj) {
           var orgName = Object.keys(newOrgObj)[0];
@@ -13504,7 +13561,18 @@ var locationSlice = createSlice({
             return Object.keys(org)[0] === orgName;
           });
           if (existingOrgIndex !== -1) {
-            mergedData[existingOrgIndex][orgName] = [].concat(_toConsumableArray(mergedData[existingOrgIndex][orgName]), _toConsumableArray(newOrgObj[orgName]));
+            var existingItems = mergedData[existingOrgIndex][orgName];
+            // De-duped by id: a later page re-returning an item already on
+            // an earlier page (e.g. an off-by-one on the backend) must not
+            // add a second copy of it here.
+            var existingIds = new Set(existingItems.map(function (it) {
+              return it._id || it._key || it.locationID;
+            }));
+            var newItems = (newOrgObj[orgName] || []).filter(function (it) {
+              var id = it._id || it._key || it.locationID;
+              return id === undefined || !existingIds.has(id);
+            });
+            mergedData[existingOrgIndex][orgName] = [].concat(_toConsumableArray(existingItems), _toConsumableArray(newItems));
           } else {
             mergedData.push(newOrgObj);
           }
@@ -13516,11 +13584,21 @@ var locationSlice = createSlice({
         state.location_tree = action.payload;
       }
     });
-    builder.addCase(LOCATION_TREE_READ.pending, function (state) {
+    builder.addCase(LOCATION_TREE_READ.pending, function (state, action) {
+      var _action$meta;
+      // A per-facility drill-down (triggered by expanding one node) shows its
+      // own local spinner in that node - it must not flip the whole-tree
+      // loading flag, which would blank out the already-rendered list.
+      if ((_action$meta = action.meta) !== null && _action$meta !== void 0 && (_action$meta = _action$meta.arg) !== null && _action$meta !== void 0 && _action$meta.facilityid) return;
       state.location_tree.loading = true;
       state.location_tree.error = false;
     });
     builder.addCase(LOCATION_TREE_READ.rejected, function (state, action) {
+      var _action$meta2;
+      // Same reasoning as .pending: a failed facility drill-down must not
+      // wipe out the rest of the already-loaded tree. The component reads
+      // the rejection off the dispatch promise itself to show a per-node error.
+      if ((_action$meta2 = action.meta) !== null && _action$meta2 !== void 0 && (_action$meta2 = _action$meta2.arg) !== null && _action$meta2 !== void 0 && _action$meta2.facilityid) return;
       state.location_tree.loading = false;
       state.location_tree.error = true;
       state.location_tree = action.payload;
@@ -17766,7 +17844,7 @@ var queries$l = {
     return {
       appcode: dbName,
       requestid: "9d2753a8-4c3e-4b21-817a-5b4d1101e4a1",
-      request: {
+      filter: {
         page: page,
         perPage: perPage,
         search: search,
@@ -18867,10 +18945,12 @@ var queries$j = {
       }
     };
   },
-  holiday_master: {
-    holiday_type: "{\n      \"appcode\": \"".concat(_dbName, "\",\n      \"requestid\": \"49d3a86e-226d-4d76-9160-0e93e56c9dea\",\n      \"filter\": {\n        \"type\": \"HOLIDAYTYPE\"\n      }      \n    }"),
-    entity_name: "{\n      \"appcode\":\"".concat(_dbName, "\",\n      \"requestid\": \"79a77938-7200-48db-8f69-462c46ffd447\"      \n    }"),
-    entity_type: "{\n      \"appcode\":\"".concat(_dbName, "\",\n      \"requestid\": \"09335a68-08b0-48b2-ad47-58ffbb5fef33\",\n      \"filter\": {\n        \"type\": \"ORGTYPE\"\n      }\n    }")
+  holiday_master: function holiday_master() {
+    return {
+      holiday_type: "{\n      \"appcode\": \"".concat(dbName, "\",\n      \"requestid\": \"49d3a86e-226d-4d76-9160-0e93e56c9dea\",\n      \"filter\": {\n        \"type\": \"HOLIDAYTYPE\"\n      }      \n    }"),
+      entity_name: "{\n      \"appcode\":\"".concat(dbName, "\",\n      \"requestid\": \"79a77938-7200-48db-8f69-462c46ffd447\"      \n    }"),
+      entity_type: "{\n      \"appcode\":\"".concat(dbName, "\",\n      \"requestid\": \"09335a68-08b0-48b2-ad47-58ffbb5fef33\",\n      \"filter\": {\n        \"type\": \"ORGTYPE\"\n      }\n    }")
+    };
   },
   appointment_type_read: function appointment_type_read(page, perPage, search) {
     return "{\n    \"appcode\": \"".concat(dbName, "\",\n    \"filter\": {\n      \"type\": \"APPTYPE\",\n      \"search\": \"").concat(search || "", "\",\n      \"status\": true,\n      \"activestatus\": true\n    },\n    \"limit\": {\n         \"offset\": ").concat(page, ",\n         \"count\": ").concat(perPage, "\n    }\n}");
@@ -19259,17 +19339,18 @@ var HOLIDAY_SINGLE_READ_SELECTED_QDM = createAsyncThunk("holidaySlice/holidaySin
 var loopMasters$8 = function loopMasters() {
   return new es6Promise.Promise(/*#__PURE__*/function () {
     var _ref9 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee6(resolve, reject) {
-      var calls;
+      var masters, calls;
       return _regenerator().w(function (_context6) {
         while (1) switch (_context6.n) {
           case 0:
-            calls = Object.keys(queries$j.holiday_master).map(/*#__PURE__*/function () {
+            masters = queries$j.holiday_master();
+            calls = Object.keys(masters).map(/*#__PURE__*/function () {
               var _ref0 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee5(val) {
                 return _regenerator().w(function (_context5) {
                   while (1) switch (_context5.n) {
                     case 0:
                       _context5.n = 1;
-                      return fetchMaster$8(val, queries$j.holiday_master[val]);
+                      return fetchMaster$8(val, masters[val]);
                     case 1:
                       return _context5.a(2, _context5.v);
                   }
@@ -19283,22 +19364,36 @@ var loopMasters$8 = function loopMasters() {
               var json = {};
               data.map(function (val) {
                 var arr = [];
-                val.data.map(function (value) {
+                var responseData = val.data || [];
+                if (Array.isArray(responseData) && responseData.length > 0) {
+                  var firstItem = responseData[0];
+                  if (firstItem && _typeof(firstItem) === "object" && !firstItem._id && !firstItem._key) {
+                    var _firstItem$keys$;
+                    var keys = Object.keys(firstItem);
+                    if (keys.length === 1 && (_firstItem$keys$ = firstItem[keys[0]]) !== null && _firstItem$keys$ !== void 0 && _firstItem$keys$.Value) {
+                      responseData = firstItem[keys[0]].Value;
+                    } else if (firstItem.result) {
+                      responseData = firstItem.result;
+                    }
+                  }
+                }
+                if (!Array.isArray(responseData)) responseData = [];
+                responseData.map(function (value) {
                   if (["entity_name"].indexOf(val.name) === 0) {
                     arr.push(_objectSpread2({
-                      label: value.name ? value.name : "",
-                      value: value.OrgID ? value.OrgID : ""
+                      label: value.name ? value.name : value.display || "",
+                      value: value.OrgID ? value.OrgID : value._id || ""
                     }, value));
                   } else {
                     arr.push(_objectSpread2({
-                      label: value.coding ? value.coding[0] ? value.coding[0].display : "" : val,
+                      label: value.coding && value.coding[0] ? value.coding[0].display || "" : value.display || "",
                       value: value._id
                     }, value));
                   }
                 });
                 json[val.name] = arr;
-                resolve(json);
               });
+              resolve(json);
             })["catch"](function (err) {
               resolve([]);
               console.log(err);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "primary_care_admin_binder",
-  "version": "0.1.201",
+  "version": "0.1.203",
   "description": "",
   "main": "dist/index.cjs.js",
   "module": "dist/index.esm.js",