@dsivd/prestations-ng 16.0.0-beta6 → 16.0.0-beta8

package/fesm2020/dsivd-prestations-ng.mjs

@@ -2062,7 +2062,6 @@ class UploaderHelper {
         this.dictionaryService = dictionaryService;
         this.applicationInfoService = applicationInfoService;
         this._accept = '.pdf';
-        this._maxSizeInMo = 1;
         this._maxFileNameLength = 64;
         this._illegalCharacters = '/,\\,?,%,*,:,|,",<,>,°';
         this._fileMinSizeInBytes = 20;
@@ -2071,7 +2070,8 @@ class UploaderHelper {
             if (appInfo.configuration.document) {
                 this.accept = appInfo.configuration.document.fileExtensions;
                 this.maxFileNameLength = Number(appInfo.configuration.document.maxFileNameLength);
-                this.maxSizeInMo = Number(appInfo.configuration.document.maxFileSizeInMo);
+                this._fileMaxSizeInBytesByFormKey =
+                    appInfo.configuration.document.fileMaxSizeInBytesByFormKey;
                 this.illegalCharacters =
                     appInfo.configuration.document.illegalCharacters;
             }
@@ -2098,27 +2098,17 @@ class UploaderHelper {
         this._maxFileNameLength = value;
     }
     // eslint-disable-next-line @typescript-eslint/member-ordering
-    get maxSizeInMo() {
-        return this._maxSizeInMo;
-    }
-    set maxSizeInMo(value) {
-        this._maxSizeInMo = value;
-    }
-    // eslint-disable-next-line @typescript-eslint/member-ordering
     get accept() {
         return this._accept;
     }
     set accept(value) {
         this._accept = value;
     }
-    isFileTooBig(fileSizeInBytes, overrideMaxSizeInMo) {
-        if (!!overrideMaxSizeInMo) {
-            return this.isTooBig(fileSizeInBytes, overrideMaxSizeInMo);
-        }
-        if (!this.maxSizeInMo) {
-            return false;
-        }
-        return this.isTooBig(fileSizeInBytes, this.maxSizeInMo);
+    getMaxFileSizeInBytesForFormKey(formKey) {
+        return this._fileMaxSizeInBytesByFormKey[formKey];
+    }
+    isFileTooBig(formKey, fileSizeInBytes) {
+        return this.isTooBig(fileSizeInBytes, this.getMaxFileSizeInBytesForFormKey(formKey));
     }
     isFileTooSmall(fileSizeInBytes) {
         if (!this.fileMinSizeInBytes) {
@@ -2158,19 +2148,19 @@ class UploaderHelper {
                 .split(',')
                 .includes(fileExtension.toUpperCase()));
     }
-    getUniqueErrorByCode(name, errorCode, fileName, customErrors, overrideMaxSizeInMo, overrideAcceptedExtensions, overrideMaxFileNameLength, overrideIllegalCharacters) {
+    getUniqueErrorByCode(name, errorCode, fileName, customErrors, overrideAcceptedExtensions, overrideMaxFileNameLength, overrideIllegalCharacters) {
         const uniqSuffix = new Date().getTime();
         return {
             name,
             code: `${errorCode}_${uniqSuffix}`,
-            message: this.replaceErrorMessageKeys(customErrors[errorCode], fileName, errorCode, overrideMaxSizeInMo, overrideAcceptedExtensions, overrideMaxFileNameLength, overrideIllegalCharacters)
+            message: this.replaceErrorMessageKeys(name, customErrors[errorCode], fileName, errorCode, overrideAcceptedExtensions, overrideMaxFileNameLength, overrideIllegalCharacters)
         };
     }
-    addCustomErrorOrDefault(name, destinationErrors, errorCode, fileName, customErrors, overrideMaxSizeInMo, overrideAcceptedExtensions, overrideMaxFileNameLength, overrideIllegalCharacters) {
+    addCustomErrorOrDefault(name, destinationErrors, errorCode, fileName, customErrors, overrideAcceptedExtensions, overrideMaxFileNameLength, overrideIllegalCharacters) {
         // Check if we have a custom error to manage
         if (customErrors[errorCode]) {
             // Need to create unique error to ensure ability to display multiple error messages
-            destinationErrors.push(this.getUniqueErrorByCode(name, errorCode, fileName, customErrors, overrideMaxSizeInMo, overrideAcceptedExtensions, overrideMaxFileNameLength, overrideIllegalCharacters));
+            destinationErrors.push(this.getUniqueErrorByCode(name, errorCode, fileName, customErrors, overrideAcceptedExtensions, overrideMaxFileNameLength, overrideIllegalCharacters));
         }
         else {
             destinationErrors.push({
@@ -2199,7 +2189,7 @@ class UploaderHelper {
         // MultiPartException from Zuul returns HTTP 0
         customErrors['0'] = customErrors['413'];
     }
-    getLocalErrors(name, files, customErrors, overrideMaxSizeInMo, overrideAcceptedExtensions, overrideMaxFileNameLength, overrideIllegalCharacters) {
+    getLocalErrors(name, files, customErrors, overrideAcceptedExtensions, overrideMaxFileNameLength, overrideIllegalCharacters) {
         const errors = [];
         files.forEach(file => {
             // File bad extension
@@ -2207,30 +2197,30 @@ class UploaderHelper {
             if (!this.isFileExtensionValid(fileExtension, overrideAcceptedExtensions)) {
                 // Default custom error 415 exist (see function 'createDefaultCustomErrors')
                 // Need to create unique error to ensure ability to display multiple error messages
-                errors.push(this.getUniqueErrorByCode(name, '415', file.name, customErrors, overrideMaxSizeInMo, overrideAcceptedExtensions, overrideMaxFileNameLength, overrideIllegalCharacters));
+                errors.push(this.getUniqueErrorByCode(name, '415', file.name, customErrors, overrideAcceptedExtensions, overrideMaxFileNameLength, overrideIllegalCharacters));
             }
             // File name contains illegal characters
             if (!this.isFileNameNameValid(file.name, overrideIllegalCharacters)) {
                 // Default custom error FILENAME_SHOULD_NOT_CONTAIN exist (see function 'createDefaultCustomErrors')
                 // Need to create unique error to ensure ability to display multiple error messages
-                errors.push(this.getUniqueErrorByCode(name, 'FILENAME_SHOULD_NOT_CONTAIN', file.name, customErrors, overrideMaxSizeInMo, overrideAcceptedExtensions, overrideMaxFileNameLength, overrideIllegalCharacters));
+                errors.push(this.getUniqueErrorByCode(name, 'FILENAME_SHOULD_NOT_CONTAIN', file.name, customErrors, overrideAcceptedExtensions, overrideMaxFileNameLength, overrideIllegalCharacters));
             }
             // Files too big
-            if (this.isFileTooBig(file.size, overrideMaxSizeInMo)) {
+            if (this.isFileTooBig(name, file.size)) {
                 // Default custom error 413 exist (see function 'createDefaultCustomErrors')
                 // Need to create unique error to ensure ability to display multiple error messages
-                errors.push(this.getUniqueErrorByCode(name, '413', file.name, customErrors, overrideMaxSizeInMo, overrideAcceptedExtensions, overrideMaxFileNameLength, overrideIllegalCharacters));
+                errors.push(this.getUniqueErrorByCode(name, '413', file.name, customErrors, overrideAcceptedExtensions, overrideMaxFileNameLength, overrideIllegalCharacters));
             }
             if (this.isFileTooSmall(file.size)) {
                 // Default custom error FILE_TOO_SMALL exist (see function 'createDefaultCustomErrors')
                 // Need to create unique error to ensure ability to display multiple error messages
-                errors.push(this.getUniqueErrorByCode(name, 'FILE_TOO_SMALL', file.name, customErrors, overrideMaxSizeInMo, overrideAcceptedExtensions, overrideMaxFileNameLength, overrideIllegalCharacters));
+                errors.push(this.getUniqueErrorByCode(name, 'FILE_TOO_SMALL', file.name, customErrors, overrideAcceptedExtensions, overrideMaxFileNameLength, overrideIllegalCharacters));
             }
             // File name too long (64 chars max)
             if (!this.isFileNameLengthValid(file.name, overrideMaxFileNameLength)) {
                 // Default custom error FILENAME_TOO_LONG exist (see function 'createDefaultCustomErrors')
                 // Need to create unique error to ensure ability to display multiple error messages
-                errors.push(this.getUniqueErrorByCode(name, 'FILENAME_TOO_LONG', file.name, customErrors, overrideMaxSizeInMo, overrideAcceptedExtensions, overrideMaxFileNameLength, overrideIllegalCharacters));
+                errors.push(this.getUniqueErrorByCode(name, 'FILENAME_TOO_LONG', file.name, customErrors, overrideAcceptedExtensions, overrideMaxFileNameLength, overrideIllegalCharacters));
             }
         });
         return errors;
@@ -2329,16 +2319,15 @@ class UploaderHelper {
     removeCommasInLabel(label) {
         return label.split(',').join('');
     }
-    isTooBig(fileSizeInBytes, limitInMo) {
-        return fileSizeInBytes / (1024 * 1024) > limitInMo;
+    isTooBig(fileSizeInBytes, limitInBytes) {
+        return fileSizeInBytes > limitInBytes;
     }
-    replaceErrorMessageKeys(errorMsg, fileName, errorCode, overrideMaxSizeInMo, overrideAcceptedExtensions, overrideMaxFileNameLength, overrideIllegalCharacters) {
+    replaceErrorMessageKeys(name, errorMsg, fileName, errorCode, overrideAcceptedExtensions, overrideMaxFileNameLength, overrideIllegalCharacters) {
         const formattedErrorMsg = errorMsg.replace('%1$s', fileName);
         if (errorCode.startsWith('413')) {
             // REQUEST_ENTITY_TOO_LARGE_ERROR_MSG
-            const fileMaxSize = (overrideMaxSizeInMo
-                ? overrideMaxSizeInMo
-                : this.maxSizeInMo).toString();
+            const fileMaxSize = (this._fileMaxSizeInBytesByFormKey[name] /
+                (1024 * 1024)).toString();
             return formattedErrorMsg.replace('%2$s', fileMaxSize);
         }
         if (errorCode.startsWith('415')) {
@@ -11251,13 +11240,13 @@ class AbstractFoehnUploaderComponent extends FoehnInputComponent {
         this.deleteDocumentSubject.next(document);
     }
     displayLocalErrors(files) {
-        const errors = this.uploaderHelper.getLocalErrors(this.name, files, this.customErrors, this.overrideMaxSizeInMo, this.overrideAcceptedExtensions, this.overrideMaxFileNameLength, this.overrideIllegalCharacters);
+        const errors = this.uploaderHelper.getLocalErrors(this.name, files, this.customErrors, this.overrideAcceptedExtensions, this.overrideMaxFileNameLength, this.overrideIllegalCharacters);
         this.refreshErrors([errors, true]);
         return errors;
     }
 }
 AbstractFoehnUploaderComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.4", ngImport: i0, type: AbstractFoehnUploaderComponent, deps: [{ token: ApplicationInfoService }, { token: FoehnConfirmModalService }, { token: SdkDictionaryService }], target: i0.ɵɵFactoryTarget.Directive });
-AbstractFoehnUploaderComponent.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "15.1.4", type: AbstractFoehnUploaderComponent, inputs: { required: "required", dragAndDrop: "dragAndDrop", showUploadButton: "showUploadButton", readonly: "readonly", hideGlobalInfos: "hideGlobalInfos", multiple: "multiple", key: "key", chooseButtonLabel: "chooseButtonLabel", chooseButtonLabelMultiple: "chooseButtonLabelMultiple", dropZoneLabel: "dropZoneLabel", dropZoneLabelMultiple: "dropZoneLabelMultiple", overrideAcceptedExtensions: "overrideAcceptedExtensions", overrideMaxSizeInMo: "overrideMaxSizeInMo", overrideMaxFileNameLength: "overrideMaxFileNameLength", overrideIllegalCharacters: "overrideIllegalCharacters", showDeleteConfirmationMessage: "showDeleteConfirmationMessage", deleteConfirmationMessage: "deleteConfirmationMessage" }, host: { listeners: { "window:dragover": "onDocumentDragOver($event)", "window:dragleave": "onDocumentDragLeave($event)", "window:drop": "onDocumentDrop($event)" } }, usesInheritance: true, ngImport: i0 });
+AbstractFoehnUploaderComponent.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "15.1.4", type: AbstractFoehnUploaderComponent, inputs: { required: "required", dragAndDrop: "dragAndDrop", showUploadButton: "showUploadButton", readonly: "readonly", hideGlobalInfos: "hideGlobalInfos", multiple: "multiple", key: "key", chooseButtonLabel: "chooseButtonLabel", chooseButtonLabelMultiple: "chooseButtonLabelMultiple", dropZoneLabel: "dropZoneLabel", dropZoneLabelMultiple: "dropZoneLabelMultiple", overrideAcceptedExtensions: "overrideAcceptedExtensions", overrideMaxFileNameLength: "overrideMaxFileNameLength", overrideIllegalCharacters: "overrideIllegalCharacters", showDeleteConfirmationMessage: "showDeleteConfirmationMessage", deleteConfirmationMessage: "deleteConfirmationMessage" }, host: { listeners: { "window:dragover": "onDocumentDragOver($event)", "window:dragleave": "onDocumentDragLeave($event)", "window:drop": "onDocumentDrop($event)" } }, usesInheritance: true, ngImport: i0 });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.4", ngImport: i0, type: AbstractFoehnUploaderComponent, decorators: [{
             type: Directive
         }], ctorParameters: function () { return [{ type: ApplicationInfoService }, { type: FoehnConfirmModalService }, { type: SdkDictionaryService }]; }, propDecorators: { required: [{
@@ -11284,8 +11273,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.4", ngImpor
                 type: Input
             }], overrideAcceptedExtensions: [{
                 type: Input
-            }], overrideMaxSizeInMo: [{
-                type: Input
             }], overrideMaxFileNameLength: [{
                 type: Input
             }], overrideIllegalCharacters: [{
@@ -11412,7 +11399,7 @@ class FoehnMultiUploadComponent extends AbstractFoehnUploaderComponent {
             const errors = [];
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
             const { status } = error;
-            this.uploaderHelper.addCustomErrorOrDefault(this.name, errors, `${status}`, '', this.customErrors, this.overrideMaxSizeInMo, this.overrideAcceptedExtensions, this.overrideMaxFileNameLength, this.overrideIllegalCharacters);
+            this.uploaderHelper.addCustomErrorOrDefault(this.name, errors, `${status}`, '', this.customErrors, this.overrideAcceptedExtensions, this.overrideMaxFileNameLength, this.overrideIllegalCharacters);
             this.refreshErrors([errors, true]);
         });
         // Delete document logic
@@ -11531,7 +11518,7 @@ class FoehnMultiUploadComponent extends AbstractFoehnUploaderComponent {
             return;
         }
         const newErrors = [];
-        errors.forEach(error => this.uploaderHelper.addCustomErrorOrDefault(this.name, newErrors, `${error.errorCode}`, error.label, this.customErrors, this.overrideMaxSizeInMo, this.overrideAcceptedExtensions, this.overrideMaxFileNameLength, this.overrideIllegalCharacters));
+        errors.forEach(error => this.uploaderHelper.addCustomErrorOrDefault(this.name, newErrors, `${error.errorCode}`, error.label, this.customErrors, this.overrideAcceptedExtensions, this.overrideMaxFileNameLength, this.overrideIllegalCharacters));
         this.refreshErrors([newErrors, true]);
     }
     manageSingleFile(files) {
@@ -11721,7 +11708,7 @@ class FoehnBoMultiUploadComponent extends AbstractFoehnUploaderComponent {
             const errors = [];
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
             const { status } = error;
-            this.uploaderHelper.addCustomErrorOrDefault(this.name, errors, `${status}`, '', this.customErrors, this.overrideMaxSizeInMo, this.overrideAcceptedExtensions, this.overrideMaxFileNameLength, this.overrideIllegalCharacters);
+            this.uploaderHelper.addCustomErrorOrDefault(this.name, errors, `${status}`, '', this.customErrors, this.overrideAcceptedExtensions, this.overrideMaxFileNameLength, this.overrideIllegalCharacters);
             this.refreshErrors([errors, true]);
         });
         // Delete document logic
@@ -11796,7 +11783,7 @@ class FoehnBoMultiUploadComponent extends AbstractFoehnUploaderComponent {
             return;
         }
         const newErrors = [];
-        errors.forEach(error => this.uploaderHelper.addCustomErrorOrDefault(this.name, newErrors, `${error.errorCode}`, error.label, this.customErrors, this.overrideMaxSizeInMo, this.overrideAcceptedExtensions, this.overrideMaxFileNameLength, this.overrideIllegalCharacters));
+        errors.forEach(error => this.uploaderHelper.addCustomErrorOrDefault(this.name, newErrors, `${error.errorCode}`, error.label, this.customErrors, this.overrideAcceptedExtensions, this.overrideMaxFileNameLength, this.overrideIllegalCharacters));
         this.refreshErrors([newErrors, true]);
     }
     removeDocumentFromModel(document) {