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

[ACA-1047] Personal Files - upload makes application unstable when view is destroyed (#121)

Browse Source
This commit is contained in:
Cilibiu Bogdan 2017-12-08 10:27:35 +02:00 committed by Denys Vuika
parent 17ae9af1fe
commit 2f33eafdc4
1 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,7 +16,7 @@
*/
import { Observable, Subscription } from 'rxjs/Rx';
import { Component, OnInit, OnDestroy, ChangeDetectorRef, ViewChild } from '@angular/core';
import { Component, OnInit, OnDestroy, ViewChild, NgZone } from '@angular/core';
import { Router, ActivatedRoute, Params } from '@angular/router';
import { MinimalNodeEntity, MinimalNodeEntryEntity, PathElementEntity, NodePaging, PathElement } from 'alfresco-js-api';
import {
@ -46,9 +46,9 @@ export class FilesComponent extends PageComponent implements OnInit, OnDestroy {
constructor(
private router: Router,
private zone: NgZone,
private route: ActivatedRoute,
private nodesApi: NodesApiService,
private changeDetector: ChangeDetectorRef,
private nodeActionsService: NodeActionsService,
private uploadService: UploadService,
private contentManagementService: ContentManagementService,
@ -215,22 +215,18 @@ export class FilesComponent extends PageComponent implements OnInit, OnDestroy {
this.isLoading = showIndicator;
this.fetchNodes(this.getParentNodeId(), pagination)
.subscribe(
(page) => {
if (this.isCurrentPageEmpty(page) && this.isNotFirstPage(page)) {
const newSkipCount = pagination.skipCount - pagination.maxItems;
.flatMap((page) => {
if (this.isCurrentPageEmpty(page) && this.isNotFirstPage(page)) {
const newSkipCount = pagination.skipCount - pagination.maxItems;
this.fetchNodes(this.getParentNodeId(), {skipCount: newSkipCount, maxItems: pagination.maxItems})
.subscribe(
(previousPage) => this.onPageLoaded(previousPage),
error => this.onFetchError(error)
);
} else {
this.onPageLoaded(page);
}
},
error => this.onFetchError(error),
() => this.changeDetector.detectChanges()
return this.fetchNodes(this.getParentNodeId(), {skipCount: newSkipCount, maxItems: pagination.maxItems});
}
return Observable.of(page);
})
.subscribe(
(page) => this.zone.run(() => this.onPageLoaded(page)),
error => this.onFetchError(error)
);
}