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

fhir-react 0.3.6 → 0.3.7

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 (31) hide show

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

@@ -5,18 +5,17 @@ import _get from 'lodash/get';
 import {
   Root,
   Header,
-  Title,
   Badge,
   Body,
   ValueSection,
-  Value,
-  BadgeSecondary,
+  ValueSectionItem,
 } from '../../ui';
 import Coding from '../../datatypes/Coding';
 import Reference from '../../datatypes/Reference';
 import fhirVersions from '../fhirResourceVersions';
 import UnhandledResourceDataStructure from '../UnhandledResourceDataStructure';
 import Attachment from '../../datatypes/Attachment';
+import Accordion from '../../containers/Accordion';
 const commonDTO = fhirResource => {
   let title = _get(fhirResource, 'code.coding.0');
@@ -158,13 +157,12 @@ const Ingredient = props => {
         <Coding fhirData={itemDisplay} />
       </label>
       <Reference fhirData={reference} />
-      {hasAmount && <BadgeSecondary>{amount}</BadgeSecondary>}
+      {hasAmount && <span>, {amount}</span>}
     </div>
   );
 };
-const Medication = props => {
-  const { fhirResource, fhirVersion } = props;
+const Medication = ({ fhirResource, fhirVersion, fhirIcons }) => {
   let fhirResourceData = {};
   try {
     fhirResourceData = resourceDTO(fhirVersion, fhirResource);
@@ -187,54 +185,95 @@ const Medication = props => {
     status,
   } = fhirResourceData;
+  const tableData = [
+    {
+      label: 'Manufacturer',
+      testId: 'manufacturer',
+      data: manufacturer && <Reference fhirData={manufacturer} />,
+      status: manufacturer,
+    },
+  ];
+  const productData = [
+    {
+      label: 'Form',
+      testId: 'product-form',
+      data:
+        productForm &&
+        productForm.map((item, i) => (
+          <Coding key={`item-${i}`} fhirData={item} />
+        )),
+      status: productForm,
+    },
+    {
+      label: 'Ingredient',
+      testId: 'product-ingredient',
+      data:
+        hasProductIngredient &&
+        productIngredient.map((item, i) => (
+          <Ingredient key={`item-${i}`} {...item} />
+        )),
+      status: hasProductIngredient,
+    },
+    {
+      label: 'Package container',
+      testId: 'package-container',
+      data:
+        hasPackageCoding &&
+        packageCoding.map((item, i) => (
+          <Coding key={`item-${i}`} fhirData={item} />
+        )),
+      status: hasPackageCoding,
+    },
+    {
+      label: 'Images',
+      testId: 'product-images',
+      data:
+        hasImages &&
+        images.map((item, i) => (
+          <Attachment key={`item-${i}`} fhirData={item} isImage />
+        )),
+      status: hasImages,
+    },
+  ];
   return (
     <Root name="Medication">
-      <Header>
-        <Title>
-          <Coding fhirData={title} />
-        </Title>
-        {isBrand && <Badge>Brand</Badge>}
-        {status && <Badge>{status}</Badge>}
-      </Header>
-      <Body>
-        {manufacturer && (
-          <Value label="Manufacturer" data-testid="manufacturer">
-            <Reference fhirData={manufacturer} />
-          </Value>
-        )}
-        {hasProduct && (
-          <ValueSection label="Product">
-            {productForm && (
-              <Value label="Form" data-testid="product-form">
-                {productForm.map((item, i) => (
-                  <Coding key={`item-${i}`} fhirData={item} />
-                ))}
-              </Value>
-            )}
-            {hasProductIngredient && (
-              <Value label="Ingredient" data-testid="product-ingredient">
-                {productIngredient.map((item, i) => (
-                  <Ingredient key={`item-${i}`} {...item} />
-                ))}
-              </Value>
-            )}
-            {hasPackageCoding && (
-              <Value label="Package container" data-testid="package-container">
-                {packageCoding.map((item, i) => (
-                  <Coding key={`item-${i}`} fhirData={item} />
-                ))}
-              </Value>
-            )}
-            {hasImages && (
-              <Value label="Images" data-testid="product-images">
-                {images.map((item, i) => (
-                  <Attachment key={`item-${i}`} fhirData={item} />
-                ))}
-              </Value>
+      <Accordion
+        headerContent={
+          <Header
+            resourceName="Medication"
+            badges={
+              <>
+                {isBrand && <Badge data-testid="brand-badge">Brand</Badge>}
+                {status && <Badge data-testid="status">{status}</Badge>}
+              </>
+            }
+            title={<Coding fhirData={title} />}
+            icon={fhirIcons}
+          />
+        }
+        bodyContent={
+          <Body tableData={tableData}>
+            {hasProduct && (
+              <ValueSection label="Product" marginTop={manufacturer}>
+                {productData.map(
+                  (item, index) =>
+                    item.status && (
+                      <ValueSectionItem
+                        key={`product-item-${index}`}
+                        label={item.label}
+                        data-testid={item.testId}
+                      >
+                        {item.data}
+                      </ValueSectionItem>
+                    ),
+                )}
+              </ValueSection>
             )}
-          </ValueSection>
-        )}
-      </Body>
+          </Body>
+        }
+      />
     </Root>
   );
 };

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

@@ -11,6 +11,8 @@ import stu3Example2 from '../../../fixtures/stu3/resources/medication/example2.j
 import r4Example1 from '../../../fixtures/r4/resources/medication/example1.json';
 import r4Example2 from '../../../fixtures/r4/resources/medication/example2.json';
 import r4Example3 from '../../../fixtures/r4/resources/medication/example3.json';
+import fhirIcons from '../../../fixtures/example-icons';
+import MedicationIcon from '../../../assets/containers/Medication/medication.svg';
 export default {
   title: 'Medication',
@@ -19,46 +21,74 @@ export default {
 export const DefaultVisualizationDSTU2 = () => {
   const fhirResource = object('Resource', dstu2Example1);
   return (
-    <Medication fhirVersion={fhirVersions.DSTU2} fhirResource={fhirResource} />
+    <Medication
+      fhirVersion={fhirVersions.DSTU2}
+      fhirResource={fhirResource}
+      fhirIcons={require('../../../assets/containers/Medication/medication.svg')}
+    />
   );
 };
 export const Example2OfDSTU2 = () => {
   const fhirResource = object('Resource', dstu2Example2);
   return (
-    <Medication fhirVersion={fhirVersions.DSTU2} fhirResource={fhirResource} />
+    <Medication
+      fhirVersion={fhirVersions.DSTU2}
+      fhirResource={fhirResource}
+      fhirIcons={MedicationIcon}
+    />
   );
 };
 export const Example1OfSTU3 = () => {
   const fhirResource = object('Resource', stu3Example1);
   return (
-    <Medication fhirVersion={fhirVersions.STU3} fhirResource={fhirResource} />
+    <Medication
+      fhirVersion={fhirVersions.STU3}
+      fhirResource={fhirResource}
+      fhirIcons={fhirIcons}
+    />
   );
 };
 export const Example2OfSTU3 = () => {
   const fhirResource = object('Resource', stu3Example2);
   return (
-    <Medication fhirVersion={fhirVersions.STU3} fhirResource={fhirResource} />
+    <Medication
+      fhirVersion={fhirVersions.STU3}
+      fhirResource={fhirResource}
+      fhirIcons={false}
+    />
   );
 };
 export const Example1OfR4 = () => {
   const fhirResource = object('Resource', r4Example1);
   return (
-    <Medication fhirVersion={fhirVersions.R4} fhirResource={fhirResource} />
+    <Medication
+      fhirVersion={fhirVersions.R4}
+      fhirResource={fhirResource}
+      fhirIcons={'random text'}
+    />
   );
 };
 export const Example2OfR4 = () => {
   const fhirResource = object('Resource', r4Example2);
   return (
-    <Medication fhirVersion={fhirVersions.R4} fhirResource={fhirResource} />
+    <Medication
+      fhirVersion={fhirVersions.R4}
+      fhirResource={fhirResource}
+      fhirIcons={fhirIcons}
+    />
   );
 };
 export const Example3OfR4 = () => {
   const fhirResource = object('Resource', r4Example3);
   return (
-    <Medication fhirVersion={fhirVersions.R4} fhirResource={fhirResource} />
+    <Medication
+      fhirVersion={fhirVersions.R4}
+      fhirResource={fhirResource}
+      fhirIcons={fhirIcons}
+    />
   );
 };

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

@@ -9,8 +9,80 @@ import stu3Example1 from '../../../fixtures/stu3/resources/medication/example1.j
 import stu3Example2 from '../../../fixtures/stu3/resources/medication/example2.json';
 import r4Example1 from '../../../fixtures/r4/resources/medication/example1.json';
 import r4Example2 from '../../../fixtures/r4/resources/medication/example2.json';
+import fhirIcons from '../../../fixtures/example-icons';
+describe('should render Medication component properly', () => {
+  it('component without a fhirIcons props should render a default icon', () => {
+    const defaultProps = {
+      fhirVersion: fhirVersions.DSTU2,
+      fhirResource: dstu2Example1,
+    };
+    const { getByAltText } = render(<Medication {...defaultProps} />);
+    const headerIcon = getByAltText('medication');
+    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(<Medication {...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/Medication/medication.svg')}
+          alt="medication"
+        />
+      ),
+    };
+    const { getByAltText } = render(<Medication {...defaultProps} />);
+    const headerIcon = getByAltText('medication');
+    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(<Medication {...defaultProps} />);
+    const headerIcon = getByAltText('medication');
+    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(<Medication {...defaultProps} />);
+    const headerIcon = getByAltText('header icon');
+    expect(headerIcon.getAttribute('src')).toContain(avatarSrc);
+  });
-describe('should render MedicationOrder component properly', () => {
   it('should render with DSTU2 source data', () => {
     const defaultProps = {
       fhirResource: dstu2Example1,
@@ -41,7 +113,9 @@ describe('should render MedicationOrder component properly', () => {
       fhirVersion: fhirVersions.STU3,
     };
-    const { container, getByTestId } = render(<Medication {...defaultProps} />);
+    const { container, getByTestId, getByAltText } = render(
+      <Medication {...defaultProps} />,
+    );
     expect(container).not.toBeNull();
     expect(getByTestId('title').textContent).toContain(
@@ -56,8 +130,8 @@ describe('should render MedicationOrder component properly', () => {
     );
     expect(getByTestId('package-container').textContent).toContain('Vial');
-    expect(getByTestId('product-images').textContent).toContain(
-      'Vancomycin Image',
+    expect(getByAltText('Vancomycin Image').src).toContain(
+      'https://www.drugs.com/images/pills/fio/AKN07410.JPG',
     );
   });

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

@@ -8,7 +8,8 @@ import Telecom from '../../datatypes/Telecom';
 import Identifier from '../../datatypes/Identifier';
 import UnhandledResourceDataStructure from '../UnhandledResourceDataStructure';
 import fhirVersions from '../fhirResourceVersions';
-import { Root, Header, Title, Body, Value, NotEnoughData } from '../../ui';
+import { Root, Header, Body, NotEnoughData } from '../../ui';
+import Accordion from '../../containers/Accordion';
 const commonDTO = fhirResource => {
   const identifier = _get(fhirResource, 'identifier', '');
@@ -54,8 +55,7 @@ const resourceDTO = (fhirVersion, fhirResource) => {
   }
 };
-const Organization = props => {
-  const { fhirResource, fhirVersion } = props;
+const Organization = ({ fhirResource, fhirVersion, fhirIcons }) => {
   let fhirResourceData = {};
   try {
     fhirResourceData = resourceDTO(fhirVersion, fhirResource);
@@ -74,42 +74,60 @@ const Organization = props => {
   const hasTelecom = Array.isArray(telecom) && telecom.length > 0;
   const hasTypes = Array.isArray(typeCodings) && typeCodings.length > 0;
   const notEnoughData = !hasAddresses && !hasTelecom && !hasTypes;
+  const tableData = [
+    {
+      label: 'Identifiers',
+      testId: 'identifier',
+      data: identifier && <Identifier fhirData={identifier} noCursive />,
+      status: identifier,
+    },
+    {
+      label: 'Addresses',
+      testId: 'address',
+      data:
+        hasAddresses &&
+        addresses.map((item, i) => (
+          <Address key={`item-${i}`} fhirData={item} />
+        )),
+      status: hasAddresses,
+    },
+    {
+      label: 'Contacts',
+      testId: 'contact',
+      data:
+        hasTelecom &&
+        telecom.map((item, i) => <Telecom key={`item-${i}`} fhirData={item} />),
+      status: hasTelecom,
+    },
+    {
+      label: 'Type',
+      testId: 'type',
+      data:
+        hasTypes &&
+        typeCodings.map((typeCoding, idx) => (
+          <Coding key={idx} fhirData={typeCoding} />
+        )),
+      status: hasTypes,
+    },
+    {
+      label: '',
+      testId: '',
+      data: notEnoughData && <NotEnoughData data-testid="NotEnoughData" />,
+      status: notEnoughData,
+    },
+  ];
   return (
     <Root name="Organization">
-      {name && (
-        <Header>
-          <Title>{name}</Title>
-        </Header>
-      )}
-      <Body>
-        {identifier && (
-          <Value label="Identifiers" data-testid="identifier">
-            <Identifier fhirData={identifier} />
-          </Value>
-        )}
-        {hasAddresses && (
-          <Value label="Addresses" data-testid="address">
-            {addresses.map((item, i) => (
-              <Address key={`item-${i}`} fhirData={item} />
-            ))}
-          </Value>
-        )}
-        {hasTelecom && (
-          <Value label="Contacts" data-testid="contact">
-            {telecom.map((item, i) => (
-              <Telecom key={`item-${i}`} fhirData={item} />
-            ))}
-          </Value>
-        )}
-        {hasTypes && (
-          <Value label="Type" data-testid="type">
-            {typeCodings.map((typeCoding, idx) => (
-              <Coding key={idx} fhirData={typeCoding} />
-            ))}
-          </Value>
-        )}
-        {notEnoughData && <NotEnoughData data-testid="NotEnoughData" />}
-      </Body>
+      <Accordion
+        headerContent={
+          name && (
+            <Header resourceName="Organization" title={name} icon={fhirIcons} />
+          )
+        }
+        bodyContent={<Body tableData={tableData} />}
+      />
     </Root>
   );
 };

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

@@ -14,6 +14,9 @@ import r4Example1 from '../../../fixtures/r4/resources/organization/example1.jso
 import r4Example2 from '../../../fixtures/r4/resources/organization/example2.json';
 import r4Example3 from '../../../fixtures/r4/resources/organization/example3.json';
+import fhirIcons from '../../../fixtures/example-icons';
+import OrganizationIcon from '../../../assets/containers/Organization/organization.svg';
 export default {
   title: 'Organization',
 };
@@ -24,6 +27,7 @@ export const DefaultVisualizationDSTU2 = () => {
     <Organization
       fhirResource={fhirResource}
       fhirVersion={fhirVersions.DSTU2}
+      fhirIcons={OrganizationIcon}
     />
   );
 };
@@ -34,6 +38,7 @@ export const Example2OfDSTU2 = () => {
     <Organization
       fhirResource={fhirResource}
       fhirVersion={fhirVersions.DSTU2}
+      fhirIcons={fhirIcons}
     />
   );
 };
@@ -41,14 +46,22 @@ export const Example2OfDSTU2 = () => {
 export const Example1OfSTU3 = () => {
   const fhirResource = object('Resource', stu3Example1);
   return (
-    <Organization fhirResource={fhirResource} fhirVersion={fhirVersions.STU3} />
+    <Organization
+      fhirResource={fhirResource}
+      fhirVersion={fhirVersions.STU3}
+      fhirIcons={false}
+    />
   );
 };
 export const Example2OfSTU3 = () => {
   const fhirResource = object('Resource', stu3Example2);
   return (
-    <Organization fhirResource={fhirResource} fhirVersion={fhirVersions.STU3} />
+    <Organization
+      fhirResource={fhirResource}
+      fhirVersion={fhirVersions.STU3}
+      fhirIcons={'random text'}
+    />
   );
 };

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

@@ -14,7 +14,80 @@ import r4Example1 from '../../../fixtures/r4/resources/organization/example1.jso
 import r4Example2 from '../../../fixtures/r4/resources/organization/example2.json';
 import r4Example3 from '../../../fixtures/r4/resources/organization/example3.json';
+import fhirIcons from '../../../fixtures/example-icons';
 describe('should render Organization component properly', () => {
+  it('component without a fhirIcons props should render a default icon', () => {
+    const defaultProps = {
+      fhirVersion: fhirVersions.DSTU2,
+      fhirResource: dstu2Example1,
+    };
+    const { getByAltText } = render(<Organization {...defaultProps} />);
+    const headerIcon = getByAltText('organization');
+    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(<Organization {...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/Organization/organization.svg')}
+          alt="organization"
+        />
+      ),
+    };
+    const { getByAltText } = render(<Organization {...defaultProps} />);
+    const headerIcon = getByAltText('organization');
+    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(<Organization {...defaultProps} />);
+    const headerIcon = getByAltText('organization');
+    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(<Organization {...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/ui/index.js CHANGED Viewed

@@ -87,7 +87,7 @@ export const Title = props => (
 export const Badge = props => {
   return (
     <small
-      className={`fhir-ui__Badge text-capitalize d-flex align-items-center px-2 py-1 rounded-1 fw-bold ${getBadgeColor(
+      className={`fhir-ui__Badge text-capitalize d-flex align-items-center mx-1 px-2 py-1 rounded-1 fw-bold ${getBadgeColor(
         props,
       )}`}
       data-testid={props['data-testid']}
@@ -128,7 +128,7 @@ export const ValueUnit = props => (
 export const Body = ({ tableData = [], reverseContent, children }) => (
   <div className="fhir-ui__Body">
     {reverseContent ? children : null}
-    <div className="row">
+    <div className="row gap-3">
       {tableData.map(
         (value, index) =>
           value.status && (
@@ -199,10 +199,17 @@ export const TableHeader = props => {
   );
 };
-export const TableRow = props => <tr>{props.children}</tr>;
+export const TableRow = props => {
+  const { children, ...rest } = props;
+  return <tr {...rest}>{props.children}</tr>;
+};
 export const TableCell = props => (
-  <td className="align-text-top border-0" data-testid={props['data-testid']}>
+  <td
+    className={`align-middle border-0 ${props.className || ''}`}
+    data-testid={props['data-testid']}
+    style={props.style}
+  >
     {props.children}
   </td>
 );