fhir-react 0.3.6 → 0.3.9

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

@@ -1,5 +1,5 @@
 import React from 'react';
-import { render } from '@testing-library/react';
+import { fireEvent, render } from '@testing-library/react';
 import Coverage from './Coverage';
 import fhirVersions from '../fhirResourceVersions';
 
@@ -8,8 +8,80 @@ import exampleCoverage from '../../../fixtures/dstu2/resources/coverage/example1
 import exampleCoverageStu3 from '../../../fixtures/stu3/resources/coverage/example1.json';
 import example2CoverageStu3 from '../../../fixtures/stu3/resources/coverage/example2.json';
 import exampleCoverageR4 from '../../../fixtures/r4/resources/coverage/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.DSTU2,
+      fhirResource: exampleCoverage,
+    };
+
+    const { getByAltText } = render(<Coverage {...defaultProps} />);
+    const headerIcon = getByAltText('coverage');
+
+    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: exampleCoverage,
+      fhirIcons: false,
+    };
+
+    const { getByTestId } = render(<Coverage {...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: exampleCoverage,
+      fhirIcons: (
+        <img
+          src={require('../assets/containers/Coverage/coverage.svg')}
+          alt="coverage"
+        />
+      ),
+    };
+
+    const { getByAltText } = render(<Coverage {...defaultProps} />);
+    const headerIcon = getByAltText('coverage');
+
+    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: exampleCoverage,
+      fhirIcons: fhirIcons,
+    };
+
+    const { getByAltText } = render(<Coverage {...defaultProps} />);
+    const headerIcon = getByAltText('coverage');
+
+    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: exampleCoverage,
+      fhirIcons: avatarSrc,
+    };
+
+    const { getByAltText } = render(<Coverage {...defaultProps} />);
+    const headerIcon = getByAltText('header icon');
+
+    expect(headerIcon.getAttribute('src')).toContain(avatarSrc);
+  });
+
   it('should render with DSTU2 source data', () => {
     const defaultProps = {
       fhirResource: exampleCoverage,
@@ -18,7 +90,7 @@ describe('should render component correctly', () => {
     const { getByTestId } = render(<Coverage {...defaultProps} />);
 
     expect(getByTestId('title').textContent.replace(nbspRegex, ' ')).toContain(
-      'Coverage Identifier: 12345',
+      'Coverage',
     );
     expect(getByTestId('issuer').textContent).toContain('Organization/2');
     expect(getByTestId('planId').textContent).toContain('CBI35');
@@ -35,7 +107,7 @@ describe('should render component correctly', () => {
     const { getByTestId } = render(<Coverage {...defaultProps} />);
 
     expect(getByTestId('title').textContent.replace(nbspRegex, ' ')).toContain(
-      'Coverage Identifier: 12345',
+      'Coverage',
     );
     expect(getByTestId('issuer').textContent).toContain('Organization/2');
     expect(getByTestId('planId').textContent).toContain('B37FC');
@@ -70,7 +142,7 @@ describe('should render component correctly', () => {
     );
 
     expect(getByTestId('title').textContent.replace(nbspRegex, ' ')).toContain(
-      'Coverage Identifier: 12345',
+      'Coverage',
     );
     expect(getByTestId('issuer').textContent).toContain('Organization/2');
     expect(queryAllByTestId('planId').length).toEqual(0);
@@ -79,4 +151,39 @@ describe('should render component correctly', () => {
     expect(getByTestId('type').textContent).toContain('extended healthcare');
     expect(queryAllByTestId('details').length).toEqual(0);
   });
+
+  it('should fire custom onClick function', () => {
+    const defaultProps = {
+      fhirResource: exampleCoverageR4,
+      fhirVersion: fhirVersions.R4,
+    };
+
+    const onClick = jest.fn();
+    const { getByRole } = render(
+      <Coverage {...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: exampleCoverageR4,
+      fhirVersion: fhirVersions.R4,
+    };
+
+    const onClick = 'test';
+    const { getByRole } = render(
+      <Coverage {...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/Device/Device.js

@@ -102,7 +102,13 @@ const resourceDTO = (fhirVersion, fhirResource) => {
   }
 };
 
-const Device = ({ fhirResource, fhirVersion, fhirIcons }) => {
+const Device = ({
+  fhirResource,
+  fhirVersion,
+  fhirIcons,
+  onClick,
+  rawOnClick,
+}) => {
   let fhirResourceData = {};
   try {
     fhirResourceData = resourceDTO(fhirVersion, fhirResource);
@@ -178,6 +184,8 @@ const Device = ({ fhirResource, fhirVersion, fhirIcons }) => {
               ))}
           </Body>
         }
+        onClick={onClick}
+        rawOnClick={rawOnClick}
       />
     </Root>
   );

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

@@ -1,5 +1,5 @@
 import React from 'react';
-import { render } from '@testing-library/react';
+import { fireEvent, render } from '@testing-library/react';
 
 import Device from './Device';
 import fhirVersions from '../fhirResourceVersions';
@@ -137,4 +137,39 @@ describe('should render Device component properly', () => {
 
     expect(getByTestId('uniqueId').textContent).toEqual('-');
   });
+
+  it('should fire custom onClick function', () => {
+    const defaultProps = {
+      fhirResource: r4Example2,
+      fhirVersion: fhirVersions.R4,
+    };
+
+    const onClick = jest.fn();
+    const { getByRole } = render(
+      <Device {...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 fire custom onClick function', () => {
+    const defaultProps = {
+      fhirResource: r4Example2,
+      fhirVersion: fhirVersions.R4,
+    };
+
+    const onClick = 'test';
+    const { getByRole } = render(
+      <Device {...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/DiagnosticReport/DiagnosticReport.js

@@ -93,8 +93,13 @@ const resourceDTO = (fhirVersion, fhirResource) => {
   }
 };
 
-const DiagnosticReport = props => {
-  const { fhirResource, fhirVersion, fhirIcons } = props;
+const DiagnosticReport = ({
+  fhirResource,
+  fhirVersion,
+  fhirIcons,
+  onClick,
+  rawOnClick,
+}) => {
   let fhirResourceData = {};
   try {
     fhirResourceData = resourceDTO(fhirVersion, fhirResource);
@@ -165,6 +170,8 @@ const DiagnosticReport = props => {
           />
         }
         bodyContent={<Body tableData={tableData} />}
+        onClick={onClick}
+        rawOnClick={rawOnClick}
       />
     </Root>
   );

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

@@ -1,5 +1,5 @@
 import React from 'react';
-import { render } from '@testing-library/react';
+import { fireEvent, render } from '@testing-library/react';
 import DiagnosticReport from './DiagnosticReport';
 import fhirVersions from '../fhirResourceVersions';
 
@@ -152,4 +152,39 @@ describe('should render component correctly', () => {
 
     expect(getByTestId('performer').textContent).toContain('Todd Ashby');
   });
+
+  it('should fire custom onClick function', () => {
+    const defaultProps = {
+      fhirResource: example2DiagnosticReportR4,
+      fhirVersion: fhirVersions.R4,
+    };
+
+    const onClick = jest.fn();
+    const { getByRole } = render(
+      <DiagnosticReport {...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: example2DiagnosticReportR4,
+      fhirVersion: fhirVersions.R4,
+    };
+
+    const onClick = 'test';
+    const { getByRole } = render(
+      <DiagnosticReport {...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/DocumentReference/DocumentReference.js

@@ -216,8 +216,13 @@ const Content = props => {
   );
 };
 
-const DocumentReference = props => {
-  const { fhirVersion, fhirResource, fhirIcons } = props;
+const DocumentReference = ({
+  fhirVersion,
+  fhirResource,
+  fhirIcons,
+  onClick,
+  rawOnClick,
+}) => {
   let fhirResourceData = {};
   try {
     fhirResourceData = resourceDTO(fhirVersion, fhirResource);
@@ -337,6 +342,8 @@ const DocumentReference = props => {
             {hasContent && <Content content={content} />}
           </Body>
         }
+        onClick={onClick}
+        rawOnClick={rawOnClick}
       />
     </Root>
   );

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

@@ -1,5 +1,5 @@
 import React from 'react';
-import { render } from '@testing-library/react';
+import { fireEvent, render } from '@testing-library/react';
 
 import { nbspRegex } from '../../../testUtils';
 import fhirVersions from '../fhirResourceVersions';
@@ -268,4 +268,45 @@ describe('should render the DocumentReference component properly', () => {
     const urls = getAllByTestId('content.url').map(node => node.textContent);
     expect(urls).toEqual(['Binary/07a6483f-732b-461e-86b6-edb665c45510']);
   });
+
+  it('should fire custom onClick function', () => {
+    const resource = JSON.parse(JSON.stringify(r4Example1));
+    resource.content[0].attachment.url =
+      'http://example.org/xds/mhd/Binary/07a6483f-732b-461e-86b6-edb665c45510';
+
+    const onClick = jest.fn();
+    const { getByRole } = render(
+      <DocumentReference
+        fhirResource={resource}
+        fhirVersion={fhirVersions.R4}
+        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 resource = JSON.parse(JSON.stringify(r4Example1));
+    resource.content[0].attachment.url =
+      'http://example.org/xds/mhd/Binary/07a6483f-732b-461e-86b6-edb665c45510';
+
+    const onClick = 'test';
+    const { getByRole } = render(
+      <DocumentReference
+        fhirResource={resource}
+        fhirVersion={fhirVersions.R4}
+        onClick={onClick}
+      />,
+    );
+    const accordion = getByRole('button');
+    fireEvent.click(accordion);
+
+    const attribute = accordion.getAttribute('data-bs-toggle');
+    expect(attribute).toEqual('collapse');
+  });
 });

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

@@ -160,7 +160,13 @@ const resourceDTO = (fhirVersion, fhirResource) => {
   }
 };
 
-const Encounter = ({ fhirResource, fhirVersion, fhirIcons }) => {
+const Encounter = ({
+  fhirResource,
+  fhirVersion,
+  fhirIcons,
+  onClick,
+  rawOnClick,
+}) => {
   let fhirResourceData = {};
   try {
     fhirResourceData = resourceDTO(fhirVersion, fhirResource);
@@ -229,6 +235,8 @@ const Encounter = ({ fhirResource, fhirVersion, fhirIcons }) => {
             )}
           </Body>
         }
+        onClick={onClick}
+        rawOnClick={rawOnClick}
       />
     </Root>
   );

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

@@ -1,5 +1,5 @@
 import React from 'react';
-import { render } from '@testing-library/react';
+import { fireEvent, render } from '@testing-library/react';
 import Encounter from './Encounter';
 import fhirVersions from '../fhirResourceVersions';
 import example1 from '../../../fixtures/dstu2/resources/encounter/example.json';
@@ -198,4 +198,39 @@ describe('should render component correctly', () => {
     );
     jest.restoreAllMocks();
   });
+
+  it('should fire custom onClick function', () => {
+    const defaultProps = {
+      fhirResource: example2_STU3,
+      fhirVersion: fhirVersions.R4,
+    };
+
+    const onClick = jest.fn();
+    const { getByRole } = render(
+      <Encounter {...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: example2_STU3,
+      fhirVersion: fhirVersions.R4,
+    };
+
+    const onClick = 'test';
+    const { getByRole } = render(
+      <Encounter {...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/ExplanationOfBenefit/ExplanationOfBenefit.js

@@ -233,6 +233,8 @@ const ExplanationOfBenefit = ({
   fhirVersion,
   withCarinBBProfile = false,
   fhirIcons,
+  onClick,
+  rawOnClick,
 }) => {
   let fhirResourceData = {};
   try {
@@ -546,6 +548,8 @@ const ExplanationOfBenefit = ({
             {hasCareTeam && <CareTeam fhirData={careTeam} />}
           </Body>
         }
+        onClick={onClick}
+        rawOnClick={rawOnClick}
       />
     </Root>
   );

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

@@ -8,7 +8,7 @@ import exampleC4BB from '../../../fixtures/r4/resources/explanationOfBenefit/c4b
 import exampleC4BBExtendedDiagnosis from '../../../fixtures/r4/resources/explanationOfBenefit/c4bbExtendedDiagnosis.json';
 import fhirVersions from '../fhirResourceVersions';
 import { nbspRegex } from '../../../testUtils';
-import { render } from '@testing-library/react';
+import { fireEvent, render } from '@testing-library/react';
 import fhirIcons from '../../../fixtures/example-icons';
 
 describe('should render ExplanationOfBenefit component properly', () => {
@@ -331,4 +331,41 @@ describe('should render ExplanationOfBenefit component properly', () => {
     expect(getByTestId('diagnosisOnAdmission').textContent).toContain('?');
     expect(queryByTestId('diagnosisPackageCode')).toBeNull();
   });
+
+  it('should fire custom onClick function', () => {
+    const defaultProps = {
+      fhirResource: exampleC4BBExtendedDiagnosis,
+      fhirVersion: fhirVersions.R4,
+      withCarinBBProfile: true,
+    };
+
+    const onClick = jest.fn();
+    const { getByRole } = render(
+      <ExplanationOfBenefit {...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: exampleC4BBExtendedDiagnosis,
+      fhirVersion: fhirVersions.R4,
+      withCarinBBProfile: true,
+    };
+
+    const onClick = 'test';
+    const { getByRole } = render(
+      <ExplanationOfBenefit {...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/FamilyMemberHistory/FamilyMemberHistory.js

@@ -70,8 +70,13 @@ const resourceDTO = (fhirVersion, fhirResource) => {
   }
 };
 
-const FamilyMemberHistory = props => {
-  const { fhirResource, fhirVersion, fhirIcons } = props;
+const FamilyMemberHistory = ({
+  fhirResource,
+  fhirVersion,
+  fhirIcons,
+  onClick,
+  rawOnClick,
+}) => {
   let fhirResourceData = {};
   try {
     fhirResourceData = resourceDTO(fhirVersion, fhirResource);
@@ -135,6 +140,8 @@ const FamilyMemberHistory = props => {
           />
         }
         bodyContent={<Body tableData={tableData} />}
+        onClick={onClick}
+        rawOnClick={rawOnClick}
       />
     </Root>
   );

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

@@ -1,5 +1,5 @@
 import React from 'react';
-import { render } from '@testing-library/react';
+import { fireEvent, render } from '@testing-library/react';
 import FamilyMemberHistory from './FamilyMemberHistory';
 import fhirVersions from '../fhirResourceVersions';
 
@@ -110,4 +110,39 @@ describe('should render FamilyMemberHistory component correctly', () => {
     expect(getByTestId('hasRelationship').textContent).toContain('father');
     expect(getByTestId('noteText').textContent).toContain('Was fishing at');
   });
+
+  it('should fire custom onClick function', () => {
+    const defaultProps = {
+      fhirResource: example1STU3,
+      fhirVersion: fhirVersions.STU3,
+    };
+
+    const onClick = jest.fn();
+    const { getByRole } = render(
+      <FamilyMemberHistory {...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: example1STU3,
+      fhirVersion: fhirVersions.STU3,
+    };
+
+    const onClick = 'test';
+    const { getByRole } = render(
+      <FamilyMemberHistory {...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/Generic/Generic.js

@@ -1,10 +1,10 @@
 import React from 'react';
 import _get from 'lodash/get';
 
-import { Root, Header, Title, Body } from '../../ui';
+import { Root, Header } from '../../ui';
+import Accordion from '../../containers/Accordion';
 
-const Generic = props => {
-  const { fhirResource } = props;
+const Generic = ({ fhirResource, fhirIcons, onClick, rawOnClick }) => {
   const title = fhirResource
     ? `${fhirResource.resourceType}/${fhirResource.id}`
     : `Unknown Resource`;
@@ -14,10 +14,24 @@ const Generic = props => {
 
   return (
     <Root>
-      <Header>
-        <Title>{title}</Title>
-      </Header>
-      {code && <Body>{code && <p>{code}</p>}</Body>}
+      <Accordion
+        headerContent={
+          <Header
+            resourceName={'Generic'}
+            title={title}
+            icon={fhirIcons}
+            additionalContent={
+              code && (
+                <span className="text-secondary" data-testid="code">
+                  {code}
+                </span>
+              )
+            }
+          />
+        }
+        onClick={onClick}
+        rawOnClick={rawOnClick}
+      />
     </Root>
   );
 };

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

@@ -2,6 +2,7 @@ import React from 'react';
 import { object } from '@storybook/addon-knobs';
 
 import Generic from './Generic';
+import fhirIcons from '../../../fixtures/example-icons';
 
 export default { title: 'Generic' };
 
@@ -14,5 +15,5 @@ export const DefaultVisualization = () => {
     },
   };
   const fhirResource = object('Resource', exampleResource);
-  return <Generic fhirResource={fhirResource} />;
+  return <Generic fhirResource={fhirResource} fhirIcons={fhirIcons} />;
 };