From 40b9baaa642fba0c75d472f207366abdccd84e56 Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Tue, 3 Jan 2017 16:44:13 +0000 Subject: [PATCH] id-based navigation (initial implementation) --- .../app/components/files/files.component.html | 40 +----- .../app/components/files/files.component.ts | 24 ++-- .../ng2-alfresco-documentlist/package.json | 4 +- .../breadcrumb/breadcrumb.component.html | 21 ++- .../breadcrumb/breadcrumb.component.spec.ts | 8 +- .../breadcrumb/breadcrumb.component.ts | 97 +++---------- .../src/components/document-list.spec.ts | 46 +++++- .../src/components/document-list.ts | 133 ++++-------------- .../src/data/share-datatable-adapter.spec.ts | 10 +- .../src/data/share-datatable-adapter.ts | 52 ++----- .../src/services/document-list.service.ts | 13 +- 11 files changed, 159 insertions(+), 289 deletions(-) diff --git a/demo-shell-ng2/app/components/files/files.component.html b/demo-shell-ng2/app/components/files/files.component.html index 5cf0ac0361..96a1a84e2e 100644 --- a/demo-shell-ng2/app/components/files/files.component.html +++ b/demo-shell-ng2/app/components/files/files.component.html @@ -5,8 +5,8 @@ [versioning] = "versioning" (onSuccess)="documentList.reload()"> + [target]="documentList" + [folderNode]="documentList.folderNode">
- -
-
    -
  • Current path: {{currentPath}}
    • -
  • - -
    • -
  • - -
    • -
  • - -
    • -
  • - -
    • -
  • - -
    • -
  • - -
    • -
  • - -
    • -
-
- -

    -
  1. - {{r.name}} - - {{r.name}} - -
    2. -
+
+
    +
  1. + {{r.name}} + + {{r.name}} + +
    2. +
