@medplum/react 2.0.1 → 2.0.3

package/dist/esm/utils/date.mjs

@@ -1,20 +1,20 @@
 /**
  * Sorts an array of resources in place by meta.lastUpdated ascending.
  * @param resources Array of resources.
+ * @param timelineResource Optional primary resource of a timeline view. If specified, the primary resource will be sorted by meta.lastUpdated descending.
  */
-function sortByDateAndPriority(resources) {
-    resources.sort(resourceDateComparator);
-}
-function resourceDateComparator(a, b) {
-    const priority1 = getPriorityScore(a);
-    const priority2 = getPriorityScore(b);
-    if (priority1 > priority2) {
-        return 1;
-    }
-    if (priority1 < priority2) {
-        return -1;
-    }
-    return getTime(a) - getTime(b);
+function sortByDateAndPriority(resources, timelineResource) {
+    resources.sort((a, b) => {
+        const priority1 = getPriorityScore(a);
+        const priority2 = getPriorityScore(b);
+        if (priority1 > priority2) {
+            return 1;
+        }
+        if (priority1 < priority2) {
+            return -1;
+        }
+        return getTime(a, timelineResource) - getTime(b, timelineResource);
+    });
 }
 function getPriorityScore(resource) {
     const priority = resource.priority;
@@ -23,18 +23,21 @@ function getPriorityScore(resource) {
     }
     return 0;
 }
-function getTime(resource) {
-    if (resource.resourceType === 'Communication' && resource.sent) {
-        return new Date(resource.sent).getTime();
-    }
-    if ((resource.resourceType === 'DiagnosticReport' ||
-        resource.resourceType === 'Media' ||
-        resource.resourceType === 'Observation') &&
-        resource.issued) {
-        return new Date(resource.issued).getTime();
-    }
-    if (resource.resourceType === 'DocumentReference' && resource.date) {
-        return new Date(resource.date).getTime();
+function getTime(resource, timelineResource) {
+    if (!isSameResourceType(resource, timelineResource)) {
+        // Only use special case timestamps if not the primary resource of a timeline view.
+        if (resource.resourceType === 'Communication' && resource.sent) {
+            return new Date(resource.sent).getTime();
+        }
+        if ((resource.resourceType === 'DiagnosticReport' ||
+            resource.resourceType === 'Media' ||
+            resource.resourceType === 'Observation') &&
+            resource.issued) {
+            return new Date(resource.issued).getTime();
+        }
+        if (resource.resourceType === 'DocumentReference' && resource.date) {
+            return new Date(resource.date).getTime();
+        }
     }
     const dateTime = resource.meta?.lastUpdated;
     if (!dateTime) {
@@ -42,6 +45,9 @@ function getTime(resource) {
     }
     return new Date(dateTime).getTime();
 }
+function isSameResourceType(a, b) {
+    return !!b && a.resourceType === b.resourceType && a.id === b.id;
+}
 
 export { sortByDateAndPriority };
 //# sourceMappingURL=date.mjs.map

package/dist/esm/utils/date.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"date.mjs","sources":["../../../src/utils/date.ts"],"sourcesContent":["import { Resource } from '@medplum/fhirtypes';\n\n/**\n * Sorts an array of resources in place by meta.lastUpdated ascending.\n * @param resources Array of resources.\n */\nexport function sortByDateAndPriority(resources: Resource[]): void {\n  resources.sort(resourceDateComparator);\n}\n\nfunction resourceDateComparator(a: Resource, b: Resource): number {\n  const priority1 = getPriorityScore(a);\n  const priority2 = getPriorityScore(b);\n  if (priority1 > priority2) {\n    return 1;\n  }\n  if (priority1 < priority2) {\n    return -1;\n  }\n  return getTime(a) - getTime(b);\n}\n\nfunction getPriorityScore(resource: Resource): number {\n  const priority = (resource as any).priority;\n  if (typeof priority === 'string') {\n    return { stat: 4, asap: 3, urgent: 2 }[priority] || 0;\n  }\n  return 0;\n}\n\nfunction getTime(resource: Resource): number {\n  if (resource.resourceType === 'Communication' && resource.sent) {\n    return new Date(resource.sent).getTime();\n  }\n\n  if (\n    (resource.resourceType === 'DiagnosticReport' ||\n      resource.resourceType === 'Media' ||\n      resource.resourceType === 'Observation') &&\n    resource.issued\n  ) {\n    return new Date(resource.issued).getTime();\n  }\n\n  if (resource.resourceType === 'DocumentReference' && resource.date) {\n    return new Date(resource.date).getTime();\n  }\n\n  const dateTime = resource.meta?.lastUpdated;\n  if (!dateTime) {\n    return 0;\n  }\n  return new Date(dateTime).getTime();\n}\n"],"names":[],"mappings":"AAEA;;;AAGG;AACG,SAAU,qBAAqB,CAAC,SAAqB,EAAA;AACzD,IAAA,SAAS,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;AACzC,CAAC;AAED,SAAS,sBAAsB,CAAC,CAAW,EAAE,CAAW,EAAA;AACtD,IAAA,MAAM,SAAS,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAAC;AACtC,IAAA,MAAM,SAAS,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAAC;IACtC,IAAI,SAAS,GAAG,SAAS,EAAE;AACzB,QAAA,OAAO,CAAC,CAAC;AACV,KAAA;IACD,IAAI,SAAS,GAAG,SAAS,EAAE;QACzB,OAAO,CAAC,CAAC,CAAC;AACX,KAAA;IACD,OAAO,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;AACjC,CAAC;AAED,SAAS,gBAAgB,CAAC,QAAkB,EAAA;AAC1C,IAAA,MAAM,QAAQ,GAAI,QAAgB,CAAC,QAAQ,CAAC;AAC5C,IAAA,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE;AAChC,QAAA,OAAO,EAAE,IAAI,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;AACvD,KAAA;AACD,IAAA,OAAO,CAAC,CAAC;AACX,CAAC;AAED,SAAS,OAAO,CAAC,QAAkB,EAAA;IACjC,IAAI,QAAQ,CAAC,YAAY,KAAK,eAAe,IAAI,QAAQ,CAAC,IAAI,EAAE;QAC9D,OAAO,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC;AAC1C,KAAA;AAED,IAAA,IACE,CAAC,QAAQ,CAAC,YAAY,KAAK,kBAAkB;QAC3C,QAAQ,CAAC,YAAY,KAAK,OAAO;AACjC,QAAA,QAAQ,CAAC,YAAY,KAAK,aAAa;QACzC,QAAQ,CAAC,MAAM,EACf;QACA,OAAO,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,CAAC;AAC5C,KAAA;IAED,IAAI,QAAQ,CAAC,YAAY,KAAK,mBAAmB,IAAI,QAAQ,CAAC,IAAI,EAAE;QAClE,OAAO,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC;AAC1C,KAAA;AAED,IAAA,MAAM,QAAQ,GAAG,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;IAC5C,IAAI,CAAC,QAAQ,EAAE;AACb,QAAA,OAAO,CAAC,CAAC;AACV,KAAA;IACD,OAAO,IAAI,IAAI,CAAC,QAAQ,CAAC,CAAC,OAAO,EAAE,CAAC;AACtC;;;;"}
+{"version":3,"file":"date.mjs","sources":["../../../src/utils/date.ts"],"sourcesContent":["import { Resource } from '@medplum/fhirtypes';\n\n/**\n * Sorts an array of resources in place by meta.lastUpdated ascending.\n * @param resources Array of resources.\n * @param timelineResource Optional primary resource of a timeline view. If specified, the primary resource will be sorted by meta.lastUpdated descending.\n */\nexport function sortByDateAndPriority(resources: Resource[], timelineResource?: Resource): void {\n  resources.sort((a: Resource, b: Resource): number => {\n    const priority1 = getPriorityScore(a);\n    const priority2 = getPriorityScore(b);\n    if (priority1 > priority2) {\n      return 1;\n    }\n    if (priority1 < priority2) {\n      return -1;\n    }\n    return getTime(a, timelineResource) - getTime(b, timelineResource);\n  });\n}\n\nfunction getPriorityScore(resource: Resource): number {\n  const priority = (resource as any).priority;\n  if (typeof priority === 'string') {\n    return { stat: 4, asap: 3, urgent: 2 }[priority] || 0;\n  }\n  return 0;\n}\n\nfunction getTime(resource: Resource, timelineResource: Resource | undefined): number {\n  if (!isSameResourceType(resource, timelineResource)) {\n    // Only use special case timestamps if not the primary resource of a timeline view.\n\n    if (resource.resourceType === 'Communication' && resource.sent) {\n      return new Date(resource.sent).getTime();\n    }\n\n    if (\n      (resource.resourceType === 'DiagnosticReport' ||\n        resource.resourceType === 'Media' ||\n        resource.resourceType === 'Observation') &&\n      resource.issued\n    ) {\n      return new Date(resource.issued).getTime();\n    }\n\n    if (resource.resourceType === 'DocumentReference' && resource.date) {\n      return new Date(resource.date).getTime();\n    }\n  }\n\n  const dateTime = resource.meta?.lastUpdated;\n  if (!dateTime) {\n    return 0;\n  }\n  return new Date(dateTime).getTime();\n}\n\nfunction isSameResourceType(a: Resource, b: Resource | undefined): boolean {\n  return !!b && a.resourceType === b.resourceType && a.id === b.id;\n}\n"],"names":[],"mappings":"AAEA;;;;AAIG;AACa,SAAA,qBAAqB,CAAC,SAAqB,EAAE,gBAA2B,EAAA;IACtF,SAAS,CAAC,IAAI,CAAC,CAAC,CAAW,EAAE,CAAW,KAAY;AAClD,QAAA,MAAM,SAAS,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAAC;AACtC,QAAA,MAAM,SAAS,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAAC;QACtC,IAAI,SAAS,GAAG,SAAS,EAAE;AACzB,YAAA,OAAO,CAAC,CAAC;AACV,SAAA;QACD,IAAI,SAAS,GAAG,SAAS,EAAE;YACzB,OAAO,CAAC,CAAC,CAAC;AACX,SAAA;AACD,QAAA,OAAO,OAAO,CAAC,CAAC,EAAE,gBAAgB,CAAC,GAAG,OAAO,CAAC,CAAC,EAAE,gBAAgB,CAAC,CAAC;AACrE,KAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,gBAAgB,CAAC,QAAkB,EAAA;AAC1C,IAAA,MAAM,QAAQ,GAAI,QAAgB,CAAC,QAAQ,CAAC;AAC5C,IAAA,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE;AAChC,QAAA,OAAO,EAAE,IAAI,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;AACvD,KAAA;AACD,IAAA,OAAO,CAAC,CAAC;AACX,CAAC;AAED,SAAS,OAAO,CAAC,QAAkB,EAAE,gBAAsC,EAAA;AACzE,IAAA,IAAI,CAAC,kBAAkB,CAAC,QAAQ,EAAE,gBAAgB,CAAC,EAAE;;QAGnD,IAAI,QAAQ,CAAC,YAAY,KAAK,eAAe,IAAI,QAAQ,CAAC,IAAI,EAAE;YAC9D,OAAO,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC;AAC1C,SAAA;AAED,QAAA,IACE,CAAC,QAAQ,CAAC,YAAY,KAAK,kBAAkB;YAC3C,QAAQ,CAAC,YAAY,KAAK,OAAO;AACjC,YAAA,QAAQ,CAAC,YAAY,KAAK,aAAa;YACzC,QAAQ,CAAC,MAAM,EACf;YACA,OAAO,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,CAAC;AAC5C,SAAA;QAED,IAAI,QAAQ,CAAC,YAAY,KAAK,mBAAmB,IAAI,QAAQ,CAAC,IAAI,EAAE;YAClE,OAAO,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC;AAC1C,SAAA;AACF,KAAA;AAED,IAAA,MAAM,QAAQ,GAAG,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;IAC5C,IAAI,CAAC,QAAQ,EAAE;AACb,QAAA,OAAO,CAAC,CAAC;AACV,KAAA;IACD,OAAO,IAAI,IAAI,CAAC,QAAQ,CAAC,CAAC,OAAO,EAAE,CAAC;AACtC,CAAC;AAED,SAAS,kBAAkB,CAAC,CAAW,EAAE,CAAuB,EAAA;AAC9D,IAAA,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,YAAY,KAAK,CAAC,CAAC,YAAY,IAAI,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,EAAE,CAAC;AACnE;;;;"}

package/icons-unique.txt

@@ -0,0 +1,36 @@
+IconAdjustmentsHorizontal
+IconAlertCircle
+IconBleach
+IconBleachOff
+IconBoxMultiple
+IconBracketsContain
+IconBucket
+IconBucketOff
+IconCalendar
+IconCheck
+IconCheckbox
+IconCircleMinus
+IconCirclePlus
+IconCloudUpload
+IconColumns
+IconCurrencyDollar
+IconDots
+IconEdit
+IconEqual
+IconEqualNot
+IconFileAlert
+IconFilePlus
+IconFilter
+IconListDetails
+IconMathGreater
+IconMathLower
+IconMessage
+IconPin
+IconPinnedOff
+IconSettings
+IconSortAscending
+IconSortDescending
+IconSquare
+IconTableExport
+IconTrash
+IconX

package/icons.txt

@@ -0,0 +1,44 @@
+IconCircleMinus
+IconCloudUpload
+IconCloudUpload
+IconAlertCircle
+IconAlertCircle
+IconCurrencyDollar
+IconAlertCircle
+IconCircleMinus
+IconCirclePlus
+IconCheckbox
+IconSquare
+IconCircleMinus
+IconCirclePlus
+IconCheck
+IconCloudUpload
+IconEdit
+IconFileAlert
+IconListDetails
+IconMessage
+IconPin
+IconPinnedOff
+IconTrash
+IconAdjustmentsHorizontal
+IconBoxMultiple
+IconColumns
+IconFilePlus
+IconFilter
+IconTableExport
+IconTrash
+IconBleach
+IconBleachOff
+IconBracketsContain
+IconBucket
+IconBucketOff
+IconCalendar
+IconEqual
+IconEqualNot
+IconMathGreater
+IconMathLower
+IconSettings
+IconSortAscending
+IconSortDescending
+IconX
+IconDots

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@medplum/react",
-  "version": "2.0.1",
+  "version": "2.0.3",
   "description": "Medplum React Component Library",
   "author": "Medplum <hello@medplum.com>",
   "license": "Apache-2.0",
@@ -20,38 +20,38 @@
   },
   "devDependencies": {
     "@emotion/react": "11.10.5",
-    "@mantine/core": "5.10.2",
-    "@mantine/hooks": "5.10.2",
-    "@mantine/notifications": "5.10.2",
+    "@mantine/core": "5.10.3",
+    "@mantine/hooks": "5.10.3",
+    "@mantine/notifications": "5.10.3",
     "@medplum/core": "*",
     "@medplum/definitions": "*",
     "@medplum/fhirtypes": "*",
     "@medplum/mock": "*",
-    "@tabler/icons": "1.119.0",
     "@storybook/addon-actions": "6.5.16",
     "@storybook/addon-essentials": "6.5.16",
     "@storybook/addon-links": "6.5.16",
     "@storybook/builder-webpack5": "6.5.16",
     "@storybook/manager-webpack5": "6.5.16",
     "@storybook/react": "6.5.16",
+    "@svgr/rollup": "6.5.1",
+    "@tabler/icons-react": "2.3.0",
     "@testing-library/dom": "8.20.0",
     "@testing-library/jest-dom": "5.16.5",
     "@testing-library/react": "13.4.0",
     "@types/jest": "29.4.0",
-    "@types/node": "18.11.18",
-    "@types/react": "18.0.27",
+    "@types/node": "18.13.0",
+    "@types/react": "18.0.28",
     "@types/react-dom": "18.0.10",
     "@types/react-router-dom": "5.3.3",
     "dotenv-webpack": "8.0.1",
     "identity-obj-proxy": "3.0.0",
-    "jest": "29.4.1",
-    "jest-each": "29.4.1",
+    "jest": "29.4.2",
+    "jest-each": "29.4.2",
     "html-webpack-plugin": "5.5.0",
     "react": "18.2.0",
     "react-dom": "18.2.0",
-    "react-router-dom": "6.8.0",
     "rimraf": "4.1.2",
-    "typescript": "4.9.4"
+    "typescript": "4.9.5"
   },
   "peerDependencies": {
     "@emotion/react": "^11.10.4",
@@ -59,10 +59,8 @@
     "@mantine/hooks": "^5.4.0",
     "@mantine/notifications": "^5.4.0",
     "@medplum/core": "*",
-    "@tabler/icons": "^1.100.0",
     "react": "^17.0.2 || ^18.0.0",
-    "react-dom": "^17.0.2 || ^18.0.0",
-    "react-router-dom": "^6.2.2"
+    "react-dom": "^17.0.2 || ^18.0.0"
   },
   "peerDependenciesMeta": {
     "@emotion/react": {
@@ -76,9 +74,6 @@
     },
     "@mantine/notifications": {
       "optional": true
-    },
-    "@tabler/icons": {
-      "optional": true
     }
   },
   "main": "dist/cjs/index.cjs",