@dsivd/prestations-ng 19.2.0-beta.5 → 19.2.0-beta.7

package/CHANGELOG.md

@@ -98,6 +98,9 @@ Please check the [UPGRADING_V19.md](UPGRADING_V19.md) guide for more information
 
 ### Fixed
 
+- `providePrestationsNgCore()` registers again the HTTP interceptors lost with `FoehnPageModule` in 19.0.0: the
+  `foehn-transmit-waiting-modal` is displayed again during a long transmission, the warning before the expiration of
+  the session receives its date again, and a new version of the application deployed meanwhile is detected again.
 - `foehn-select`, `foehn-radio`, `foehn-checkbox` and the autocompletes:
     - the model is no longer set back to its previous value when the parent changes `elements` and `model`
       at the same time
@@ -119,6 +122,10 @@ Please check the [UPGRADING_V19.md](UPGRADING_V19.md) guide for more information
     - dynamic list: a model changed by the project (another value, `null`) is displayed again; once a value had been
       displayed, the display no longer followed the model. The elements loaded for the search of the user still do
       not replace what they type.
+- `foehn-input-address` without zone.js: an address given by the parent right after the initialization of the
+  component (e.g. prefilled with `SessionInfoWithApplicationService.prefillForm()` for a connected user) is no
+  longer overwritten by the model with the default country only; the default country and the clean-up of the model
+  are applied after the next rendering, from the latest model.
 - `foehn-input-address`: the deferred clean-up of the model (hidden address lines and post office box) applies
   to the latest model, it could restore a previous value (e.g. remove the default country); nothing is
   updated anymore once the component is destroyed.

package/fesm2022/dsivd-prestations-ng.mjs

@@ -2,7 +2,7 @@ import * as i0 from '@angular/core';
 import { Injectable, inject, InjectionToken, model, input, viewChildren, viewChild, forwardRef, output, computed, linkedSignal, DestroyRef, signal, effect, untracked, PendingTasks, Directive, ChangeDetectorRef, Pipe, Component, contentChildren, EnvironmentInjector, runInInjectionContext, afterNextRender, ElementRef, Injector, makeEnvironmentProviders, ErrorHandler, provideBrowserGlobalErrorListeners, provideAppInitializer, importProvidersFrom, NgZone, contentChild, TemplateRef } from '@angular/core';
 import { takeUntilDestroyed, toSignal, toObservable, outputToObservable } from '@angular/core/rxjs-interop';
 import { Router, ActivatedRoute, RouterLink, NavigationStart, NavigationEnd } from '@angular/router';
-import { Subject, BehaviorSubject, combineLatest, of, filter as filter$1, tap as tap$1, throwError, switchMap as switchMap$1, forkJoin, from, concatMap, toArray, EMPTY, startWith, merge, noop, interval, withLatestFrom, Observable, map as map$1, concat } from 'rxjs';
+import { Subject, BehaviorSubject, combineLatest, of, filter as filter$1, tap as tap$1, throwError, switchMap as switchMap$1, forkJoin, from, concatMap, toArray, EMPTY, startWith, merge, noop, interval, withLatestFrom, map as map$1, concat } from 'rxjs';
 import { filter, shareReplay, tap, map, debounceTime, catchError, switchMap, first, finalize, throttleTime, mergeMap, share, take, distinctUntilChanged, startWith as startWith$1, takeWhile, takeUntil } from 'rxjs/operators';
 import { HttpClient, HttpEventType, HttpResponse, HTTP_INTERCEPTORS, HttpStatusCode, HttpResponseBase, HttpErrorResponse, HttpParams, provideHttpClient, withInterceptorsFromDi, withInterceptors } from '@angular/common/http';
 import * as i1 from '@angular/forms';
@@ -5461,6 +5461,203 @@ class I18nForm {
     referenceInterne = undefined;
 }
 