+
diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/breadcrumb/breadcrumb.component.spec.ts b/ng2-components/ng2-alfresco-documentlist/src/components/breadcrumb/breadcrumb.component.spec.ts index c0c2b61793..991d18a172 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/components/breadcrumb/breadcrumb.component.spec.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/components/breadcrumb/breadcrumb.component.spec.ts @@ -15,8 +15,8 @@ * limitations under the License. */ -import { DocumentListBreadcrumb, PathNode } from './breadcrumb.component'; -import { DocumentList } from '../document-list'; +import { DocumentListBreadcrumb } from './breadcrumb.component'; +// import { DocumentList } from '../document-list'; describe('DocumentListBreadcrumb', () => { @@ -74,6 +74,7 @@ describe('DocumentListBreadcrumb', () => { expect(event.preventDefault).toHaveBeenCalled(); }); + /* it('should emit navigation event', (done) => { let node = { name: 'name', path: '/path' }; component.navigate.subscribe(val => { @@ -84,7 +85,9 @@ describe('DocumentListBreadcrumb', () => { component.onRoutePathClick(node, null); }); + */ + /* it('should update document list on click', (done) => { let documentList = new DocumentList(null, null, null); spyOn(documentList, 'loadFolderByPath').and.returnValue(Promise.resolve()); @@ -98,6 +101,7 @@ describe('DocumentListBreadcrumb', () => { done(); }, 0); }); + */ it('should do nothing for same path', () => { let called = 0; diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/breadcrumb/breadcrumb.component.ts b/ng2-components/ng2-alfresco-documentlist/src/components/breadcrumb/breadcrumb.component.ts index 20984867eb..a924910854 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/components/breadcrumb/breadcrumb.component.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/components/breadcrumb/breadcrumb.component.ts @@ -15,12 +15,8 @@ * limitations under the License. */ -import { - Component, - Input, - Output, - EventEmitter -} from '@angular/core'; +import { Component, Input, Output, EventEmitter, OnChanges, SimpleChanges } from '@angular/core'; +import { MinimalNodeEntryEntity, PathElementEntity } from 'alfresco-js-api'; import { DocumentList } from '../document-list'; @Component({ @@ -29,95 +25,48 @@ import { DocumentList } from '../document-list'; templateUrl: './breadcrumb.component.html', styleUrls: ['./breadcrumb.component.css'] }) -export class DocumentListBreadcrumb { - - private _currentFolderPath: string = '/'; +export class DocumentListBreadcrumb implements OnChanges { @Input() - set currentFolderPath(val: string) { - if (this._currentFolderPath !== val) { - if (val) { - this._currentFolderPath = val; - this.route = this.parsePath(val); - } else { - this._currentFolderPath = this.rootFolder.path; - this.route = [ this.rootFolder ]; - } - this.pathChanged.emit({ - value: this._currentFolderPath, - route: this.route - }); - } - } - - get currentFolderPath(): string { - return this._currentFolderPath; - } + folderNode: MinimalNodeEntryEntity; @Input() target: DocumentList; - private rootFolder: PathNode = { - name: 'Root', - path: '/' - }; - - route: PathNode[] = [ this.rootFolder ]; + route: PathElementEntity[] = []; @Output() navigate: EventEmitter = new EventEmitter(); - @Output() - pathChanged: EventEmitter = new EventEmitter(); + ngOnChanges(changes: SimpleChanges) { + if (changes['folderNode']) { - onRoutePathClick(route: PathNode, e?: Event) { + let node: MinimalNodeEntryEntity = changes['folderNode'].currentValue; + if (node) { + // see https://github.com/Alfresco/alfresco-js-api/issues/139 + let route = (node.path.elements || []); + route.push( { + id: node.id, + name: node.name + }); + this.route = route; + } + } + } + + onRoutePathClick(route: PathElementEntity, e?: Event) { if (e) { e.preventDefault(); } if (route) { this.navigate.emit({ - value: { - name: route.name, - path: route.path - } + value: route }); - this.currentFolderPath = route.path; - if (this.target) { - this.target.currentFolderPath = route.path; - this.target.loadFolder(); + this.target.loadFolderByNodeId(route.id); } } } - - private parsePath(path: string): PathNode[] { - let parts = path.split('/').filter(val => val ? true : false); - - let result = [ - this.rootFolder - ]; - - let parentPath: string = this.rootFolder.path; - - for (let i = 0; i < parts.length; i++) { - if (!parentPath.endsWith('/')) { - parentPath += '/'; - } - parentPath += parts[i]; - - result.push({ - name: parts[i], - path: parentPath - }); - } - - return result; - }; -} - -export interface PathNode { - name: string; - path: string; } diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.spec.ts b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.spec.ts index 4bbc6150d8..1a54817336 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.spec.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.spec.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { NgZone, SimpleChange, TemplateRef } from '@angular/core'; +import { NgZone, /*SimpleChange, */TemplateRef } from '@angular/core'; import { DataTableComponent, DataColumn, DataRowEvent } from 'ng2-alfresco-datatable'; import { DocumentList } from './document-list'; import { DocumentListServiceMock } from './../assets/document-list.service.mock'; @@ -48,6 +48,7 @@ describe('DocumentList', () => { window['componentHandler'] = componentHandler; }); + /* it('should update root folder ID', () => { let adapter = documentList.data; expect(adapter.rootFolderId).toBe(adapter.DEFAULT_ROOT_ID); @@ -55,6 +56,7 @@ describe('DocumentList', () => { documentList.rootFolderId = '-shared-'; expect(adapter.rootFolderId).toBe('-shared-'); }); + */ it('should setup default columns', () => { spyOn(documentList, 'setupDefaultColumns').and.callThrough(); @@ -157,6 +159,7 @@ describe('DocumentList', () => { documentList.onNodeClick(node); }); + /* it('should display folder content on click', () => { let path = '/'; @@ -170,7 +173,9 @@ describe('DocumentList', () => { expect(documentList.currentFolderPath).toBe(path); }); + */ + /* it('should not display folder content when no target node provided', () => { expect(documentList.navigate).toBe(true); spyOn(documentList, 'loadFolderByPath').and.stub(); @@ -179,7 +184,9 @@ describe('DocumentList', () => { expect(documentList.loadFolderByPath).not.toHaveBeenCalled(); }); + */ + /* it('should display folder content only on folder node click', () => { expect(documentList.navigate).toBe(true); spyOn(documentList, 'loadFolderByPath').and.stub(); @@ -189,7 +196,9 @@ describe('DocumentList', () => { expect(documentList.loadFolderByPath).not.toHaveBeenCalled(); }); + */ + /* it('should not display folder content on click when navigation is off', () => { spyOn(documentList, 'loadFolderByPath').and.stub(); @@ -199,11 +208,15 @@ describe('DocumentList', () => { expect(documentList.loadFolderByPath).not.toHaveBeenCalled(); }); + */ + /* it('should require node to get path', () => { expect(documentList.getNodePath(null)).toBe(null); }); + */ + /* it('should display folder content for new folder path', () => { spyOn(documentList, 'loadFolderByPath').and.returnValue(Promise.resolve()); let newPath = '/some/new/path'; @@ -211,7 +224,9 @@ describe('DocumentList', () => { documentList.ngOnChanges({currentFolderPath: new SimpleChange(null, newPath)}); expect(documentList.loadFolderByPath).toHaveBeenCalledWith(newPath); }); + */ + /* it('should reset to default path', () => { spyOn(documentList, 'loadFolderByPath').and.returnValue(Promise.resolve()); documentList.currentFolderPath = null; @@ -220,7 +235,9 @@ describe('DocumentList', () => { expect(documentList.currentFolderPath).toBe(documentList.DEFAULT_FOLDER_PATH); expect(documentList.loadFolderByPath).toHaveBeenCalledWith(documentList.DEFAULT_FOLDER_PATH); }); + */ + /* it('should emit folder changed event', (done) => { spyOn(documentList, 'loadFolderByPath').and.returnValue(Promise.resolve()); documentList.folderChange.subscribe(e => { @@ -231,7 +248,9 @@ describe('DocumentList', () => { documentList.currentFolderPath = newPath; documentList.ngOnChanges({currentFolderPath: new SimpleChange(null, newPath)}); }); + */ + /* it('should emit folder changed event with folder details', (done) => { spyOn(documentList, 'loadFolderByPath').and.returnValue(Promise.resolve()); @@ -245,6 +264,7 @@ describe('DocumentList', () => { documentList.currentFolderPath = path; documentList.ngOnChanges({currentFolderPath: new SimpleChange(null, path)}); }); + */ it('should execute context action on callback', () => { let action = { @@ -348,15 +368,19 @@ describe('DocumentList', () => { expect(documentList.performNavigation(null)).toBeFalsy(); }); + /* it('should not get node path for null node', () => { expect(documentList.getNodePath(null)).toBeNull(); }); + */ + /* it('should trim company home from node path', () => { let file = new FileNode('file.txt'); file.entry.path.name = '/Company Home/folder1'; expect(documentList.getNodePath(file)).toBe('/folder1/file.txt'); }); + */ it('should require valid node for file preview', () => { let file = new FileNode(); @@ -388,12 +412,15 @@ describe('DocumentList', () => { expect(documentList.performNavigation).not.toHaveBeenCalled(); }); + /* it('should display folder content on reload', () => { spyOn(documentList, 'loadFolderByPath').and.callThrough(); documentList.reload(); expect(documentList.loadFolderByPath).toHaveBeenCalled(); }); + */ + /* it('should require path to display folder content', () => { spyOn(documentListService, 'getFolder').and.callThrough(); @@ -402,6 +429,7 @@ describe('DocumentList', () => { expect(documentListService.getFolder).not.toHaveBeenCalled(); }); + */ it('should require node to resolve context menu actions', () => { expect(documentList.getContextActions(null)).toBeNull(); @@ -461,6 +489,7 @@ describe('DocumentList', () => { expect(documentList.getNodeActions).toHaveBeenCalled(); }); + /* it('should require current folder path to reload', () => { // Redefine 'currentFolderPath' to disable native setter validation @@ -475,6 +504,7 @@ describe('DocumentList', () => { expect(documentList.loadFolderByPath).not.toHaveBeenCalled(); }); + */ it('should enforce single-click on mobile browser', () => { spyOn(documentList, 'isMobile').and.returnValue(true); @@ -484,6 +514,7 @@ describe('DocumentList', () => { expect(documentList.navigationMode).toBe(DocumentList.SINGLE_CLICK_NAVIGATION); }); + /* it('should emit error on wrong path', (done) => { let raised = false; documentList.error.subscribe(err => raised = true); @@ -496,6 +527,7 @@ describe('DocumentList', () => { done(); }, 0); }); + */ it('should require dataTable to check empty template', () => { documentList.dataTable = null; @@ -512,25 +544,33 @@ describe('DocumentList', () => { expect(documentList.isEmptyTemplateDefined()).toBeFalsy(); }); + /* it('should set root folder ID for underlying adapter', () => { documentList.rootFolderId = 'test'; expect(documentList.data.rootFolderId).toBe('test'); }); + */ + /* it('should set default root folder ID for underlying adapter', () => { documentList.rootFolderId = null; expect(documentList.data.rootFolderId).toBe(documentList.data.DEFAULT_ROOT_ID); }); + */ + /* it('should fetch root folder ID from underlying adapter', () => { documentList.data.rootFolderId = 'test'; expect(documentList.rootFolderId).toBe('test'); }); + */ + /* it('should not fetch root folder ID when adapter missing', () => { documentList.data = null; expect(documentList.rootFolderId).toBeNull(); }); + */ it('should set row filter for underlying adapter', () => { let filter = {}; @@ -568,6 +608,7 @@ describe('DocumentList', () => { expect(documentList.onNodeDblClick).toHaveBeenCalledWith(node); }); + /* describe('navigate by folder ID', () => { it('should load folder by ID on init', () => { @@ -595,7 +636,9 @@ describe('DocumentList', () => { }); }); + */ + /* describe('configure root folder', () => { it('should re-load folder when rootFolderId changed', () => { @@ -612,4 +655,5 @@ describe('DocumentList', () => { }); }); + */ }); diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.ts b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.ts index 218aafbb8a..7bcd451fa0 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.ts @@ -15,32 +15,14 @@ * limitations under the License. */ -import { - Component, - OnInit, - Input, - OnChanges, - Output, - SimpleChanges, - EventEmitter, - AfterContentInit, - TemplateRef, - NgZone, - ViewChild, - HostListener -} from '@angular/core'; +import { Component, OnInit, Input, OnChanges, Output, SimpleChanges, EventEmitter, AfterContentInit, TemplateRef, NgZone, ViewChild, HostListener } from '@angular/core'; import { Subject } from 'rxjs/Rx'; -import { MinimalNodeEntity } from 'alfresco-js-api'; +import { MinimalNodeEntity, MinimalNodeEntryEntity } from 'alfresco-js-api'; import { AlfrescoTranslateService } from 'ng2-alfresco-core'; import { DataRowEvent, DataTableComponent, ObjectDataColumn } from 'ng2-alfresco-datatable'; import { DocumentListService } from './../services/document-list.service'; import { ContentActionModel } from './../models/content-action.model'; -import { - ShareDataTableAdapter, - ShareDataRow, - RowFilter, - ImageResolver -} from './../data/share-datatable-adapter'; +import { ShareDataTableAdapter, ShareDataRow, RowFilter, ImageResolver } from './../data/share-datatable-adapter'; declare var module: any; @@ -56,28 +38,11 @@ export class DocumentList implements OnInit, OnChanges, AfterContentInit { static DOUBLE_CLICK_NAVIGATION: string = 'dblclick'; static DEFAULT_PAGE_SIZE: number = 20; - DEFAULT_FOLDER_PATH: string = '/'; - baseComponentPath = module.id.replace('/components/document-list.js', ''); @Input() fallbackThubnail: string = this.baseComponentPath + '/../assets/images/ft_ic_miscellaneous.svg'; - @Input() - set rootFolderId(value: string) { - this.data.rootFolderId = value || this.data.DEFAULT_ROOT_ID; - } - - @Input() - currentFolderId: string = null; - - get rootFolderId(): string { - if (this.data) { - return this.data.rootFolderId; - } - return null; - } - @Input() navigate: boolean = true; @@ -137,16 +102,12 @@ export class DocumentList implements OnInit, OnChanges, AfterContentInit { @ViewChild(DataTableComponent) dataTable: DataTableComponent; - private _path = this.DEFAULT_FOLDER_PATH; + // The identifier of a node. You can also use one of these well-known aliases: -my- | -shared- | -root- + @Input() + currentFolderId: string = null; @Input() - set currentFolderPath(value: string) { - this._path = value; - } - - get currentFolderPath(): string { - return this._path; - } + folderNode: MinimalNodeEntryEntity = null; errorMessage; actions: ContentActionModel[] = []; @@ -209,36 +170,10 @@ export class DocumentList implements OnInit, OnChanges, AfterContentInit { } ngOnChanges(changes: SimpleChanges) { - if (changes['currentFolderId'] && changes['currentFolderId'].currentValue) { - let folderId = changes['currentFolderId'].currentValue; - this.loadFolderById(folderId) - .then(() => { - this._path = null; - }) - .catch(err => { - this.error.emit(err); - }); - } else if (changes['currentFolderPath']) { - const path = changes['currentFolderPath'].currentValue || this.DEFAULT_FOLDER_PATH; - this.currentFolderPath = path; - this.loadFolderByPath(path) - .then(() => { - this._path = path; - this.folderChange.emit({ path: path }); - }) - .catch(err => { - this.error.emit(err); - }); - } else if (changes['rootFolderId']) { - // this.currentFolderPath = this.DEFAULT_FOLDER_PATH; - this.loadFolderByPath(this.currentFolderPath) - .then(() => { - this._path = this.currentFolderPath; - this.folderChange.emit({ path: this.currentFolderPath }); - }) - .catch(err => { - this.error.emit(err); - }); + if (changes['folderNode'] && changes['folderNode'].currentValue) { + this.loadFolder(); + } else if (changes['currentFolderId'] && changes['currentFolderId'].currentValue) { + this.loadFolderByNodeId(changes['currentFolderId'].currentValue); } } @@ -289,10 +224,12 @@ export class DocumentList implements OnInit, OnChanges, AfterContentInit { performNavigation(node: MinimalNodeEntity): boolean { if (node && node.entry && node.entry.isFolder) { - this.currentFolderPath = this.getNodePath(node); - this.currentFolderId = null; + + this.currentFolderId = node.entry.id; + this.folderNode = node.entry; + this.loadFolder(); - this.folderChange.emit({ path: this.currentFolderPath }); + this.folderChange.emit({ node: node.entry }); return true; } return false; @@ -309,10 +246,6 @@ export class DocumentList implements OnInit, OnChanges, AfterContentInit { } } - loadFolderByPath(path: string): Promise { - return this.data.loadPath(path); - } - loadFolderById(id: string): Promise { return this.data.loadById(id); } @@ -323,31 +256,21 @@ export class DocumentList implements OnInit, OnChanges, AfterContentInit { }); } - public loadFolder() { - if (this.currentFolderId) { - this.loadFolderById(this.currentFolderId) - .catch(err => { - this.error.emit(err); - }); - } else if (this.currentFolderPath) { - this.loadFolderByPath(this.currentFolderPath) - .catch(err => { - this.error.emit(err); - }); + loadFolder() { + let nodeId = this.folderNode ? this.folderNode.id : this.currentFolderId; + if (nodeId) { + this.loadFolderById(nodeId) + .catch(err => this.error.emit(err)); } } - /** - * Gets a path for a given node. - * @param node - * @returns {string} - */ - getNodePath(node: MinimalNodeEntity): string { - if (node) { - let pathWithCompanyHome = node.entry.path.name; - return pathWithCompanyHome.replace('/Company Home', '') + '/' + node.entry.name; - } - return null; + // gets folder node and its content + loadFolderByNodeId(nodeId: string) { + this.documentListService.getFolderNode(nodeId).then(node => { + this.folderNode = node; + this.currentFolderId = node.id; + this.data.loadById(node.id).catch(err => this.error.emit(err)); + }); } /** diff --git a/ng2-components/ng2-alfresco-documentlist/src/data/share-datatable-adapter.spec.ts b/ng2-components/ng2-alfresco-documentlist/src/data/share-datatable-adapter.spec.ts index 9f5a977b76..707305bf92 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/data/share-datatable-adapter.spec.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/data/share-datatable-adapter.spec.ts @@ -18,7 +18,7 @@ import { DataColumn, DataRow, DataSorting } from 'ng2-alfresco-datatable'; import { DocumentListServiceMock } from './../assets/document-list.service.mock'; import { ShareDataTableAdapter, ShareDataRow } from './share-datatable-adapter'; -import { FileNode, FolderNode, PageNode } from './../assets/document-library.model.mock'; +import { FileNode, FolderNode/*, PageNode*/ } from './../assets/document-library.model.mock'; describe('ShareDataTableAdapter', () => { @@ -102,6 +102,7 @@ describe('ShareDataTableAdapter', () => { expect(check).toThrowError(adapter.ERR_COL_NOT_FOUND); }); + /* it('should require path to load data', () => { spyOn(documentListService, 'getFolder').and.callThrough(); @@ -110,7 +111,9 @@ describe('ShareDataTableAdapter', () => { expect(documentListService.getFolder).not.toHaveBeenCalled(); }); + */ + /* it('should load data for path', () => { let folder = new FolderNode(); let path = '/some/path'; @@ -128,6 +131,7 @@ describe('ShareDataTableAdapter', () => { expect(rows.length).toBe(1); expect((rows[0]).node).toBe(folder); }); + */ it('should covert cell value to formatted date', () => { let rawValue = new Date(2015, 6, 15, 21, 43, 11); // Wed Jul 15 2015 21:43:11 GMT+0100 (BST); @@ -322,6 +326,7 @@ describe('ShareDataTableAdapter', () => { expect(value).toBeNull(); }); + /* it('should log load error', (done) => { let error = 'My Error'; documentListService.getFolderReject = true; @@ -336,6 +341,7 @@ describe('ShareDataTableAdapter', () => { done(); }); }); + */ it('should generate file icon path based on mime type', () => { let fileName = 'custom-icon.svg'; @@ -399,6 +405,7 @@ describe('ShareDataTableAdapter', () => { expect(( rows[1]).node).toBe(file1); }); + /* it('should preserve sorting on navigation', () => { let file1 = new FileNode('file1'); let file2 = new FileNode('file2'); @@ -426,6 +433,7 @@ describe('ShareDataTableAdapter', () => { expect(( sorted[0]).node).toBe(file3); expect(( sorted[1]).node).toBe(file4); }); + */ }); describe('ShareDataRow', () => { diff --git a/ng2-components/ng2-alfresco-documentlist/src/data/share-datatable-adapter.ts b/ng2-components/ng2-alfresco-documentlist/src/data/share-datatable-adapter.ts index b3f2569099..c3cba404d3 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/data/share-datatable-adapter.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/data/share-datatable-adapter.ts @@ -17,11 +17,7 @@ import { DatePipe } from '@angular/common'; import { ObjectUtils } from 'ng2-alfresco-core'; -import { - PaginationProvider, DataLoadedEventEmitter, - DataTableAdapter, - DataRow, DataColumn, DataSorting -} from 'ng2-alfresco-datatable'; +import { PaginationProvider, DataLoadedEventEmitter, DataTableAdapter, DataRow, DataColumn, DataSorting } from 'ng2-alfresco-datatable'; import { NodePaging, NodeMinimalEntry } from './../models/document-library.model'; import { DocumentListService } from './../services/document-list.service'; @@ -31,7 +27,6 @@ export class ShareDataTableAdapter implements DataTableAdapter, PaginationProvid ERR_ROW_NOT_FOUND: string = 'Row not found'; ERR_COL_NOT_FOUND: string = 'Column not found'; - DEFAULT_ROOT_ID: string = '-root-'; DEFAULT_DATE_FORMAT: string = 'medium'; DEFAULT_PAGE_SIZE: number = 20; MIN_PAGE_SIZE: number = 5; @@ -40,7 +35,7 @@ export class ShareDataTableAdapter implements DataTableAdapter, PaginationProvid private rows: DataRow[]; private columns: DataColumn[]; private page: NodePaging; - private currentPath: string; + private folderNodeId: string; private filter: RowFilter; private imageResolver: ImageResolver; @@ -53,7 +48,6 @@ export class ShareDataTableAdapter implements DataTableAdapter, PaginationProvid thumbnails: boolean = false; dataLoaded: DataLoadedEventEmitter; - rootFolderId: string = this.DEFAULT_ROOT_ID; constructor(private documentListService: DocumentListService, private basePath: string, @@ -83,7 +77,7 @@ export class ShareDataTableAdapter implements DataTableAdapter, PaginationProvid set skipCount(value: number) { if (value !== this._skipCount) { this._skipCount = value > 0 ? value : 0; - this.loadPath(this.currentPath); + this.loadById(this.folderNodeId); } } @@ -94,7 +88,7 @@ export class ShareDataTableAdapter implements DataTableAdapter, PaginationProvid set maxItems(value: number) { if (value !== this._maxItems) { this._maxItems = value > this.MIN_PAGE_SIZE ? value : this.MIN_PAGE_SIZE; - this.loadPath(this.currentPath); + this.loadById(this.folderNodeId); } } @@ -203,17 +197,17 @@ export class ShareDataTableAdapter implements DataTableAdapter, PaginationProvid this.setSorting(sorting); } - loadPath(path: string): Promise { + loadById(id: string): Promise { return new Promise((resolve, reject) => { - if (path && this.documentListService) { + if (id && this.documentListService) { this.documentListService - .getFolder(path, { + .getFolder(null, { maxItems: this._maxItems, skipCount: this._skipCount, - rootFolderId: this.rootFolderId + rootFolderId: id }) .subscribe(val => { - this.currentPath = path; + this.folderNodeId = id; this.loadPage(val); this.dataLoaded.emit(null); resolve(true); @@ -228,35 +222,11 @@ export class ShareDataTableAdapter implements DataTableAdapter, PaginationProvid } - loadById(id: string): Promise { - return new Promise((resolve, reject) => { - if (id && this.documentListService) { - this.documentListService - .getFolder(null, { - maxItems: this._maxItems, - skipCount: this._skipCount, - rootFolderId: id - }) - .subscribe(val => { - this.loadPage(val); - this.dataLoaded.emit(null); - resolve(true); - }, - error => { - reject(error); - }); - } else { - resolve(false); - } - }); - - } - setFilter(filter: RowFilter) { this.filter = filter; - if (this.filter && this.currentPath) { - this.loadPath(this.currentPath); + if (this.filter && this.folderNodeId) { + this.loadById(this.folderNodeId); } } diff --git a/ng2-components/ng2-alfresco-documentlist/src/services/document-list.service.ts b/ng2-components/ng2-alfresco-documentlist/src/services/document-list.service.ts index 928e0780bf..35fdef6d75 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/services/document-list.service.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/services/document-list.service.ts @@ -18,7 +18,7 @@ import { Injectable } from '@angular/core'; import { Response } from '@angular/http'; import { Observable } from 'rxjs/Rx'; -import { NodePaging, MinimalNodeEntity } from 'alfresco-js-api'; +import { NodePaging, MinimalNodeEntity, MinimalNodeEntryEntity } from 'alfresco-js-api'; import { AuthService, ContentService, AlfrescoApiService } from 'ng2-alfresco-core'; @Injectable() @@ -121,6 +121,17 @@ export class DocumentListService { .catch(this.handleError); } + getFolderNode(nodeId: string): Promise { + let opts: any = { + includeSource: true, + include: ['path', 'properties'] + }; + + // see https://github.com/Alfresco/alfresco-js-api/issues/140 + let nodes: any = this.apiService.getInstance().nodes; + return nodes.getNodeInfo(nodeId, opts); + } + /** * Get thumbnail URL for the given document node. * @param node Node to get URL for.