fhir-react 0.3.0 → 0.3.4

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 = () => {

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

@@ -7,8 +7,75 @@ import examplePatientSTU3 from '../../../fixtures/stu3/resources/patient/example
 import example2PatientSTU3 from '../../../fixtures/stu3/resources/patient/example2.json';
 import example1PatientR4 from '../../../fixtures/r4/resources/patient/example1.json';
 import example3PatientR4 from '../../../fixtures/r4/resources/patient/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: examplePatient,
+    };
+
+    const { getByAltText } = render(<Patient {...defaultProps} />);
+    const headerIcon = getByAltText('patient');
+
+    expect(headerIcon.getAttribute('src')).toContain('IMAGE_MOCK');
+  });
+
+  it('component with a false as a fhirIcons props should render a placeholder', () => {
+    const defaultProps = {
+      fhirResource: examplePatient,
+      fhirIcons: false,
+    };
+
+    const { getByTestId } = render(<Patient {...defaultProps} />);
+    const headerIcon = getByTestId('placeholder');
+
+    expect(headerIcon).toBeTruthy();
+  });
+
+  it('component with the img as a fhirIcons props should render an img', () => {
+    const defaultProps = {
+      fhirResource: examplePatient,
+      fhirIcons: (
+        <img
+          src={require('../assets/containers/ExplanationOfBenefit/explanation-of-benefit.svg.svg')}
+          alt="patient"
+        />
+      ),
+    };
+
+    const { getByAltText } = render(<Patient {...defaultProps} />);
+    const headerIcon = getByAltText('patient');
+
+    expect(headerIcon.getAttribute('src')).toContain('IMAGE_MOCK');
+  });
+
+  it('component with the resources object as a fhirIcons props should render an img', () => {
+    const defaultProps = {
+      fhirResource: examplePatient,
+      fhirIcons: fhirIcons,
+    };
+
+    const { getByAltText } = render(<Patient {...defaultProps} />);
+    const headerIcon = getByAltText('patient');
+
+    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: examplePatient,
+      fhirIcons: avatarSrc,
+    };
+
+    const { getByAltText } = render(<Patient {...defaultProps} />);
+    const headerIcon = getByAltText('header icon');
+
+    expect(headerIcon.getAttribute('src')).toContain(avatarSrc);
+  });
+
   it('DSTU2', () => {
     const defaultProps = {
       fhirResource: examplePatient,

package/src/components/resources/Practitioner/Practitioner.js

@@ -15,7 +15,6 @@ import UnhandledResourceDataStructure from '../UnhandledResourceDataStructure';
 import _get from 'lodash/get';
 import _has from 'lodash/has';
 import fhirVersions from '../fhirResourceVersions';
-import md5 from 'md5';
 
 const commonDTO = fhirResource => {
   const id = _get(fhirResource, 'id', '');
@@ -83,8 +82,7 @@ const resourceDTO = (fhirVersion, fhirResource) => {
   }
 };
 
-const Practitioner = props => {
-  const { fhirResource, fhirVersion } = props;
+const Practitioner = ({ fhirResource, fhirVersion, fhirIcons }) => {
   let fhirResourceData = {};
   try {
     fhirResourceData = resourceDTO(fhirVersion, fhirResource);
@@ -93,7 +91,6 @@ const Practitioner = props => {
     return <UnhandledResourceDataStructure resourceName="Practitioner" />;
   }
   const {
-    id,
     identifier,
     name,
     gender,
@@ -155,17 +152,10 @@ const Practitioner = props => {
       <Accordion
         headerContent={
           <Header
+            resourceName="Practitioner"
             additionalContent={<p className="mb-0">{`(${use})`}</p>}
             badges={status && <Badge data-testid="status">{status}</Badge>}
-            icon={
-              <img
-                className="header-icon__practitioner-avatar rounded-1"
-                src={`http://www.gravatar.com/avatar/${md5(
-                  id,
-                )}?s=30&r=any&default=identicon&forcedefault=1`}
-                alt=""
-              />
-            }
+            icon={fhirIcons}
             title={<HumanName fhirData={name} isTitle />}
           />
         }

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

@@ -11,6 +11,8 @@ import stu3Example1 from '../../../fixtures/stu3/resources/practitioner/example-
 import r4Example1 from '../../../fixtures/r4/resources/practitioner/example1.json';
 import r4Example2 from '../../../fixtures/r4/resources/practitioner/example2.json';
 import r4Example3 from '../../../fixtures/r4/resources/practitioner/example3.json';
+import PractitionerIcon from '../../../assets/containers/Practitioner/practitioner.svg';
+import fhirIcons from '../../../fixtures/example-icons';
 
 export default { title: 'Practitioner' };
 
@@ -20,6 +22,7 @@ export const DefaultVisualizationDSTU2 = () => {
     <Practitioner
       fhirVersion={fhirVersions.DSTU2}
       fhirResource={fhirResource}
+      fhirIcons={require('../../../assets/containers/Practitioner/practitioner.svg')}
     />
   );
 };
@@ -30,6 +33,7 @@ export const Example2OfDSTU2 = () => {
     <Practitioner
       fhirVersion={fhirVersions.DSTU2}
       fhirResource={fhirResource}
+      fhirIcons={PractitionerIcon}
     />
   );
 };
@@ -37,21 +41,33 @@ export const Example2OfDSTU2 = () => {
 export const ExampleOfSTU3 = () => {
   const fhirResource = object('Resource', stu3Example1);
   return (
-    <Practitioner fhirVersion={fhirVersions.STU3} fhirResource={fhirResource} />
+    <Practitioner
+      fhirVersion={fhirVersions.STU3}
+      fhirResource={fhirResource}
+      fhirIcons={fhirIcons}
+    />
   );
 };
 
 export const Example1OfR4 = () => {
   const fhirResource = object('Resource', r4Example1);
   return (
-    <Practitioner fhirVersion={fhirVersions.R4} fhirResource={fhirResource} />
+    <Practitioner
+      fhirVersion={fhirVersions.R4}
+      fhirResource={fhirResource}
+      fhirIcons={false}
+    />
   );
 };
 
 export const Example2OfR4 = () => {
   const fhirResource = object('Resource', r4Example2);
   return (
-    <Practitioner fhirVersion={fhirVersions.R4} fhirResource={fhirResource} />
+    <Practitioner
+      fhirVersion={fhirVersions.R4}
+      fhirResource={fhirResource}
+      fhirIcons={'random text'}
+    />
   );
 };
 

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

@@ -7,8 +7,80 @@ import dstu2Example1 from '../../../fixtures/dstu2/resources/practitioner/exampl
 import stu3Example1 from '../../../fixtures/stu3/resources/practitioner/example-1.json';
 import r4Example1 from '../../../fixtures/r4/resources/practitioner/example1.json';
 import r4Example2 from '../../../fixtures/r4/resources/practitioner/example3.json';
+import fhirIcons from '../../../fixtures/example-icons';
 
 describe('Practitioner should render component correctly', () => {
+  it('component without a fhirIcons props should render a default icon', () => {
+    const defaultProps = {
+      fhirVersion: fhirVersions.DSTU2,
+      fhirResource: dstu2Example1,
+    };
+
+    const { getByAltText } = render(<Practitioner {...defaultProps} />);
+    const headerIcon = getByAltText('practitioner');
+
+    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(<Practitioner {...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/Practitioner/practitioner.svg')}
+          alt="practitioner"
+        />
+      ),
+    };
+
+    const { getByAltText } = render(<Practitioner {...defaultProps} />);
+    const headerIcon = getByAltText('practitioner');
+
+    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(<Practitioner {...defaultProps} />);
+    const headerIcon = getByAltText('practitioner');
+
+    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(<Practitioner {...defaultProps} />);
+    const headerIcon = getByAltText('header icon');
+
+    expect(headerIcon.getAttribute('src')).toContain(avatarSrc);
+  });
+
   it('should render component correctly with DSTU2 source data', () => {
     const defaultProps = {
       fhirVersion: fhirVersions.DSTU2,

package/src/components/resources/Procedure/Procedure.js

@@ -37,7 +37,6 @@ const Procedure = props => {
   const note = _get(fhirResource, 'note', []);
   const outcome = _get(fhirResource, 'outcome');
 
-  const headerIcon = fhirIcons[_get(fhirResource, 'resourceType')];
   const tableData = [
     {
       label: 'Identification',
@@ -121,7 +120,7 @@ const Procedure = props => {
               </>
             }
             badges={status && <Badge data-testid="status">{status}</Badge>}
-            icon={headerIcon}
+            icon={fhirIcons}
             title={display}
           />
         }

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

@@ -12,17 +12,23 @@ import r4Example2 from '../../../fixtures/r4/resources/procedure/example2.json';
 import r4Example3 from '../../../fixtures/r4/resources/procedure/example3.json';
 
 import fhirIcons from '../../../fixtures/example-icons';
+import ProcedureIcon from '../../../assets/containers/Procedure/procedure.svg';
 
 export default { title: 'Procedure' };
 
 export const DefaultVisualizationDSTU2 = () => {
   const fhirResource = object('Resource', example1);
-  return <Procedure fhirResource={fhirResource} fhirIcons={fhirIcons} />;
+  return (
+    <Procedure
+      fhirResource={fhirResource}
+      fhirIcons={require('../../../assets/containers/Procedure/procedure.svg')}
+    />
+  );
 };
 
 export const ExampleOfSTU3 = () => {
   const fhirResource = object('Resource', stu3Example1);
-  return <Procedure fhirResource={fhirResource} fhirIcons={fhirIcons} />;
+  return <Procedure fhirResource={fhirResource} fhirIcons={ProcedureIcon} />;
 };
 
 export const Example2OfSTU3 = () => {
@@ -32,15 +38,15 @@ export const Example2OfSTU3 = () => {
 
 export const Example1OfR4 = () => {
   const fhirResource = object('Resource', r4Example1);
-  return <Procedure fhirResource={fhirResource} fhirIcons={fhirIcons} />;
+  return <Procedure fhirResource={fhirResource} fhirIcons={false} />;
 };
 
 export const Example2OfR4 = () => {
   const fhirResource = object('Resource', r4Example2);
-  return <Procedure fhirResource={fhirResource} fhirIcons={fhirIcons} />;
+  return <Procedure fhirResource={fhirResource} fhirIcons={'random text'} />;
 };
 
 export const Example3OfR4 = () => {
   const fhirResource = object('Resource', r4Example3);
-  return <Procedure fhirResource={fhirResource} fhirIcons={fhirIcons} />;
+  return <Procedure fhirResource={fhirResource} />;
 };

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

@@ -5,10 +5,80 @@ import r4Example2 from '../../../fixtures/r4/resources/procedure/example2.json';
 import r4Example3 from '../../../fixtures/r4/resources/procedure/example3.json';
 import { render } from '@testing-library/react';
 import stu3Example1 from '../../../fixtures/stu3/resources/procedure/example1.json';
-
 import fhirIcons from '../../../fixtures/example-icons';
+import fhirVersions from '../fhirResourceVersions';
 
 describe('Procedure should render component correctly', () => {
+  it('component without a fhirIcons props should render a default icon', () => {
+    const defaultProps = {
+      fhirVersion: fhirVersions.DSTU2,
+      fhirResource: dstu2Example1,
+    };
+
+    const { getByAltText } = render(<Procedure {...defaultProps} />);
+    const headerIcon = getByAltText('procedure');
+
+    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(<Procedure {...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/Procedure/procedure.svg')}
+          alt="procedure"
+        />
+      ),
+    };
+
+    const { getByAltText } = render(<Procedure {...defaultProps} />);
+    const headerIcon = getByAltText('procedure');
+
+    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(<Procedure {...defaultProps} />);
+    const headerIcon = getByAltText('procedure');
+
+    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: dstu2Example1,
+      fhirIcons: avatarSrc,
+    };
+
+    const { getByAltText } = render(<Procedure {...defaultProps} />);
+    const headerIcon = getByAltText('header icon');
+
+    expect(headerIcon.getAttribute('src')).toContain(avatarSrc);
+  });
+
   it('should render component correctly with DSTU2 source data', () => {
     const defaultProps = {
       fhirResource: dstu2Example1,

package/src/components/resources/ResourceCategory/ResourceCategory.js

@@ -1,8 +1,8 @@
 import { Root, Title } from '../../ui';
-import ChevronRight from '../../../assets/common/chevron-right.svg';
 import HeaderIcon from '../../datatypes/HeaderIcon';
 import React from 'react';
 import PropTypes from 'prop-types';
+import { isUrl } from '../../../utils/isUrl';
 
 const ResourceCategory = props => {
   const { title, itemsCount, fhirIcons } = props;
@@ -13,7 +13,10 @@ const ResourceCategory = props => {
   const getItemsCountLabel = () =>
     `${parsedItemsCount} ${parsedItemsCount === 1 ? 'item' : 'items'}`;
 
-  const headerIcon = fhirIcons['ResourceCategoryPlaceholder'];
+  const headerIcon = isUrl(fhirIcons)
+    ? fhirIcons
+    : fhirIcons && fhirIcons['ResourceCategory'];
+
   const parsedItemsCount = parseNumber(itemsCount);
 
   return (
@@ -38,7 +41,7 @@ const ResourceCategory = props => {
             </div>
           )}
           <img
-            src={ChevronRight}
+            src={require('../../../assets/common/chevron-right.svg')}
             alt="chevron"
             style={{ height: 28, width: 28 }}
           />

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

@@ -5,7 +5,7 @@ import fhirIcons from '../../../fixtures/example-icons';
 import ResourceCategory from './ResourceCategory';
 
 describe('should render ResourceCategory component properly', () => {
-  const placeholderResource = fhirIcons['ResourceCategoryPlaceholder'].props;
+  const placeholderResource = fhirIcons['ResourceCategory'].props;
 
   it('should render ResourceCategory component with icon and itemsCount > 1 correctly', () => {
     const defaultProps = {

package/src/components/supportedFhirResourceList.js

@@ -37,6 +37,7 @@ import Questionnaire from './resources/Questionnaire';
 import QuestionnaireResponse from './resources/QuestionnaireResponse';
 import ReferralRequest from './resources/ReferralRequest';
 import ResearchStudy from './resources/ResearchStudy';
+import ResourceCategory from './resources/ResourceCategory';
 
 export {
   Appointment,
@@ -78,4 +79,5 @@ export {
   QuestionnaireResponse,
   ReferralRequest,
   ResearchStudy,
+  ResourceCategory,
 };