@openmrs/esm-form-entry-app 7.0.2-pre.3932 → 7.0.2-pre.3949

package/dist/openmrs-esm-form-entry-app.js.buildmanifest.json

@@ -3927,9 +3927,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 2429,
+      "size": 2505,
       "sizes": {
-        "javascript": 2429
+        "javascript": 2505
       },
       "names": [],
       "idHints": [],
@@ -3938,12 +3938,12 @@
         "main"
       ],
       "files": [
-        "13574.cc880f0562472eee.js"
+        "13574.8da1a980740c857d.js"
       ],
       "auxiliaryFiles": [
-        "13574.cc880f0562472eee.js.map"
+        "13574.8da1a980740c857d.js.map"
       ],
-      "hash": "e634321c9d0bbf6e",
+      "hash": "6c68797f3e688ab5",
       "childrenByOrder": {}
     },
     {
@@ -8106,9 +8106,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 5539376,
+      "size": 5539366,
       "sizes": {
-        "javascript": 5539376
+        "javascript": 5539366
       },
       "names": [
         "bootstrap"
@@ -8119,12 +8119,12 @@
         "main"
       ],
       "files": [
-        "27264.b36257ba265d1fdd.js"
+        "27264.3808a6936d746d78.js"
       ],
       "auxiliaryFiles": [
-        "27264.b36257ba265d1fdd.js.map"
+        "27264.3808a6936d746d78.js.map"
       ],
-      "hash": "cfa18bbd10f055da",
+      "hash": "eb5e1e42d39b7101",
       "childrenByOrder": {}
     },
     {
@@ -12149,12 +12149,12 @@
       ],
       "files": [
         "main.c9fedbf76d90aec0.css",
-        "main.ed13f6ac86e7d7d2.js"
+        "main.1a29e99eb5cda48b.js"
       ],
       "auxiliaryFiles": [
-        "main.ed13f6ac86e7d7d2.js.map"
+        "main.1a29e99eb5cda48b.js.map"
       ],
-      "hash": "70441ff0b9892eb6",
+      "hash": "a022458cff9bdc6b",
       "childrenByOrder": {}
     },
     {
@@ -26501,7 +26501,7 @@
       "auxiliaryFiles": [
         "openmrs-esm-form-entry-app.js.map"
       ],
-      "hash": "60a68f4772f2872a",
+      "hash": "4552f7ab1fbd7622",
       "childrenByOrder": {}
     },
     {

package/dist/routes.json

@@ -1 +1 @@
-{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"webservices.rest":"^2.24.0","o3forms":"*"},"extensions":[{"name":"form-widget","component":"formWidget","slot":"form-widget-slot","online":true,"offline":true}],"version":"7.0.2-pre.3932"}
+{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"webservices.rest":"^2.24.0","o3forms":"*"},"extensions":[{"name":"form-widget","component":"formWidget","slot":"form-widget-slot","online":true,"offline":true}],"version":"7.0.2-pre.3949"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-form-entry-app",
-  "version": "7.0.2-pre.3932",
+  "version": "7.0.2-pre.3949",
   "license": "MPL-2.0",
   "description": "Form engine entry capabilities for the OpenMRS SPA",
   "browser": "dist/openmrs-esm-form-entry-app.js",
@@ -102,5 +102,5 @@
     "style-loader": "2.x",
     "webpack": "~5.89.0"
   },
-  "gitHead": "02ae852389586cf84b590ddacbf07aa567f6131d"
+  "gitHead": "70fb09c7cf694a6b0127da5a6c5fbf16bfc91178"
 }

package/src/app/fe-wrapper/fe-wrapper.component.ts

@@ -241,12 +241,9 @@ export class FeWrapperComponent implements OnInit, OnDestroy {
           (error: Error) => {
             this.changeState('submissionError');
             showSnackbar({
-              isLowContrast: false,
+              isLowContrast: true,
               kind: 'error',
-              subtitle: this.translateService
-                .instant('formSubmissionFailed')
-                .replace('{error}', this.extractErrorMessagesFromResponse(error)),
-
+              subtitle: this.translateService.instant('formSubmissionFailed').replace('{error}', error.message),
               title: this.form.schema.display ?? this.form.schema.name,
               timeoutInMs: 5000,
             });
@@ -374,27 +371,4 @@ export class FeWrapperComponent implements OnInit, OnDestroy {
       store.setState(obj);
     }
   }
-
-  /**
-   * Extracts error messages from a given error response object.
-   * If fieldErrors are present, it extracts the error messages from each field.
-   * Otherwise, it returns the top-level error message.
-   *
-   * @param {object} errorObject - The error response object.
-   * @returns {string[]} An array of error messages.
-   */
-  private extractErrorMessagesFromResponse(errorObject) {
-    const error = errorObject?.error?.error;
-    const fieldErrors = errorObject?.responseBody?.error?.fieldErrors;
-
-    if (error) {
-      return error?.message;
-    }
-
-    if (!fieldErrors) {
-      return [errorObject?.responseBody?.error?.message ?? errorObject?.message];
-    }
-
-    return Object.values(fieldErrors).flatMap((errors: Array<Error>) => errors.map((error) => error.message));
-  }
 }

