hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-12 04:23:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed issue with a subscribe when section components are destroyed

Browse Source
This commit is contained in:
Giuseppe
2018-10-24 14:54:31 +02:00
parent e2725086b5
commit 9eb00b9e62
4 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/app/submission/sections/models/section.model.ts
View File

@@ -1,8 +1,9 @@
import { Inject, OnInit } from '@angular/core';
import { Inject, OnDestroy, OnInit } from '@angular/core';
import { SectionDataObject } from './section-data.model';
import { Observable } from 'rxjs/Observable';
import { SectionsService } from '../sections.service';
import { isNotUndefined } from '../../../shared/empty.util';
import { hasValue, isNotUndefined } from '../../../shared/empty.util';
import { Subscription } from 'rxjs/Subscription';
export interface SectionDataModel {
sectionData: SectionDataObject
@@ -11,12 +12,13 @@ export interface SectionDataModel {
/**
* An abstract model class for a submission edit form section.
*/
export abstract class SectionModelComponent implements OnInit, SectionDataModel {
export abstract class SectionModelComponent implements OnDestroy, OnInit, SectionDataModel {
protected abstract sectionService: SectionsService;
collectionId: string;
sectionData: SectionDataObject;
submissionId: string;
protected valid: boolean;
private sectionStatusSub: Subscription;
public constructor(@Inject('collectionIdProvider') public injectedCollectionId: string,
@Inject('sectionDataProvider') public injectedSectionData: SectionDataObject,
@@ -33,13 +35,21 @@ export abstract class SectionModelComponent implements OnInit, SectionDataModel
protected abstract getSectionStatus(): Observable<boolean>;
protected abstract onSectionInit(): void;
protected abstract onSectionDestroy(): void;
protected updateSectionStatus(): void {
this.getSectionStatus()
this.sectionStatusSub = this.getSectionStatus()
.filter((sectionStatus: boolean) => isNotUndefined(sectionStatus))
.startWith(true)
.subscribe((sectionStatus: boolean) => {
this.sectionService.setSectionStatus(this.submissionId, this.sectionData.id, sectionStatus);
});
}
ngOnDestroy(): void {
this.onSectionDestroy();
if (hasValue(this.sectionStatusSub)) {
this.sectionStatusSub.unsubscribe();
}
}
}