fhir-react 0.3.3 → 0.3.4

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

@@ -9,8 +9,80 @@ import example2_STU3 from '../../../fixtures/stu3/resources/encounter/example-2.
 import example1_R4 from '../../../fixtures/r4/resources/encounter/example1.json';
 import example2_R4 from '../../../fixtures/r4/resources/encounter/example2.json';
 import example3_R4 from '../../../fixtures/r4/resources/encounter/example3.json';
+import fhirIcons from '../../../fixtures/example-icons';
 
 describe('should render component correctly', () => {
+  it('component without a fhirIcons props should render a default icon', () => {
+    const defaultProps = {
+      fhirVersion: fhirVersions.DSTU2,
+      fhirResource: example1,
+    };
+
+    const { getByAltText } = render(<Encounter {...defaultProps} />);
+    const headerIcon = getByAltText('encounter');
+
+    expect(headerIcon.getAttribute('src')).toContain('IMAGE_MOCK');
+  });
+
+  it('component with a false as a fhirIcons props should render a placeholder', () => {
+    const defaultProps = {
+      fhirVersion: fhirVersions.DSTU2,
+      fhirResource: example1,
+      fhirIcons: false,
+    };
+
+    const { getByTestId } = render(<Encounter {...defaultProps} />);
+    const headerIcon = getByTestId('placeholder');
+
+    expect(headerIcon).toBeTruthy();
+  });
+
+  it('component with the img as a fhirIcons props should render an img', () => {
+    const defaultProps = {
+      fhirVersion: fhirVersions.DSTU2,
+      fhirResource: example1,
+      fhirIcons: (
+        <img
+          src={require('../assets/containers/Encounter/encounter.svg')}
+          alt="encounter"
+        />
+      ),
+    };
+
+    const { getByAltText } = render(<Encounter {...defaultProps} />);
+    const headerIcon = getByAltText('encounter');
+
+    expect(headerIcon.getAttribute('src')).toContain('IMAGE_MOCK');
+  });
+
+  it('component with the resources object as a fhirIcons props should render an img', () => {
+    const defaultProps = {
+      fhirVersion: fhirVersions.DSTU2,
+      fhirResource: example1,
+      fhirIcons: fhirIcons,
+    };
+
+    const { getByAltText } = render(<Encounter {...defaultProps} />);
+    const headerIcon = getByAltText('encounter');
+
+    expect(headerIcon.getAttribute('src')).toContain('IMAGE_MOCK');
+  });
+
+  it('component with the url as a fhirIcons props should render an img', () => {
+    const avatarSrc =
+      'https://www.gravatar.com/avatar/?s=50&r=any&default=identicon&forcedefault=1';
+    const defaultProps = {
+      fhirVersion: fhirVersions.DSTU2,
+      fhirResource: example1,
+      fhirIcons: avatarSrc,
+    };
+
+    const { getByAltText } = render(<Encounter {...defaultProps} />);
+    const headerIcon = getByAltText('header icon');
+
+    expect(headerIcon.getAttribute('src')).toContain(avatarSrc);
+  });
+
   it('DSTU2 - with PARTICIPANTS table', () => {
     const defaultProps = {
       fhirVersion: fhirVersions.DSTU2,

package/src/components/resources/ExplanationOfBenefit/ExplanationOfBenefit.js

@@ -228,8 +228,12 @@ const resourceDTO = (fhirVersion, fhirResource, withCarinBBProfile) => {
   }
 };
 
-const ExplanationOfBenefit = props => {
-  const { fhirResource, fhirVersion, withCarinBBProfile = false } = props;
+const ExplanationOfBenefit = ({
+  fhirResource,
+  fhirVersion,
+  withCarinBBProfile = false,
+  fhirIcons,
+}) => {
   let fhirResourceData = {};
   try {
     fhirResourceData = resourceDTO(
@@ -414,6 +418,7 @@ const ExplanationOfBenefit = props => {
                 </Value>
               )
             }
+            icon={fhirIcons}
           />
         }
         bodyContent={

package/src/components/resources/ExplanationOfBenefit/ExplanationOfBenefit.stories.js

@@ -12,6 +12,9 @@ import example2R4 from '../../../fixtures/r4/resources/explanationOfBenefit/eobF
 import exampleC4BB from '../../../fixtures/r4/resources/explanationOfBenefit/c4bbExample.json';
 import exampleC4BBExtendedDiagnosis from '../../../fixtures/r4/resources/explanationOfBenefit/c4bbExtendedDiagnosis.json';
 
+import fhirIcons from '../../../fixtures/example-icons';
+import ExplanationOfBenefitIcon from '../../../assets/containers/ExplanationOfBenefit/explanation-of-benefit.svg';
+
 export default {
   title: 'ExplanationOfBenefit',
 };
@@ -22,6 +25,7 @@ export const DefaultVisualizationDSTU2 = () => {
     <ExplanationOfBenefit
       fhirVersion={fhirVersions.DSTU2}
       fhirResource={fhirResource}
+      fhirIcons={require('../../../assets/containers/ExplanationOfBenefit/explanation-of-benefit.svg')}
     />
   );
 };
@@ -32,6 +36,7 @@ export const ExampleSTU3 = () => {
     <ExplanationOfBenefit
       fhirVersion={fhirVersions.STU3}
       fhirResource={fhirResource}
+      fhirIcons={ExplanationOfBenefitIcon}
     />
   );
 };
@@ -41,6 +46,7 @@ export const Example2OfSTU3 = () => {
     <ExplanationOfBenefit
       fhirVersion={fhirVersions.STU3}
       fhirResource={fhirResource}
+      fhirIcons={fhirIcons}
     />
   );
 };
@@ -50,6 +56,7 @@ export const PersonPrimaryCoverageR4 = () => {
     <ExplanationOfBenefit
       fhirVersion={fhirVersions.R4}
       fhirResource={fhirResource}
+      fhirIcons={false}
     />
   );
 };
@@ -59,6 +66,7 @@ export const EOBForClaimWithErrorsR4 = () => {
     <ExplanationOfBenefit
       fhirVersion={fhirVersions.R4}
       fhirResource={fhirResource}
+      fhirIcons={'random text'}
     />
   );
 };

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

@@ -9,8 +9,80 @@ import exampleC4BBExtendedDiagnosis from '../../../fixtures/r4/resources/explana
 import fhirVersions from '../fhirResourceVersions';
 import { nbspRegex } from '../../../testUtils';
 import { render } from '@testing-library/react';
+import fhirIcons from '../../../fixtures/example-icons';
 
 describe('should render ExplanationOfBenefit component properly', () => {
+  it('component without a fhirIcons props should render a default icon', () => {
+    const defaultProps = {
+      fhirVersion: fhirVersions.DSTU2,
+      fhirResource: dstu2Example1,
+    };
+
+    const { getByAltText } = render(<ExplanationOfBenefit {...defaultProps} />);
+    const headerIcon = getByAltText('explanation of benefit');
+
+    expect(headerIcon.getAttribute('src')).toContain('IMAGE_MOCK');
+  });
+
+  it('component with a false as a fhirIcons props should render a placeholder', () => {
+    const defaultProps = {
+      fhirVersion: fhirVersions.DSTU2,
+      fhirResource: dstu2Example1,
+      fhirIcons: false,
+    };
+
+    const { getByTestId } = render(<ExplanationOfBenefit {...defaultProps} />);
+    const headerIcon = getByTestId('placeholder');
+
+    expect(headerIcon).toBeTruthy();
+  });
+
+  it('component with the img as a fhirIcons props should render an img', () => {
+    const defaultProps = {
+      fhirVersion: fhirVersions.DSTU2,
+      fhirResource: dstu2Example1,
+      fhirIcons: (
+        <img
+          src={require('../assets/containers/ExplanationOfBenefit/explanation-of-benefit.svg.svg')}
+          alt="explanation of benefit"
+        />
+      ),
+    };
+
+    const { getByAltText } = render(<ExplanationOfBenefit {...defaultProps} />);
+    const headerIcon = getByAltText('explanation of benefit');
+
+    expect(headerIcon.getAttribute('src')).toContain('IMAGE_MOCK');
+  });
+
+  it('component with the resources object as a fhirIcons props should render an img', () => {
+    const defaultProps = {
+      fhirVersion: fhirVersions.DSTU2,
+      fhirResource: dstu2Example1,
+      fhirIcons: fhirIcons,
+    };
+
+    const { getByAltText } = render(<ExplanationOfBenefit {...defaultProps} />);
+    const headerIcon = getByAltText('explanation of benefit');
+
+    expect(headerIcon.getAttribute('src')).toContain('IMAGE_MOCK');
+  });
+
+  it('component with the url as a fhirIcons props should render an img', () => {
+    const avatarSrc =
+      'https://www.gravatar.com/avatar/?s=50&r=any&default=identicon&forcedefault=1';
+    const defaultProps = {
+      fhirVersion: fhirVersions.DSTU2,
+      fhirResource: dstu2Example1,
+      fhirIcons: avatarSrc,
+    };
+
+    const { getByAltText } = render(<ExplanationOfBenefit {...defaultProps} />);
+    const headerIcon = getByAltText('header icon');
+
+    expect(headerIcon.getAttribute('src')).toContain(avatarSrc);
+  });
+
   it('should render with DSTU2 source data', () => {
     const defaultProps = {
       fhirResource: dstu2Example1,

package/src/components/resources/Immunization/Immunization.js

@@ -125,7 +125,6 @@ const Immunization = props => {
     note,
   } = resourceDTO(fhirVersion, fhirResource);
 
-  const headerIcon = fhirIcons && fhirIcons[_get(fhirResource, 'resourceType')];
   const tableData = [
     {
       label: 'Manufacturer Text',
@@ -237,7 +236,7 @@ const Immunization = props => {
               )
             }
             badges={status && <Badge data-testid="status">{status}</Badge>}
-            icon={headerIcon}
+            icon={fhirIcons}
             title={title}
           />
         }

package/src/components/resources/Immunization/Immunization.stories.js

@@ -11,6 +11,7 @@ import r4Example1 from '../../../fixtures/r4/resources/immunization/example1.jso
 import r4Example2 from '../../../fixtures/r4/resources/immunization/example2.json';
 import r4Example3 from '../../../fixtures/r4/resources/immunization/example3.json';
 import fhirIcons from '../../../fixtures/example-icons';
+import ImmunizationIcon from '../../../assets/containers/Immunization/immunization.svg';
 
 export default {
   title: 'Immunization',
@@ -22,7 +23,7 @@ export const DefaultVisualizationDSTU2 = () => {
     <Immunization
       fhirResource={fhirResource}
       fhirVersion={fhirVersions.DSTU2}
-      fhirIcons={fhirIcons}
+      fhirIcons={require('../../../assets/containers/Immunization/immunization.svg')}
     />
   );
 };
@@ -33,7 +34,7 @@ export const Example2OfDSTU2 = () => {
     <Immunization
       fhirResource={fhirResource}
       fhirVersion={fhirVersions.DSTU2}
-      fhirIcons={fhirIcons}
+      fhirIcons={ImmunizationIcon}
     />
   );
 };
@@ -55,7 +56,7 @@ export const Example1R4 = () => {
     <Immunization
       fhirResource={fhirResource}
       fhirVersion={fhirVersions.R4}
-      fhirIcons={fhirIcons}
+      fhirIcons={false}
     />
   );
 };
@@ -65,17 +66,13 @@ export const Example2R4 = () => {
     <Immunization
       fhirResource={fhirResource}
       fhirVersion={fhirVersions.R4}
-      fhirIcons={fhirIcons}
+      fhirIcons={'random text'}
     />
   );
 };
 export const Example3R4 = () => {
   const fhirResource = object('Resource', r4Example3);
   return (
-    <Immunization
-      fhirResource={fhirResource}
-      fhirVersion={fhirVersions.R4}
-      fhirIcons={fhirIcons}
-    />
+    <Immunization fhirResource={fhirResource} fhirVersion={fhirVersions.R4} />
   );
 };

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

@@ -6,10 +6,80 @@ import r4Example1 from '../../../fixtures/r4/resources/immunization/example1.jso
 import r4Example2 from '../../../fixtures/r4/resources/immunization/example2.json';
 import { render } from '@testing-library/react';
 import stu3Example from '../../../fixtures/stu3/resources/immunization/example1.json';
-
 import fhirIcons from '../../../fixtures/example-icons';
 
 describe('should render Immunization component properly', () => {
+  it('component without a fhirIcons props should render a default icon', () => {
+    const defaultProps = {
+      fhirVersion: fhirVersions.DSTU2,
+      fhirResource: dstu2Example,
+    };
+
+    const { getByAltText } = render(<Immunization {...defaultProps} />);
+    const headerIcon = getByAltText('immunization');
+
+    expect(headerIcon.getAttribute('src')).toContain('IMAGE_MOCK');
+  });
+
+  it('component with a false as a fhirIcons props should render a placeholder', () => {
+    const defaultProps = {
+      fhirVersion: fhirVersions.DSTU2,
+      fhirResource: dstu2Example,
+      fhirIcons: false,
+    };
+
+    const { getByTestId } = render(<Immunization {...defaultProps} />);
+    const headerIcon = getByTestId('placeholder');
+
+    expect(headerIcon).toBeTruthy();
+  });
+
+  it('component with the img as a fhirIcons props should render an img', () => {
+    const defaultProps = {
+      fhirVersion: fhirVersions.DSTU2,
+      fhirResource: dstu2Example,
+      fhirIcons: (
+        <img
+          src={require('../assets/containers/Immunization/immunization.svg')}
+          alt="immunization"
+        />
+      ),
+    };
+
+    const { getByAltText } = render(<Immunization {...defaultProps} />);
+    const headerIcon = getByAltText('immunization');
+
+    expect(headerIcon.getAttribute('src')).toContain('IMAGE_MOCK');
+  });
+
+  it('component with the resources object as a fhirIcons props should render an img', () => {
+    const defaultProps = {
+      fhirVersion: fhirVersions.DSTU2,
+      fhirResource: dstu2Example,
+      fhirIcons: fhirIcons,
+    };
+
+    const { getByAltText } = render(<Immunization {...defaultProps} />);
+    const headerIcon = getByAltText('immunization');
+
+    expect(headerIcon.getAttribute('src')).toContain('IMAGE_MOCK');
+  });
+
+  it('component with the url as a fhirIcons props should render an img', () => {
+    const avatarSrc =
+      'https://www.gravatar.com/avatar/?s=50&r=any&default=identicon&forcedefault=1';
+    const defaultProps = {
+      fhirVersion: fhirVersions.DSTU2,
+      fhirResource: dstu2Example,
+      fhirIcons: avatarSrc,
+    };
+
+    const { getByAltText } = render(<Immunization {...defaultProps} />);
+    const headerIcon = getByAltText('header icon');
+
+    expect(headerIcon.getAttribute('src')).toContain(avatarSrc);
+  });
+
   it('should render with DSTU2 source data', () => {
     const defaultProps = {
       fhirResource: dstu2Example,

package/src/components/resources/Observation/Observation.js

@@ -18,8 +18,7 @@ import {
 } from '../../ui';
 import Reference from '../../datatypes/Reference';
 
-const Observation = props => {
-  const { fhirResource } = props;
+const Observation = ({ fhirResource, fhirIcons }) => {
   const effectiveDate = _get(fhirResource, 'effectiveDateTime');
   const codeCodingDisplay = _get(fhirResource, 'code.coding.0.display');
   const codeText = _get(fhirResource, 'code.text', '');
@@ -72,7 +71,7 @@ const Observation = props => {
       <Accordion
         headerContent={
           <Header
-            resourceName={fhirResource.resourceType}
+            resourceName="Observation"
             additionalContent={
               issued && (
                 <Value label="Start date" data-testid="headerStartDate">
@@ -104,6 +103,7 @@ const Observation = props => {
                 small
               />
             }
+            icon={fhirIcons}
           />
         }
         bodyContent={

package/src/components/resources/Observation/Observation.stories.js

@@ -12,32 +12,41 @@ import example3ObservationExcessSTU3 from '../../../fixtures/stu3/resources/obse
 import example1ObservationExcessR4 from '../../../fixtures/r4/resources/observation/example1.json';
 import example2ObservationExcessR4 from '../../../fixtures/r4/resources/observation/example2.json';
 import example3ObservationExcessR4 from '../../../fixtures/r4/resources/observation/example3.json';
+import ObservationIcon from '../../../assets/containers/Observation/observation.svg';
+import fhirIcons from '../../../fixtures/example-icons';
 
 export default { title: 'Observation' };
 
 export const DefaultVisualizationDSTU2 = () => {
   const fhirResource = object('Resource', exampleObservationIssued);
-  return <Observation fhirResource={fhirResource} />;
+  return (
+    <Observation
+      fhirResource={fhirResource}
+      fhirIcons={require('../../../assets/containers/Observation/observation.svg')}
+    />
+  );
 };
 
 export const ExampleWithoutIssuedDSTU2 = () => {
   const fhirResource = object('Resource', exampleObservation);
-  return <Observation fhirResource={fhirResource} />;
+  return (
+    <Observation fhirResource={fhirResource} fhirIcons={ObservationIcon} />
+  );
 };
 
 export const ExampleWithIssuedSTU3 = () => {
   const fhirResource = object('Resource', exampleObservationExcessSTU3);
-  return <Observation fhirResource={fhirResource} />;
+  return <Observation fhirResource={fhirResource} fhirIcons={fhirIcons} />;
 };
 
 export const ExampleWithoutIssuedSTU3 = () => {
   const fhirResource = object('Resource', exampleObservationSTU3);
-  return <Observation fhirResource={fhirResource} />;
+  return <Observation fhirResource={fhirResource} fhirIcons={false} />;
 };
 
 export const Example3OfSTU3 = () => {
   const fhirResource = object('Resource', example3ObservationExcessSTU3);
-  return <Observation fhirResource={fhirResource} />;
+  return <Observation fhirResource={fhirResource} fhirIcons={'random text'} />;
 };
 
 export const Example1OfR4 = () => {

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

@@ -11,8 +11,75 @@ import exampleObservationExcessSTU3 from '../../../fixtures/stu3/resources/obser
 
 import example1ObservationExcessR4 from '../../../fixtures/r4/resources/observation/example2.json';
 import example2ObservationExcessR4 from '../../../fixtures/r4/resources/observation/example3.json';
+import fhirIcons from '../../../fixtures/example-icons';
 
 describe('should render component correctly', () => {
+  it('component without a fhirIcons props should render a default icon', () => {
+    const defaultProps = {
+      fhirResource: exampleObservationIssued,
+    };
+
+    const { getByAltText } = render(<Observation {...defaultProps} />);
+    const headerIcon = getByAltText('observation');
+
+    expect(headerIcon.getAttribute('src')).toContain('IMAGE_MOCK');
+  });
+
+  it('component with a false as a fhirIcons props should render a placeholder', () => {
+    const defaultProps = {
+      fhirResource: exampleObservationIssued,
+      fhirIcons: false,
+    };
+
+    const { getByTestId } = render(<Observation {...defaultProps} />);
+    const headerIcon = getByTestId('placeholder');
+
+    expect(headerIcon).toBeTruthy();
+  });
+
+  it('component with the img as a fhirIcons props should render an img', () => {
+    const defaultProps = {
+      fhirResource: exampleObservationIssued,
+      fhirIcons: (
+        <img
+          src={require('../assets/containers/ExplanationOfBenefit/explanation-of-benefit.svg')}
+          alt="observation"
+        />
+      ),
+    };
+
+    const { getByAltText } = render(<Observation {...defaultProps} />);
+    const headerIcon = getByAltText('observation');
+
+    expect(headerIcon.getAttribute('src')).toContain('IMAGE_MOCK');
+  });
+
+  it('component with the resources object as a fhirIcons props should render an img', () => {
+    const defaultProps = {
+      fhirResource: exampleObservationIssued,
+      fhirIcons: fhirIcons,
+    };
+
+    const { getByAltText } = render(<Observation {...defaultProps} />);
+    const headerIcon = getByAltText('observation');
+
+    expect(headerIcon.getAttribute('src')).toContain('IMAGE_MOCK');
+  });
+
+  it('component with the url as a fhirIcons props should render an img', () => {
+    const avatarSrc =
+      'https://www.gravatar.com/avatar/?s=50&r=any&default=identicon&forcedefault=1';
+    const defaultProps = {
+      fhirResource: exampleObservationIssued,
+      fhirIcons: avatarSrc,
+    };
+
+    const { getByAltText } = render(<Observation {...defaultProps} />);
+    const headerIcon = getByAltText('header icon');
+
+    expect(headerIcon.getAttribute('src')).toContain(avatarSrc);
+  });
+
   test('DSTU2 renders properly', () => {
     const defaultProps = {
       fhirResource: exampleObservationIssued,

package/src/components/resources/Patient/Patient.js

@@ -2,7 +2,6 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import _get from 'lodash/get';
 import _isEmpty from 'lodash/isEmpty';
-import md5 from 'md5';
 
 import HumanName from '../../datatypes/HumanName';
 import Telecom from '../../datatypes/Telecom';
@@ -41,11 +40,15 @@ export function getGender(fhirResource) {
 }
 
 function Patient(props) {
-  const { fhirResource, fhirVersion, renderName, patientSimple } = props;
+  const {
+    fhirResource,
+    fhirVersion,
+    renderName,
+    patientSimple,
+    fhirIcons,
+  } = props;
 
   const id = getId(fhirResource);
-  const idHash = md5(id || '');
-  const avatarSrc = `http://www.gravatar.com/avatar/${idHash}?s=50&r=any&default=identicon&forcedefault=1`;
   const patientName = getNames(fhirResource);
   const patientBirthDate = getBirthDate(fhirResource);
   const patientGender = getGender(fhirResource);
@@ -118,7 +121,7 @@ function Patient(props) {
       <Accordion
         headerContent={
           <Header
-            resourceName={fhirResource.resourceType}
+            resourceName="Patient"
             additionalContent={
               patientBirthDate && (
                 <span className="text-gray-600">
@@ -130,7 +133,7 @@ function Patient(props) {
                 </span>
               )
             }
-            icon={avatarSrc}
+            icon={fhirIcons}
             badges={
               active && <Badge data-testid="activeStatus">{activeStatus}</Badge>
             }

package/src/components/resources/Patient/Patient.stories.js

@@ -12,32 +12,39 @@ import example2PatientSTU3 from '../../../fixtures/stu3/resources/patient/exampl
 import example1PatientR4 from '../../../fixtures/r4/resources/patient/example1.json';
 import example2PatientR4 from '../../../fixtures/r4/resources/patient/example2.json';
 import example3PatientR4 from '../../../fixtures/r4/resources/patient/example3.json';
+import PatientIcon from '../../../assets/containers/Patient/patient.svg';
+import fhirIcons from '../../../fixtures/example-icons';
 
 export default { title: 'Patient' };
 
 export const DefaultVisualizationDSTU2 = () => {
   const fhirResource = object('Resource', examplePatient);
-  return <Patient fhirResource={fhirResource} />;
+  return (
+    <Patient
+      fhirResource={fhirResource}
+      fhirIcons={require('../../../assets/containers/Patient/patient.svg')}
+    />
+  );
 };
 
 export const Example2OfDSTU2 = () => {
   const fhirResource = object('Resource', example2PatientDSTU2);
-  return <Patient fhirResource={fhirResource} />;
+  return <Patient fhirResource={fhirResource} fhirIcons={PatientIcon} />;
 };
 
 export const ExampleSTU3 = () => {
   const fhirResource = object('Resource', examplePatientSTU3);
-  return <Patient fhirResource={fhirResource} />;
+  return <Patient fhirResource={fhirResource} fhirIcons={fhirIcons} />;
 };
 
 export const Example2STU3 = () => {
   const fhirResource = object('Resource', example2PatientSTU3);
-  return <Patient fhirResource={fhirResource} />;
+  return <Patient fhirResource={fhirResource} fhirIcons={false} />;
 };
 
 export const Example1R4 = () => {
   const fhirResource = object('Resource', example1PatientR4);
-  return <Patient fhirResource={fhirResource} />;
+  return <Patient fhirResource={fhirResource} fhirIcons={'random text'} />;
 };
 
 export const Example2R4 = () => {