@medplum/react 2.0.20 → 2.0.21

package/dist/esm/utils/date.mjs

@@ -5,8 +5,8 @@
  */
 function sortByDateAndPriority(resources, timelineResource) {
     resources.sort((a, b) => {
-        const priority1 = getPriorityScore(a);
-        const priority2 = getPriorityScore(b);
+        const priority1 = getPriorityScore(a, timelineResource);
+        const priority2 = getPriorityScore(b, timelineResource);
         if (priority1 > priority2) {
             return 1;
         }
@@ -16,10 +16,13 @@ function sortByDateAndPriority(resources, timelineResource) {
         return getTime(a, timelineResource) - getTime(b, timelineResource);
     });
 }
-function getPriorityScore(resource) {
-    const priority = resource.priority;
-    if (typeof priority === 'string') {
-        return { stat: 4, asap: 3, urgent: 2 }[priority] || 0;
+function getPriorityScore(resource, timelineResource) {
+    if (!isSameResourceType(resource, timelineResource)) {
+        // Only use priority if not the primary resource of a timeline view.
+        const priority = resource.priority;
+        if (typeof priority === 'string') {
+            return { stat: 4, asap: 3, urgent: 2 }[priority] || 0;
+        }
     }
     return 0;
 }

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 * @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;;;;"}
+{"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, timelineResource);\n    const priority2 = getPriorityScore(b, timelineResource);\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, timelineResource: Resource | undefined): number {\n  if (!isSameResourceType(resource, timelineResource)) {\n    // Only use priority if not the primary resource of a timeline view.\n\n    const priority = (resource as any).priority;\n    if (typeof priority === 'string') {\n      return { stat: 4, asap: 3, urgent: 2 }[priority] || 0;\n    }\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;QAClD,MAAM,SAAS,GAAG,gBAAgB,CAAC,CAAC,EAAE,gBAAgB,CAAC,CAAC;QACxD,MAAM,SAAS,GAAG,gBAAgB,CAAC,CAAC,EAAE,gBAAgB,CAAC,CAAC;QACxD,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,EAAE,gBAAsC,EAAA;AAClF,IAAA,IAAI,CAAC,kBAAkB,CAAC,QAAQ,EAAE,gBAAgB,CAAC,EAAE;;AAGnD,QAAA,MAAM,QAAQ,GAAI,QAAgB,CAAC,QAAQ,CAAC;AAC5C,QAAA,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE;AAChC,YAAA,OAAO,EAAE,IAAI,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;AACvD,SAAA;AACF,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/dist/types/AppShell/Header.d.ts

@@ -1,5 +1,7 @@
 import React from 'react';
 interface HeaderProps {
+    pathname?: string;
+    searchParams?: URLSearchParams;
     logo: React.ReactNode;
     version?: string;
     navbarToggle: () => void;

package/dist/types/AppShell/HeaderSearchInput.d.ts

@@ -3,5 +3,6 @@ import { Patient, ServiceRequest } from '@medplum/fhirtypes';
 export type HeaderSearchTypes = Patient | ServiceRequest;
 export interface HeaderSearchInputProps {
     pathname?: string;
+    searchParams?: URLSearchParams;
 }
 export declare function HeaderSearchInput(props: HeaderSearchInputProps): JSX.Element;

package/dist/types/Timeline/Timeline.d.ts

@@ -8,6 +8,7 @@ export declare function Timeline(props: TimelineProps): JSX.Element;
 export interface TimelineItemProps extends PanelProps {
     resource: Resource;
     profile?: Reference;
+    dateTime?: string;
     padding?: boolean;
     popupMenuItems?: React.ReactNode;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@medplum/react",
-  "version": "2.0.20",
+  "version": "2.0.21",
   "description": "Medplum React Component Library",
   "author": "Medplum <hello@medplum.com>",
   "license": "Apache-2.0",