fhir-react 0.3.4 → 0.3.5

package/src/components/resources/MedicationStatement/MedicationStatement.test.js

@@ -19,7 +19,7 @@ describe('should render MedicationStatement component correctly', () => {
     expect(getByTestId('title').textContent).toContain(
       'amphetamine-dextroamphetamine',
     );
-    expect(getByTestId('hasEffectivePeriod').textContent).toContain('from');
+    expect(getByTestId('startDate').textContent).toContain('4/19/2016');
     expect(queryByTestId('medicationReference')).toBeNull();
 
     expect(getByTestId('dosageInstruction').textContent).toContain(
@@ -32,19 +32,35 @@ describe('should render MedicationStatement component correctly', () => {
       fhirResource: stu3Example,
       fhirVersion: fhirVersions.STU3,
     };
-    const { getByTestId, queryAllByTestId } = render(
+    const { getByTestId, queryAllByTestId, queryByTestId } = render(
       <MedicationStatement {...defaultProps} />,
     );
 
     expect(getByTestId('title').textContent).toEqual('Medication Statement');
-    expect(queryAllByTestId('hasEffectivePeriod')).toHaveLength(0);
+    expect(queryAllByTestId('startDate')).toHaveLength(0);
+    expect(queryAllByTestId('endDate')).toHaveLength(0);
 
     expect(getByTestId('dosageInstruction').textContent).toContain(
       '1-2 tablets once daily',
     );
 
-    expect(getByTestId('hasNote').textContent).toContain('occasional');
+    const ingredients = queryAllByTestId('ingredient-item').map(
+      x => x.textContent,
+    );
+    expect(ingredients).toHaveLength(2);
+    expect(ingredients).toEqual([
+      'Acetaminophen 500 MG',
+      'Diphenhydramine Hydrochloride 25 mg',
+    ]);
+
+    expect(getByTestId('dosageInstruction').textContent).toContain(
+      '1-2 tablets once daily at bedtime as needed for restless legs',
+    );
 
+    expect(queryByTestId('medicationReference').textContent).toContain(
+      '#med0309',
+    );
+    expect(getByTestId('hasNote').textContent).toContain('occasional');
     expect(getByTestId('hasReasonCode').textContent).toContain('Legs');
   });
 
@@ -58,14 +74,23 @@ describe('should render MedicationStatement component correctly', () => {
     );
 
     expect(getByTestId('title').textContent).toEqual('Medication Statement');
-    expect(queryAllByTestId('hasEffectivePeriod')).toHaveLength(0);
+    expect(queryAllByTestId('startDate')).toHaveLength(0);
+    expect(queryAllByTestId('endDate')).toHaveLength(0);
 
     expect(getByTestId('dosageInstruction').textContent).toContain(
       '1-2 tablets once daily',
     );
 
-    expect(getByTestId('hasNote').textContent).toContain('occasional');
+    const ingredients = queryAllByTestId('ingredient-item').map(
+      x => x.textContent,
+    );
+    expect(ingredients).toHaveLength(2);
+    expect(ingredients).toEqual([
+      'Acetaminophen 500 MG',
+      'Diphenhydramine Hydrochloride 25 mg',
+    ]);
 
+    expect(getByTestId('hasNote').textContent).toContain('occasional');
     expect(getByTestId('hasReasonCode').textContent).toContain('Legs');
     expect(getByTestId('medicationReference').textContent).toContain(
       '#med0309',

package/src/components/ui/bootstrap-reboot.min.css

@@ -173,8 +173,14 @@ sup {
 .fhir-resource kbd,
 .fhir-resource pre,
 .fhir-resource samp {
-  font-family: SFMono-Regular, Menlo, Monaco, Consolas, 'Liberation Mono',
-    'Courier New', monospace;
+  font-family:
+    SFMono-Regular,
+    Menlo,
+    Monaco,
+    Consolas,
+    'Liberation Mono',
+    'Courier New',
+    monospace;
   font-size: 1em;
 }
 

package/src/components/ui/index.js

@@ -225,6 +225,17 @@ export const MissingValue = () => (
   <span className="fhir-ui__MissingValue">-</span>
 );
 
+export const ValueSectionItem = props => {
+  return (
+    <div className="d-flex flex-column flex-sm-row my-2">
+      <div className="dataTable__value-label ps-0">
+        <Label>{props.label}</Label>
+      </div>
+      <Data data-testid={props['data-testid']}>{props.children}</Data>
+    </div>
+  );
+};
+
 export const NotEnoughData = props => (
   <div data-testid={props['data-testid']} className="fhir-ui__NotEnoughData">
     No additional data

package/src/fixtures/example-icons.jsx

@@ -1,6 +1,13 @@
 import React from 'react';
 
 export default {
+  Binary: (
+    <img
+      className="header-icon__image"
+      src={require('../assets/containers/Binary/binary.svg')}
+      alt="binary"
+    />
+  ),
   Condition: (
     <img
       className="header-icon__image"

package/src/style.scss

@@ -86,6 +86,7 @@ $enable-negative-margins: true;
   width: auto;
   @include media-breakpoint-up(sm) {
     width: 130px;
+    min-width: 130px;
   }
 }
 

package/src/utils/formatDate.js

@@ -1,7 +1,6 @@
 export const formatDate = (date, locale) => {
   const rawDate = new Date(date);
-  const usDate = rawDate.toLocaleDateString(locale, whichOptions(date));
-  return usDate;
+  return rawDate.toLocaleDateString(locale, whichOptions(date));
 };
 
 const whichOptions = date => {
@@ -9,13 +8,16 @@ const whichOptions = date => {
   const YEAR_MONTH_FORMAT = 'YYYY-MM';
 
   if (date.length === YEAR_FORMAT.length) {
-    return { year: 'numeric' };
+    return { year: 'numeric', timeZone: 'UTC' };
   }
   if (date.length <= YEAR_MONTH_FORMAT.length) {
     return {
       year: 'numeric',
       month: 'long',
+      timeZone: 'UTC',
     };
   }
-  return;
+  return {
+    timeZone: 'UTC',
+  };
 };

package/src/components/resources/AllergyIntolerance/AllergyIntolerance.css

@@ -1,4 +0,0 @@
-.fhir-resource__AllergyIntolerance__grouping {
-  display: flex;
-  align-items: center;
-}

package/src/components/resources/CarePlan/CarePlan.css

@@ -1,7 +0,0 @@
-.fhir-resource__CarePlan__activity {
-  margin-bottom: 0.5rem;
-}
-
-.fhir-resource__CarePlan__activity-title {
-  font-weight: bold;
-}