inteligr8/alfresco-content-app
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-content-app.git synced 2025-09-17 14:21:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

ensure parameter node id is a folder instance (#166)

Browse Source
This commit is contained in:
Cilibiu Bogdan
2017-12-18 16:19:31 +02:00
committed by Denys Vuika
parent 92c147fae3
commit 9428913900
2 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/app/components/files/files.component.spec.ts
View File

@@ -77,7 +77,7 @@ describe('FilesComponent', () => {
}));
beforeEach(() => {
node = { id: 'node-id' };
node = { id: 'node-id', isFolder: true };
page = {
list: {
entries: ['a', 'b', 'c'],
@@ -134,6 +134,17 @@ describe('FilesComponent', () => {
expect(component.onFetchError).toHaveBeenCalled();
});
it('if should navigate to parent if node is not a folder', () => {
node.isFolder = false;
node.parentId = 'parent-id';
spyOn(component, 'fetchNode').and.returnValue(Observable.of(node));
spyOn(router, 'navigate');
fixture.detectChanges();
expect(router.navigate).toHaveBeenCalledWith([ '/personal-files', 'parent-id' ]);
});
});
describe('refresh on events', () => {

8
src/app/components/files/files.component.ts
View File

@@ -76,7 +76,13 @@ export class FilesComponent extends PageComponent implements OnInit, OnDestroy {
this.isLoading = true;
this.fetchNode(nodeId)
.do((node) => this.updateCurrentNode(node))
.do((node) => {
if (node.isFolder) {
this.updateCurrentNode(node);
} else {
this.router.navigate(['/personal-files', node.parentId]);
}
})
.flatMap((node) => this.fetchNodes(node.id))
.subscribe(
(page) => {