npm - fhir-react - Versions diffs - 0.3.7 → 0.3.8 - Mend

fhir-react 0.3.7 → 0.3.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (138) hide show

package/src/components/resources/Device/Device.js CHANGED Viewed

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

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

@@ -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 CHANGED Viewed

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

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

@@ -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 CHANGED Viewed

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

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

@@ -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 CHANGED Viewed

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

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

@@ -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 CHANGED Viewed

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

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

@@ -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 CHANGED Viewed

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

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

@@ -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 CHANGED Viewed

@@ -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 }) => {
   const title = fhirResource
     ? `${fhirResource.resourceType}/${fhirResource.id}`
     : `Unknown Resource`;
@@ -14,10 +14,23 @@ 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}
+      />
     </Root>
   );
 };

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

@@ -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} />;
 };

package/src/components/resources/Generic/Generic.test.js CHANGED Viewed

@@ -1,8 +1,9 @@
 import React from 'react';
-import { render } from '@testing-library/react';
+import { fireEvent, render } from '@testing-library/react';
 import Generic from './Generic';
+import fhirIcons from '../../../fixtures/example-icons';
-it('should render component correctly', () => {
+describe('should render the Generic component properly', () => {
   const exampleResource = {
     resourceType: 'UnknownResource',
     id: '12345',
@@ -10,10 +11,28 @@ it('should render component correctly', () => {
       text: 'Resource code text',
     },
   };
-  const { container, getByTestId } = render(
-    <Generic fhirResource={exampleResource} />,
-  );
-  expect(getByTestId('title').textContent).toEqual('UnknownResource/12345');
-  expect(container.textContent).toContain('Resource code text');
+  it('should render component correctly', () => {
+    const { container, getByTestId, getByAltText } = render(
+      <Generic fhirResource={exampleResource} fhirIcons={fhirIcons} />,
+    );
+    const headerIcon = getByAltText('generic');
+    expect(headerIcon.getAttribute('src')).toContain('IMAGE_MOCK');
+    expect(getByTestId('title').textContent).toEqual('UnknownResource/12345');
+    expect(container.textContent).toContain('Resource code text');
+  });
+  it('should fire custom onClick function', () => {
+    const onClick = jest.fn();
+    const { getByRole } = render(
+      <Generic fhirResource={exampleResource} onClick={onClick} />,
+    );
+    const accordion = getByRole('button');
+    fireEvent.click(accordion);
+    const attribute = accordion.getAttribute('data-bs-toggle');
+    expect(attribute).not.toEqual('collapse');
+    expect(onClick).toHaveBeenCalled();
+  });
 });

package/src/components/resources/Goal/Goal.js CHANGED Viewed

@@ -99,9 +99,7 @@ const resourceDTO = (fhirVersion, fhirResource) => {
   }
 };
-const Goal = props => {
-  const { fhirResource, fhirVersion, fhirIcons } = props;
+const Goal = ({ fhirResource, fhirVersion, fhirIcons, onClick }) => {
   let fhirResourceData = {};
   try {
     fhirResourceData = resourceDTO(fhirVersion, fhirResource);
@@ -229,6 +227,7 @@ const Goal = props => {
           />
         }
         bodyContent={<Body tableData={tableData} />}
+        onClick={onClick}
       />
     </Root>
   );

package/src/components/resources/Goal/Goal.test.js CHANGED Viewed

@@ -1,5 +1,5 @@
 import React from 'react';
-import { render } from '@testing-library/react';
+import { fireEvent, render } from '@testing-library/react';
 import Goal from './Goal';
 import fhirVersions from '../fhirResourceVersions';
@@ -187,4 +187,35 @@ describe('should render Goal component properly', () => {
     expect(queryByTestId('priority')).toBeNull();
   });
+  it('should fire custom onClick function', () => {
+    const defaultProps = {
+      fhirResource: r4Example2,
+      fhirVersion: fhirVersions.R4,
+    };
+    const onClick = jest.fn();
+    const { getByRole } = render(<Goal {...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: r4Example2,
+      fhirVersion: fhirVersions.R4,
+    };
+    const onClick = 'test';
+    const { getByRole } = render(<Goal {...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/Immunization/Immunization.js CHANGED Viewed

@@ -103,8 +103,7 @@ const resourceDTO = (fhirVersion, fhirResource) => {
   }
 };
-const Immunization = props => {
-  const { fhirVersion, fhirResource, fhirIcons } = props;
+const Immunization = ({ fhirVersion, fhirResource, fhirIcons, onClick }) => {
   const {
     title,
     status,
@@ -241,6 +240,7 @@ const Immunization = props => {
           />
         }
         bodyContent={<Body tableData={tableData} />}
+        onClick={onClick}
       />
     </Root>
   );

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

@@ -4,7 +4,7 @@ import dstu2Example from '../../../fixtures/dstu2/resources/immunization/example
 import fhirVersions from '../fhirResourceVersions';
 import r4Example1 from '../../../fixtures/r4/resources/immunization/example1.json';
 import r4Example2 from '../../../fixtures/r4/resources/immunization/example2.json';
-import { render } from '@testing-library/react';
+import { fireEvent, render } from '@testing-library/react';
 import stu3Example from '../../../fixtures/stu3/resources/immunization/example1.json';
 import fhirIcons from '../../../fixtures/example-icons';
@@ -222,4 +222,39 @@ describe('should render Immunization component properly', () => {
     expect(queryByTestId('site')).toBeNull();
   });
+  it('should fire custom onClick function', () => {
+    const defaultProps = {
+      fhirResource: r4Example1,
+      fhirVersion: fhirVersions.R4,
+    };
+    const onClick = jest.fn();
+    const { getByRole } = render(
+      <Immunization {...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(
+      <Immunization {...defaultProps} onClick={onClick} />,
+    );
+    const accordion = getByRole('button');
+    fireEvent.click(accordion);
+    const attribute = accordion.getAttribute('data-bs-toggle');
+    expect(attribute).toEqual('collapse');
+  });
 });