@eka-care/medical-records-ui 1.0.16 → 1.0.19

package/dist/index.js

@@ -334,7 +334,7 @@ function createDocumentTypeLabelResolver(types) {
   for (const t of _nullishCoalesce(types, () => ( []))) {
     if (t.id && t.display_name) fromConfig.set(t.id, t.display_name);
   }
-  return (code) => _nullishCoalesce(_nullishCoalesce(fromConfig.get(code), () => ( STATIC_LABELS[code])), () => ( code));
+  return (code) => _nullishCoalesce(_nullishCoalesce(fromConfig.get(code), () => ( STATIC_LABELS[code])), () => ( "Other"));
 }
 
 // src/components/icons/EmptyRecordsIcon.tsx
@@ -1467,10 +1467,9 @@ function useUploadConnection() {
         return id;
       });
       const batchRequests = items.map((it) => ({
-        dt: it.documentType,
-        dd_e: Math.floor(it.documentDateMs / 1e3),
-        // epoch seconds
-        ...it.tags && it.tags.length ? { tg: it.tags } : {},
+        documentType: it.documentType,
+        documentDate: Math.floor(it.documentDateMs / 1e3),
+        ...it.tags && it.tags.length ? { tags: it.tags } : {},
         ...it.caseIds && it.caseIds.length ? { cases: it.caseIds } : {},
         files: [
           {
@@ -1596,8 +1595,15 @@ function useCasesStatus(store) {
 
 
 // src/helpers/recordFilter.ts
-function recordMatchesFilters(r, filters, { skipType = false } = {}) {
-  if (!skipType && filters.type && r.typeCode !== filters.type) return false;
+var OTHER_TYPE_SENTINEL = "__other__";
+function recordMatchesFilters(r, filters, { skipType = false, labelOf } = {}) {
+  if (!skipType && filters.type) {
+    if (filters.type === OTHER_TYPE_SENTINEL) {
+      if (!labelOf || labelOf(r.typeCode) !== "Other") return false;
+    } else if (r.typeCode !== filters.type) {
+      return false;
+    }
+  }
   const search = filters.search.trim().toLowerCase();
   if (search && !r.title.toLowerCase().includes(search)) return false;
   if (filters.documentDateFrom != null && r.createdAtEpoch < filters.documentDateFrom) return false;
@@ -1612,14 +1618,14 @@ function recordMatchesFilters(r, filters, { skipType = false } = {}) {
 }
 
 // src/stores/selectors/filteredSelectors.ts
-function useFilteredRecordIds(store) {
+function useFilteredRecordIds(store, labelOf) {
   const ids = _zustand.useStore.call(void 0, store, (s) => s.records.ids);
   const byId = _zustand.useStore.call(void 0, store, (s) => s.records.byId);
   const filters = _zustand.useStore.call(void 0, store, (s) => s.filters);
   return _react.useMemo.call(void 0, () => {
     const filtered = ids.filter((id) => {
       const r = byId[id];
-      return r ? recordMatchesFilters(r, filters) : false;
+      return r ? recordMatchesFilters(r, filters, { labelOf }) : false;
     });
     const dir = filters.sortDir === "asc" ? 1 : -1;
     const sorted = [...filtered].sort((a, b) => {
@@ -1664,7 +1670,8 @@ function useCasesStatus2() {
   return useCasesStatus(useSdk().store);
 }
 function useFilteredRecordIds2() {
-  return useFilteredRecordIds(useSdk().store);
+  const { store, labelOf } = useSdk();
+  return useFilteredRecordIds(store, labelOf);
 }
 
 // src/views/RecordsView/FilterPopover.tsx
@@ -1706,7 +1713,22 @@ function FilterPopover({ onClose }) {
   const ids = _zustand.useStore.call(void 0, store, (s) => s.records.ids);
   const typeOptions = _react.useMemo.call(void 0, () => {
     const seen = /* @__PURE__ */ new Set();
-    return ids.map((id) => _optionalChain([byId, 'access', _44 => _44[id], 'optionalAccess', _45 => _45.typeCode])).filter((code) => !!code && !seen.has(code) && !!seen.add(code)).map((code) => ({ value: code, label: labelOf(code) }));
+    let hasOther = false;
+    const options = [];
+    for (const id of ids) {
+      const code = _optionalChain([byId, 'access', _44 => _44[id], 'optionalAccess', _45 => _45.typeCode]);
+      if (!code) continue;
+      const label = labelOf(code);
+      if (label === "Other") {
+        hasOther = true;
+        continue;
+      }
+      if (seen.has(code)) continue;
+      seen.add(code);
+      options.push({ value: code, label });
+    }
+    if (hasOther) options.push({ value: OTHER_TYPE_SENTINEL, label: "Other" });
+    return options;
   }, [ids, byId, labelOf]);
   const [docType, setDocType] = _react.useState.call(void 0, _nullishCoalesce(filters.type, () => ( "")));
   const [docPreset, setDocPreset] = _react.useState.call(void 0, filters.documentDatePreset);
@@ -1908,14 +1930,15 @@ function RecordsToolbar({
     for (const id of ids) {
       const r = byId[id];
       if (!r) continue;
-      if (!counts.has(r.typeCode)) counts.set(r.typeCode, 0);
-      if (recordMatchesFilters(r, filters, { skipType: true })) {
-        counts.set(r.typeCode, (_nullishCoalesce(counts.get(r.typeCode), () => ( 0))) + 1);
+      const key = labelOf(r.typeCode) === "Other" ? OTHER_TYPE_SENTINEL : r.typeCode;
+      if (!counts.has(key)) counts.set(key, 0);
+      if (recordMatchesFilters(r, filters, { skipType: true, labelOf })) {
+        counts.set(key, (_nullishCoalesce(counts.get(key), () => ( 0))) + 1);
       }
     }
     return [...counts.entries()].map(([code, count]) => ({
       code,
-      label: labelOf(code),
+      label: code === OTHER_TYPE_SENTINEL ? "Other" : labelOf(code),
       count
     }));
   }, [ids, byId, labelOf, filters]);