@dsivd/prestations-ng 16.4.10-beta.2 → 16.4.10-beta.4

package/fesm2020/dsivd-prestations-ng.mjs

@@ -979,7 +979,11 @@ const DEFAULT_DICTIONARY = {
     'espace-securise.menu.item.administrer-espace-pro.label': "Administrer l'espace professionnel",
     'espace-securise.menu.item.administrer-espace-pro.title': "Administrer l'espace professionnel",
     'espace-securise.menu.item.deconnection.label': 'Se déconnecter',
-    'espace-securise.menu.item.deconnection.title': 'Se déconnecter'
+    'espace-securise.menu.item.deconnection.title': 'Se déconnecter',
+    'foehn-remaining-alert-summary.default-error-message': '<p>Notre formulaire a un problème et vous ne pourrez pas le transmettre.</p>' +
+        '<p>Merci de prendre contact avec nous et de nous communiquer cette erreur au moyen du formulaire de support : ' +
+        '<a href="{supportLink}" target="_blank">https://www.vd.ch/contact-portail/</a></p>' +
+        '<p>Nous reprendrons contact avec vous.</p>'
 };
 
 class GrowlMessage {
@@ -1502,11 +1506,23 @@ class ApplicationInfoService {
         return this.data.pipe(map(appInfo => appInfo.configuration?.portail?.cyberLoginUrl ||
             `${this.getPortailBaseUrl(appInfo)}100018/`));
     }
-    getSafeSupportFormUrl(reference) {
+    getSafeSupportFormUrl(reference, errors) {
         return this.data.pipe(map(appInfo => appInfo.configuration?.portail?.supportFormUrl ||
-            `${this.getPortailBaseUrl(appInfo)}pub/101098/`), map(link => !!reference?.length
-            ? `${link}?concernedReference=${reference}`
-            : link));
+            `${this.getPortailBaseUrl(appInfo)}pub/101098/`), map(link => {
+            if (!!reference?.length) {
+                link += `?concernedReference=${reference}`;
+            }
+            if (!!errors?.length) {
+                link += !!reference?.length ? '&' : '?';
+                // Need following code to avoid browser Sanitizing error when using JSON.stringify
+                link += `errors=${errors
+                    .map(error => Object.entries(error)
+                    .map(value => `${value.join('=')}`)
+                    .join(','))
+                    .join(';')}`;
+            }
+            return link;
+        }));
     }
     getSafeSupportFormTitle() {
         return this.data.pipe(map(appInfo => {
@@ -4679,9 +4695,10 @@ class ObjectHelper {
      *
      * @param value1 as first value to compare to
      * @param value2 as value to be compared to
+     * @param skipFunctionTypeCompare boolean (default true) (when set to false compares functions)
      * @returns boolean
      */
-    static isEqual(value1, value2) {
+    static isEqual(value1, value2, skipFunctionTypeCompare = true) {
         if (value1 &&
             value2 &&
             typeof value1 === 'object' &&
@@ -4689,6 +4706,16 @@ class ObjectHelper {
             const matches = (obj, source) => Object.keys(source).length === Object.keys(obj).length &&
                 Object.keys(source).every(key => {
                     if (obj.hasOwnProperty(key)) {
+                        if (obj[key] &&
+                            source[key] &&
+                            typeof obj[key] === 'function' &&
+                            typeof source[key] === 'function') {
+                            if (skipFunctionTypeCompare) {
+                                return true;
+                            }
+                            // Didn't find better to compare two functions
+                            return (obj[key].toString() === source[key].toString());
+                        }
                         if (obj[key] &&
                             source[key] &&
                             typeof obj[key] === 'object' &&
@@ -4703,6 +4730,9 @@ class ObjectHelper {
         }
         return value1 === value2;
     }
+    static isDifferent(value1, value2, skipFunctionType = true) {
+        return !ObjectHelper.isEqual(value1, value2, skipFunctionType);
+    }
     static hasAnyValue(value) {
         // do not simplify with an inline variable result due to compilation error
         const result = Object.keys(value).some(key => {
@@ -12056,23 +12086,44 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.10", ngImpo
         }] });
 
 class FoehnRemainingAlertsSummaryComponent {
-    constructor(gesdemService) {
+    constructor(gesdemService, applicationInfoService, dictionaryService) {
         this.gesdemService = gesdemService;
-        this.remainingErrorsLabel = '<p>Il reste des erreurs, le formulaire ne peut pas être transmis.</p>' +
-            '<p>Merci de revenir en arrière ou de réessayer plus tard.</p>';
+        this.applicationInfoService = applicationInfoService;
+        this.dictionaryService = dictionaryService;
         this.remainingErrorNamesToIgnore = [];
         this.hasRemainingErrors = of(false);
-        this.hasRemainingErrors = this.gesdemService.updateFormDataSubject.pipe(map(() => !!this.gesdemService.lastResponse.errors.filter(e => !this.remainingErrorNamesToIgnore.includes(e.name)).length));
+        this.remainingErrorsLabelSubject = new BehaviorSubject(null);
+        this.DEFAULT_REMAINING_ERRORS_MSG_KEY = 'foehn-remaining-alert-summary.default-error-message';
+        const remainingErrors = this.gesdemService.updateFormDataSubject.pipe(map(() => {
+            this.reference = this.gesdemService.lastResponse.meta.reference;
+            return this.gesdemService.lastResponse.errors.filter(e => !this.remainingErrorNamesToIgnore.includes(e.name));
+        }), shareReplay(1));
+        const defaultRemainingErrorsMsg = remainingErrors.pipe(filter(errors => !!errors.length), switchMap(errors => this.applicationInfoService.getSafeSupportFormUrl(this.reference, errors)), map(link => this.dictionaryService.getKeySync(this.DEFAULT_REMAINING_ERRORS_MSG_KEY, {
+            supportLink: link
+        })));
+        this.hasRemainingErrors = remainingErrors.pipe(map(errors => !!errors.length));
+        this.remainingErrorsMessage = combineLatest([
+            defaultRemainingErrorsMsg,
+            this.remainingErrorsLabelSubject.asObservable()
+        ]).pipe(map(([defaultMsg, errorLabel]) => {
+            if (errorLabel) {
+                return errorLabel;
+            }
+            return defaultMsg;
+        }));
+    }
+    set remainingErrorsLabel(msg) {
+        this.remainingErrorsLabelSubject.next(msg);
     }
 }
-FoehnRemainingAlertsSummaryComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: FoehnRemainingAlertsSummaryComponent, deps: [{ token: GesdemHandlerService }], target: i0.ɵɵFactoryTarget.Component });
-FoehnRemainingAlertsSummaryComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "15.2.10", type: FoehnRemainingAlertsSummaryComponent, selector: "foehn-remaining-alerts-summary", inputs: { remainingErrorsLabel: "remainingErrorsLabel", remainingErrorNamesToIgnore: "remainingErrorNamesToIgnore" }, ngImport: i0, template: "<div\n    class=\"alert alert-danger\"\n    *ngIf=\"hasRemainingErrors | async\"\n    [innerHTML]=\"remainingErrorsLabel\"\n></div>\n", styles: [""], dependencies: [{ kind: "directive", type: i2.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "pipe", type: i2.AsyncPipe, name: "async" }] });
+FoehnRemainingAlertsSummaryComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: FoehnRemainingAlertsSummaryComponent, deps: [{ token: GesdemHandlerService }, { token: ApplicationInfoService }, { token: SdkDictionaryService }], target: i0.ɵɵFactoryTarget.Component });
+FoehnRemainingAlertsSummaryComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "15.2.10", type: FoehnRemainingAlertsSummaryComponent, selector: "foehn-remaining-alerts-summary", inputs: { remainingErrorNamesToIgnore: "remainingErrorNamesToIgnore", remainingErrorsLabel: "remainingErrorsLabel" }, ngImport: i0, template: "<div\n    class=\"alert alert-danger\"\n    *ngIf=\"hasRemainingErrors | async\"\n    [innerHTML]=\"remainingErrorsMessage | async\"\n></div>\n", styles: [""], dependencies: [{ kind: "directive", type: i2.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "pipe", type: i2.AsyncPipe, name: "async" }] });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: FoehnRemainingAlertsSummaryComponent, decorators: [{
             type: Component,
-            args: [{ selector: 'foehn-remaining-alerts-summary', template: "<div\n    class=\"alert alert-danger\"\n    *ngIf=\"hasRemainingErrors | async\"\n    [innerHTML]=\"remainingErrorsLabel\"\n></div>\n" }]
-        }], ctorParameters: function () { return [{ type: GesdemHandlerService }]; }, propDecorators: { remainingErrorsLabel: [{
+            args: [{ selector: 'foehn-remaining-alerts-summary', template: "<div\n    class=\"alert alert-danger\"\n    *ngIf=\"hasRemainingErrors | async\"\n    [innerHTML]=\"remainingErrorsMessage | async\"\n></div>\n" }]
+        }], ctorParameters: function () { return [{ type: GesdemHandlerService }, { type: ApplicationInfoService }, { type: SdkDictionaryService }]; }, propDecorators: { remainingErrorNamesToIgnore: [{
                 type: Input
-            }], remainingErrorNamesToIgnore: [{
+            }], remainingErrorsLabel: [{
                 type: Input
             }] } });
 
@@ -14491,9 +14542,28 @@ class FoehnListSummaryComponent extends FoehnInputComponent {
         this.tableSort = {
             sortDirection: 'ASC'
         };
+        this.list_ = [];
+        this.listItemDescriptions_ = [];
         this.trackFoehnListItem = (index, item) => item.trackingIndex || index;
         this.trackFoehnListItemDescription = (index, item) => item.label || index;
     }
+    get list() {
+        return this.list_;
+    }
+    set list(items) {
+        if (ObjectHelper.isDifferent(items, this.list_)) {
+            this.list_ = items;
+        }
+    }
+    // eslint-disable-next-line @typescript-eslint/member-ordering
+    get listItemDescriptions() {
+        return this.listItemDescriptions_;
+    }
+    set listItemDescriptions(items) {
+        if (ObjectHelper.isDifferent(items, this.listItemDescriptions_)) {
+            this.listItemDescriptions_ = items;
+        }
+    }
     ngOnChanges(changes) {
         if (!!changes?.list?.currentValue?.length || !!changes.showAsTable) {
             this.updateListCopyForTable();
@@ -14573,7 +14643,7 @@ class FoehnListSummaryComponent extends FoehnInputComponent {
     }
 }
 FoehnListSummaryComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: FoehnListSummaryComponent, deps: [{ token: FoehnConfirmModalService }, { token: i0.NgZone }], target: i0.ɵɵFactoryTarget.Component });
-FoehnListSummaryComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "15.2.10", type: FoehnListSummaryComponent, selector: "foehn-list-summary", inputs: { list: "list", getListItemTitle: "getListItemTitle", showAsTable: "showAsTable", listItemDescriptions: "listItemDescriptions" }, outputs: { itemRemoved: "itemRemoved", itemEdit: "itemEdit" }, providers: [
+FoehnListSummaryComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "15.2.10", type: FoehnListSummaryComponent, selector: "foehn-list-summary", inputs: { getListItemTitle: "getListItemTitle", showAsTable: "showAsTable", list: "list", listItemDescriptions: "listItemDescriptions" }, outputs: { itemRemoved: "itemRemoved", itemEdit: "itemEdit" }, providers: [
         {
             provide: FoehnInputComponent,
             useExisting: forwardRef(() => FoehnListSummaryComponent),
@@ -14592,18 +14662,18 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.10", ngImpo
         }], ctorParameters: function () { return [{ type: FoehnConfirmModalService }, { type: i0.NgZone }]; }, propDecorators: { tableActionButtons: [{
                 type: ViewChild,
                 args: ['tableActionButtons']
-            }], list: [{
-                type: Input
             }], getListItemTitle: [{
                 type: Input
             }], showAsTable: [{
                 type: Input
-            }], listItemDescriptions: [{
-                type: Input
             }], itemRemoved: [{
                 type: Output
             }], itemEdit: [{
                 type: Output
+            }], list: [{
+                type: Input
+            }], listItemDescriptions: [{
+                type: Input
             }] } });
 
 class FoehnMenuItemComponent {