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

[AAE-207] support aps 1.x for upload reset (#5260)

Browse Source 
* support aps 1.x for upload reset

* update test

* revert pdfjd change

* fix error reporting and crash from upload button

* i18n support for generic error

* fix test
This commit is contained in:
Denys Vuika
2019-11-21 15:06:00 +00:00
committed by Eugenio Romano
parent c61de922af
commit e806e97c75
8 changed files with 29 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/content-services/src/lib/i18n/en.json
View File

@@ -151,7 +151,8 @@
"FILE_UPLOAD": {
"BUTTON": {
"UPLOAD_FILE": "Upload file",
"UPLOAD_FOLDER": "Upload folder"
"UPLOAD_FOLDER": "Upload folder",
"PERMISSION_CHECK_ERROR": "Error checking permission."
},
"VERSION": {
"MESSAGES": {

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

@@ -384,7 +384,7 @@ describe('UploadButtonComponent', () => {
spyOn(contentService, 'getNode').and.returnValue(throwError('error'));
component.error.subscribe((value) => {
expect(value).toBe('error');
expect(value).toBe('FILE_UPLOAD.BUTTON.PERMISSION_CHECK_ERROR');
done();
});

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

@@ -120,7 +120,13 @@ export class UploadButtonComponent extends UploadBase implements OnInit, OnChang
this.contentService.getNode(this.rootFolderId, opts).subscribe(
(res) => this.permissionValue.next(this.nodeHasPermission(res.entry, AllowableOperationsEnum.CREATE)),
(error) => this.error.emit(error)
(error: { error: Error }) => {
if (error && error.error) {
this.error.emit(error.error.message);
} else {
this.error.emit('FILE_UPLOAD.BUTTON.PERMISSION_CHECK_ERROR');
}
}
);
}
}