+const APP_VERSION_HEADER = 'app-version';
+class AppInfoHeadersInterceptor {
+    foehnPageService = inject(FoehnPageService);
+    appVersion = undefined;
+    errorListenerRegistered = false;
+    constructor() {
+        // Enregistrer une seule fois
+        if (!this.errorListenerRegistered) {
+            window.addEventListener('error', (event) => {
+                if (event.message?.includes('ChunkLoadError') ||
+                    event.message?.includes('Loading chunk')) {
+                    this.foehnPageService.setAppVersionMismatch();
+                }
+            });
+            this.errorListenerRegistered = true;
+        }
+    }
+    intercept(request, next) {
+        return next.handle(request).pipe(tap$1((httpEvent) => {
+            if (httpEvent instanceof HttpResponse) {
+                const appVersionInHeader = httpEvent.headers.get(APP_VERSION_HEADER);
+                if (!this.appVersion?.length) {
+                    this.appVersion = appVersionInHeader ?? '';
+                }
+                else if (appVersionInHeader &&
+                    this.appVersion !== appVersionInHeader) {
+                    this.foehnPageService.setAppVersionMismatch();
+                }
+            }
+        }));
+    }
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.23", ngImport: i0, type: AppInfoHeadersInterceptor, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
+    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.2.23", ngImport: i0, type: AppInfoHeadersInterceptor, providedIn: 'root' });
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.23", ngImport: i0, type: AppInfoHeadersInterceptor, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root',
+                }]
+        }], ctorParameters: () => [] });
+const APP_INFO_HEADERS_INTERCEPTOR_PROVIDER = [
+    {
+        provide: HTTP_INTERCEPTORS,
+        useExisting: AppInfoHeadersInterceptor,
+        multi: true,
+    },
+];
+
+class CurrentSessionExpiration {
+    expiration = undefined;
+    type = undefined;
+}
+
+class IntervalHelper {
+    static accurateInterval(
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-function-type
+    callBack, intervalInMilliseconds, 
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-function-type
+    errorCallBack) {
+        let timeout = null;
+        let nextAt = Date.now() + intervalInMilliseconds;
+        const clear = () => {
+            if (timeout !== null) {
+                clearTimeout(timeout);
+            }
+        };
+        const timerHandler = () => {
+            nextAt += intervalInMilliseconds;
+            // Avoid time drift by doing "nextAt - Date.now()"
+            const calculatedTimeout = nextAt - Date.now();
+            // Verify browser tab inactivity
+            if (calculatedTimeout < 0) {
+                if (errorCallBack) {
+                    clear();
+                    return errorCallBack();
+                }
+            }
+            timeout = setTimeout(timerHandler, Math.max(0, nextAt - Date.now()));
+            callBack();
+        };
+        // Avoid time drift by doing "nextAt - Date.now()"
+        timeout = setTimeout(timerHandler, nextAt - Date.now());
+        return { clear };
+    }
+}
+
+class DemandeExpirationService {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    interval;
+    PULLING_IN_MILLISECONDS = 1000;
+    _demandeExpirationDateTimeSubject = new BehaviorSubject(null);
+    intervalSubject = new BehaviorSubject(undefined);
+    shouldDisplayExpirationTimerMessage() {
+        return combineLatest([
+            this.getDemandeExpirationDateTime(),
+            this.intervalSubject.asObservable(),
+        ]).pipe(map(([value]) => !dayjs().isBefore(value?.expiration)), tap((visible) => {
+            if (visible) {
+                this.clearPulling();
+            }
+        }), 
+        // Checked every second: only a change must refresh the views.
+        distinctUntilChanged(), shareReplay(1));
+    }
+    setDemandeExpirationDateTime(expiration) {
+        this._demandeExpirationDateTimeSubject.next(expiration);
+    }
+    getDemandeExpirationDateTime() {
+        return this._demandeExpirationDateTimeSubject.asObservable().pipe(filter((value) => !!value?.expiration?.isValid()), tap((value) => {
+            if (dayjs().isBefore(value.expiration)) {
+                this.startPulling();
+            }
+        }), shareReplay(1));
+    }
+    startPulling() {
+        this.clearPulling();
+        this.interval = IntervalHelper.accurateInterval(() => {
+            this.intervalSubject.next();
+        }, this.PULLING_IN_MILLISECONDS, () => {
+            this.startPulling();
+        });
+    }
+    clearPulling() {
+        this.interval?.clear();
+    }
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.23", ngImport: i0, type: DemandeExpirationService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
+    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.2.23", ngImport: i0, type: DemandeExpirationService, providedIn: 'root' });
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.23", ngImport: i0, type: DemandeExpirationService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root',
+                }]
+        }] });
+
+const EXPIRATION_HEADER = 'Sessions-Expirations';
+class DemandeExpirationInterceptor {
+    demandeExpirationService = inject(DemandeExpirationService);
+    intercept(request, next) {
+        return next.handle(request).pipe(tap$1((httpEvent) => {
+            if (httpEvent.type === HttpEventType.Sent) {
+                return;
+            }
+            if (httpEvent instanceof HttpResponse) {
+                if (httpEvent.headers.has(EXPIRATION_HEADER)) {
+                    const expirationHeader = httpEvent.headers.get(EXPIRATION_HEADER);
+                    if (expirationHeader) {
+                        this.manageDemandeExpirationHeader(expirationHeader, httpEvent.body);
+                    }
+                }
+            }
+        }));
+    }
+    manageDemandeExpirationHeader(expirationByDemande, responseBody) {
+        const expirationByDemandeMap = this.getExpirationByDemandeMap(expirationByDemande);
+        const expiration = new CurrentSessionExpiration();
+        const reference = responseBody?.meta?.reference || '';
+        const dateTimeForReference = expirationByDemandeMap.get(reference);
+        const dateTimeForIam = expirationByDemandeMap.get('IAM');
+        if (dateTimeForReference) {
+            expiration.type = 'SESSION-TOKEN';
+            expiration.expiration = dayjs(dateTimeForReference);
+        }
+        else if (dateTimeForIam) {
+            expiration.type = 'IAM';
+            expiration.expiration = dayjs(dateTimeForIam);
+        }
+        if (expiration.expiration?.isValid()) {
+            this.demandeExpirationService.setDemandeExpirationDateTime(expiration);
+        }
+    }
+    getExpirationByDemandeMap(expirationByDemande) {
+        const myMap = new Map();
+        const expirationByDemandesAsArray = expirationByDemande.split(';');
+        expirationByDemandesAsArray.forEach((value) => {
+            const valueAsArray = value.split(',');
+            myMap.set(valueAsArray[0], new Date(valueAsArray[1]));
+        });
+        return myMap;
+    }
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.23", ngImport: i0, type: DemandeExpirationInterceptor, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
+    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.2.23", ngImport: i0, type: DemandeExpirationInterceptor, providedIn: 'root' });
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.23", ngImport: i0, type: DemandeExpirationInterceptor, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root',
+                }]
+        }] });
+const DEMANDE_EXPIRATION_INTERCEPTOR_PROVIDER = [
+    {
+        provide: HTTP_INTERCEPTORS,
+        useExisting: DemandeExpirationInterceptor,
+        multi: true,
+    },
+];
+
 const OIDC_ENABLED = new InjectionToken('enable.oidc.interceptor', {
     factory: () => false,
 });
