Explicitly check some types for undefined instead of using falsy expr…

…ession
aehrc · Sep 11, 2024 · 2ffb86f · 2ffb86f
1 parent 527b745
commit 2ffb86f
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/packages/smart-forms-renderer/src/hooks/useDateValidation.tsx b/packages/smart-forms-renderer/src/hooks/useDateValidation.tsx
@@ -40,7 +40,7 @@ function useDateValidation(input: string, parseFail: boolean = false): string |
     }
 
     const matches = input.split('/');
-    if (!matches[0] || !matches[1] || !matches[2]) {
+    if (matches[0] === undefined || matches[1] === undefined || matches[2] === undefined) {
       return 'Input is an invalid date.';
     }
 
@@ -58,7 +58,7 @@ function useDateValidation(input: string, parseFail: boolean = false): string |
     }
 
     const matches = input.split('/');
-    if (!matches[0] || !matches[1]) {
+    if (matches[0] === undefined || matches[1] === undefined) {
       return 'Input is an invalid date.';
     }
 

diff --git a/packages/smart-forms-renderer/src/hooks/useQuantityCalculatedExpression.ts b/packages/smart-forms-renderer/src/hooks/useQuantityCalculatedExpression.ts
@@ -116,7 +116,7 @@ function useQuantityCalculatedExpression(
               const ucumValueSet = 'http://hl7.org/fhir/ValueSet/ucum-units';
               const ucumSystem = 'http://unitsofmeasure.org';
 
-              if (!value || !unitCodeFormatted) {
+              if (value === undefined || unitCodeFormatted === undefined) {
                 onChangeByCalcExpressionNull();
                 return;
               }

diff --git a/packages/smart-forms-renderer/src/tests/initial.test.ts b/packages/smart-forms-renderer/src/tests/initial.test.ts
@@ -23,9 +23,9 @@ test('item.initial is properly pre-filled into QuestionnaireResponse', () => {
   const outputResponse = initialiseQuestionnaireResponse(qInitialValueSample);
 
   expect(outputResponse?.item?.[0]).toBeTruthy();
-  expect(outputResponse?.item?.[0].item?.[0]).toBeTruthy();
-  expect(outputResponse?.item?.[0].item?.[0].item?.[0]).toBeTruthy();
-  expect(outputResponse?.item?.[0].item?.[0].item?.[0].item?.[0].answer?.[0]).toStrictEqual({
+  expect(outputResponse?.item?.[0]?.item?.[0]).toBeTruthy();
+  expect(outputResponse?.item?.[0]?.item?.[0]?.item?.[0]).toBeTruthy();
+  expect(outputResponse?.item?.[0]?.item?.[0]?.item?.[0]?.item?.[0]?.answer?.[0]).toStrictEqual({
     valueCoding: {
       system: 'http://snomed.info/sct',
       code: '373066001'

diff --git a/packages/smart-forms-renderer/src/utils/enableWhenExpression.ts b/packages/smart-forms-renderer/src/utils/enableWhenExpression.ts
@@ -88,7 +88,7 @@ function evaluateEnableWhenSingleExpressions(
     const enableWhenSingleExpression = enableWhenSingleExpressions[linkId];
     const initialValue = enableWhenSingleExpression?.isEnabled;
     const expression = enableWhenSingleExpression?.expression;
-    if (!enableWhenSingleExpression || !expression) {
+    if (!enableWhenSingleExpression || expression === undefined) {
       continue;
     }
 

diff --git a/packages/smart-forms-renderer/src/utils/mapItem.ts b/packages/smart-forms-renderer/src/utils/mapItem.ts
@@ -56,7 +56,7 @@ export function getQrItemsIndex(
 
       // Assign either a qrItem array or a single qrItem based on whether it is a repeatGroup or not
       let isRepeatGroup = false;
-      if (qItemIndex) {
+      if (typeof qItemIndex === 'number') {
         const qItemAtIndex = qItems[qItemIndex];
         if (qItemAtIndex) {
           isRepeatGroup = isRepeatItemAndNotCheckbox(qItemAtIndex) && qItemAtIndex.type === 'group';

diff --git a/packages/smart-forms-renderer/src/utils/qrItem.ts b/packages/smart-forms-renderer/src/utils/qrItem.ts
@@ -115,14 +115,14 @@ export function updateQrItemsInGroup(
     }
 
     const newQrItemIndex = qItemsIndexMap[newQrItem.linkId];
-    if (!newQrItemIndex) {
+    if (newQrItemIndex === undefined) {
       return;
     }
 
     // Get actual sequence index of qrItem within qrGroup
     for (let i = 0; i < qrItemsRealIndexArr.length; i++) {
       const currentRealIndex = qrItemsRealIndexArr[i];
-      if (!currentRealIndex) {
+      if (currentRealIndex === undefined) {
         continue;
       }
 
@@ -164,13 +164,13 @@ export function updateQrItemsInGroup(
 
     // Get actual sequence index of qrItems within qrGroup
     const newQrItemIndex = qItemsIndexMap[newQrRepeatGroup.linkId];
-    if (!newQrItemIndex) {
+    if (newQrItemIndex === undefined) {
       return;
     }
 
     for (let i = 0; i < qrItemsRealIndexArr.length; i++) {
       const currentRealIndex = qrItemsRealIndexArr[i];
-      if (!currentRealIndex) {
+      if (currentRealIndex === undefined) {
         continue;
       }