fix post submission action error, improve post submission error handling

openmrs · Nov 14, 2023 · e6145b7 · e6145b7
1 parent 1bed5e3
commit e6145b7
Show file tree

Hide file tree

Showing 4 changed files with 83 additions and 30 deletions.
diff --git a/src/components/encounter/ohri-encounter-form.component.tsx b/src/components/encounter/ohri-encounter-form.component.tsx
@@ -126,7 +126,7 @@ export const OHRIEncounterForm: React.FC<OHRIEncounterFormProps> = ({
           }
           flattenedFieldsTemp.push(question);
           if (question.type == 'obsGroup') {
-            question.questions.forEach(groupedField => {
+            question.questions.forEach((groupedField) => {
               if (groupedField.questionOptions.rendering == 'fixed-value' && !groupedField['fixedValue']) {
                 groupedField['fixedValue'] = groupedField.value;
               }
@@ -419,9 +419,8 @@ export const OHRIEncounterForm: React.FC<OHRIEncounterFormProps> = ({
       .filter((field) => !field['groupId']) // filter out grouped obs
       .filter((field) => !field.questionOptions.isTransient && field.questionOptions.rendering !== 'file')
       .forEach((field) => {
-
         if (field.type == 'obsGroup') {
-          const obsGroupUuid = encounter?.obs?.find(m => m.concept.uuid == field.questionOptions.concept)?.uuid
+          const obsGroupUuid = encounter?.obs?.find((m) => m.concept.uuid == field.questionOptions.concept)?.uuid;
           const obsGroup = {
             person: patient?.id,
             obsDatetime: encounterDate,
@@ -498,22 +497,21 @@ export const OHRIEncounterForm: React.FC<OHRIEncounterFormProps> = ({
 
     if (encounterForSubmission.obs?.length || encounterForSubmission.orders?.length) {
       const ac = new AbortController();
-      return saveEncounter(ac, encounterForSubmission, encounter?.uuid)
-        .then((response) => response.data)
-        .then((encounter) => {
-          fields
-            ?.filter((field) => field?.questionOptions.rendering === 'file')
-            .map((field) => {
-              return saveAttachment(
-                encounter?.patient.uuid,
-                field,
-                field?.questionOptions.concept,
-                new Date().toISOString(),
-                encounter?.uuid,
-                ac,
-              );
-            });
+      return saveEncounter(ac, encounterForSubmission, encounter?.uuid).then((response) => {
+        const encounter = response.data;
+        const fileFields = fields?.filter((field) => field?.questionOptions.rendering === 'file');
+        const saveAttachmentPromises = fileFields.map((field) => {
+          return saveAttachment(
+            encounter?.patient.uuid,
+            field,
+            field?.questionOptions.concept,
+            new Date().toISOString(),
+            encounter?.uuid,
+            ac,
+          );
         });
+        return Promise.all(saveAttachmentPromises).then(() => response);
+      });
     }
   };
 

diff --git a/src/hooks/usePostSubmissionAction.test.tsx b/src/hooks/usePostSubmissionAction.test.tsx
@@ -0,0 +1,42 @@
+import { renderHook, act } from '@testing-library/react';
+import { usePostSubmissionAction } from './usePostSubmissionAction';
+
+// Mock the getRegisteredPostSubmissionAction function
+jest.mock('../registry/registry', () => ({
+  getRegisteredPostSubmissionAction: jest.fn(),
+}));
+
+describe('usePostSubmissionAction', () => {
+  // Mock the actual post-submission action function
+  const mockPostAction = jest.fn();
+
+  // Sample action references
+  const actionRefs = [
+    { actionId: 'action1', config: { param1: 'value1' } },
+    { actionId: 'action2', config: { param2: 'value2' } },
+  ];
+
+  // Set up the mock implementation for getRegisteredPostSubmissionAction
+  beforeEach(() => {
+    jest.clearAllMocks();
+    jest.spyOn(global.console, 'error').mockImplementation(() => {});
+    jest.requireMock('../registry/registry').getRegisteredPostSubmissionAction.mockImplementation((actionId) => {
+      if (actionId === 'action1') {
+        return Promise.resolve(mockPostAction);
+      }
+      return Promise.resolve(null);
+    });
+  });
+
+  it('should fetch post-submission actions and return them', async () => {
+    const { result } = renderHook(() => usePostSubmissionAction(actionRefs));
+
+    // Wait for the effect to complete
+    await act(async () => {});
+
+    expect(result.current).toEqual([
+      { postAction: mockPostAction, config: { param1: 'value1' }, actionId: 'action1' },
+      { postAction: null, config: { param2: 'value2' }, actionId: 'action2' },
+    ]);
+  });
+});
diff --git a/src/ohri-form.component.tsx b/src/ohri-form.component.tsx
@@ -202,14 +202,28 @@ const OHRIForm: React.FC<OHRIFormProps> = ({
             await Promise.all(
               postSubmissionHandlers.map(async ({ postAction, config, actionId }) => {
                 try {
-                  await postAction.applyAction(
-                    {
-                      patient,
-                      sessionMode,
-                      encounters: results.map((encounterResult) => encounterResult.data),
-                    },
-                    config,
-                  );
+                  const encounterData = [];
+                  if (results) {
+                    results.forEach((result) => {
+                      if (result?.data) {
+                        encounterData.push(result.data);
+                      }
+                    });
+                    if (encounterData.length) {
+                      await postAction.applyAction(
+                        {
+                          patient,
+                          sessionMode,
+                          encounters: encounterData,
+                        },
+                        config,
+                      );
+                    } else {
+                      throw new Error('No encounter data to process post submission action');
+                    }
+                  } else {
+                    throw new Error('No handlers available to process post submission action');
+                  }
                 } catch (error) {
                   const errorMessages = extractErrorMessagesFromResponse(error);
                   showToast({

diff --git a/src/utils/error-utils.ts b/src/utils/error-utils.ts
@@ -30,10 +30,9 @@ export function extractErrorMessagesFromResponse(errorObject) {
     return [errorObject?.responseBody?.error?.message ?? errorObject?.message];
   }
 
-  if(globalErrors){
+  if (globalErrors) {
     return globalErrors.flatMap((error) => error.message);
-  }else{
-    return Object.values(fieldErrors).flatMap((errors: Array<Error>) => errors.map(error => error.message));
+  } else {
+    return Object.values(fieldErrors).flatMap((errors: Array<Error>) => errors.map((error) => error.message));
   }
-
 }