fhir-react 0.3.7 → 0.3.8

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

@@ -1,12 +1,84 @@
 import React from 'react';
-import { render } from '@testing-library/react';
+import { fireEvent, render } from '@testing-library/react';
 import AdverseEvent from './AdverseEvent';
 import fhirVersions from '../fhirResourceVersions';
 
 import stu3Example1 from '../../../fixtures/stu3/resources/adverseEvent/example1.json';
 import r4Example1 from '../../../fixtures/r4/resources/adverseEvent/example1.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.STU3,
+      fhirResource: stu3Example1,
+    };
+
+    const { getByAltText } = render(<AdverseEvent {...defaultProps} />);
+    const headerIcon = getByAltText('adverse event');
+
+    expect(headerIcon.getAttribute('src')).toContain('IMAGE_MOCK');
+  });
+
+  it('component with a false as a fhirIcons props should render a placeholder', () => {
+    const defaultProps = {
+      fhirVersion: fhirVersions.STU3,
+      fhirResource: stu3Example1,
+      fhirIcons: false,
+    };
+
+    const { getByTestId } = render(<AdverseEvent {...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.STU3,
+      fhirResource: stu3Example1,
+      fhirIcons: (
+        <img
+          src={require('../assets/containers/AdverseEvent/adverse-event.svg')}
+          alt="adverse event"
+        />
+      ),
+    };
+
+    const { getByAltText } = render(<AdverseEvent {...defaultProps} />);
+    const headerIcon = getByAltText('adverse event');
+
+    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.STU3,
+      fhirResource: stu3Example1,
+      fhirIcons: fhirIcons,
+    };
+
+    const { getByAltText } = render(<AdverseEvent {...defaultProps} />);
+    const headerIcon = getByAltText('adverse event');
+
+    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.STU3,
+      fhirResource: stu3Example1,
+      fhirIcons: avatarSrc,
+    };
+
+    const { getByAltText } = render(<AdverseEvent {...defaultProps} />);
+    const headerIcon = getByAltText('header icon');
+
+    expect(headerIcon.getAttribute('src')).toContain(avatarSrc);
+  });
+
   it('should render with STU3 source data', () => {
     const defaultProps = {
       fhirResource: stu3Example1,
@@ -18,7 +90,7 @@ describe('should render component correctly', () => {
 
     expect(getByTestId('date').textContent).toEqual('1/29/2017');
 
-    expect(getByTestId('type').textContent).toContain('304386008');
+    expect(getByTestId('event').textContent).toContain('304386008');
 
     expect(getByTestId('description').textContent).toContain(
       'This was a mild rash',
@@ -44,4 +116,39 @@ describe('should render component correctly', () => {
 
     expect(getByTestId('actuality').textContent).toEqual('actual');
   });
+
+  it('should fire custom onClick function', () => {
+    const defaultProps = {
+      fhirResource: r4Example1,
+      fhirVersion: fhirVersions.R4,
+    };
+
+    const onClick = jest.fn();
+    const { getByRole } = render(
+      <AdverseEvent {...defaultProps} onClick={onClick} />,
+    );
+    const accordion = getByRole('button');
+    fireEvent.click(accordion);
+
+    const attribute = accordion.getAttribute('data-bs-toggle');
+    expect(attribute).not.toEqual('collapse');
+    expect(onClick).toHaveBeenCalled();
+  });
+
+  it('should not fire custom onClick function', () => {
+    const defaultProps = {
+      fhirResource: r4Example1,
+      fhirVersion: fhirVersions.R4,
+    };
+
+    const onClick = 'test';
+    const { getByRole } = render(
+      <AdverseEvent {...defaultProps} onClick={onClick} />,
+    );
+    const accordion = getByRole('button');
+    fireEvent.click(accordion);
+
+    const attribute = accordion.getAttribute('data-bs-toggle');
+    expect(attribute).toEqual('collapse');
+  });
 });

package/src/components/resources/AllergyIntolerance/AllergyIntolerance.js

@@ -123,7 +123,12 @@ const resourceDTO = (fhirVersion, fhirResource) => {
   }
 };
 
-const AllergyIntolerance = ({ fhirResource, fhirVersion, fhirIcons }) => {
+const AllergyIntolerance = ({
+  fhirResource,
+  fhirVersion,
+  fhirIcons,
+  onClick,
+}) => {
   let fhirResourceData = {};
   try {
     fhirResourceData = resourceDTO(fhirVersion, fhirResource);
@@ -231,6 +236,7 @@ const AllergyIntolerance = ({ fhirResource, fhirVersion, fhirIcons }) => {
           />
         }
         bodyContent={<Body tableData={tableData} />}
+        onClick={onClick}
       />
     </Root>
   );

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

@@ -1,5 +1,5 @@
 import React from 'react';
-import { render } from '@testing-library/react';
+import { fireEvent, render } from '@testing-library/react';
 import AllergyIntolerance from './AllergyIntolerance';
 
 import exampleAllergyIntoleranceDSTU2 from '../../../fixtures/dstu2/resources/allergyIntolerance/example1.json';
@@ -201,4 +201,39 @@ describe('should render component correctly', () => {
 
     expect(queryByTestId('asserter')).toBeNull();
   });
+
+  it('should fire custom onClick function', () => {
+    const defaultProps = {
+      fhirResource: example2AllergyIntoleranceR4,
+      fhirVersion: fhirVersions.R4,
+    };
+
+    const onClick = jest.fn();
+    const { getByRole } = render(
+      <AllergyIntolerance {...defaultProps} onClick={onClick} />,
+    );
+    const accordion = getByRole('button');
+    fireEvent.click(accordion);
+
+    const attribute = accordion.getAttribute('data-bs-toggle');
+    expect(attribute).not.toEqual('collapse');
+    expect(onClick).toHaveBeenCalled();
+  });
+
+  it('should not fire custom onClick function', () => {
+    const defaultProps = {
+      fhirResource: example2AllergyIntoleranceR4,
+      fhirVersion: fhirVersions.R4,
+    };
+
+    const onClick = 'test';
+    const { getByRole } = render(
+      <AllergyIntolerance {...defaultProps} onClick={onClick} />,
+    );
+    const accordion = getByRole('button');
+    fireEvent.click(accordion);
+
+    const attribute = accordion.getAttribute('data-bs-toggle');
+    expect(attribute).toEqual('collapse');
+  });
 });

package/src/components/resources/Appointment/Appointment.js

@@ -144,7 +144,7 @@ const resourceDTO = (fhirVersion, fhirResource) => {
   }
 };
 
-const Appointment = ({ fhirResource, fhirVersion, fhirIcons }) => {
+const Appointment = ({ fhirResource, fhirVersion, fhirIcons, onClick }) => {
   const {
     description,
     status,
@@ -253,6 +253,7 @@ const Appointment = ({ fhirResource, fhirVersion, fhirIcons }) => {
             )}
           </Body>
         }
+        onClick={onClick}
       />
     </Root>
   );

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

@@ -1,5 +1,5 @@
 import React from 'react';
-import { render } from '@testing-library/react';
+import { fireEvent, render } from '@testing-library/react';
 import Appointment from './Appointment';
 import fhirVersions from '../fhirResourceVersions';
 
@@ -231,4 +231,39 @@ describe('should render component correctly', () => {
 
     expect(getByTestId('reason').textContent).toContain('Clinical Review');
   });
+
+  it('should fire custom onClick function', () => {
+    const defaultProps = {
+      fhirResource: example3AppointmentR4,
+      fhirVersion: fhirVersions.R4,
+    };
+
+    const onClick = jest.fn();
+    const { getByRole } = render(
+      <Appointment {...defaultProps} onClick={onClick} />,
+    );
+    const accordion = getByRole('button');
+    fireEvent.click(accordion);
+
+    const attribute = accordion.getAttribute('data-bs-toggle');
+    expect(attribute).not.toEqual('collapse');
+    expect(onClick).toHaveBeenCalled();
+  });
+
+  it('should not fire custom onClick function', () => {
+    const defaultProps = {
+      fhirResource: example3AppointmentR4,
+      fhirVersion: fhirVersions.R4,
+    };
+
+    const onClick = 'test';
+    const { getByRole } = render(
+      <Appointment {...defaultProps} onClick={onClick} />,
+    );
+    const accordion = getByRole('button');
+    fireEvent.click(accordion);
+
+    const attribute = accordion.getAttribute('data-bs-toggle');
+    expect(attribute).toEqual('collapse');
+  });
 });

