Release 0.3.12 (#362)

* Update fhir version * Add customId to accordion (#361) * Add hashCode function * Remove unused code * Remove hashcode and add customId * Update readme * [PATIENTAPP-144] EOB Information only displaying status for Days Supply/Claim Received Date (#363) * Fix issiue with coding * Remove unnecessary let
1uphealth · May 17, 2022 · 3f4d5b9 · 3f4d5b9
1 parent 5aacefe
commit 3f4d5b9
Show file tree

Hide file tree

Showing 42 changed files with 160 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 [![CircleCI](https://circleci.com/gh/1uphealth/fhir-react/tree/master.svg?style=svg)](https://circleci.com/gh/1uphealth/fhir-react/tree/master)
-[![Storybook](https://github.com/storybookjs/brand/raw/master/badge/badge-storybook.svg?sanitize=true)](https://fhir-react-lib-test-storybook.s3.amazonaws.com/branch/release-0-3-11/index.html)
+[![Storybook](https://github.com/storybookjs/brand/raw/master/badge/badge-storybook.svg?sanitize=true)](https://fhir-react-lib-test-storybook.s3.amazonaws.com/branch/release-0-3-12/index.html)
 
 # fhir-react
 
@@ -157,6 +157,22 @@ const MyComponent = () => {
 };
 ```
 
+User can provide a number that can be assigned at the end of Accordion id. Not providing any number will cause a lodash uniqueId function to be used instead (default functionality up to this point).
+
+```jsx
+const MyComponent = () => {
+  const fhirResource = JSON.parse(fhirResourceAsJsonString);
+
+  return (
+    <FhirResource
+      fhirResource={fhirResource}
+      fhirVersion={fhirVersions.R4}
+      customId={id}
+    />
+  );
+};
+```
+
 ### `FhirResource` component props
 
 | Prop                 | Type                                                       | Default | Description                                                                                                                                                                                               |

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fhir-react",
-  "version": "0.3.11",
+  "version": "0.3.12",
   "description": "React component library for displaying FHIR Resources ",
   "main": "build/index.js",
   "peerDependencies": {

diff --git a/src/components/containers/Accordion/Accordion.js b/src/components/containers/Accordion/Accordion.js
@@ -6,12 +6,16 @@ const CHEVRON_DOWN_COLOR = '#6f83a9';
 const CHEVRON_UP_COLOR = '#2a6fd7';
 
 const Accordion = props => {
-  const { headerContent, bodyContent, onClick, rawOnClick } = props;
+  const { headerContent, bodyContent, onClick, rawOnClick, customId } = props;
   const [rotate, setRotate] = useState(false);
   const handleAccordionClick = () => setRotate(!rotate);
-  const accordionId = uniqueId(
-    `accordion-type-${headerContent.props.resourceName || 'default'}-`,
-  );
+
+  const accordionIdText = `accordion-type-${headerContent.props.resourceName ||
+    'default'}-`;
+  const accordionId =
+    typeof customId === 'number'
+      ? `${accordionIdText}${customId}`
+      : uniqueId(accordionIdText);
 
   const isAccordionOpenable = () => {
     if (bodyContent) {

diff --git a/src/components/resources/AdverseEvent/AdverseEvent.js b/src/components/resources/AdverseEvent/AdverseEvent.js
@@ -77,6 +77,7 @@ const AdverseEvent = ({
   fhirIcons,
   onClick,
   rawOnClick,
+  customId,
 }) => {
   let fhirResourceData = {};
   try {
@@ -172,6 +173,7 @@ const AdverseEvent = ({
         }
         onClick={onClick}
         rawOnClick={rawOnClick}
+        customId={customId}
       />
     </Root>
   );

diff --git a/src/components/resources/AllergyIntolerance/AllergyIntolerance.js b/src/components/resources/AllergyIntolerance/AllergyIntolerance.js
@@ -51,6 +51,7 @@ const dstu2DTO = fhirResource => {
     asserter,
   };
 };
+
 const stu3DTO = fhirResource => {
   const title = _get(fhirResource, 'code.coding.0.display');
   const status = _get(fhirResource, 'verificationStatus');
@@ -73,6 +74,7 @@ const stu3DTO = fhirResource => {
     hasNote,
   };
 };
+
 const r4DTO = fhirResource => {
   const title = _get(fhirResource, 'code.coding.0.display');
   const status = _get(fhirResource, 'verificationStatus.coding[0].display');
@@ -129,6 +131,7 @@ const AllergyIntolerance = ({
   fhirIcons,
   onClick,
   rawOnClick,
+  customId,
 }) => {
   let fhirResourceData = {};
   try {
@@ -239,6 +242,7 @@ const AllergyIntolerance = ({
         bodyContent={<Body tableData={tableData} />}
         onClick={onClick}
         rawOnClick={rawOnClick}
+        customId={customId}
       />
     </Root>
   );

diff --git a/src/components/resources/Appointment/Appointment.js b/src/components/resources/Appointment/Appointment.js
@@ -150,6 +150,7 @@ const Appointment = ({
   fhirIcons,
   onClick,
   rawOnClick,
+  customId,
 }) => {
   const {
     description,
@@ -261,6 +262,7 @@ const Appointment = ({
         }
         onClick={onClick}
         rawOnClick={rawOnClick}
+        customId={customId}
       />
     </Root>
   );

diff --git a/src/components/resources/Binary/Binary.js b/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>
   );

diff --git a/src/components/resources/CarePlan/CarePlan.js b/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>
   );

diff --git a/src/components/resources/CareTeam/CareTeam.js b/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>
   );

diff --git a/src/components/resources/Claim/Claim.js b/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>
   );

diff --git a/src/components/resources/ClaimResponse/ClaimResponse.js b/src/components/resources/ClaimResponse/ClaimResponse.js
@@ -291,6 +291,7 @@ const ClaimResponse = ({
   fhirIcons,
   onClick,
   rawOnClick,
+  customId,
 }) => {
   let fhirResourceData = {};
   try {
@@ -456,6 +457,7 @@ const ClaimResponse = ({
         }
         onClick={onClick}
         rawOnClick={rawOnClick}
+        customId={customId}
       />
     </Root>
   );

diff --git a/src/components/resources/Condition/Condition.js b/src/components/resources/Condition/Condition.js
@@ -93,6 +93,7 @@ const Condition = ({
   fhirIcons,
   onClick,
   rawOnClick,
+  customId,
 }) => {
   const {
     codeText,
@@ -164,6 +165,7 @@ const Condition = ({
         bodyContent={<Body tableData={tableData} />}
         onClick={onClick}
         rawOnClick={rawOnClick}
+        customId={customId}
       />
     </Root>
   );

diff --git a/src/components/resources/Coverage/Coverage.js b/src/components/resources/Coverage/Coverage.js
@@ -60,6 +60,7 @@ const stu3DTO = fhirResource => {
     hasExtension,
   };
 };
+
 const r4DTO = fhirResource => {
   const issuer = _get(fhirResource, 'payor.0');
   const planId = _get(fhirResource, 'class.plan');
@@ -120,6 +121,7 @@ const Coverage = ({
   fhirIcons,
   onClick,
   rawOnClick,
+  customId,
 }) => {
   let fhirResourceData = {};
   try {
@@ -240,6 +242,7 @@ const Coverage = ({
         bodyContent={<Body tableData={tableData} />}
         onClick={onClick}
         rawOnClick={rawOnClick}
+        customId={customId}
       />
     </Root>
   );

diff --git a/src/components/resources/Device/Device.js b/src/components/resources/Device/Device.js
@@ -42,6 +42,7 @@ const dstu2DTO = fhirResource => {
     getExpiry,
   };
 };
+
 const stu3DTO = fhirResource => {
   const getUdi = _get(fhirResource, 'udi.name');
   const hasExpiry = _has(fhirResource, 'expirationDate');
@@ -108,6 +109,7 @@ const Device = ({
   fhirIcons,
   onClick,
   rawOnClick,
+  customId,
 }) => {
   let fhirResourceData = {};
   try {
@@ -186,6 +188,7 @@ const Device = ({
         }
         onClick={onClick}
         rawOnClick={rawOnClick}
+        customId={customId}
       />
     </Root>
   );

diff --git a/src/components/resources/DiagnosticReport/DiagnosticReport.js b/src/components/resources/DiagnosticReport/DiagnosticReport.js
@@ -99,6 +99,7 @@ const DiagnosticReport = ({
   fhirIcons,
   onClick,
   rawOnClick,
+  customId,
 }) => {
   let fhirResourceData = {};
   try {
@@ -172,6 +173,7 @@ const DiagnosticReport = ({
         bodyContent={<Body tableData={tableData} />}
         onClick={onClick}
         rawOnClick={rawOnClick}
+        customId={customId}
       />
     </Root>
   );

diff --git a/src/components/resources/DocumentReference/DocumentReference.js b/src/components/resources/DocumentReference/DocumentReference.js
@@ -222,6 +222,7 @@ const DocumentReference = ({
   fhirIcons,
   onClick,
   rawOnClick,
+  customId,
 }) => {
   let fhirResourceData = {};
   try {
@@ -344,6 +345,7 @@ const DocumentReference = ({
         }
         onClick={onClick}
         rawOnClick={rawOnClick}
+        customId={customId}
       />
     </Root>
   );

diff --git a/src/components/resources/Encounter/Encounter.js b/src/components/resources/Encounter/Encounter.js
@@ -166,6 +166,7 @@ const Encounter = ({
   fhirIcons,
   onClick,
   rawOnClick,
+  customId,
 }) => {
   let fhirResourceData = {};
   try {
@@ -237,6 +238,7 @@ const Encounter = ({
         }
         onClick={onClick}
         rawOnClick={rawOnClick}
+        customId={customId}
       />
     </Root>
   );

diff --git a/src/components/resources/ExplanationOfBenefit/ExplanationOfBenefit.js b/src/components/resources/ExplanationOfBenefit/ExplanationOfBenefit.js
@@ -235,6 +235,7 @@ const ExplanationOfBenefit = ({
   fhirIcons,
   onClick,
   rawOnClick,
+  customId,
 }) => {
   let fhirResourceData = {};
   try {
@@ -517,9 +518,22 @@ const ExplanationOfBenefit = ({
                           return key !== 'sequence' && key !== 'category';
                         },
                       );
-                      const infoStatus = _get(informationItem, infoKey);
-                      const StatusComponent =
-                        infoKey.toString() === 'timingDate' ? Date : Quantity;
+                      let infoStatus = _get(informationItem, infoKey);
+                      let StatusComponent;
+                      switch (infoKey.toString()) {
+                        case 'timingDate':
+                          StatusComponent = Date;
+                          break;
+                        case 'timingPeriod':
+                          StatusComponent = Period;
+                          break;
+                        case 'valueQuantity':
+                          StatusComponent = Quantity;
+                          break;
+                        default:
+                          StatusComponent = Coding;
+                          infoStatus = _get(infoStatus, 'coding', '')[0];
+                      }
 
                       return (
                         <TableRow key={`serviceItem-${i}`}>
@@ -550,6 +564,7 @@ const ExplanationOfBenefit = ({
         }
         onClick={onClick}
         rawOnClick={rawOnClick}
+        customId={customId}
       />
     </Root>
   );

diff --git a/src/components/resources/FamilyMemberHistory/FamilyMemberHistory.js b/src/components/resources/FamilyMemberHistory/FamilyMemberHistory.js
@@ -76,6 +76,7 @@ const FamilyMemberHistory = ({
   fhirIcons,
   onClick,
   rawOnClick,
+  customId,
 }) => {
   let fhirResourceData = {};
   try {
@@ -142,6 +143,7 @@ const FamilyMemberHistory = ({
         bodyContent={<Body tableData={tableData} />}
         onClick={onClick}
         rawOnClick={rawOnClick}
+        customId={customId}
       />
     </Root>
   );