@@ -5531,6 +5728,11 @@ function providePrestationsNgCore() {
             useExisting: IamExpiredInterceptorService,
             multi: true,
         },
+        // Formerly provided by FoehnPageModule: the version of the application changed during a deployment,
+        // the expiration of the session and the modal displayed during the transmission
+        APP_INFO_HEADERS_INTERCEPTOR_PROVIDER,
+        DEMANDE_EXPIRATION_INTERCEPTOR_PROVIDER,
+        DEMANDE_TRANSMIT_INTERCEPTOR_PROVIDER,
         {
             provide: ErrorHandler,
             useClass: ChunkLoadErrorHandler,
@@ -7456,88 +7658,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.23", ngImpo
             args: [{ selector: 'foehn-app-version-mis-match-modal', imports: [FoehnModalComponent, AsyncPipe, SdkDictionaryPipe], template: "<foehn-modal\n    [id]=\"'foehn-app-version-mismatch-modal'\"\n    [modalHeaderText]=\"\n        'foehn-app-version-mismatch-modal.title' | fromDictionary\n    \"\n    modalSize=\"modal-md\"\n    [isModalVisible]=\"(isModalVisible | async) ?? false\"\n    [closeable]=\"false\"\n>\n    <div\n        id=\"foehn-app-version-mismatch-modal-body\"\n        [innerHTML]=\"\n            'foehn-app-version-mismatch-modal.content' | fromDictionary\n        \"\n    ></div>\n\n    <div modal-footer class=\"w-100\">\n        <div class=\"d-flex\">\n            <button\n                id=\"saveAndReloadBtn\"\n                type=\"button\"\n                class=\"btn btn-primary ms-auto\"\n                [innerHTML]=\"\n                    (hasDemandeInProgress\n                        ? 'foehn-app-version-mismatch-modal.btn.save-and-reload'\n                        : 'foehn-app-version-mismatch-modal.btn.reload'\n                    ) | fromDictionary\n                \"\n                (click)=\"saveAndReload()\"\n            ></button>\n        </div>\n    </div>\n</foehn-modal>\n", styles: [":host ::ng-deep .modal{z-index:10000}\n"] }]
         }], ctorParameters: () => [] });
 
