Fix #202

src/app/app.component.ts

@@ -438,7 +438,12 @@ export class AppComponent implements OnInit, OnDestroy, Observer {
         if (result.emptySession) {
           this.doEmptySession();
         }
-        this.formulaireService.loadSession(result.file, result.calculators);
+        this.formulaireService.loadSession(result.file, result.calculators).catch((err) => {
+          this.notificationsService.notify(this.intlService.localizeText("ERROR_LOADING_SESSION"));
+          console.error("error loading session - ", err);
+          // rollback to ensure session is clean
+          this.doEmptySession();
+        });
       }
     });
   }

src/app/services/formulaire/formulaire.service.ts

@@ -454,8 +454,8 @@ export class FormulaireService extends Observable {
      * @param f fichier session
      * @param formInfos infos sur les modules de calcul @see DialogLoadSessionComponent.calculators
      */
-    public loadSession(f: File, formInfos: any[]) {
-        this.readSingleFile(f).then(s => {
+    public loadSession(f: File, formInfos: any[]): Promise<any> {
+        return this.readSingleFile(f).then(s => {
             const uids: string[] = [];
             formInfos.forEach((fi) => {
                 if (fi.selected) {
@@ -472,6 +472,7 @@ export class FormulaireService extends Observable {
                 this.createFormulaire(nn.nub.calcType, nn.nub, title);
             });
         }).catch(err => {
+            // forward errors to caller, to avoid "Uncaught (in promise)…"
             throw err;
         });
     }

src/app/services/notifications/notifications.service.ts

@@ -20,7 +20,7 @@ export class NotificationsService {
     }
 
     /** Push a notification and display it as soon as possible */
-    public notify(message: string, duration: number, action: string = "OK") {
+    public notify(message: string, duration: number = 2000, action: string = "OK") {
         this.notifications.push({
             message: message,
             duration: duration,

src/locale/messages.en.json

@@ -10,6 +10,7 @@
     "ERROR_INTERVAL_OUTSIDE": "Interval: value %value% is outside of %interval",
     "ERROR_INTERVAL_UNDEF": "Interval: invalid 'undefined' value",
     "ERROR_INVALID_AT_POSITION": "Position %s:",
+    "ERROR_LOADING_SESSION": "Unable to load session",
     "ERROR_MINMAXSTEP_MAX": "Value is not in ]%s,%s]",
     "ERROR_MINMAXSTEP_MIN": "Value is not in [%s,%s[",
     "ERROR_MINMAXSTEP_STEP": "Value is not in %s",

src/locale/messages.fr.json

@@ -10,6 +10,7 @@
     "ERROR_INTERVAL_OUTSIDE": "Interval : la valeur %value% est hors de l'intervalle %interval",
     "ERROR_INTERVAL_UNDEF": "Interval : valeur 'undefined' incorrecte",
     "ERROR_INVALID_AT_POSITION": "Position %s :",
+    "ERROR_LOADING_SESSION": "Impossible de charger la session",
     "ERROR_MINMAXSTEP_MAX": "La valeur n'est pas dans ]%s,%s]",
     "ERROR_MINMAXSTEP_MIN": "La valeur n'est pas dans [%s,%s[",
     "ERROR_MINMAXSTEP_STEP": "La valeur n'est pas dans %s",