mirror of
https://github.com/DSpace/dspace-angular.git
synced 2025-10-09 19:13:08 +00:00
Fixed issue with a subscribe when section components are destroyed
This commit is contained in:
@@ -35,7 +35,7 @@ import { difference } from '../../../shared/object.util';
|
||||
templateUrl: './section-form.component.html',
|
||||
})
|
||||
@renderSectionFor(SectionsType.SubmissionForm)
|
||||
export class FormSectionComponent extends SectionModelComponent implements OnDestroy {
|
||||
export class FormSectionComponent extends SectionModelComponent {
|
||||
|
||||
public formId;
|
||||
public formModel: DynamicFormControlModel[];
|
||||
@@ -90,7 +90,7 @@ export class FormSectionComponent extends SectionModelComponent implements OnDes
|
||||
});
|
||||
}
|
||||
|
||||
ngOnDestroy() {
|
||||
onSectionDestroy() {
|
||||
this.subs
|
||||
.filter((subscription) => hasValue(subscription))
|
||||
.forEach((subscription) => subscription.unsubscribe());
|
||||
|
@@ -30,7 +30,7 @@ import { FormComponent } from '../../../shared/form/form.component';
|
||||
templateUrl: './section-license.component.html',
|
||||
})
|
||||
@renderSectionFor(SectionsType.License)
|
||||
export class LicenseSectionComponent extends SectionModelComponent implements OnDestroy {
|
||||
export class LicenseSectionComponent extends SectionModelComponent {
|
||||
|
||||
public formId;
|
||||
public formModel: DynamicFormControlModel[];
|
||||
@@ -140,7 +140,7 @@ export class LicenseSectionComponent extends SectionModelComponent implements On
|
||||
}
|
||||
}
|
||||
|
||||
ngOnDestroy() {
|
||||
onSectionDestroy() {
|
||||
this.subs
|
||||
.filter((subscription) => hasValue(subscription))
|
||||
.forEach((subscription) => subscription.unsubscribe());
|
||||
|
@@ -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();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@@ -33,7 +33,7 @@ export const POLICY_DEFAULT_WITH_LIST = 2; // Banner2
|
||||
templateUrl: './section-upload.component.html',
|
||||
})
|
||||
@renderSectionFor(SectionsType.Upload)
|
||||
export class UploadSectionComponent extends SectionModelComponent implements OnDestroy {
|
||||
export class UploadSectionComponent extends SectionModelComponent {
|
||||
|
||||
public AlertTypeEnum = AlertType;
|
||||
public fileIndexes = [];
|
||||
@@ -205,7 +205,7 @@ export class UploadSectionComponent extends SectionModelComponent implements OnD
|
||||
/**
|
||||
* Method provided by Angular. Invoked when the instance is destroyed.
|
||||
*/
|
||||
ngOnDestroy() {
|
||||
onSectionDestroy() {
|
||||
this.subs
|
||||
.filter((subscription) => hasValue(subscription))
|
||||
.forEach((subscription) => subscription.unsubscribe());
|
||||
|
Reference in New Issue
Block a user