package/src/app/form-submission/form-submission.service.ts

@@ -8,7 +8,7 @@ import { EncounterResourceService } from '../openmrs-api/encounter-resource.serv
 import { PersonResourceService } from '../openmrs-api/person-resource.service';
 import { FormDataSourceService } from '../form-data-source/form-data-source.service';
 import { HttpErrorResponse } from '@angular/common/http';
-import { Person, PersonUpdate, EncounterCreate, Encounter, IdentifierPayload, Identifier } from '../types';
+import { Person, PersonUpdate, EncounterCreate, Encounter, IdentifierPayload, Identifier, ErrorObject } from '../types';
 import {
   findQueuedPatientFormSyncItemByContentId,
   PatientFormSyncItemContent,
@@ -22,7 +22,7 @@ import { v4 } from 'uuid';
 import { VisitResourceService } from '../openmrs-api/visit-resource.service';
 import { PatientResourceService } from '../openmrs-api/patient-resource.service';
 import { ConfigResourceService } from '../services/config-resource.service';
-
+import { TranslateService } from '@ngx-translate/core';
 /**
  * The result of submitting a form via the {@link FormSubmissionService.submitPayload} function.
  */
@@ -44,6 +44,7 @@ export class FormSubmissionService {
     private readonly visitResourceService: VisitResourceService,
     private readonly patientResourceService: PatientResourceService,
     private readonly configResourceService: ConfigResourceService,
+    private readonly translateService: TranslateService,
   ) {}
 
   public submitPayload(form: Form): Observable<FormSubmissionResult> {
@@ -249,18 +250,37 @@ export class FormSubmissionService {
 
   // TODO: Should this function be extracted?
   // This type of general HTTP/REST API error handling is most likely also useful elsewhere.
-  private throwUserFriendlyError(error: string | HttpErrorResponse): never {
-    if (typeof error === 'object') {
-      const fieldErrors: Array<any> = Object.values(error.error?.error?.fieldErrors ?? {});
-      const fieldErrorMessages = fieldErrors
-        .flatMap((fieldErrors) => fieldErrors)
-        .map((fieldError) => fieldError.message);
-      const message = fieldErrorMessages.length > 0 ? fieldErrorMessages.join(' ') : error.message;
-      throw new Error(message);
-    } else if (typeof error === 'string') {
-      throw new Error(error);
-    } else {
-      throw new Error(`An unknown error occured: ${error}.`);
+  private throwUserFriendlyError(error: HttpErrorResponse): never {
+    const errorMessage = this.extractErrorMessagesFromResponse(error?.error ?? error);
+    throw new Error(errorMessage);
+  }
+
+  /**
+   * Extracts error messages from a given error response object.
+   * If fieldErrors are present, it extracts the error messages from each field.
+   * If globalErrors are present, it extracts the error messages from each global error.
+   * Otherwise, it returns the top-level error message.
+   *
+   * @param {ErrorObject} errorObject - The error response object.
+   * @returns {string[]} An array of error messages.
+   */
+  private extractErrorMessagesFromResponse(errorObject: ErrorObject) {
+    const {
+      error: { fieldErrors, globalErrors, message, code },
+    } = errorObject ?? {};
+
+    if (fieldErrors) {
+      return Object.values(fieldErrors)
+        .flatMap((errors) => errors.map((error) => error.message))
+        .join('\n');
+    }
+
+    if (globalErrors) {
+      return Object.values(globalErrors)
+        .flatMap((errors) => errors.map((error) => error.message))
+        .join('\n');
     }
+
+    return message ?? code ?? this.translateService.instant('unknownError');
   }
 }

package/src/app/types/index.ts

@@ -460,3 +460,16 @@ export interface IdentifierPayload {
   newIdentifiers: Array<any>;
   currentIdentifiers: Array<any>;
 }
+
+type FieldError = {
+  [key: string]: Array<{ code: string; message: string }>;
+};
+export type ErrorObject = {
+  error: {
+    code: string;
+    message: string;
+    detail: string;
+    fieldErrors?: FieldError;
+    globalErrors?: FieldError;
+  };
+};

package/translations/en.json

@@ -23,7 +23,7 @@
   "errorLoadingForm": "Error loading form",
   "errorWithForm": "There was an error with this form",
   "fix": "Fix",
-  "formSubmissionFailed": "An error has occurred while submitting the form. Error: {error}",
+  "formSubmissionFailed": "An error occurred while processing your form submission. Kindly notify the system administrator and reference the following error : {error}",
   "formSubmittedSuccessfully": "The form has been submitted successfully.",
   "from": "From",
   "futureDateRestriction": "Future date is not allowed!",

package/dist/13574.cc880f0562472eee.js

@@ -1 +0,0 @@
-"use strict";(self.webpackChunk_openmrs_esm_form_entry_app=self.webpackChunk_openmrs_esm_form_entry_app||[]).push([[13574],{13574:e=>{e.exports=JSON.parse('{"aDayAgo":"a day ago","aFewSecondsAgo":"a few seconds ago","aMinuteAgo":"a minute ago","aMonthAgo":"a month ago","aYearAgo":"a year ago","add":"Add","addHour":"Add a hour","addMinute":"Add a minute","addSecond":"Add a second","anHourAgo":"an hour ago","cancel":"Cancel","changeToMonthView":"Change to month view","chooseMonthAndYear":"Choose month and year","clearEntry":"Are you sure you want to clear this entry?","closeThisPanel":"Close this panel","componentLoadingFailed":"Component Loading failed...","daysAgo":" days ago","deleteEntry":"Are you sure you want to delete this item?","discardButton":"Discard","enterMoreCharacters":"Please enter 2 or more characters","errorFetchingFormData":"There was an error fetching form data. Details: {detail}","errorLoadingForm":"Error loading form","errorWithForm":"There was an error with this form","fix":"Fix","formSubmissionFailed":"An error has occurred while submitting the form. Error: {error}","formSubmittedSuccessfully":"The form has been submitted successfully.","from":"From","futureDateRestriction":"Future date is not allowed!","hoursAgo":" hours ago","invalidDate":"Provided date is invalid!","loading":"Loading...","loadingComponent":"Loading Component...","max":"Max value should be {max}","maxDate":"Max Date should be {maxDate}","maxEntries":"Cannot have more than {max} entries","maxLength":"Max Length should be {maxLength}","min":"Min value should be {min}","minDate":"Min Date should be {minDate}","minLength":"Min Length should be {minLength}","minusHour":"Minus a hour","minusMinute":"Minus a minute","minusSecond":"Minus a second","minutesAgo":" minutes ago","monthsAgo":" months ago","next":"Next","next21Years":"Next 21 years","nextMonth":"Next month","nextYear":"Next year","patientIdentifierDuplication":"Patient identifier duplication","patientIdentifierDuplicationDescription":"The identifier provided is already associated with an existing patient. Please check the identifier and try again.","previous":"Previous","previous21Years":"Previous 21 years","previousMonth":"Previous month","previousValue":"Previous Value","previousYear":"Previous year","remove":"Remove","requiredField":"This field is required!","saveAndCloseButton":"Save and close","selectWeeks":"Select Weeks","set":"Set","submitting":"Submitting","to":"To","tryOpeningAnotherForm":"Try opening another form","useValue":"Use Value","weeks":"Weeks","yearsAgo":" years ago"}')}}]);

package/dist/13574.cc880f0562472eee.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"13574.cc880f0562472eee.js","mappings":"AAAA,aAAa,+GAA+G,UAAU,uBAAuB,0uBAA0uB,OAAO,2LAA2L,MAAM,6SAA6S,IAAI,iCAAiC,QAAQ,uCAAuC,KAAK,4CAA4C,UAAU,8BAA8B,IAAI,iCAAiC,QAAQ,qCAAqC,UAAU,04BAA04B,IAAI","sources":["webpack://_openmrs_esm_form_entry_app/13574.cc880f0562472eee.js"],"names":[],"sourceRoot":""}