package/src/components/resources/Bundle/Bundle.css

@@ -1,3 +1,10 @@
 .fhir-resource__Bundle__item {
   margin-top: 10px;
 }
+
+.fhir-resource__Bundle__rootPadding:first-of-type {
+  padding: 8px;
+  background: white;
+  border-radius: 0.2rem;
+  border: 1px solid #dee2e6;
+}

package/src/components/resources/Bundle/Bundle.js

@@ -4,12 +4,12 @@ import _get from 'lodash/get';
 
 import fhirVersions from '../fhirResourceVersions';
 import UnhandledResourceDataStructure from '../UnhandledResourceDataStructure';
-import { Root, Header, Title, Badge, Body, BadgeSecondary } from '../../ui';
+import { Root, Header, Badge, Body, BadgeSecondary } from '../../ui';
 import * as FhirResourceTypes from '../../supportedFhirResourceList';
 
 import './Bundle.css';
 
-export default function Bundle({ fhirResource, fhirVersion, fhirIcons }) {
+export default function Bundle({ fhirResource, fhirVersion }) {
   const commonDTO = fhirResource => {
     const type = _get(fhirResource, 'type', null);
     const total = _get(fhirResource, 'total');
@@ -51,11 +51,14 @@ export default function Bundle({ fhirResource, fhirVersion, fhirIcons }) {
     .filter(Boolean);
 
   return (
-    <Root name="Bundle">
-      <Header>
-        {type && <Title data-testid="title">{type}</Title>}
-        {total && <Badge data-testid="total">{total}</Badge>}
-      </Header>
+    <Root name="Bundle" className="fhir-resource__Bundle__rootPadding">
+      <Header
+        resourceName="Bundle"
+        title={type}
+        badges={!isNaN(total) && <Badge data-testid="total">{total}</Badge>}
+        capitalize
+        isNoIcon
+      />
       <Body>
         {resources.length > 0 &&
           resources.map((resource, index) => {
@@ -71,14 +74,15 @@ export default function Bundle({ fhirResource, fhirVersion, fhirIcons }) {
                 key={`${resource.id}-${index}`}
               >
                 {resourceType && (
-                  <BadgeSecondary data-testid="resourceType">
-                    {resourceType}
-                  </BadgeSecondary>
+                  <div className="mx-20">
+                    <BadgeSecondary data-testid="resourceType">
+                      {resourceType}
+                    </BadgeSecondary>
+                  </div>
                 )}
                 <FhirComponent
                   fhirResource={resource}
                   fhirVersion={fhirVersion}
-                  fhirIcons={fhirIcons}
                 />
               </div>
             );

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

@@ -17,8 +17,6 @@ import r4Example3 from '../../../fixtures/r4/resources/bundle/example3.json';
 import r4Example4 from '../../../fixtures/r4/resources/bundle/example4.json';
 import fhirVersions from '../fhirResourceVersions';
 
-import fhirIcons from '../../../fixtures/example-icons';
-
 export default {
   title: 'Bundle',
 };
@@ -26,133 +24,69 @@ export default {
 export const Example1OfDSTU2 = () => {
   const fhirResource = object('Resource', dstu2Example1);
   return (
-    <Bundle
-      fhirResource={fhirResource}
-      fhirVersion={fhirVersions.DSTU2}
-      fhirIcons={fhirIcons}
-    />
+    <Bundle fhirResource={fhirResource} fhirVersion={fhirVersions.DSTU2} />
   );
 };
 
 export const Example2OfDSTU2 = () => {
   const fhirResource = object('Resource', dstu2Example2);
   return (
-    <Bundle
-      fhirResource={fhirResource}
-      fhirVersion={fhirVersions.DSTU2}
-      fhirIcons={fhirIcons}
-    />
+    <Bundle fhirResource={fhirResource} fhirVersion={fhirVersions.DSTU2} />
   );
 };
 
 export const Example3OfDSTU2 = () => {
   const fhirResource = object('Resource', dstu2Example3);
   return (
-    <Bundle
-      fhirResource={fhirResource}
-      fhirVersion={fhirVersions.DSTU2}
-      fhirIcons={fhirIcons}
-    />
+    <Bundle fhirResource={fhirResource} fhirVersion={fhirVersions.DSTU2} />
   );
 };
 
 export const Example4OfDSTU2 = () => {
   const fhirResource = object('Resource', dstu2Example4);
   return (
-    <Bundle
-      fhirResource={fhirResource}
-      fhirVersion={fhirVersions.DSTU2}
-      fhirIcons={fhirIcons}
-    />
+    <Bundle fhirResource={fhirResource} fhirVersion={fhirVersions.DSTU2} />
   );
 };
 
 export const Example1OfSTU3 = () => {
   const fhirResource = object('Resource', stu3Example1);
-  return (
-    <Bundle
-      fhirResource={fhirResource}
-      fhirVersion={fhirVersions.STU3}
-      fhirIcons={fhirIcons}
-    />
-  );
+  return <Bundle fhirResource={fhirResource} fhirVersion={fhirVersions.STU3} />;
 };
 
 export const Example2OfSTU3 = () => {
   const fhirResource = object('Resource', stu3Example2);
-  return (
-    <Bundle
-      fhirResource={fhirResource}
-      fhirVersion={fhirVersions.STU3}
-      fhirIcons={fhirIcons}
-    />
-  );
+  return <Bundle fhirResource={fhirResource} fhirVersion={fhirVersions.STU3} />;
 };
 
 export const Example3OfSTU3 = () => {
   const fhirResource = object('Resource', stu3Example3);
-  return (
-    <Bundle
-      fhirResource={fhirResource}
-      fhirVersion={fhirVersions.STU3}
-      fhirIcons={fhirIcons}
-    />
-  );
+  return <Bundle fhirResource={fhirResource} fhirVersion={fhirVersions.STU3} />;
 };
 
 export const Example4OfSTU3 = () => {
   const fhirResource = object('Resource', stu3Example4);
-  return (
-    <Bundle
-      fhirResource={fhirResource}
-      fhirVersion={fhirVersions.STU3}
-      fhirIcons={fhirIcons}
-    />
-  );
+  return <Bundle fhirResource={fhirResource} fhirVersion={fhirVersions.STU3} />;
 };
 
 export const Example1OfR4 = () => {
   const fhirResource = object('Resource', r4Example1);
-  return (
-    <Bundle
-      fhirResource={fhirResource}
-      fhirVersion={fhirVersions.R4}
-      fhirIcons={fhirIcons}
-    />
-  );
+  return <Bundle fhirResource={fhirResource} fhirVersion={fhirVersions.R4} />;
 };
 
 export const Example2OfR4 = () => {
   const fhirResource = object('Resource', r4Example2);
-  return (
-    <Bundle
-      fhirResource={fhirResource}
-      fhirVersion={fhirVersions.R4}
-      fhirIcons={fhirIcons}
-    />
-  );
+  return <Bundle fhirResource={fhirResource} fhirVersion={fhirVersions.R4} />;
 };
 
 export const Example3OfR4 = () => {
   const fhirResource = object('Resource', r4Example3);
-  return (
-    <Bundle
-      fhirResource={fhirResource}
-      fhirVersion={fhirVersions.R4}
-      fhirIcons={fhirIcons}
-    />
-  );
+  return <Bundle fhirResource={fhirResource} fhirVersion={fhirVersions.R4} />;
 };
 
 export const Example4OfR4 = () => {
   const fhirResource = object('Resource', r4Example4);
-  return (
-    <Bundle
-      fhirResource={fhirResource}
-      fhirVersion={fhirVersions.R4}
-      fhirIcons={fhirIcons}
-    />
-  );
+  return <Bundle fhirResource={fhirResource} fhirVersion={fhirVersions.R4} />;
 };
 
 // export const ExampleWithoutFHIRVersionProperty = () => {

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

@@ -8,8 +8,6 @@ import dstu2Example2 from '../../../fixtures/dstu2/resources/bundle/example3.jso
 import stu3Example1 from '../../../fixtures/stu3/resources/bundle/example1.json';
 import r4Example1 from '../../../fixtures/r4/resources/bundle/example1.json';
 
-import fhirIcons from '../../../fixtures/example-icons';
-
 describe('Bundle should render component correctly', () => {
   it('should render component correctly with DSTU2 source data', () => {
     const defaultProps = {
@@ -31,7 +29,6 @@ describe('Bundle should render component correctly', () => {
     const defaultProps = {
       fhirVersion: fhirVersions.DSTU2,
       fhirResource: dstu2Example2,
-      fhirIcons: fhirIcons,
     };
     const { getByText, getAllByTestId } = render(<Bundle {...defaultProps} />);
     expect(getAllByTestId('title').map(title => title.textContent)).toEqual([

package/src/components/resources/CarePlan/CarePlan.js

@@ -162,7 +162,7 @@ const resourceDTO = (fhirVersion, fhirResource) => {
   }
 };
 
-const CarePlan = ({ fhirResource, fhirVersion, fhirIcons }) => {
+const CarePlan = ({ fhirResource, fhirVersion, fhirIcons, onClick }) => {
   let fhirResourceData = {};
   try {
     fhirResourceData = resourceDTO(fhirVersion, fhirResource);
@@ -304,6 +304,7 @@ const CarePlan = ({ fhirResource, fhirVersion, fhirIcons }) => {
             )}
           </Body>
         }
+        onClick={onClick}
       />
     </Root>
   );

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

@@ -1,5 +1,5 @@
 import React from 'react';
-import { render } from '@testing-library/react';
+import { fireEvent, render } from '@testing-library/react';
 import CarePlan from './CarePlan';
 import fhirVersions from '../fhirResourceVersions';
 
@@ -111,8 +111,9 @@ describe('should render component correctly', () => {
     expect(getByTestId('activity').textContent).toContain('3141-9');
     expect(getByTestId('intent').textContent).toEqual('plan');
     expect(getByTestId('description').textContent).toContain('Manage obesity');
-    expect(getByTestId('subject').textContent).toContain('Peter James');
-    expect(getByTestId('subject').textContent).toContain('Patient/example');
+    expect(getByTestId('subject').textContent).toContain(
+      'Peter James Chalmers',
+    );
     expect(getByTestId('author').textContent).toContain('Dr Adam Careful');
     expect(getByTestId('periodEnd').textContent).toEqual('6/1/2017');
     expect(getByTestId('basedOn').textContent).toEqual(
@@ -136,8 +137,9 @@ describe('should render component correctly', () => {
     expect(getByTestId('intent').textContent).toEqual('plan');
     expect(getByTestId('goals').textContent).toEqual('Goal/example');
     expect(getByTestId('description').textContent).toContain('Manage obesity');
-    expect(getByTestId('subject').textContent).toContain('Peter James');
-    expect(getByTestId('subject').textContent).toContain('Patient/example');
+    expect(getByTestId('subject').textContent).toContain(
+      'Peter James Chalmers',
+    );
     expect(getByTestId('author').textContent).toContain('Dr Adam Careful');
     expect(getByTestId('periodEnd').textContent).toEqual('6/1/2017');
     expect(getByTestId('basedOn').textContent).toEqual(
@@ -160,8 +162,42 @@ describe('should render component correctly', () => {
     expect(getByTestId('intent').textContent).toEqual('plan');
     expect(getByTestId('goals').textContent).toEqual('#goal');
     expect(getByTestId('subject').textContent).toContain('Eve Everywoman');
-    expect(getByTestId('subject').textContent).toContain('Patient/1');
     expect(getByTestId('periodStart').textContent).toEqual('1/1/2013');
     expect(getByTestId('periodEnd').textContent).toEqual('10/1/2013');
   });
+
+  it('should fire custom onClick function', () => {
+    const defaultProps = {
+      fhirResource: example2CarePlanR4,
+      fhirVersion: fhirVersions.R4,
+    };
+
+    const onClick = jest.fn();
+    const { getByRole } = render(
+      <CarePlan {...defaultProps} onClick={onClick} />,
+    );
+    const accordion = getByRole('button');
+    fireEvent.click(accordion);
+
+    const attribute = accordion.getAttribute('data-bs-toggle');
+    expect(attribute).not.toEqual('collapse');
+    expect(onClick).toHaveBeenCalled();
+  });
+
+  it('should not fire custom onClick function', () => {
+    const defaultProps = {
+      fhirResource: example2CarePlanR4,
+      fhirVersion: fhirVersions.R4,
+    };
+
+    const onClick = 'test';
+    const { getByRole } = render(
+      <CarePlan {...defaultProps} onClick={onClick} />,
+    );
+    const accordion = getByRole('button');
+    fireEvent.click(accordion);
+
+    const attribute = accordion.getAttribute('data-bs-toggle');
+    expect(attribute).toEqual('collapse');
+  });
 });