taxtank-core 0.30.23 → 0.30.24
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -1,9 +1,14 @@
|
|
|
1
1
|
import { DOCUMENT_FILE_TYPES } from '../models/document/document-file-types.const';
|
|
2
|
+
import { AbstractModel } from '../db/Models';
|
|
2
3
|
const MAX_SIZE = 4194304;
|
|
3
4
|
export class FileValidator {
|
|
4
5
|
// File max size check
|
|
5
6
|
static fileMaxSize(maxSize = MAX_SIZE) {
|
|
6
7
|
const validatorFn = (file) => {
|
|
8
|
+
// We don`t need to validate saved files, because when saving the form, the file was valid
|
|
9
|
+
if (file instanceof AbstractModel) {
|
|
10
|
+
return null;
|
|
11
|
+
}
|
|
7
12
|
return file.size > maxSize ? { fileMaxSize: { maxSize } } : null;
|
|
8
13
|
};
|
|
9
14
|
return FileValidator.fileValidation(validatorFn);
|
|
@@ -11,6 +16,10 @@ export class FileValidator {
|
|
|
11
16
|
// File extension check
|
|
12
17
|
static fileExtensions(allowedExtensions = DOCUMENT_FILE_TYPES.all) {
|
|
13
18
|
const validatorFn = (file) => {
|
|
19
|
+
// We don`t need to validate saved files, because when saving the form, the file was valid
|
|
20
|
+
if (file instanceof AbstractModel) {
|
|
21
|
+
return null;
|
|
22
|
+
}
|
|
14
23
|
return allowedExtensions.includes(file.type) ? null : { fileExtension: { allowedExtensions: allowedExtensions.join() } };
|
|
15
24
|
};
|
|
16
25
|
return FileValidator.fileValidation(validatorFn);
|
|
@@ -24,4 +33,4 @@ export class FileValidator {
|
|
|
24
33
|
};
|
|
25
34
|
}
|
|
26
35
|
}
|
|
27
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
36
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmlsZS52YWxpZGF0b3IuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy90dC1jb3JlL3NyYy9saWIvdmFsaWRhdG9ycy9maWxlLnZhbGlkYXRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSw4Q0FBOEMsQ0FBQztBQUNuRixPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sY0FBYyxDQUFDO0FBRTdDLE1BQU0sUUFBUSxHQUFHLE9BQU8sQ0FBQztBQUV6QixNQUFNLE9BQU8sYUFBYTtJQUN4QixzQkFBc0I7SUFDdEIsTUFBTSxDQUFDLFdBQVcsQ0FBQyxVQUFrQixRQUFRO1FBQzNDLE1BQU0sV0FBVyxHQUFRLENBQUMsSUFBVSxFQUFVLEVBQUU7WUFFN0MsMEZBQTBGO1lBQzNGLElBQUksSUFBSSxZQUFZLGFBQWEsRUFBRTtnQkFDakMsT0FBTyxJQUFJLENBQUM7YUFDYjtZQUVELE9BQU8sSUFBSSxDQUFDLElBQUksR0FBRyxPQUFPLENBQUMsQ0FBQyxDQUFDLEVBQUUsV0FBVyxFQUFFLEVBQUMsT0FBTyxFQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDO1FBQ2pFLENBQUMsQ0FBQztRQUNGLE9BQU8sYUFBYSxDQUFDLGNBQWMsQ0FBQyxXQUFXLENBQUMsQ0FBQztJQUNuRCxDQUFDO0lBRUQsdUJBQXVCO0lBQ3ZCLE1BQU0sQ0FBQyxjQUFjLENBQUMsb0JBQThCLG1CQUFtQixDQUFDLEdBQUc7UUFDekUsTUFBTSxXQUFXLEdBQVEsQ0FBQyxJQUFVLEVBQVUsRUFBRTtZQUU5QywwRkFBMEY7WUFDMUYsSUFBSSxJQUFJLFlBQVksYUFBYSxFQUFFO2dCQUNqQyxPQUFPLElBQUksQ0FBQzthQUNiO1lBRUQsT0FBTyxpQkFBaUIsQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLEVBQUUsYUFBYSxFQUFFLEVBQUMsaUJBQWlCLEVBQUUsaUJBQWlCLENBQUMsSUFBSSxFQUFFLEVBQUMsRUFBRSxDQUFDO1FBQ3pILENBQUMsQ0FBQztRQUVGLE9BQU8sYUFBYSxDQUFDLGNBQWMsQ0FBQyxXQUFXLENBQUMsQ0FBQztJQUNuRCxDQUFDO0lBRU8sTUFBTSxDQUFDLGNBQWMsQ0FBQyxXQUEwQztRQUN0RSxPQUFPLENBQUMsV0FBK0IsRUFBRSxFQUFFO1lBQ3pDLElBQUksQ0FBQyxXQUFXLENBQUMsS0FBSyxFQUFFO2dCQUN0QixPQUFPLElBQUksQ0FBQzthQUNiO1lBRUQsT0FBTyxXQUFXLENBQUMsV0FBVyxDQUFDLEtBQUssQ0FBQyxDQUFDO1FBQ3hDLENBQUMsQ0FBQztJQUNKLENBQUM7Q0FDRiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IFZhbGlkYXRvckZuLCBVbnR5cGVkRm9ybUNvbnRyb2wgfSBmcm9tICdAYW5ndWxhci9mb3Jtcyc7XG5pbXBvcnQgeyBET0NVTUVOVF9GSUxFX1RZUEVTIH0gZnJvbSAnLi4vbW9kZWxzL2RvY3VtZW50L2RvY3VtZW50LWZpbGUtdHlwZXMuY29uc3QnO1xuaW1wb3J0IHsgQWJzdHJhY3RNb2RlbCB9IGZyb20gJy4uL2RiL01vZGVscyc7XG5cbmNvbnN0IE1BWF9TSVpFID0gNDE5NDMwNDtcblxuZXhwb3J0IGNsYXNzIEZpbGVWYWxpZGF0b3Ige1xuICAvLyBGaWxlIG1heCBzaXplIGNoZWNrXG4gIHN0YXRpYyBmaWxlTWF4U2l6ZShtYXhTaXplOiBudW1iZXIgPSBNQVhfU0laRSk6IFZhbGlkYXRvckZuIHtcbiAgICBjb25zdCB2YWxpZGF0b3JGbjogYW55ID0gKGZpbGU6IEZpbGUpOiBvYmplY3QgPT4ge1xuXG4gICAgICAgLy8gV2UgZG9uYHQgbmVlZCB0byB2YWxpZGF0ZSBzYXZlZCBmaWxlcywgYmVjYXVzZSB3aGVuIHNhdmluZyB0aGUgZm9ybSwgdGhlIGZpbGUgd2FzIHZhbGlkXG4gICAgICBpZiAoZmlsZSBpbnN0YW5jZW9mIEFic3RyYWN0TW9kZWwpIHtcbiAgICAgICAgcmV0dXJuIG51bGw7XG4gICAgICB9XG5cbiAgICAgIHJldHVybiBmaWxlLnNpemUgPiBtYXhTaXplID8geyBmaWxlTWF4U2l6ZToge21heFNpemV9IH0gOiBudWxsO1xuICAgIH07XG4gICAgcmV0dXJuIEZpbGVWYWxpZGF0b3IuZmlsZVZhbGlkYXRpb24odmFsaWRhdG9yRm4pO1xuICB9XG5cbiAgLy8gRmlsZSBleHRlbnNpb24gY2hlY2tcbiAgc3RhdGljIGZpbGVFeHRlbnNpb25zKGFsbG93ZWRFeHRlbnNpb25zOiBzdHJpbmdbXSA9IERPQ1VNRU5UX0ZJTEVfVFlQRVMuYWxsKTogVmFsaWRhdG9yRm4ge1xuICAgIGNvbnN0IHZhbGlkYXRvckZuOiBhbnkgPSAoZmlsZTogRmlsZSk6IG9iamVjdCA9PiB7XG5cbiAgICAgIC8vIFdlIGRvbmB0IG5lZWQgdG8gdmFsaWRhdGUgc2F2ZWQgZmlsZXMsIGJlY2F1c2Ugd2hlbiBzYXZpbmcgdGhlIGZvcm0sIHRoZSBmaWxlIHdhcyB2YWxpZFxuICAgICAgaWYgKGZpbGUgaW5zdGFuY2VvZiBBYnN0cmFjdE1vZGVsKSB7XG4gICAgICAgIHJldHVybiBudWxsO1xuICAgICAgfVxuXG4gICAgICByZXR1cm4gYWxsb3dlZEV4dGVuc2lvbnMuaW5jbHVkZXMoZmlsZS50eXBlKSA/IG51bGwgOiB7IGZpbGVFeHRlbnNpb246IHthbGxvd2VkRXh0ZW5zaW9uczogYWxsb3dlZEV4dGVuc2lvbnMuam9pbigpfSB9O1xuICAgIH07XG5cbiAgICByZXR1cm4gRmlsZVZhbGlkYXRvci5maWxlVmFsaWRhdGlvbih2YWxpZGF0b3JGbik7XG4gIH1cblxuICBwcml2YXRlIHN0YXRpYyBmaWxlVmFsaWRhdGlvbih2YWxpZGF0b3JGbjogKEZpbGU6IEZpbGUpID0+IG51bGwgfCBvYmplY3QpOiBWYWxpZGF0b3JGbiB7XG4gICAgcmV0dXJuIChmb3JtQ29udHJvbDogVW50eXBlZEZvcm1Db250cm9sKSA9PiB7XG4gICAgICBpZiAoIWZvcm1Db250cm9sLnZhbHVlKSB7XG4gICAgICAgIHJldHVybiBudWxsO1xuICAgICAgfVxuXG4gICAgICByZXR1cm4gdmFsaWRhdG9yRm4oZm9ybUNvbnRyb2wudmFsdWUpO1xuICAgIH07XG4gIH1cbn1cbiJdfQ==
|
|
@@ -17512,6 +17512,10 @@ class FileValidator {
|
|
|
17512
17512
|
// File max size check
|
|
17513
17513
|
static fileMaxSize(maxSize = MAX_SIZE) {
|
|
17514
17514
|
const validatorFn = (file) => {
|
|
17515
|
+
// We don`t need to validate saved files, because when saving the form, the file was valid
|
|
17516
|
+
if (file instanceof AbstractModel) {
|
|
17517
|
+
return null;
|
|
17518
|
+
}
|
|
17515
17519
|
return file.size > maxSize ? { fileMaxSize: { maxSize } } : null;
|
|
17516
17520
|
};
|
|
17517
17521
|
return FileValidator.fileValidation(validatorFn);
|
|
@@ -17519,6 +17523,10 @@ class FileValidator {
|
|
|
17519
17523
|
// File extension check
|
|
17520
17524
|
static fileExtensions(allowedExtensions = DOCUMENT_FILE_TYPES.all) {
|
|
17521
17525
|
const validatorFn = (file) => {
|
|
17526
|
+
// We don`t need to validate saved files, because when saving the form, the file was valid
|
|
17527
|
+
if (file instanceof AbstractModel) {
|
|
17528
|
+
return null;
|
|
17529
|
+
}
|
|
17522
17530
|
return allowedExtensions.includes(file.type) ? null : { fileExtension: { allowedExtensions: allowedExtensions.join() } };
|
|
17523
17531
|
};
|
|
17524
17532
|
return FileValidator.fileValidation(validatorFn);
|