Remove unnecessary non nullish checks

onaio · Jul 17, 2024 · 8987116 · 8987116
1 parent 99009c3
commit 8987116
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 12 deletions.
diff --git a/packages/fhir-flag/src/components/Utils/payloadConfigs.ts b/packages/fhir-flag/src/components/Utils/payloadConfigs.ts
@@ -1,4 +1,4 @@
-// eslint-disable @typescript-eslint/no-explicit-any
+/* eslint-disable @typescript-eslint/no-explicit-any */
 import { IEncounter } from '@smile-cdr/fhirts/dist/FHIR-R4/interfaces/IEncounter';
 import { IObservation } from '@smile-cdr/fhirts/dist/FHIR-R4/interfaces/IObservation';
 

diff --git a/packages/fhir-flag/src/components/Utils/tests/fixtures.ts b/packages/fhir-flag/src/components/Utils/tests/fixtures.ts
@@ -68,6 +68,7 @@ export const flag: IFlag = {
     reference: 'Group/e44e26d0-1f7a-41d6-aa57-99c5712ddd66',
   },
   period: {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     start: '2024-04-29T20:37:45+03:00' as any,
   },
   encounter: {

diff --git a/packages/fhir-flag/src/components/Utils/tests/utils.test.tsx b/packages/fhir-flag/src/components/Utils/tests/utils.test.tsx
@@ -97,10 +97,8 @@ describe('Utility functions', () => {
     expect(mockUpdate).toHaveBeenCalledWith(payload);
   });
   it('should generate correct encounter payload with location reference', () => {
-    // const conceptsHaveCodings = jest.fn();
     const practitionerId = 'practitioner123';
     const locationReference = 'Location/123';
-    const { conceptsHaveCodings } = require('@opensrp/fhir-helpers');
 
     (conceptsHaveCodings as jest.Mock).mockReturnValue(false);
 
@@ -111,7 +109,7 @@ describe('Utility functions', () => {
         tag: flag.meta?.tag,
       },
       resourceType: 'Encounter',
-      partOf: { reference: flag?.encounter?.reference },
+      partOf: { reference: flag.encounter?.reference },
       location: [{ location: { reference: 'Location/123' }, status: 'active' }],
       participant: [
         {
@@ -133,6 +131,7 @@ describe('Utility functions', () => {
   it('should generate correct observation payload with location reference', () => {
     const practitionerId = 'practitioner123';
     const locationReference = 'Location/123';
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const values = { comments: 'Test comments', status: 'test status' as any }; // Example CloseFlagFormFields
 
     (conceptsHaveCodings as jest.Mock).mockReturnValue(false);
@@ -143,7 +142,7 @@ describe('Utility functions', () => {
       meta: {
         tag: flag.meta?.tag,
       },
-      subject: { reference: flag.subject?.reference },
+      subject: { reference: flag.subject.reference },
       encounter: { reference: 'Encounter/mocked-uuid' },
       focus: [{ reference: 'Location/123' }, { reference: `Flag/${flag.id}` }],
       performer: undefined,
@@ -168,6 +167,7 @@ describe('Utility functions', () => {
   it('should generate correct observation payload with performer and focus flag reference', () => {
     const practitionerId = 'practitioner123';
     const locationReference = 'Location/123';
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const values = { comments: 'Test comments', status: 'active' as any }; // Example CloseFlagFormFields
 
     (conceptsHaveCodings as jest.Mock).mockReturnValue(true);
@@ -178,7 +178,7 @@ describe('Utility functions', () => {
       meta: {
         tag: flag.meta?.tag,
       },
-      subject: { reference: flag.subject?.reference },
+      subject: { reference: flag.subject.reference },
       encounter: { reference: 'Encounter/mocked-uuid' },
       focus: [{ reference: `Flag/1a3a0d65-b6ad-40af-b6cd-2e8801614de9` }],
       performer: [{ reference: `Practitioner/practitioner123` }],

diff --git a/packages/fhir-flag/src/components/Utils/utils.tsx b/packages/fhir-flag/src/components/Utils/utils.tsx
@@ -81,7 +81,7 @@ export const generateEncounterPayload = (
   return {
     ...encounter,
     ...commonProperties,
-    partOf: { reference: flag?.encounter?.reference },
+    partOf: { reference: flag.encounter?.reference },
     location: [{ location: { reference }, status: 'active' }],
     participant: [
       {
@@ -110,7 +110,7 @@ export const generateObservationPayload = (
   return {
     ...observation,
     ...commonProperties,
-    subject: { reference: flag.subject?.reference },
+    subject: { reference: flag.subject.reference },
     encounter: { reference: `Encounter/${encounterProperties.id}` },
     focus: isSPCHECKOrCNBEN
       ? [{ reference: `Flag/${flag.id}` }]

diff --git a/packages/fhir-flag/src/constants.tsx b/packages/fhir-flag/src/constants.tsx
@@ -7,7 +7,7 @@ export const URL_CLOSE_FLAGS = `${URL_ADMIN}/close-flags`;
 export const thatiMinutes = 30 * 60 * 1000;
 
 // form fields
-export const locationName = "locationName" as const
-export const productName = "productName" as const
-export const status = "status" as const
-export const comments = "comments" as const
+export const locationName = 'locationName' as const;
+export const productName = 'productName' as const;
+export const status = 'status' as const;
+export const comments = 'comments' as const;