inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-24 17:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ADF-2170] fixed condition for file size equal zero (#2860)

Browse Source 
* [ADF-2170] fixed condition for file size equal zero

* [ADF-2170] refactored if condition
This commit is contained in:
Vito
2018-01-22 17:52:02 +01:00
committed by Eugenio Romano
parent b65440b490
commit b481bde483
2 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/content-services/upload/components/upload-button.component.spec.ts
View File

@@ -216,6 +216,17 @@ describe('UploadButtonComponent', () => {
expect(addToQueueSpy.calls.mostRecent()).toBeUndefined(); expect(addToQueueSpy.calls.mostRecent()).toBeUndefined();
}); });
it('should allow file of 0 size when the max file size is set to 0', () => {
const zeroFiles: File[] = [
<File> { name: 'zeroFile.png', size: 0 }
];
component.maxFilesSize = 0;
component.uploadFiles(zeroFiles);
expect(addToQueueSpy.calls.mostRecent()).toBeDefined();
});
it('should filter out all files if maxFilesSize is <0', () => { it('should filter out all files if maxFilesSize is <0', () => {
component.maxFilesSize = -2; component.maxFilesSize = -2;

14
lib/content-services/upload/components/upload-button.component.ts
View File

@@ -201,7 +201,7 @@ export class UploadButtonComponent implements OnInit, OnChanges, NodePermissionS
private isFileSizeAcceptable(file: FileModel): boolean { private isFileSizeAcceptable(file: FileModel): boolean {
let acceptableSize = true; let acceptableSize = true;
if ((this.maxFilesSize !== undefined && this.maxFilesSize !== null ) && (this.maxFilesSize <= 0 || file.size > this.maxFilesSize)) { if (this.isFileSizeAllowed(file)) {
acceptableSize = false; acceptableSize = false;
this.translateService.get('FILE_UPLOAD.MESSAGES.EXCEED_MAX_FILE_SIZE', {fileName: file.name}).subscribe((message: string) => { this.translateService.get('FILE_UPLOAD.MESSAGES.EXCEED_MAX_FILE_SIZE', {fileName: file.name}).subscribe((message: string) => {
@@ -212,6 +212,18 @@ export class UploadButtonComponent implements OnInit, OnChanges, NodePermissionS
return acceptableSize; return acceptableSize;
} }
private isFileSizeAllowed(file: FileModel) {
return this.isMaxFileSizeDefined() && this.isFileSizeCorrect(file);
}
private isMaxFileSizeDefined() {
return this.maxFilesSize !== undefined && this.maxFilesSize !== null;
}
private isFileSizeCorrect(file: FileModel) {
return this.maxFilesSize < 0 || file.size > this.maxFilesSize;
}
checkPermission() { checkPermission() {
if (this.rootFolderId) { if (this.rootFolderId) {
this.getFolderNode(this.rootFolderId).subscribe( this.getFolderNode(this.rootFolderId).subscribe(