@wizishop/img-manager 0.2.100 → 0.2.101
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.
- package/bundles/wizishop-img-manager.umd.js +22 -3
- package/bundles/wizishop-img-manager.umd.js.map +1 -1
- package/bundles/wizishop-img-manager.umd.min.js +1 -1
- package/bundles/wizishop-img-manager.umd.min.js.map +1 -1
- package/esm2015/lib/components/img-upload/img-upload.component.js +23 -4
- package/esm5/lib/components/img-upload/img-upload.component.js +23 -4
- package/fesm2015/wizishop-img-manager.js +22 -3
- package/fesm2015/wizishop-img-manager.js.map +1 -1
- package/fesm5/wizishop-img-manager.js +22 -3
- package/fesm5/wizishop-img-manager.js.map +1 -1
- package/lib/components/img-upload/img-upload.component.d.ts +3 -0
- package/package.json +1 -1
- package/wizishop-img-manager-0.2.101.tgz +0 -0
- package/wizishop-img-manager.metadata.json +1 -1
- package/wz-img-manager.scss +62 -62
- package/wizishop-img-manager-0.2.100.tgz +0 -0
|
@@ -16,6 +16,7 @@ let ImgUploadComponent = class ImgUploadComponent {
|
|
|
16
16
|
this.loadingText = 'ImgManager.ImgUpload.loading';
|
|
17
17
|
this.errorUploadingImg = 'ImgManager.ImgUpload.errorUploadingImg';
|
|
18
18
|
this.errorNotImg = 'ImgManager.ImgUpload.errorNotImg';
|
|
19
|
+
this.MAX_IMAGE_SIZE = 10000000; // In bytes
|
|
19
20
|
}
|
|
20
21
|
ngOnInit() {
|
|
21
22
|
this.assetsIcon = this.getAssets();
|
|
@@ -37,20 +38,32 @@ let ImgUploadComponent = class ImgUploadComponent {
|
|
|
37
38
|
this.isLoading = true;
|
|
38
39
|
const imgToUploadList = [];
|
|
39
40
|
for (const file of files) {
|
|
40
|
-
|
|
41
|
-
formData.append('image', file, file.name);
|
|
41
|
+
console.log('file', file.size);
|
|
42
42
|
if (!this.isFileImage(file.type)) {
|
|
43
43
|
this.alertService.openAlert(this.errorNotImg);
|
|
44
44
|
this.isLoading = false;
|
|
45
45
|
continue;
|
|
46
46
|
}
|
|
47
|
+
if (!this.isSizeValid(file.size)) {
|
|
48
|
+
this.alertService.openAlert(`L'image : ${file.name} est trop grande (${this.getImageSizeInKo(file.size)}ko). Taille maximum acceptée: ${this.getImageSizeInKo(this.MAX_IMAGE_SIZE)}ko`);
|
|
49
|
+
this.isLoading = false;
|
|
50
|
+
continue;
|
|
51
|
+
}
|
|
52
|
+
const formData = new FormData();
|
|
53
|
+
formData.append('image', file, file.name);
|
|
47
54
|
imgToUploadList.push(this.imgManager.uploadFile(formData));
|
|
48
55
|
}
|
|
49
56
|
forkJoin(imgToUploadList).subscribe((img) => {
|
|
50
57
|
this.onImgUpload(img),
|
|
51
58
|
this.isLoading = false;
|
|
52
59
|
}, error => {
|
|
53
|
-
|
|
60
|
+
var _a, _b;
|
|
61
|
+
if (((_b = (_a = error) === null || _a === void 0 ? void 0 : _a.error) === null || _b === void 0 ? void 0 : _b.message) && error.statusText !== 'Bad Request') {
|
|
62
|
+
this.alertService.openAlertWithBackendRespons(this.errorUploadingImg, error.error.message);
|
|
63
|
+
}
|
|
64
|
+
else {
|
|
65
|
+
this.alertService.openAlert(this.errorUploadingImg);
|
|
66
|
+
}
|
|
54
67
|
this.isLoading = false;
|
|
55
68
|
});
|
|
56
69
|
}
|
|
@@ -65,6 +78,12 @@ let ImgUploadComponent = class ImgUploadComponent {
|
|
|
65
78
|
isFileImage(fileType) {
|
|
66
79
|
return fileType.split('/')[0] === 'image';
|
|
67
80
|
}
|
|
81
|
+
isSizeValid(imageBytesSize) {
|
|
82
|
+
return imageBytesSize < this.MAX_IMAGE_SIZE;
|
|
83
|
+
}
|
|
84
|
+
getImageSizeInKo(size) {
|
|
85
|
+
return Math.round(size / 1024);
|
|
86
|
+
}
|
|
68
87
|
/**
|
|
69
88
|
* Remove the style of the drag and drop box
|
|
70
89
|
* After an img is droped, the box is still grey
|
|
@@ -103,4 +122,4 @@ ImgUploadComponent = __decorate([
|
|
|
103
122
|
ImgManagerConfigService])
|
|
104
123
|
], ImgUploadComponent);
|
|
105
124
|
export { ImgUploadComponent };
|
|
106
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
125
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"img-upload.component.js","sourceRoot":"ng://@wizishop/img-manager/","sources":["lib/components/img-upload/img-upload.component.ts"],"names":[],"mappings":"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","sourcesContent":["import {Component, OnInit, Input, Output, EventEmitter, ViewChild, ElementRef} from '@angular/core';\nimport { ImgManagerService } from '../../services/img-manager.service';\nimport { Observable, forkJoin } from 'rxjs';\nimport { ImgPictureDTO } from '../../dto/img-manager.dto';\nimport { easeInOut } from '../../animations/easeInOut/ease-in-out.animation';\nimport {ImgManagerConfigService} from \"../../services/config/external-config.service\";\nimport { stateDisplayed } from '../../dto/export-dtos.api';\nimport { AlertService } from '../../services/alert.service';\n\n@Component({\n  selector: 'img-upload',\n  templateUrl: './img-upload.component.html',\n  animations: [\n    easeInOut\n  ]\n})\nexport class ImgUploadComponent implements OnInit {\n\n  files: any = [];\n  isLoading: boolean = false;\n  assetsIcon: string;\n  @Input() stateDisplayed: stateDisplayed;\n  @Output() imgUploaded = new EventEmitter();\n\n  @ViewChild('dragAndDropBox') dragAndDropBox: ElementRef;\n\n  loadingText = 'ImgManager.ImgUpload.loading';\n  errorUploadingImg = 'ImgManager.ImgUpload.errorUploadingImg';\n  errorNotImg = 'ImgManager.ImgUpload.errorNotImg';\n\n  MAX_IMAGE_SIZE = 10000000; // In bytes\n\n  constructor(\n    private imgManager: ImgManagerService,\n    private alertService: AlertService,\n    private externalConfigService: ImgManagerConfigService\n    ) {}\n\n  ngOnInit(): void {\n    this.assetsIcon = this.getAssets();\n  }\n\n  filesChangeByClick(event: any) {\n    this.uploadFile(event.target.files);\n  }\n\n  getAssets() {\n    return this.externalConfigService.getRouteAssets() + \"img/icon_picture.svg\";\n  }\n\n  filesChangeByDragAndDrop(filesList: File[]) {\n    this.removeDragAndDropStyle();\n    this.uploadFile(filesList);\n  }\n\n  uploadFile(files: File[]) {\n    if (files && !files.length) {\n      return;\n    }\n\n    this.isLoading =true;\n    const imgToUploadList: Observable<any>[] = [];\n    for (const file of files) {\n      console.log('file', file.size);\n\n      if(!this.isFileImage(file.type)) {\n        this.alertService.openAlert(this.errorNotImg);\n        this.isLoading = false;\n        continue;\n      }\n\n      if (!this.isSizeValid(file.size)) {\n        this.alertService.openAlert(`L'image : ${file.name} est trop grande (${this.getImageSizeInKo(file.size)}ko). Taille maximum acceptée: ${this.getImageSizeInKo(this.MAX_IMAGE_SIZE)}ko`);\n        this.isLoading = false;\n        continue;\n      }\n\n      const formData = new FormData();\n      formData.append('image', file, file.name);\n\n\n      imgToUploadList.push(this.imgManager.uploadFile(formData));\n    }\n\n    forkJoin(imgToUploadList).subscribe(\n      (img: ImgPictureDTO[]) => {\n        this.onImgUpload(img),\n        this.isLoading =false;\n      },\n      error => {\n        if (error?.error?.message && error.statusText !== 'Bad Request') {\n          this.alertService.openAlertWithBackendRespons(this.errorUploadingImg, error.error.message);\n        } else {\n          this.alertService.openAlert(this.errorUploadingImg);\n        }\n        this.isLoading =false;\n      }\n    )\n  }\n\n  /**\n   * Send the img uploaded to the tabs components,\n   * Then the tabs components add the img to upload list by calling the method onImgUploaded of the upload-list component\n   * @param img\n   */\n  onImgUpload(img: ImgPictureDTO[]) {\n    this.imgUploaded.emit(img);\n  }\n\n  isFileImage(fileType: string) {\n    return fileType.split('/')[0] === 'image';\n  }\n\n  isSizeValid(imageBytesSize: number): boolean {\n    return imageBytesSize < this.MAX_IMAGE_SIZE;\n  }\n\n  getImageSizeInKo(size: number) {\n    return Math.round(size / 1024);\n  }\n\n  /**\n   * Remove the style of the drag and drop box\n   * After an img is droped, the box is still grey\n   */\n  removeDragAndDropStyle() {\n    this.dragAndDropBox.nativeElement.style = '';\n  }\n}\n"]}
|
|
@@ -16,6 +16,7 @@ var ImgUploadComponent = /** @class */ (function () {
|
|
|
16
16
|
this.loadingText = 'ImgManager.ImgUpload.loading';
|
|
17
17
|
this.errorUploadingImg = 'ImgManager.ImgUpload.errorUploadingImg';
|
|
18
18
|
this.errorNotImg = 'ImgManager.ImgUpload.errorNotImg';
|
|
19
|
+
this.MAX_IMAGE_SIZE = 10000000; // In bytes
|
|
19
20
|
}
|
|
20
21
|
ImgUploadComponent.prototype.ngOnInit = function () {
|
|
21
22
|
this.assetsIcon = this.getAssets();
|
|
@@ -41,13 +42,19 @@ var ImgUploadComponent = /** @class */ (function () {
|
|
|
41
42
|
try {
|
|
42
43
|
for (var files_1 = __values(files), files_1_1 = files_1.next(); !files_1_1.done; files_1_1 = files_1.next()) {
|
|
43
44
|
var file = files_1_1.value;
|
|
44
|
-
|
|
45
|
-
formData.append('image', file, file.name);
|
|
45
|
+
console.log('file', file.size);
|
|
46
46
|
if (!this.isFileImage(file.type)) {
|
|
47
47
|
this.alertService.openAlert(this.errorNotImg);
|
|
48
48
|
this.isLoading = false;
|
|
49
49
|
continue;
|
|
50
50
|
}
|
|
51
|
+
if (!this.isSizeValid(file.size)) {
|
|
52
|
+
this.alertService.openAlert("L'image : " + file.name + " est trop grande (" + this.getImageSizeInKo(file.size) + "ko). Taille maximum accept\u00E9e: " + this.getImageSizeInKo(this.MAX_IMAGE_SIZE) + "ko");
|
|
53
|
+
this.isLoading = false;
|
|
54
|
+
continue;
|
|
55
|
+
}
|
|
56
|
+
var formData = new FormData();
|
|
57
|
+
formData.append('image', file, file.name);
|
|
51
58
|
imgToUploadList.push(this.imgManager.uploadFile(formData));
|
|
52
59
|
}
|
|
53
60
|
}
|
|
@@ -62,7 +69,13 @@ var ImgUploadComponent = /** @class */ (function () {
|
|
|
62
69
|
_this.onImgUpload(img),
|
|
63
70
|
_this.isLoading = false;
|
|
64
71
|
}, function (error) {
|
|
65
|
-
|
|
72
|
+
var _a, _b;
|
|
73
|
+
if (((_b = (_a = error) === null || _a === void 0 ? void 0 : _a.error) === null || _b === void 0 ? void 0 : _b.message) && error.statusText !== 'Bad Request') {
|
|
74
|
+
_this.alertService.openAlertWithBackendRespons(_this.errorUploadingImg, error.error.message);
|
|
75
|
+
}
|
|
76
|
+
else {
|
|
77
|
+
_this.alertService.openAlert(_this.errorUploadingImg);
|
|
78
|
+
}
|
|
66
79
|
_this.isLoading = false;
|
|
67
80
|
});
|
|
68
81
|
};
|
|
@@ -77,6 +90,12 @@ var ImgUploadComponent = /** @class */ (function () {
|
|
|
77
90
|
ImgUploadComponent.prototype.isFileImage = function (fileType) {
|
|
78
91
|
return fileType.split('/')[0] === 'image';
|
|
79
92
|
};
|
|
93
|
+
ImgUploadComponent.prototype.isSizeValid = function (imageBytesSize) {
|
|
94
|
+
return imageBytesSize < this.MAX_IMAGE_SIZE;
|
|
95
|
+
};
|
|
96
|
+
ImgUploadComponent.prototype.getImageSizeInKo = function (size) {
|
|
97
|
+
return Math.round(size / 1024);
|
|
98
|
+
};
|
|
80
99
|
/**
|
|
81
100
|
* Remove the style of the drag and drop box
|
|
82
101
|
* After an img is droped, the box is still grey
|
|
@@ -116,4 +135,4 @@ var ImgUploadComponent = /** @class */ (function () {
|
|
|
116
135
|
return ImgUploadComponent;
|
|
117
136
|
}());
|
|
118
137
|
export { ImgUploadComponent };
|
|
119
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
138
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"img-upload.component.js","sourceRoot":"ng://@wizishop/img-manager/","sources":["lib/components/img-upload/img-upload.component.ts"],"names":[],"mappings":";AAAA,OAAO,EAAC,SAAS,EAAU,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,SAAS,EAAE,UAAU,EAAC,MAAM,eAAe,CAAC;AACpG,OAAO,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AACvE,OAAO,EAAc,QAAQ,EAAE,MAAM,MAAM,CAAC;AAE5C,OAAO,EAAE,SAAS,EAAE,MAAM,kDAAkD,CAAC;AAC7E,OAAO,EAAC,uBAAuB,EAAC,MAAM,+CAA+C,CAAC;AAEtF,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAS5D;IAgBE,4BACU,UAA6B,EAC7B,YAA0B,EAC1B,qBAA8C;QAF9C,eAAU,GAAV,UAAU,CAAmB;QAC7B,iBAAY,GAAZ,YAAY,CAAc;QAC1B,0BAAqB,GAArB,qBAAqB,CAAyB;QAjBxD,UAAK,GAAQ,EAAE,CAAC;QAChB,cAAS,GAAY,KAAK,CAAC;QAGjB,gBAAW,GAAG,IAAI,YAAY,EAAE,CAAC;QAI3C,gBAAW,GAAG,8BAA8B,CAAC;QAC7C,sBAAiB,GAAG,wCAAwC,CAAC;QAC7D,gBAAW,GAAG,kCAAkC,CAAC;QAEjD,mBAAc,GAAG,QAAQ,CAAC,CAAC,WAAW;IAMjC,CAAC;IAEN,qCAAQ,GAAR;QACE,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;IACrC,CAAC;IAED,+CAAkB,GAAlB,UAAmB,KAAU;QAC3B,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACtC,CAAC;IAED,sCAAS,GAAT;QACE,OAAO,IAAI,CAAC,qBAAqB,CAAC,cAAc,EAAE,GAAG,sBAAsB,CAAC;IAC9E,CAAC;IAED,qDAAwB,GAAxB,UAAyB,SAAiB;QACxC,IAAI,CAAC,sBAAsB,EAAE,CAAC;QAC9B,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;IAC7B,CAAC;IAED,uCAAU,GAAV,UAAW,KAAa;;QAAxB,iBA2CC;QA1CC,IAAI,KAAK,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE;YAC1B,OAAO;SACR;QAED,IAAI,CAAC,SAAS,GAAE,IAAI,CAAC;QACrB,IAAM,eAAe,GAAsB,EAAE,CAAC;;YAC9C,KAAmB,IAAA,UAAA,SAAA,KAAK,CAAA,4BAAA,+CAAE;gBAArB,IAAM,IAAI,kBAAA;gBACb,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;gBAE/B,IAAG,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;oBAC/B,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;oBAC9C,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;oBACvB,SAAS;iBACV;gBAED,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;oBAChC,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,eAAa,IAAI,CAAC,IAAI,0BAAqB,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,2CAAiC,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,cAAc,CAAC,OAAI,CAAC,CAAC;oBACxL,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;oBACvB,SAAS;iBACV;gBAED,IAAM,QAAQ,GAAG,IAAI,QAAQ,EAAE,CAAC;gBAChC,QAAQ,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;gBAG1C,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC;aAC5D;;;;;;;;;QAED,QAAQ,CAAC,eAAe,CAAC,CAAC,SAAS,CACjC,UAAC,GAAoB;YACnB,KAAI,CAAC,WAAW,CAAC,GAAG,CAAC;gBACrB,KAAI,CAAC,SAAS,GAAE,KAAK,CAAC;QACxB,CAAC,EACD,UAAA,KAAK;;YACH,IAAI,aAAA,KAAK,0CAAE,KAAK,0CAAE,OAAO,KAAI,KAAK,CAAC,UAAU,KAAK,aAAa,EAAE;gBAC/D,KAAI,CAAC,YAAY,CAAC,2BAA2B,CAAC,KAAI,CAAC,iBAAiB,EAAE,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;aAC5F;iBAAM;gBACL,KAAI,CAAC,YAAY,CAAC,SAAS,CAAC,KAAI,CAAC,iBAAiB,CAAC,CAAC;aACrD;YACD,KAAI,CAAC,SAAS,GAAE,KAAK,CAAC;QACxB,CAAC,CACF,CAAA;IACH,CAAC;IAED;;;;OAIG;IACH,wCAAW,GAAX,UAAY,GAAoB;QAC9B,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC7B,CAAC;IAED,wCAAW,GAAX,UAAY,QAAgB;QAC1B,OAAO,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC;IAC5C,CAAC;IAED,wCAAW,GAAX,UAAY,cAAsB;QAChC,OAAO,cAAc,GAAG,IAAI,CAAC,cAAc,CAAC;IAC9C,CAAC;IAED,6CAAgB,GAAhB,UAAiB,IAAY;QAC3B,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC,CAAC;IACjC,CAAC;IAED;;;OAGG;IACH,mDAAsB,GAAtB;QACE,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC,KAAK,GAAG,EAAE,CAAC;IAC/C,CAAC;;gBA9FqB,iBAAiB;gBACf,YAAY;gBACH,uBAAuB;;IAd/C;QAAR,KAAK,EAAE;;8DAAgC;IAC9B;QAAT,MAAM,EAAE;;2DAAkC;IAEd;QAA5B,SAAS,CAAC,gBAAgB,CAAC;kCAAiB,UAAU;8DAAC;IAR7C,kBAAkB;QAP9B,SAAS,CAAC;YACT,QAAQ,EAAE,YAAY;YACtB,kzCAA0C;YAC1C,UAAU,EAAE;gBACV,SAAS;aACV;SACF,CAAC;yCAkBsB,iBAAiB;YACf,YAAY;YACH,uBAAuB;OAnB7C,kBAAkB,CAgH9B;IAAD,yBAAC;CAAA,AAhHD,IAgHC;SAhHY,kBAAkB","sourcesContent":["import {Component, OnInit, Input, Output, EventEmitter, ViewChild, ElementRef} from '@angular/core';\nimport { ImgManagerService } from '../../services/img-manager.service';\nimport { Observable, forkJoin } from 'rxjs';\nimport { ImgPictureDTO } from '../../dto/img-manager.dto';\nimport { easeInOut } from '../../animations/easeInOut/ease-in-out.animation';\nimport {ImgManagerConfigService} from \"../../services/config/external-config.service\";\nimport { stateDisplayed } from '../../dto/export-dtos.api';\nimport { AlertService } from '../../services/alert.service';\n\n@Component({\n  selector: 'img-upload',\n  templateUrl: './img-upload.component.html',\n  animations: [\n    easeInOut\n  ]\n})\nexport class ImgUploadComponent implements OnInit {\n\n  files: any = [];\n  isLoading: boolean = false;\n  assetsIcon: string;\n  @Input() stateDisplayed: stateDisplayed;\n  @Output() imgUploaded = new EventEmitter();\n\n  @ViewChild('dragAndDropBox') dragAndDropBox: ElementRef;\n\n  loadingText = 'ImgManager.ImgUpload.loading';\n  errorUploadingImg = 'ImgManager.ImgUpload.errorUploadingImg';\n  errorNotImg = 'ImgManager.ImgUpload.errorNotImg';\n\n  MAX_IMAGE_SIZE = 10000000; // In bytes\n\n  constructor(\n    private imgManager: ImgManagerService,\n    private alertService: AlertService,\n    private externalConfigService: ImgManagerConfigService\n    ) {}\n\n  ngOnInit(): void {\n    this.assetsIcon = this.getAssets();\n  }\n\n  filesChangeByClick(event: any) {\n    this.uploadFile(event.target.files);\n  }\n\n  getAssets() {\n    return this.externalConfigService.getRouteAssets() + \"img/icon_picture.svg\";\n  }\n\n  filesChangeByDragAndDrop(filesList: File[]) {\n    this.removeDragAndDropStyle();\n    this.uploadFile(filesList);\n  }\n\n  uploadFile(files: File[]) {\n    if (files && !files.length) {\n      return;\n    }\n\n    this.isLoading =true;\n    const imgToUploadList: Observable<any>[] = [];\n    for (const file of files) {\n      console.log('file', file.size);\n\n      if(!this.isFileImage(file.type)) {\n        this.alertService.openAlert(this.errorNotImg);\n        this.isLoading = false;\n        continue;\n      }\n\n      if (!this.isSizeValid(file.size)) {\n        this.alertService.openAlert(`L'image : ${file.name} est trop grande (${this.getImageSizeInKo(file.size)}ko). Taille maximum acceptée: ${this.getImageSizeInKo(this.MAX_IMAGE_SIZE)}ko`);\n        this.isLoading = false;\n        continue;\n      }\n\n      const formData = new FormData();\n      formData.append('image', file, file.name);\n\n\n      imgToUploadList.push(this.imgManager.uploadFile(formData));\n    }\n\n    forkJoin(imgToUploadList).subscribe(\n      (img: ImgPictureDTO[]) => {\n        this.onImgUpload(img),\n        this.isLoading =false;\n      },\n      error => {\n        if (error?.error?.message && error.statusText !== 'Bad Request') {\n          this.alertService.openAlertWithBackendRespons(this.errorUploadingImg, error.error.message);\n        } else {\n          this.alertService.openAlert(this.errorUploadingImg);\n        }\n        this.isLoading =false;\n      }\n    )\n  }\n\n  /**\n   * Send the img uploaded to the tabs components,\n   * Then the tabs components add the img to upload list by calling the method onImgUploaded of the upload-list component\n   * @param img\n   */\n  onImgUpload(img: ImgPictureDTO[]) {\n    this.imgUploaded.emit(img);\n  }\n\n  isFileImage(fileType: string) {\n    return fileType.split('/')[0] === 'image';\n  }\n\n  isSizeValid(imageBytesSize: number): boolean {\n    return imageBytesSize < this.MAX_IMAGE_SIZE;\n  }\n\n  getImageSizeInKo(size: number) {\n    return Math.round(size / 1024);\n  }\n\n  /**\n   * Remove the style of the drag and drop box\n   * After an img is droped, the box is still grey\n   */\n  removeDragAndDropStyle() {\n    this.dragAndDropBox.nativeElement.style = '';\n  }\n}\n"]}
|
|
@@ -874,6 +874,7 @@ let ImgUploadComponent = class ImgUploadComponent {
|
|
|
874
874
|
this.loadingText = 'ImgManager.ImgUpload.loading';
|
|
875
875
|
this.errorUploadingImg = 'ImgManager.ImgUpload.errorUploadingImg';
|
|
876
876
|
this.errorNotImg = 'ImgManager.ImgUpload.errorNotImg';
|
|
877
|
+
this.MAX_IMAGE_SIZE = 10000000; // In bytes
|
|
877
878
|
}
|
|
878
879
|
ngOnInit() {
|
|
879
880
|
this.assetsIcon = this.getAssets();
|
|
@@ -895,20 +896,32 @@ let ImgUploadComponent = class ImgUploadComponent {
|
|
|
895
896
|
this.isLoading = true;
|
|
896
897
|
const imgToUploadList = [];
|
|
897
898
|
for (const file of files) {
|
|
898
|
-
|
|
899
|
-
formData.append('image', file, file.name);
|
|
899
|
+
console.log('file', file.size);
|
|
900
900
|
if (!this.isFileImage(file.type)) {
|
|
901
901
|
this.alertService.openAlert(this.errorNotImg);
|
|
902
902
|
this.isLoading = false;
|
|
903
903
|
continue;
|
|
904
904
|
}
|
|
905
|
+
if (!this.isSizeValid(file.size)) {
|
|
906
|
+
this.alertService.openAlert(`L'image : ${file.name} est trop grande (${this.getImageSizeInKo(file.size)}ko). Taille maximum acceptée: ${this.getImageSizeInKo(this.MAX_IMAGE_SIZE)}ko`);
|
|
907
|
+
this.isLoading = false;
|
|
908
|
+
continue;
|
|
909
|
+
}
|
|
910
|
+
const formData = new FormData();
|
|
911
|
+
formData.append('image', file, file.name);
|
|
905
912
|
imgToUploadList.push(this.imgManager.uploadFile(formData));
|
|
906
913
|
}
|
|
907
914
|
forkJoin(imgToUploadList).subscribe((img) => {
|
|
908
915
|
this.onImgUpload(img),
|
|
909
916
|
this.isLoading = false;
|
|
910
917
|
}, error => {
|
|
911
|
-
|
|
918
|
+
var _a, _b;
|
|
919
|
+
if (((_b = (_a = error) === null || _a === void 0 ? void 0 : _a.error) === null || _b === void 0 ? void 0 : _b.message) && error.statusText !== 'Bad Request') {
|
|
920
|
+
this.alertService.openAlertWithBackendRespons(this.errorUploadingImg, error.error.message);
|
|
921
|
+
}
|
|
922
|
+
else {
|
|
923
|
+
this.alertService.openAlert(this.errorUploadingImg);
|
|
924
|
+
}
|
|
912
925
|
this.isLoading = false;
|
|
913
926
|
});
|
|
914
927
|
}
|
|
@@ -923,6 +936,12 @@ let ImgUploadComponent = class ImgUploadComponent {
|
|
|
923
936
|
isFileImage(fileType) {
|
|
924
937
|
return fileType.split('/')[0] === 'image';
|
|
925
938
|
}
|
|
939
|
+
isSizeValid(imageBytesSize) {
|
|
940
|
+
return imageBytesSize < this.MAX_IMAGE_SIZE;
|
|
941
|
+
}
|
|
942
|
+
getImageSizeInKo(size) {
|
|
943
|
+
return Math.round(size / 1024);
|
|
944
|
+
}
|
|
926
945
|
/**
|
|
927
946
|
* Remove the style of the drag and drop box
|
|
928
947
|
* After an img is droped, the box is still grey
|