-class IntervalHelper {
-    static accurateInterval(
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-function-type
-    callBack, intervalInMilliseconds, 
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-function-type
-    errorCallBack) {
-        let timeout = null;
-        let nextAt = Date.now() + intervalInMilliseconds;
-        const clear = () => {
-            if (timeout !== null) {
-                clearTimeout(timeout);
-            }
-        };
-        const timerHandler = () => {
-            nextAt += intervalInMilliseconds;
-            // Avoid time drift by doing "nextAt - Date.now()"
-            const calculatedTimeout = nextAt - Date.now();
-            // Verify browser tab inactivity
-            if (calculatedTimeout < 0) {
-                if (errorCallBack) {
-                    clear();
-                    return errorCallBack();
-                }
-            }
-            timeout = setTimeout(timerHandler, Math.max(0, nextAt - Date.now()));
-            callBack();
-        };
-        // Avoid time drift by doing "nextAt - Date.now()"
-        timeout = setTimeout(timerHandler, nextAt - Date.now());
-        return { clear };
-    }
-}
-
-class DemandeExpirationService {
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    interval;
-    PULLING_IN_MILLISECONDS = 1000;
-    _demandeExpirationDateTimeSubject = new BehaviorSubject(null);
-    intervalSubject = new BehaviorSubject(undefined);
-    shouldDisplayExpirationTimerMessage() {
-        return combineLatest([
-            this.getDemandeExpirationDateTime(),
-            this.intervalSubject.asObservable(),
-        ]).pipe(map(([value]) => !dayjs().isBefore(value?.expiration)), tap((visible) => {
-            if (visible) {
-                this.clearPulling();
-            }
-        }), 
-        // Checked every second: only a change must refresh the views.
-        distinctUntilChanged(), shareReplay(1));
-    }
-    setDemandeExpirationDateTime(expiration) {
-        this._demandeExpirationDateTimeSubject.next(expiration);
-    }
-    getDemandeExpirationDateTime() {
-        return this._demandeExpirationDateTimeSubject.asObservable().pipe(filter((value) => !!value?.expiration?.isValid()), tap((value) => {
-            if (dayjs().isBefore(value.expiration)) {
-                this.startPulling();
-            }
-        }), shareReplay(1));
-    }
-    startPulling() {
-        this.clearPulling();
-        this.interval = IntervalHelper.accurateInterval(() => {
-            this.intervalSubject.next();
-        }, this.PULLING_IN_MILLISECONDS, () => {
-            this.startPulling();
-        });
-    }
-    clearPulling() {
-        this.interval?.clear();
-    }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.23", ngImport: i0, type: DemandeExpirationService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
-    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.2.23", ngImport: i0, type: DemandeExpirationService, providedIn: 'root' });
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.23", ngImport: i0, type: DemandeExpirationService, decorators: [{
-            type: Injectable,
-            args: [{
-                    providedIn: 'root',
-                }]
-        }] });
-
 class FoehnPageExpirationTimerComponent {
     isVisible;
     countDownTimeToDisplay;
@@ -8924,34 +9044,6 @@ class StreetNumber {
 }
 const isDefined$1 = (value) => value === true || value === false;
 const hasInputChanged$1 = (change) => change && !ObjectHelper.isEqual(change.previousValue, change.currentValue);
-/**
- * Same as `debounceTime(0)`, but the application is not stable (PendingTasks, e.g. `fixture.whenStable()`)
- * while a value is waiting to be emitted and processed synchronously by the next operators.
- */
-const debounceTimeZeroAsPendingTask = (pendingTasks) => (source) => new Observable((subscriber) => {
-    let removeTask = null;
-    const subscription = source
-        .pipe(tap(() => (removeTask ??= pendingTasks.add())), debounceTime(0))
-        .subscribe({
-        next: (value) => {
-            const removeSettledTask = removeTask;
-            removeTask = null;
-            try {
-                subscriber.next(value);
-            }
-            finally {
-                removeSettledTask?.();
-            }
-        },
-        error: (error) => subscriber.error(error),
-        complete: () => subscriber.complete(),
-    });
-    return () => {
-        subscription.unsubscribe();
-        removeTask?.();
-        removeTask = null;
-    };
-});
 class FoehnInputAddressComponent extends FoehnInputComponent {
     isOnlySwiss = input(true, ...(ngDevMode ? [{ debugName: "isOnlySwiss" }] : /* istanbul ignore next */ []));
     showPostOfficeBoxText = input(false, ...(ngDevMode ? [{ debugName: "showPostOfficeBoxText" }] : /* istanbul ignore next */ []));
@@ -8998,8 +9090,9 @@ class FoehnInputAddressComponent extends FoehnInputComponent {
     streetCustomErrors = signal({}, ...(ngDevMode ? [{ debugName: "streetCustomErrors" }] : /* istanbul ignore next */ []));
     httpClient = inject(HttpClient);
     dictionaryService = inject(SdkDictionaryService);
-    addressPendingTasks = inject(PendingTasks);
+    addressInjector = inject(Injector);
     isSanitizationScheduled = false;
+    isDefaultCountryScheduled = false;
     iso2IdSubject = new BehaviorSubject(null);
     zipCodeIdSubject = new BehaviorSubject(null);
     estrIdSubject = new BehaviorSubject(null);
@@ -9235,32 +9328,21 @@ class FoehnInputAddressComponent extends FoehnInputComponent {
         return ObjectHelper.isDifferent(value, sanitized) ? sanitized : null;
     }
     /**
-     * The sanitized model is set in a macrotask (not while the view is checked) and computed from the latest model
-     * (e.g. the default country may have been set in between). The application is not stable until it is done.
+     * The sanitized model is set after the next rendering (not while the view is checked), from the latest model: the
+     * model given by the parent in between (e.g. prefilled asynchronously) has been received, it is not overwritten.
      */
     scheduleModelSanitization() {
         if (this.isSanitizationScheduled) {
             return;
         }
         this.isSanitizationScheduled = true;
-        const removeTask = this.addressPendingTasks.add();
-        const timeoutId = setTimeout(() => {
-            unregisterOnDestroy();
+        afterNextRender(() => {
             this.isSanitizationScheduled = false;
-            try {
-                const sanitized = this.getSanitizedModel(this.model());
-                if (sanitized) {
-                    this.updateNgModel(sanitized);
-                }
-            }
-            finally {
-                removeTask();
+            const sanitized = this.getSanitizedModel(this.model());
+            if (sanitized) {
+                this.updateNgModel(sanitized);
             }
-        });
-        const unregisterOnDestroy = this._destroyRef.onDestroy(() => {
-            clearTimeout(timeoutId);
-            removeTask();
-        });
+        }, { injector: this.addressInjector });
     }
     replaceAtLeastOneNotNull(notNullErrorLabel) {
         if (!this.showPostOfficeBoxText()) {
@@ -9402,29 +9484,45 @@ class FoehnInputAddressComponent extends FoehnInputComponent {
             this.isEmpty(this.addressLine2()));
     }
     manageDefaultCountry() {
-        // The application is not stable until the debounced changes are processed (the model can be updated).
         combineLatest([
-            this.countryModelChangeSubject.asObservable().pipe(debounceTimeZeroAsPendingTask(this.addressPendingTasks), distinctUntilChanged((previous, current) => previous?.iso2Id === current?.iso2Id)),
+            this.countryModelChangeSubject
+                .asObservable()
+                .pipe(distinctUntilChanged((previous, current) => previous?.iso2Id === current?.iso2Id)),
             this.isOnlySwissChangeSubject
                 .asObservable()
-                .pipe(debounceTimeZeroAsPendingTask(this.addressPendingTasks), distinctUntilChanged()),
+                .pipe(distinctUntilChanged()),
         ])
-            .pipe(tap(([country, isOnlySwiss]) => {
-            if (!isOnlySwiss &&
-                !country &&
-                !this.isCountryInputDirty()) {
-                this.setDefaultCountry();
-                return;
-            }
-            if (isOnlySwiss) {
-                // When there is a country, we need to check if it has to be cleaned and set to default
-                if (country && !ObjectHelper.isEmpty(country)) {
-                    this.clearAutocompletesWhenCountryIsUnappropriatedToComponentConfiguration();
-                }
-                this.setDefaultCountry();
+            .pipe(takeUntilDestroyed(this._destroyRef))
+            .subscribe(() => this.scheduleDefaultCountry());
+    }
+    /**
+     * The default country is applied after the next rendering (once for the changes of the same rendering), from the
+     * latest state: without zone.js, a model given by the parent in between (e.g. prefilled asynchronously) is only
+     * received with the next change detection, it must not be overwritten by the model with the default country only.
+     */
+    scheduleDefaultCountry() {
+        if (this.isDefaultCountryScheduled) {
+            return;
+        }
+        this.isDefaultCountryScheduled = true;
+        afterNextRender(() => {
+            this.isDefaultCountryScheduled = false;
+            this.applyDefaultCountry();
+        }, { injector: this.addressInjector });
+    }
+    applyDefaultCountry() {
+        const country = this.country();
+        if (!this.isOnlySwiss() && !country && !this.isCountryInputDirty()) {
+            this.setDefaultCountry();
+            return;
+        }
+        if (this.isOnlySwiss()) {
+            // When there is a country, we need to check if it has to be cleaned and set to default
+            if (country && !ObjectHelper.isEmpty(country)) {
+                this.clearAutocompletesWhenCountryIsUnappropriatedToComponentConfiguration();
             }
-        }), takeUntilDestroyed(this._destroyRef))
-            .subscribe();
+            this.setDefaultCountry();
+        }
     }
     isCountryInputDirty() {
         const countryAutocomplete = this.countryAutocomplete();