From eb68bd5f48855e3fcdabb3bc8cf156af276244c5 Mon Sep 17 00:00:00 2001 From: Eugenio Romano Date: Thu, 4 Aug 2016 10:24:50 +0100 Subject: [PATCH] insert new logic in the demo Shell --- .../app/components/files/files.component.html | 4 +-- .../app/components/files/files.component.ts | 8 ++--- .../search/search-bar.component.html | 4 ++- .../app/components/search/search.component.ts | 5 ++- .../ng2-alfresco-viewer/demo/src/main.ts | 4 +-- .../src/viewer.component.html | 2 +- .../src/viewer.component.ts | 31 ++++++++++++------- 7 files changed, 29 insertions(+), 29 deletions(-) diff --git a/demo-shell-ng2/app/components/files/files.component.html b/demo-shell-ng2/app/components/files/files.component.html index c5dca88622..3cf95cd013 100644 --- a/demo-shell-ng2/app/components/files/files.component.html +++ b/demo-shell-ng2/app/components/files/files.component.html @@ -177,9 +177,7 @@ diff --git a/demo-shell-ng2/app/components/files/files.component.ts b/demo-shell-ng2/app/components/files/files.component.ts index 2d430e20ea..371536eb78 100644 --- a/demo-shell-ng2/app/components/files/files.component.ts +++ b/demo-shell-ng2/app/components/files/files.component.ts @@ -58,9 +58,7 @@ declare let __moduleName: string; export class FilesComponent implements OnInit { currentPath: string = '/Sites/swsdp/documentLibrary'; - urlFile: string; - fileName: string; - mimeType: string; + fileNodeId: any; fileShowed: boolean = false; multipleFileUpload: boolean = false; folderUpload: boolean = false; @@ -92,9 +90,7 @@ export class FilesComponent implements OnInit { showFile(event) { if (event.value.entry.isFile) { - this.fileName = event.value.entry.name; - this.mimeType = event.value.entry.content.mimeType; - this.urlFile = this.contentService.getContentUrl(event.value); + this.fileNodeId = event.value.entry.id; this.fileShowed = true; } else { this.fileShowed = false; diff --git a/demo-shell-ng2/app/components/search/search-bar.component.html b/demo-shell-ng2/app/components/search/search-bar.component.html index 0d144a574b..4d89fd0d8b 100644 --- a/demo-shell-ng2/app/components/search/search-bar.component.html +++ b/demo-shell-ng2/app/components/search/search-bar.component.html @@ -1,6 +1,8 @@ - + diff --git a/demo-shell-ng2/app/components/search/search.component.ts b/demo-shell-ng2/app/components/search/search.component.ts index c3d57964d8..bf836b7783 100644 --- a/demo-shell-ng2/app/components/search/search.component.ts +++ b/demo-shell-ng2/app/components/search/search.component.ts @@ -56,15 +56,14 @@ export class SearchComponent { previewName: string; previewMimeType: string; previewActive: boolean = false; + fileNodeId: string; constructor(public contentService: AlfrescoContentService) { } onFileClicked(event) { if (event.value.entry.isFile) { - this.previewName = event.value.entry.name; - this.previewMimeType = event.value.entry.content.mimeType; - this.previewContentUrl = this.contentService.getContentUrl(event.value); + this.fileNodeId = event.value.entry.id; this.previewActive = true; } } diff --git a/ng2-components/ng2-alfresco-viewer/demo/src/main.ts b/ng2-components/ng2-alfresco-viewer/demo/src/main.ts index 47bd1c0e18..4f6296c12d 100644 --- a/ng2-components/ng2-alfresco-viewer/demo/src/main.ts +++ b/ng2-components/ng2-alfresco-viewer/demo/src/main.ts @@ -49,15 +49,13 @@ import { + [overlayMode]="true"> `, directives: [VIEWERCOMPONENT] }) class MyDemoApp { - authenticated: boolean; ecmHost: string = 'http://127.0.0.1:8080'; diff --git a/ng2-components/ng2-alfresco-viewer/src/viewer.component.html b/ng2-components/ng2-alfresco-viewer/src/viewer.component.html index 2984a00758..1f0c56df87 100644 --- a/ng2-components/ng2-alfresco-viewer/src/viewer.component.html +++ b/ng2-components/ng2-alfresco-viewer/src/viewer.component.html @@ -43,7 +43,7 @@ -
+
diff --git a/ng2-components/ng2-alfresco-viewer/src/viewer.component.ts b/ng2-components/ng2-alfresco-viewer/src/viewer.component.ts index 3a1dc6e28b..44b540309e 100644 --- a/ng2-components/ng2-alfresco-viewer/src/viewer.component.ts +++ b/ng2-components/ng2-alfresco-viewer/src/viewer.component.ts @@ -36,15 +36,9 @@ export class ViewerComponent { @Input() urlFile: string; - @Input() - fileName: string = null; - @Input() fileNodeId: string = null; - @Input() - mimeType: string = null; - @Input() overlayMode: boolean = false; @@ -60,6 +54,10 @@ export class ViewerComponent { extension: string; + mimeType: string; + + loaded: boolean = false; + constructor(private authService: AlfrescoAuthenticationService, private element: ElementRef, @Inject(DOCUMENT) private document) { } @@ -67,18 +65,20 @@ export class ViewerComponent { if (this.showViewer) { this.hideOtherHeaderBar(); this.blockOtherScrollBar(); - if (!this.urlFile) { - throw new Error('Attribute urlFile is required'); + if (!this.urlFile && !this.fileNodeId) { + throw new Error('Attribute urlFile or fileNodeId is required'); } return new Promise((resolve) => { if (this.urlFile) { let filenameFromUrl = this.getFilenameFromUrl(this.urlFile); - this.displayName = this.fileName !== null ? this.fileName : filenameFromUrl; + this.displayName = filenameFromUrl ? filenameFromUrl : ''; this.extension = this.getFileExtension(filenameFromUrl); } else if (this.fileNodeId) { - console.log('call api'); - this.authService.getAlfrescoApi().getNodeInfo(this.fileNodeId).then(function (data) { - console.log('This is the name' + JSON.stringify(data) ); + this.authService.getAlfrescoApi().nodes.getNodeInfo(this.fileNodeId).then((data) => { + this.mimeType = data.content.mimeType; + this.displayName = data.name; + this.urlFile = this.authService.getAlfrescoApi().content.getContentUrl(data.id); + this.loaded = true; }, function (error) { console.log('This node does not exist'); }); @@ -249,4 +249,11 @@ export class ViewerComponent { } } } + + /** + * return true if the data about the node in the ecm are loaded + */ + isLoaded() { + return this.fileNodeId ? this.loaded : true; + } }