fhir-react 0.3.9 → 0.3.12

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

@@ -1,5 +1,5 @@
 import React from 'react';
-import { object } from '@storybook/addon-knobs';
+import { defaultArgTypes } from '../../defaultArgTypes';
 import fhirVersions from '../fhirResourceVersions';
 
 import Appointment from './Appointment';
@@ -16,76 +16,65 @@ import example3AppointmentR4 from '../../../fixtures/r4/resources/appointment/ex
 import fhirIcons from '../../../fixtures/example-icons';
 import AppointmentIcon from '../../../assets/containers/Appointment/appointment.svg';
 
-export default { title: 'Appointment' };
+export default {
+  title: 'Appointment',
+  component: Appointment,
+  argTypes: {
+    ...defaultArgTypes,
+  },
+};
+
+const Template = args => <Appointment {...args} />;
 
-export const DefaultVisualizationDSTU2 = () => {
-  const fhirResource = object('Resource', exampleAppointmentDSTU2);
-  return (
-    <Appointment
-      fhirResource={fhirResource}
-      fhirVersion={fhirVersions.DSTU2}
-      fhirIcons={require('../../../assets/containers/Appointment/appointment.svg')}
-    />
-  );
+export const DefaultVisualizationDSTU2 = Template.bind({});
+DefaultVisualizationDSTU2.args = {
+  fhirResource: exampleAppointmentDSTU2,
+  fhirVersion: fhirVersions.DSTU2,
+  fhirIcons: require('../../../assets/containers/Appointment/appointment.svg'),
 };
 
-export const Example2OfDSTU2 = () => {
-  const fhirResource = object('Resource', example2AppointmentDSTU2);
-  return (
-    <Appointment
-      fhirResource={fhirResource}
-      fhirVersion={fhirVersions.DSTU2}
-      fhirIcons={AppointmentIcon}
-    />
-  );
+export const Example2OfDSTU2 = Template.bind({});
+Example2OfDSTU2.args = {
+  fhirResource: example2AppointmentDSTU2,
+  fhirVersion: fhirVersions.DSTU2,
+  fhirIcons: AppointmentIcon,
 };
 
-export const Example1OfSTU3 = () => {
-  const fhirResource = object('Resource', example1AppointmentSTU3);
-  return (
-    <Appointment
-      fhirResource={fhirResource}
-      fhirVersion={fhirVersions.STU3}
-      fhirIcons={fhirIcons}
-    />
-  );
+export const Example1OfSTU3 = Template.bind({});
+Example1OfSTU3.args = {
+  fhirResource: example1AppointmentSTU3,
+  fhirVersion: fhirVersions.STU3,
+  fhirIcons: fhirIcons,
 };
-export const Example2OfSTU3 = () => {
-  const fhirResource = object('Resource', example2AppointmentSTU3);
-  return (
-    <Appointment
-      fhirResource={fhirResource}
-      fhirVersion={fhirVersions.STU3}
-      fhirIcons={false}
-    />
-  );
+
+export const Example2OfSTU3 = Template.bind({});
+Example2OfSTU3.args = {
+  fhirResource: example2AppointmentSTU3,
+  fhirVersion: fhirVersions.STU3,
+  fhirIcons: false,
 };
-export const Example3OfSTU3 = () => {
-  const fhirResource = object('Resource', example3AppointmentSTU3);
-  return (
-    <Appointment
-      fhirResource={fhirResource}
-      fhirVersion={fhirVersions.STU3}
-      fhirIcons={'random text'}
-    />
-  );
+
+export const Example3OfSTU3 = Template.bind({});
+Example3OfSTU3.args = {
+  fhirResource: example3AppointmentSTU3,
+  fhirVersion: fhirVersions.STU3,
+  fhirIcons: 'random text',
 };
 
-export const Example1OfR4 = () => {
-  const fhirResource = object('Resource', example1AppointmentR4);
-  return (
-    <Appointment fhirResource={fhirResource} fhirVersion={fhirVersions.R4} />
-  );
+export const Example1OfR4 = Template.bind({});
+Example1OfR4.args = {
+  fhirResource: example1AppointmentR4,
+  fhirVersion: fhirVersions.R4,
 };
-export const Example2OfR4 = () => {
-  const fhirResource = object('Resource', example2AppointmentR4);
-  return (
-    <Appointment fhirResource={fhirResource} fhirVersion={fhirVersions.R4} />
-  );
+
+export const Example2OfR4 = Template.bind({});
+Example2OfR4.args = {
+  fhirResource: example2AppointmentR4,
+  fhirVersion: fhirVersions.R4,
 };
-export const Example3OfR4 = () => {
-  const fhirResource = object('Resource', example3AppointmentR4);
-  return (
-    <Appointment fhirResource={fhirResource} fhirVersion={fhirVersions.R4} />
-  );
+
+export const Example3OfR4 = Template.bind({});
+Example3OfR4.args = {
+  fhirResource: example3AppointmentR4,
+  fhirVersion: fhirVersions.R4,
 };

package/src/components/resources/Binary/Binary.js

@@ -6,7 +6,7 @@ import Accordion from '../../containers/Accordion/Accordion';
 import { Body, Header } from '../../ui';
 
 const Binary = props => {
-  const { fhirResource, fhirIcons, rawOnClick } = props;
+  const { fhirResource, fhirIcons, rawOnClick, customId } = props;
 
   const loadBinaryFile = () => {
     switch (fhirResource.contentType) {
@@ -38,6 +38,7 @@ const Binary = props => {
         }
         bodyContent={<Body>{loadBinaryFile()}</Body>}
         rawOnClick={rawOnClick}
+        customId={customId}
       />
     </div>
   );

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

@@ -1,5 +1,5 @@
 import React from 'react';
-import { object } from '@storybook/addon-knobs';
+import { defaultArgTypes } from '../../defaultArgTypes';
 
 import Binary from './Binary';
 
@@ -13,34 +13,40 @@ import BinaryIcon from '../../../assets/containers/Binary/binary.svg';
 
 export default {
   title: 'Binary',
+  component: Binary,
+  argTypes: {
+    ...defaultArgTypes,
+  },
 };
 
-export const PdfDSTU2 = () => {
-  const fhirResource = object('Resource', dstu2ExamplePdf);
-  return (
-    <Binary
-      fhirResource={fhirResource}
-      fhirIcons={require('../../../assets/containers/Binary/binary.svg')}
-    />
-  );
+const Template = args => <Binary {...args} />;
+
+export const PdfDSTU2 = Template.bind({});
+PdfDSTU2.args = {
+  fhirResource: dstu2ExamplePdf,
+  fhirIcons: require('../../../assets/containers/Binary/binary.svg'),
 };
 
-export const JpegDSTU2 = () => {
-  const fhirResource = object('Resource', dstu2ExampleJpeg);
-  return <Binary fhirResource={fhirResource} fhirIcons={BinaryIcon} />;
+export const JpegDSTU2 = Template.bind({});
+JpegDSTU2.args = {
+  fhirResource: dstu2ExampleJpeg,
+  fhirIcons: BinaryIcon,
 };
 
-export const PdfSTU3 = () => {
-  const fhirResource = object('Resource', stu3ExamplePdf);
-  return <Binary fhirResource={fhirResource} fhirIcons={false} />;
+export const PdfSTU3 = Template.bind({});
+PdfSTU3.args = {
+  fhirResource: stu3ExamplePdf,
+  fhirIcons: false,
 };
 
-export const JpegSTU3 = () => {
-  const fhirResource = object('Resource', stu3ExampleJpeg);
-  return <Binary fhirResource={fhirResource} fhirIcons={'random text'} />;
+export const JpegSTU3 = Template.bind({});
+JpegSTU3.args = {
+  fhirResource: stu3ExampleJpeg,
+  fhirIcons: 'random text',
 };
 
-export const JsonSTU3 = () => {
-  const fhirResource = object('Resource', stu3ExampleJson);
-  return <Binary fhirResource={fhirResource} fhirIcons={fhirIcons} />;
+export const JsonSTU3 = Template.bind({});
+JsonSTU3.args = {
+  fhirResource: stu3ExampleJson,
+  fhirIcons: fhirIcons,
 };

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

@@ -1,5 +1,5 @@
 import React from 'react';
-import { object } from '@storybook/addon-knobs';
+import { defaultArgTypes } from '../../defaultArgTypes';
 
 import Bundle from './Bundle';
 
@@ -19,77 +19,87 @@ import fhirVersions from '../fhirResourceVersions';
 
 export default {
   title: 'Bundle',
+  component: Bundle,
+  argTypes: {
+    ...defaultArgTypes,
+  },
 };
 
-export const Example1OfDSTU2 = () => {
-  const fhirResource = object('Resource', dstu2Example1);
-  return (
-    <Bundle fhirResource={fhirResource} fhirVersion={fhirVersions.DSTU2} />
-  );
+const Template = args => <Bundle {...args} />;
+
+export const Example1OfDSTU2 = Template.bind({});
+Example1OfDSTU2.args = {
+  fhirVersion: fhirVersions.DSTU2,
+  fhirResource: dstu2Example1,
 };
 
-export const Example2OfDSTU2 = () => {
-  const fhirResource = object('Resource', dstu2Example2);
-  return (
-    <Bundle fhirResource={fhirResource} fhirVersion={fhirVersions.DSTU2} />
-  );
+export const Example2OfDSTU2 = Template.bind({});
+Example2OfDSTU2.args = {
+  fhirVersion: fhirVersions.DSTU2,
+  fhirResource: dstu2Example2,
 };
 
-export const Example3OfDSTU2 = () => {
-  const fhirResource = object('Resource', dstu2Example3);
-  return (
-    <Bundle fhirResource={fhirResource} fhirVersion={fhirVersions.DSTU2} />
-  );
+export const Example3OfDSTU2 = Template.bind({});
+Example3OfDSTU2.args = {
+  fhirVersion: fhirVersions.DSTU2,
+  fhirResource: dstu2Example3,
 };
 
-export const Example4OfDSTU2 = () => {
-  const fhirResource = object('Resource', dstu2Example4);
-  return (
-    <Bundle fhirResource={fhirResource} fhirVersion={fhirVersions.DSTU2} />
-  );
+export const Example4OfDSTU2 = Template.bind({});
+Example4OfDSTU2.args = {
+  fhirVersion: fhirVersions.DSTU2,
+  fhirResource: dstu2Example4,
 };
 
-export const Example1OfSTU3 = () => {
-  const fhirResource = object('Resource', stu3Example1);
-  return <Bundle fhirResource={fhirResource} fhirVersion={fhirVersions.STU3} />;
+export const Example1OfSTU3 = Template.bind({});
+Example1OfSTU3.args = {
+  fhirVersion: fhirVersions.STU3,
+  fhirResource: stu3Example1,
 };
 
-export const Example2OfSTU3 = () => {
-  const fhirResource = object('Resource', stu3Example2);
-  return <Bundle fhirResource={fhirResource} fhirVersion={fhirVersions.STU3} />;
+export const Example2OfSTU3 = Template.bind({});
+Example2OfSTU3.args = {
+  fhirVersion: fhirVersions.STU3,
+  fhirResource: stu3Example2,
 };
 
-export const Example3OfSTU3 = () => {
-  const fhirResource = object('Resource', stu3Example3);
-  return <Bundle fhirResource={fhirResource} fhirVersion={fhirVersions.STU3} />;
+export const Example3OfSTU3 = Template.bind({});
+Example3OfSTU3.args = {
+  fhirVersion: fhirVersions.STU3,
+  fhirResource: stu3Example3,
 };
 
-export const Example4OfSTU3 = () => {
-  const fhirResource = object('Resource', stu3Example4);
-  return <Bundle fhirResource={fhirResource} fhirVersion={fhirVersions.STU3} />;
+export const Example4OfSTU3 = Template.bind({});
+Example4OfSTU3.args = {
+  fhirVersion: fhirVersions.STU3,
+  fhirResource: stu3Example4,
 };
 
-export const Example1OfR4 = () => {
-  const fhirResource = object('Resource', r4Example1);
-  return <Bundle fhirResource={fhirResource} fhirVersion={fhirVersions.R4} />;
+export const Example1OfR4 = Template.bind({});
+Example1OfR4.args = {
+  fhirVersion: fhirVersions.R4,
+  fhirResource: r4Example1,
 };
 
-export const Example2OfR4 = () => {
-  const fhirResource = object('Resource', r4Example2);
-  return <Bundle fhirResource={fhirResource} fhirVersion={fhirVersions.R4} />;
+export const Example2OfR4 = Template.bind({});
+Example2OfR4.args = {
+  fhirVersion: fhirVersions.R4,
+  fhirResource: r4Example2,
 };
 
-export const Example3OfR4 = () => {
-  const fhirResource = object('Resource', r4Example3);
-  return <Bundle fhirResource={fhirResource} fhirVersion={fhirVersions.R4} />;
+export const Example3OfR4 = Template.bind({});
+Example3OfR4.args = {
+  fhirVersion: fhirVersions.R4,
+  fhirResource: r4Example3,
 };
 
-export const Example4OfR4 = () => {
-  const fhirResource = object('Resource', r4Example4);
-  return <Bundle fhirResource={fhirResource} fhirVersion={fhirVersions.R4} />;
+export const Example4OfR4 = Template.bind({});
+Example4OfR4.args = {
+  fhirVersion: fhirVersions.R4,
+  fhirResource: r4Example4,
 };
 
-// export const ExampleWithoutFHIRVersionProperty = () => {
-//   const fhirResource = object('Resource', stu3Example2);
-//   return <Bundle fhirResource={fhirResource} />;
-// };
+export const ExampleWithoutFHIRVersionProperty = Template.bind({});
+ExampleWithoutFHIRVersionProperty.args = {
+  fhirResource: stu3Example2,
+};

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

@@ -75,6 +75,7 @@ const dstu2DTO = fhirResource => {
     hasActivity,
   };
 };
+
 const stu3DTO = fhirResource => {
   let activity = _get(fhirResource, 'activity');
   const hasActivity = Array.isArray(activity);
@@ -168,6 +169,7 @@ const CarePlan = ({
   fhirIcons,
   onClick,
   rawOnClick,
+  customId,
 }) => {
   let fhirResourceData = {};
   try {
@@ -312,6 +314,7 @@ const CarePlan = ({
         }
         onClick={onClick}
         rawOnClick={rawOnClick}
+        customId={customId}
       />
     </Root>
   );

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

@@ -1,5 +1,6 @@
 import React from 'react';
-import { object } from '@storybook/addon-knobs';
+import fhirVersions from '../fhirResourceVersions';
+import { defaultArgTypes } from '../../defaultArgTypes';
 
 import CarePlan from './CarePlan';
 
@@ -9,73 +10,62 @@ import example2CarePlanSTU3 from '../../../fixtures/stu3/resources/carePlan/exam
 import weightLossCarePlanR4 from '../../../fixtures/r4/resources/carePlan/weightLossPlan.json';
 import pregnancyCarePlanR4 from '../../../fixtures/r4/resources/carePlan/pregnancyPlan.json';
 import heartOperationCarePlanR4 from '../../../fixtures/r4/resources/carePlan/heartOperationPlan.json';
-import fhirVersions from '../fhirResourceVersions';
+
 import CarePlanIcon from '../../../assets/containers/CarePlan/care-plan.svg';
 import fhirIcons from '../../../fixtures/example-icons';
 
-export default { title: 'CarePlan' };
+export default {
+  title: 'CarePlan',
+  component: CarePlan,
+  argTypes: {
+    ...defaultArgTypes,
+  },
+};
+
+const Template = args => <CarePlan {...args} />;
 
-export const DefaultVisualizationDSTU2 = () => {
-  const fhirResource = object('Resource', exampleCarePlanDSTU2);
-  return (
-    <CarePlan
-      fhirVersion={fhirVersions.DSTU2}
-      fhirResource={fhirResource}
-      fhirIcons={require('../../../assets/containers/CarePlan/care-plan.svg')}
-    />
-  );
+export const DefaultVisualizationDSTU2 = Template.bind({});
+DefaultVisualizationDSTU2.args = {
+  fhirVersion: fhirVersions.DSTU2,
+  fhirResource: exampleCarePlanDSTU2,
+  fhirIcons: require('../../../assets/containers/CarePlan/care-plan.svg'),
 };
 
-export const ExampleCarePlanSTU3 = () => {
-  const fhirResource = object('Resource', exampleCarePlanSTU3);
-  return (
-    <CarePlan
-      fhirVersion={fhirVersions.STU3}
-      fhirResource={fhirResource}
-      fhirIcons={CarePlanIcon}
-    />
-  );
+export const ExampleCarePlanSTU3 = Template.bind({});
+ExampleCarePlanSTU3.args = {
+  fhirVersion: fhirVersions.STU3,
+  fhirResource: exampleCarePlanSTU3,
+  fhirIcons: CarePlanIcon,
 };
 
-export const Example2CarePlanSTU3 = () => {
-  const fhirResource = object('Resource', example2CarePlanSTU3);
-  return (
-    <CarePlan
-      fhirVersion={fhirVersions.STU3}
-      fhirResource={fhirResource}
-      fhirIcons={fhirIcons}
-    />
-  );
+export const Example2CarePlanSTU3 = Template.bind({});
+Example2CarePlanSTU3.args = {
+  fhirVersion: fhirVersions.STU3,
+  fhirResource: example2CarePlanSTU3,
+  fhirIcons: fhirIcons,
 };
 
-export const WeightLossCarePlanR4 = () => {
-  const fhirResource = object('Resource', weightLossCarePlanR4);
-  return (
-    <CarePlan
-      fhirVersion={fhirVersions.R4}
-      fhirResource={fhirResource}
-      fhirIcons={false}
-    />
-  );
+export const WeightLossCarePlanR4 = Template.bind({});
+WeightLossCarePlanR4.args = {
+  fhirVersion: fhirVersions.R4,
+  fhirResource: weightLossCarePlanR4,
+  fhirIcons: false,
 };
 
-export const PregnancyCarePlanR4 = () => {
-  const fhirResource = object('Resource', pregnancyCarePlanR4);
-  return (
-    <CarePlan
-      fhirVersion={fhirVersions.R4}
-      fhirResource={fhirResource}
-      fhirIcons={'random text'}
-    />
-  );
+export const PregnancyCarePlanR4 = Template.bind({});
+PregnancyCarePlanR4.args = {
+  fhirVersion: fhirVersions.R4,
+  fhirResource: pregnancyCarePlanR4,
+  fhirIcons: 'random text',
 };
 
-export const HeartOperatioCarePlanR4 = () => {
-  const fhirResource = object('Resource', heartOperationCarePlanR4);
-  return <CarePlan fhirVersion={fhirVersions.R4} fhirResource={fhirResource} />;
+export const HeartOperatioCarePlanR4 = Template.bind({});
+HeartOperatioCarePlanR4.args = {
+  fhirVersion: fhirVersions.R4,
+  fhirResource: heartOperationCarePlanR4,
 };
 
-export const ExampleWithoutFhirVersionProperty = () => {
-  const fhirResource = object('Resource', example2CarePlanSTU3);
-  return <CarePlan fhirResource={fhirResource} />;
+export const ExampleWithoutFhirVersionProperty = Template.bind({});
+ExampleWithoutFhirVersionProperty.args = {
+  fhirResource: example2CarePlanSTU3,
 };

package/src/components/resources/CareTeam/CareTeam.js

@@ -89,6 +89,7 @@ const CareTeam = ({
   fhirIcons,
   onClick,
   rawOnClick,
+  customId,
 }) => {
   const {
     name,
@@ -174,6 +175,7 @@ const CareTeam = ({
         }
         onClick={onClick}
         rawOnClick={rawOnClick}
+        customId={customId}
       />
     </Root>
   );

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

@@ -1,5 +1,5 @@
 import React from 'react';
-import { object } from '@storybook/addon-knobs';
+import { defaultArgTypes } from '../../defaultArgTypes';
 
 import CareTeam from './CareTeam';
 import fhirVersions from '../fhirResourceVersions';
@@ -12,37 +12,31 @@ import CareTeamIcon from '../../../assets/containers/CareTeam/care-team.svg';
 
 export default {
   title: 'CareTeam',
+  component: CareTeam,
+  argTypes: {
+    ...defaultArgTypes,
+  },
 };
 
-export const ExampleSTU3 = () => {
-  const fhirResource = object('Resource', example_STU3);
-  return (
-    <CareTeam
-      fhirResource={fhirResource}
-      fhirVersion={fhirVersions.STU3}
-      fhirIcons={CareTeamIcon}
-    />
-  );
+const Template = args => <CareTeam {...args} />;
+
+export const ExampleSTU3 = Template.bind({});
+ExampleSTU3.args = {
+  fhirVersion: fhirVersions.STU3,
+  fhirResource: example_STU3,
+  fhirIcons: CareTeamIcon,
 };
 
-export const Example2OfSTU3 = () => {
-  const fhirResource = object('Resource', example2_STU3);
-  return (
-    <CareTeam
-      fhirResource={fhirResource}
-      fhirVersion={fhirVersions.STU3}
-      fhirIcons={fhirIcons}
-    />
-  );
+export const Example2OfSTU3 = Template.bind({});
+Example2OfSTU3.args = {
+  fhirVersion: fhirVersions.STU3,
+  fhirResource: example2_STU3,
+  fhirIcons: fhirIcons,
 };
 
-export const ExampleR4 = () => {
-  const fhirResource = object('Resource', example_R4);
-  return (
-    <CareTeam
-      fhirResource={fhirResource}
-      fhirVersion={fhirVersions.R4}
-      fhirIcons={false}
-    />
-  );
+export const ExampleR4 = Template.bind({});
+ExampleR4.args = {
+  fhirVersion: fhirVersions.R4,
+  fhirResource: example_R4,
+  fhirIcons: false,
 };

package/src/components/resources/Claim/Claim.js

@@ -105,6 +105,7 @@ const dstu2DTO = fhirResource => {
     items,
   };
 };
+
 const stu3DTO = fhirResource => {
   const status = _get(fhirResource, 'status');
   const typeCoding = _get(fhirResource, 'type.coding[0]');
@@ -304,6 +305,7 @@ const Claim = ({
   fhirIcons,
   onClick,
   rawOnClick,
+  customId,
 }) => {
   let fhirResourceData = {};
   try {
@@ -489,6 +491,7 @@ const Claim = ({
         }
         onClick={onClick}
         rawOnClick={rawOnClick}
+        customId={customId}
       />
     </Root>
   );