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

fhir-react 0.3.4 → 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 (84) hide show

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

@@ -3,20 +3,13 @@ import PropTypes from 'prop-types';
 import Reference from '../../datatypes/Reference';
 import Coding from '../../datatypes/Coding';
 import Date from '../../datatypes/Date';
+import Accordion from '../../containers/Accordion/Accordion';
 import _get from 'lodash/get';
 import _has from 'lodash/has';
 import UnhandledResourceDataStructure from '../UnhandledResourceDataStructure';
 import fhirVersions from '../fhirResourceVersions';
-import {
-  Root,
-  Header,
-  Title,
-  Badge,
-  BadgeSecondary,
-  Body,
-  Value,
-} from '../../ui';
+import { Root, Header, Badge, Body, Value } from '../../ui';
 const commonDTO = fhirResource => {
   const title = _get(fhirResource, 'note[0].text', 'Goal');
@@ -107,7 +100,8 @@ const resourceDTO = (fhirVersion, fhirResource) => {
 };
 const Goal = props => {
-  const { fhirResource, fhirVersion } = props;
+  const { fhirResource, fhirVersion, fhirIcons } = props;
   let fhirResourceData = {};
   try {
     fhirResourceData = resourceDTO(fhirVersion, fhirResource);
@@ -135,83 +129,107 @@ const Goal = props => {
     statusDate,
   } = fhirResourceData;
+  const tableData = [
+    {
+      label: 'Subject',
+      testId: 'subject',
+      data: subject && <Reference fhirData={subject} />,
+      status: subject,
+    },
+    {
+      label: 'Subject',
+      testId: 'statusDate',
+      data: statusDate && <Date fhirData={statusDate} />,
+      status: statusDate,
+    },
+    {
+      label: 'Description',
+      testId: 'description',
+      data: description,
+      status: description,
+    },
+    {
+      label: 'Category',
+      testId: 'category',
+      data:
+        hasCategory &&
+        category.map((item, i) => {
+          const coding = _get(item, 'coding', []);
+          if (!Array.isArray(coding)) {
+            return null;
+          }
+          return coding.map((codingItem, j) => (
+            <Coding key={`coding-item-${j}`} fhirData={codingItem} />
+          ));
+        }),
+      status: hasCategory,
+    },
+    {
+      label: 'Universal Device Identifier',
+      testId: 'udi',
+      data: udi,
+      status: hasUdi,
+    },
+    {
+      label: 'Addresses',
+      testId: 'addresses',
+      data:
+        hasAddresses &&
+        addresses.map((address, i) => (
+          <Reference key={`address-item-${i}`} fhirData={address} />
+        )),
+      status: hasAddresses,
+    },
+    {
+      label: 'Priority',
+      testId: 'priority',
+      data: priority && <Coding fhirData={priority} />,
+      status: priority,
+    },
+    {
+      label: 'Author',
+      testId: 'author',
+      data: author && <Reference fhirData={author} />,
+      status: author,
+    },
+    {
+      label: 'Outcome',
+      testId: 'outcomeReference',
+      data:
+        outcomeReference &&
+        outcomeReference.map((item, i) => (
+          <Reference key={`outcome-reference-item-${i}`} fhirData={item} />
+        )),
+      status: outcomeReference,
+    },
+    {
+      label: 'Achievement Status',
+      testId: 'achievementStatus',
+      data: achievementStatus && <Coding fhirData={achievementStatus} />,
+      status: achievementStatus,
+    },
+  ];
   return (
     <Root name="Goal">
-      <Header>
-        <Title data-testid="title">{title}</Title>
-        {hasStatus && <Badge data-testid="status">{status}</Badge>}
-        {startDate && (
-          <BadgeSecondary data-testid="statusSecondary">
-            starting on {startDate}
-          </BadgeSecondary>
-        )}
-      </Header>
-      <Body>
-        {subject && (
-          <Value label="Subject" data-testid="subject">
-            <Reference fhirData={subject} />
-          </Value>
-        )}
-        {statusDate && (
-          <Value label="Status Date" data-testid="statusDate">
-            <Date fhirData={statusDate} />
-          </Value>
-        )}
-        {description && (
-          <Value label="Description" data-testid="description">
-            {description}
-          </Value>
-        )}
-        {hasCategory && (
-          <Value label="Category" data-testid="category">
-            {category.map((item, i) => {
-              const coding = _get(item, 'coding', []);
-              if (!Array.isArray(coding)) {
-                return null;
-              }
-              return coding.map((codingItem, j) => (
-                <div key={`item-${j}`}>
-                  <Coding fhirData={codingItem} />
-                </div>
-              ));
-            })}
-          </Value>
-        )}
-        {hasUdi && <Value label="Universal Device Identifier"> {udi}</Value>}
-        {hasAddresses && (
-          <Value label="Addresses" data-testid="addresses">
-            {addresses.map((address, i) => {
-              return (
-                <div key={`item-${i}`}>
-                  <Reference fhirData={address} />
-                </div>
-              );
-            })}
-          </Value>
-        )}
-        {priority && (
-          <Value label="Priority" data-testid="priority">
-            <Coding fhirData={priority} />
-          </Value>
-        )}
-        {author && (
-          <Value label="Author" data-testid="author">
-            <Reference fhirData={author} />
-          </Value>
-        )}
-        {outcomeReference && (
-          <Value label="Outcome" data-testid="outcomeReference">
-            {outcomeReference.map((item, i) => (
-              <Reference key={`item-${i}`} fhirData={item} />
-            ))}
-          </Value>
-        )}
-        {achievementStatus && (
-          <Value label="Achievement Status" data-testid="achievementStatus">
-            <Coding fhirData={achievementStatus} />
-          </Value>
-        )}
-      </Body>
+      <Accordion
+        headerContent={
+          <Header
+            resourceName="Goal"
+            additionalContent={
+              startDate && (
+                <Value label="Started" data-testid="headerStartDate">
+                  <Date fhirData={startDate} isBlack />
+                </Value>
+              )
+            }
+            badges={hasStatus && <Badge data-testid="status">{status}</Badge>}
+            icon={fhirIcons}
+            title={title}
+          />
+        }
+        bodyContent={<Body tableData={tableData} />}
+      />
     </Root>
   );
 };

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

@@ -2,13 +2,14 @@ import React from 'react';
 import { object } from '@storybook/addon-knobs';
 import Goal from './Goal';
+import fhirIcons from '../../../fixtures/example-icons';
 import dstu2Example1 from '../../../fixtures/dstu2/resources/goal/example1.json';
 import dstu2Example2 from '../../../fixtures/dstu2/resources/goal/example2.json';
 import stu3Example1 from '../../../fixtures/stu3/resources/goal/example1.json';
 import r4Example1 from '../../../fixtures/r4/resources/goal/example1.json';
 import r4Example2 from '../../../fixtures/r4/resources/goal/example2.json';
 import fhirVersions from '../fhirResourceVersions';
+import GoalIcon from '../../../assets/containers/Goal/goal.svg';
 export default {
   title: 'Goal',
@@ -16,30 +17,60 @@ export default {
 export const DefaultVisualizationDSTU2 = () => {
   const fhirResource = object('Resource', dstu2Example1);
-  return <Goal fhirVersion={fhirVersions.DSTU2} fhirResource={fhirResource} />;
+  return (
+    <Goal
+      fhirVersion={fhirVersions.DSTU2}
+      fhirResource={fhirResource}
+      fhirIcons={require('../../../assets/containers/Goal/goal.svg')}
+    />
+  );
 };
 export const Example2OfDSTU2 = () => {
   const fhirResource = object('Resource', dstu2Example2);
-  return <Goal fhirVersion={fhirVersions.DSTU2} fhirResource={fhirResource} />;
+  return (
+    <Goal
+      fhirVersion={fhirVersions.DSTU2}
+      fhirResource={fhirResource}
+      fhirIcons={GoalIcon}
+    />
+  );
 };
 export const ExampleOfSTU3 = () => {
   const fhirResource = object('Resource', stu3Example1);
-  return <Goal fhirVersion={fhirVersions.STU3} fhirResource={fhirResource} />;
+  return (
+    <Goal
+      fhirVersion={fhirVersions.STU3}
+      fhirResource={fhirResource}
+      fhirIcons={fhirIcons}
+    />
+  );
 };
 export const Example1OfR4 = () => {
   const fhirResource = object('Resource', r4Example1);
-  return <Goal fhirVersion={fhirVersions.R4} fhirResource={fhirResource} />;
+  return (
+    <Goal
+      fhirVersion={fhirVersions.R4}
+      fhirResource={fhirResource}
+      fhirIcons={false}
+    />
+  );
 };
 export const Example2OfR4 = () => {
   const fhirResource = object('Resource', r4Example2);
-  return <Goal fhirVersion={fhirVersions.R4} fhirResource={fhirResource} />;
+  return (
+    <Goal
+      fhirVersion={fhirVersions.R4}
+      fhirResource={fhirResource}
+      fhirIcons={'random text'}
+    />
+  );
 };
 export const ExampleWithoutFhirVersionProperty = () => {
   const fhirResource = object('Resource', stu3Example1);
-  return <Goal fhirResource={fhirResource} />;
+  return <Goal fhirResource={fhirResource} fhirIcons={fhirIcons} />;
 };

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

@@ -7,8 +7,77 @@ import dstu2Example1 from '../../../fixtures/dstu2/resources/goal/example1.json'
 import stu3Example1 from '../../../fixtures/stu3/resources/goal/example1.json';
 import r4Example1 from '../../../fixtures/r4/resources/goal/example1.json';
 import r4Example2 from '../../../fixtures/r4/resources/goal/example2.json';
+import fhirIcons from '../../../fixtures/example-icons';
 describe('should render Goal component properly', () => {
+  it('component without a fhirIcons props should render a default icon', () => {
+    const defaultProps = {
+      fhirResource: dstu2Example1,
+      fhirVersion: fhirVersions.DSTU2,
+    };
+    const { getByAltText } = render(<Goal {...defaultProps} />);
+    const headerIcon = getByAltText('goal');
+    expect(headerIcon.getAttribute('src')).toContain('IMAGE_MOCK');
+  });
+  it('component with a false as a fhirIcons props should render a placeholder', () => {
+    const defaultProps = {
+      fhirResource: dstu2Example1,
+      fhirVersion: fhirVersions.DSTU2,
+      fhirIcons: false,
+    };
+    const { getByTestId } = render(<Goal {...defaultProps} />);
+    const headerIcon = getByTestId('placeholder');
+    expect(headerIcon).toBeTruthy();
+  });
+  it('component with the img as a fhirIcons props should render an img', () => {
+    const defaultProps = {
+      fhirResource: dstu2Example1,
+      fhirVersion: fhirVersions.DSTU2,
+      fhirIcons: (
+        <img src={require('../assets/containers/Goal/goal.svg')} alt="goal" />
+      ),
+    };
+    const { getByAltText } = render(<Goal {...defaultProps} />);
+    const headerIcon = getByAltText('goal');
+    expect(headerIcon.getAttribute('src')).toContain('IMAGE_MOCK');
+  });
+  it('component with the resources object as a fhirIcons props should render an img', () => {
+    const defaultProps = {
+      fhirResource: dstu2Example1,
+      fhirVersion: fhirVersions.DSTU2,
+      fhirIcons: fhirIcons,
+    };
+    const { getByAltText } = render(<Goal {...defaultProps} />);
+    const headerIcon = getByAltText('goal');
+    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,
+      fhirVersion: fhirVersions.DSTU2,
+      fhirIcons: avatarSrc,
+    };
+    const { getByAltText } = render(<Goal {...defaultProps} />);
+    const headerIcon = getByAltText('header icon');
+    expect(headerIcon.getAttribute('src')).toContain(avatarSrc);
+  });
   it('should render with DSTU2 source data', () => {
     const defaultProps = {
       fhirResource: dstu2Example1,
@@ -100,9 +169,7 @@ describe('should render Goal component properly', () => {
     expect(getByTestId('status').textContent).toEqual('completed');
-    expect(getByTestId('statusSecondary').textContent).toEqual(
-      'starting on 2015-04-05',
-    );
+    expect(getByTestId('headerStartDate').textContent).toEqual('4/5/2015');
     expect(getByTestId('subject').textContent).toContain(
       'Peter James Chalmers',

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}
+    />
   );
 };