primary_care_admin_binder 0.1.202 → 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],
@@ -18916,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}");
@@ -19308,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);
                   }
@@ -19332,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.202",
+  "version": "0.1.203",
   "description": "",
   "main": "dist/index.cjs.js",
   "module": "dist/index.esm.js",