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

[ADF-2138] Viewer enhancements (#2897)

Browse Source 
* greatly improved rendition management

* code cleanup

* test fixes

* better handling of media types

* docs update

* fix code style

* fix tests after rebase
This commit is contained in:
Denys Vuika
2018-02-01 17:14:32 +00:00
committed by Eugenio Romano
parent 8cd2190f37
commit e5afe96a52
5 changed files with 238 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/core/services/renditions.service.ts
View File

@@ -26,7 +26,9 @@ import 'rxjs/add/observable/interval';
import 'rxjs/add/operator/takeWhile';
/**
* @deprecated
* RenditionsService
* (this service is deprecated in 2.2.0 and will be removed in future revisions)
*
* @returns {RenditionsService} .
*/
@@ -36,6 +38,7 @@ export class RenditionsService {
constructor(private apiService: AlfrescoApiService) {
}
/** @deprecated */
isRenditionAvailable(nodeId: string, encoding: string): Observable<boolean> {
return Observable.create((observer) => {
this.getRendition(nodeId, encoding).subscribe(
@@ -55,6 +58,7 @@ export class RenditionsService {
});
}
/** @deprecated */
isConversionPossible(nodeId: string, encoding: string): Observable<boolean> {
return Observable.create((observer) => {
this.getRendition(nodeId, encoding).subscribe(
@@ -70,31 +74,42 @@ export class RenditionsService {
});
}
/** @deprecated */
getRenditionUrl(nodeId: string, encoding: string): string {
return this.apiService.contentApi.getRenditionUrl(nodeId, encoding);
}
/** @deprecated */
getRendition(nodeId: string, encoding: string): Observable<RenditionEntry> {
return Observable.fromPromise(this.apiService.renditionsApi.getRendition(nodeId, encoding));
}
/** @deprecated */
getRenditionsListByNodeId(nodeId: string): Observable<RenditionPaging> {
return Observable.fromPromise(this.apiService.renditionsApi.getRenditions(nodeId));
}
/** @deprecated */
createRendition(nodeId: string, encoding: string): Observable<{}> {
return Observable.fromPromise(this.apiService.renditionsApi.createRendition(nodeId, {id: encoding}));
}
convert(nodeId: string, encoding: string, pollingInterval: number = 1000) {
/** @deprecated */
convert(nodeId: string, encoding: string, pollingInterval: number = 1000, retries: number = 5) {
return this.createRendition(nodeId, encoding)
.concatMap(() => this.pollRendition(nodeId, encoding, pollingInterval));
.concatMap(() => this.pollRendition(nodeId, encoding, pollingInterval, retries));
}
private pollRendition(nodeId: string, encoding: string, interval: number = 1000) {
/** @deprecated */
private pollRendition(nodeId: string, encoding: string, interval: number = 1000, retries: number = 5) {
let attempts = 0;
return Observable.interval(interval)
.switchMap(() => this.getRendition(nodeId, encoding))
.takeWhile((data) => {
attempts += 1;
if (attempts > retries) {
return false;
}
return (data.entry.status.toString() !== 'CREATED');
});
}

155
lib/core/services/thumbnail.service.ts
View File

@@ -29,97 +29,130 @@ export class ThumbnailService {
'image/png': './assets/images/ft_ic_raster_image.svg',
'image/jpeg': './assets/images/ft_ic_raster_image.svg',
'image/gif': './assets/images/ft_ic_raster_image.svg',
'image/bmp': './assets/images/ft_ic_raster_image.svg',
'image/cgm': './assets/images/ft_ic_raster_image.svg',
'image/ief': './assets/images/ft_ic_raster_image.svg',
'image/jp2': './assets/images/ft_ic_raster_image.svg',
'image/tiff': './assets/images/ft_ic_raster_image.svg',
'image/vnd.adobe.photoshop': './assets/images/ft_ic_raster_image.svg',
'image/vnd.adobe.premiere': './assets/images/ft_ic_raster_image.svg',
'image/x-cmu-raster': './assets/images/ft_ic_raster_image.svg',
'image/x-dwt': './assets/images/ft_ic_raster_image.svg',
'image/x-portable-anymap': './assets/images/ft_ic_raster_image.svg',
'image/x-portable-bitmap': './assets/images/ft_ic_raster_image.svg',
'image/x-portable-graymap': './assets/images/ft_ic_raster_image.svg',
'image/x-portable-pixmap': './assets/images/ft_ic_raster_image.svg',
'image/x-raw-adobe': './assets/images/ft_ic_raster_image.svg',
'image/x-raw-canon': './assets/images/ft_ic_raster_image.svg',
'image/x-raw-fuji': './assets/images/ft_ic_raster_image.svg',
'image/x-raw-hasselblad': './assets/images/ft_ic_raster_image.svg',
'image/x-raw-kodak': './assets/images/ft_ic_raster_image.svg',
'image/x-raw-leica': './assets/images/ft_ic_raster_image.svg',
'image/x-raw-minolta': './assets/images/ft_ic_raster_image.svg',
'image/x-raw-nikon': './assets/images/ft_ic_raster_image.svg',
'image/x-raw-olympus': './assets/images/ft_ic_raster_image.svg',
'image/x-raw-panasonic': './assets/images/ft_ic_raster_image.svg',
'image/x-raw-pentax': './assets/images/ft_ic_raster_image.svg',
'image/x-raw-red': './assets/images/ft_ic_raster_image.svg',
'image/x-raw-sigma': './assets/images/ft_ic_raster_image.svg',
'image/x-raw-sony': './assets/images/ft_ic_raster_image.svg',
'image/x-xbitmap': './assets/images/ft_ic_raster_image.svg',
'image/x-xpixmap': './assets/images/ft_ic_raster_image.svg',
'image/x-xwindowdump': './assets/images/ft_ic_raster_image.svg',
'image/svg+xml': './assets/images/ft_ic_vector_image.svg',
'application/eps': './assets/images/ft_ic_raster_image.svg',
'application/illustrator': './assets/images/ft_ic_raster_image.svg',
'application/pdf': './assets/images/ft_ic_pdf.svg',
'application/vnd.ms-excel': './assets/images/ft_ic_ms_excel.svg',
'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet': './assets/images/ft_ic_ms_excel.svg',
'application/vnd.openxmlformats-officedocument.spreadsheetml.template': './assets/images/ft_ic_ms_excel.svg',
'application/vnd.ms-excel.addin.macroenabled.12': './assets/images/ft_ic_ms_excel.svg',
'application/vnd.ms-excel.sheet.binary.macroenabled.12': './assets/images/ft_ic_ms_excel.svg',
'application/vnd.ms-excel.sheet.macroenabled.12': './assets/images/ft_ic_ms_excel.svg',
'application/vnd.ms-excel.template.macroenabled.12': './assets/images/ft_ic_ms_excel.svg',
'application/vnd.sun.xml.calc': './assets/images/ft_ic_ms_excel.svg',
'application/vnd.sun.xml.calc.template': './assets/images/ft_ic_ms_excel.svg',
'application/vnd.ms-outlook': './assets/images/ft_ic_document.svg',
'application/msword': './assets/images/ft_ic_ms_word.svg',
'application/vnd.openxmlformats-officedocument.wordprocessingml.document': './assets/images/ft_ic_ms_word.svg',
'application/vnd.openxmlformats-officedocument.wordprocessingml.template': './assets/images/ft_ic_ms_word.svg',
'application/vnd.ms-word.document.macroenabled.12': './assets/images/ft_ic_ms_word.svg',
'application/vnd.ms-word.template.macroenabled.12': './assets/images/ft_ic_ms_word.svg',
'application/vnd.sun.xml.writer': './assets/images/ft_ic_ms_word.svg',
'application/vnd.sun.xml.writer.template': './assets/images/ft_ic_ms_word.svg',
'application/rtf': './assets/images/ft_ic_ms_word.svg',
'application/vnd.ms-powerpoint': './assets/images/ft_ic_ms_powerpoint.svg',
'application/vnd.openxmlformats-officedocument.presentationml.presentation': './assets/images/ft_ic_ms_powerpoint.svg',
'application/vnd.openxmlformats-officedocument.presentationml.template': './assets/images/ft_ic_ms_powerpoint.svg',
'application/vnd.openxmlformats-officedocument.presentationml.slideshow': './assets/images/ft_ic_ms_powerpoint.svg',
'application/vnd.oasis.opendocument.presentation': './assets/images/ft_ic_ms_powerpoint.svg',
'application/vnd.oasis.opendocument.presentation-template': './assets/images/ft_ic_ms_powerpoint.svg',
'application/vnd.openxmlformats-officedocument.presentationml.slide': './assets/images/ft_ic_ms_powerpoint.svg',
'application/vnd.sun.xml.impress': './assets/images/ft_ic_ms_powerpoint.svg',
'application/vnd.sun.xml.impress.template': './assets/images/ft_ic_ms_powerpoint.svg',
'application/vnd.oasis.opendocument.spreadsheet': './assets/images/ft_ic_ms_excel.svg',
'application/vnd.oasis.opendocument.spreadsheet-template': './assets/images/ft_ic_ms_excel.svg',
'application/vnd.ms-powerpoint.addin.macroenabled.12': './assets/images/ft_ic_ms_powerpoint.svg',
'application/vnd.ms-powerpoint.presentation.macroenabled.12': './assets/images/ft_ic_ms_powerpoint.svg',
'application/vnd.ms-powerpoint.slide.macroenabled.12': './assets/images/ft_ic_ms_powerpoint.svg',
'application/vnd.ms-powerpoint.slideshow.macroenabled.12': './assets/images/ft_ic_ms_powerpoint.svg',
'application/vnd.ms-powerpoint.template.macroenabled.12': './assets/images/ft_ic_ms_powerpoint.svg',
'video/mp4': './assets/images/ft_ic_video.svg',
'video/3gpp': './assets/images/ft_ic_video.svg',
'video/3gpp2': './assets/images/ft_ic_video.svg',
'video/mp2t': './assets/images/ft_ic_video.svg',
'video/mpeg': './assets/images/ft_ic_video.svg',
'video/mpeg2': './assets/images/ft_ic_video.svg',
'video/ogg': './assets/images/ft_ic_video.svg',
'video/quicktime': './assets/images/ft_ic_video.svg',
'video/webm': './assets/images/ft_ic_video.svg',
'video/x-flv': './assets/images/ft_ic_video.svg',
'video/x-m4v': './assets/images/ft_ic_video.svg',
'video/x-ms-asf': './assets/images/ft_ic_video.svg',
'video/x-ms-wmv': './assets/images/ft_ic_video.svg',
'video/x-msvideo': './assets/images/ft_ic_video.svg',
'video/x-rad-screenplay': './assets/images/ft_ic_video.svg',
'video/x-sgi-movie': './assets/images/ft_ic_video.svg',
'video/x-matroska': './assets/images/ft_ic_video.svg',
'audio/mpeg': './assets/images/ft_ic_audio.svg',
'audio/ogg': './assets/images/ft_ic_audio.svg',
'audio/wav': './assets/images/ft_ic_audio.svg',
'audio/basic': './assets/images/ft_ic_audio.svg',
'audio/mp4': './assets/images/ft_ic_audio.svg',
'audio/vnd.adobe.soundbooth': './assets/images/ft_ic_audio.svg',
'audio/vorbis': './assets/images/ft_ic_audio.svg',
'audio/x-aiff': './assets/images/ft_ic_audio.svg',
'audio/x-flac': './assets/images/ft_ic_audio.svg',
'audio/x-ms-wma': './assets/images/ft_ic_audio.svg',
'audio/x-wav': './assets/images/ft_ic_audio.svg',
'x-world/x-vrml': './assets/images/ft_ic_video.svg',
'text/plain': './assets/images/ft_ic_document.svg',
'application/vnd.oasis.opendocument.text': './assets/images/ft_ic_document.svg',
'application/vnd.oasis.opendocument.text-template': './assets/images/ft_ic_document.svg',
'application/x-javascript': './assets/images/ft_ic_document.svg',
'application/json': './assets/images/ft_ic_document.svg',
'image/svg+xml': './assets/images/ft_ic_vector_image.svg',
'text/csv': './assets/images/ft_ic_document.svg',
'text/xml': './assets/images/ft_ic_document.svg',
'text/html': './assets/images/ft_ic_website.svg',
'application/x-compressed': './assets/images/ft_ic_archive.svg',
'application/x-zip-compressed': './assets/images/ft_ic_archive.svg',
'application/zip': './assets/images/ft_ic_archive.svg',
'application/x-tar': './assets/images/ft_ic_archive.svg',
'application/vnd.apple.keynote': './assets/images/ft_ic_presentation.svg',
'application/vnd.apple.pages': './assets/images/ft_ic_document.svg',
'application/vnd.apple.numbers': './assets/images/ft_ic_spreadsheet.svg',
'application/vnd.visio': './assets/images/ft_ic_document.svg',
'application/wordperfect': './assets/images/ft_ic_document.svg',
'application/x-cpio': './assets/images/ft_ic_document.svg',
'folder': './assets/images/ft_ic_folder.svg',
'disable/folder': './assets/images/ft_ic_folder_disable.svg',
'selected': './assets/images/ft_ic_selected.svg'
};
constructor(public contentService: ContentService, matIconRegistry: MatIconRegistry, sanitizer: DomSanitizer) {
matIconRegistry.addSvgIcon('image/png',
sanitizer.bypassSecurityTrustResourceUrl('./assets/images/ft_ic_raster_image.svg'));
matIconRegistry.addSvgIcon('image/jpeg',
sanitizer.bypassSecurityTrustResourceUrl('./assets/images/ft_ic_raster_image.svg'));
matIconRegistry.addSvgIcon('image/gif',
sanitizer.bypassSecurityTrustResourceUrl('./assets/images/ft_ic_raster_image.svg'));
matIconRegistry.addSvgIcon('application/pdf',
sanitizer.bypassSecurityTrustResourceUrl('./assets/images/ft_ic_pdf.svg'));
matIconRegistry.addSvgIcon('application/vnd.ms-excel',
sanitizer.bypassSecurityTrustResourceUrl('./assets/images/ft_ic_ms_excel.svg'));
matIconRegistry.addSvgIcon('application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
sanitizer.bypassSecurityTrustResourceUrl('./assets/images/ft_ic_ms_excel.svg'));
matIconRegistry.addSvgIcon('application/vnd.openxmlformats-officedocument.spreadsheetml.template',
sanitizer.bypassSecurityTrustResourceUrl('./assets/images/ft_ic_ms_excel.svg'));
matIconRegistry.addSvgIcon('application/msword',
sanitizer.bypassSecurityTrustResourceUrl('./assets/images/ft_ic_ms_word.svg'));
matIconRegistry.addSvgIcon('application/vnd.openxmlformats-officedocument.wordprocessingml.document',
sanitizer.bypassSecurityTrustResourceUrl('./assets/images/ft_ic_ms_word.svg'));
matIconRegistry.addSvgIcon('application/vnd.openxmlformats-officedocument.wordprocessingml.template',
sanitizer.bypassSecurityTrustResourceUrl('./assets/images/ft_ic_ms_word.svg'));
matIconRegistry.addSvgIcon('application/vnd.ms-powerpoint',
sanitizer.bypassSecurityTrustResourceUrl('./assets/images/ft_ic_ms_powerpoint.svg'));
matIconRegistry.addSvgIcon('application/vnd.openxmlformats-officedocument.presentationml.presentation',
sanitizer.bypassSecurityTrustResourceUrl('./assets/images/ft_ic_ms_powerpoint.svg'));
matIconRegistry.addSvgIcon('application/vnd.openxmlformats-officedocument.presentationml.template',
sanitizer.bypassSecurityTrustResourceUrl('./assets/images/ft_ic_ms_powerpoint.svg'));
matIconRegistry.addSvgIcon('application/vnd.openxmlformats-officedocument.presentationml.slideshow',
sanitizer.bypassSecurityTrustResourceUrl('./assets/images/ft_ic_ms_powerpoint.svg'));
matIconRegistry.addSvgIcon('video/mp4',
sanitizer.bypassSecurityTrustResourceUrl('./assets/images/ft_ic_video.svg'));
matIconRegistry.addSvgIcon('text/plain',
sanitizer.bypassSecurityTrustResourceUrl('./assets/images/ft_ic_document.svg'));
matIconRegistry.addSvgIcon('application/x-javascript',
sanitizer.bypassSecurityTrustResourceUrl('./assets/images/ft_ic_document.svg'));
matIconRegistry.addSvgIcon('application/json',
sanitizer.bypassSecurityTrustResourceUrl('./assets/images/ft_ic_document.svg'));
matIconRegistry.addSvgIcon('image/svg+xml',
sanitizer.bypassSecurityTrustResourceUrl('./assets/images/ft_ic_vector_image.svg'));
matIconRegistry.addSvgIcon('text/html',
sanitizer.bypassSecurityTrustResourceUrl('./assets/images/ft_ic_website.svg'));
matIconRegistry.addSvgIcon('application/x-compressed',
sanitizer.bypassSecurityTrustResourceUrl('./assets/images/ft_ic_archive.svg'));
matIconRegistry.addSvgIcon('application/x-zip-compressed',
sanitizer.bypassSecurityTrustResourceUrl('./assets/images/ft_ic_archive.svg'));
matIconRegistry.addSvgIcon('application/zip',
sanitizer.bypassSecurityTrustResourceUrl('./assets/images/ft_ic_archive.svg'));
matIconRegistry.addSvgIcon('application/vnd.apple.keynote',
sanitizer.bypassSecurityTrustResourceUrl('./assets/images/ft_ic_presentation.svg'));
matIconRegistry.addSvgIcon('application/vnd.apple.pages',
sanitizer.bypassSecurityTrustResourceUrl('./assets/images/ft_ic_document.svg'));
matIconRegistry.addSvgIcon('application/vnd.apple.numbers',
sanitizer.bypassSecurityTrustResourceUrl('./assets/images/ft_ic_spreadsheet.svg'));
matIconRegistry.addSvgIcon('folder',
sanitizer.bypassSecurityTrustResourceUrl('./assets/images/ft_ic_folder.svg'));
matIconRegistry.addSvgIcon('disable/folder',
sanitizer.bypassSecurityTrustResourceUrl('./assets/images/ft_ic_folder_disable.svg'));
matIconRegistry.addSvgIcon('selected',
sanitizer.bypassSecurityTrustResourceUrl('./assets/images/ft_ic_selected.svg'));
matIconRegistry.addSvgIcon('default',
sanitizer.bypassSecurityTrustResourceUrl('./assets/images/ft_ic_miscellaneous.svg'));
Object.keys(this.mimeTypeIcons).forEach(key => {
matIconRegistry.addSvgIcon(key, sanitizer.bypassSecurityTrustResourceUrl(this.mimeTypeIcons[key]));
});
}
/**