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

Fixed issue with a subscribiption when submission component is destroyed

Browse Source
This commit is contained in:
Giuseppe Digilio
2018-11-21 14:55:50 +01:00
parent 9eb00b9e62
commit 8efa2cfc4b
3 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/submission/objects/submission-objects.reducer.ts
View File

@@ -615,7 +615,7 @@ function changeSectionState(state: SubmissionObjectState, action: EnableSectionA
* the new state, with the section new validity status. * the new state, with the section new validity status.
*/ */
function setIsValid(state: SubmissionObjectState, action: SectionStatusChangeAction): SubmissionObjectState { function setIsValid(state: SubmissionObjectState, action: SectionStatusChangeAction): SubmissionObjectState {
if (hasValue(state[ action.payload.submissionId ].sections[ action.payload.sectionId ])) { if (isNotEmpty(state[ action.payload.submissionId ]) && hasValue(state[ action.payload.submissionId ].sections[ action.payload.sectionId ])) {
return Object.assign({}, state, { return Object.assign({}, state, {
[ action.payload.submissionId ]: Object.assign({}, state[ action.payload.submissionId ], { [ action.payload.submissionId ]: Object.assign({}, state[ action.payload.submissionId ], {
sections: Object.assign({}, state[ action.payload.submissionId ].sections, sections: Object.assign({}, state[ action.payload.submissionId ].sections,

2
src/app/submission/sections/license/section-license.component.ts
View File

@@ -74,7 +74,6 @@ export class LicenseSectionComponent extends SectionModelComponent {
// Retrieve license accepted status // Retrieve license accepted status
if ((this.sectionData.data as WorkspaceitemSectionLicenseObject).granted) { if ((this.sectionData.data as WorkspaceitemSectionLicenseObject).granted) {
(model as DynamicCheckboxModel).valueUpdates.next(true); (model as DynamicCheckboxModel).valueUpdates.next(true);
// this.sectionService.setSectionStatus(this.submissionId, this.sectionData.id, true);
} else { } else {
(model as DynamicCheckboxModel).valueUpdates.next(false); (model as DynamicCheckboxModel).valueUpdates.next(false);
} }
@@ -130,7 +129,6 @@ export class LicenseSectionComponent extends SectionModelComponent {
onChange(event: DynamicFormControlEvent) { onChange(event: DynamicFormControlEvent) {
const path = this.formOperationsService.getFieldPathSegmentedFromChangeEvent(event); const path = this.formOperationsService.getFieldPathSegmentedFromChangeEvent(event);
const value = this.formOperationsService.getFieldValueFromChangeEvent(event); const value = this.formOperationsService.getFieldValueFromChangeEvent(event);
// this.sectionService.setSectionStatus(this.submissionId, this.sectionData.id, value.value);
if (value) { if (value) {
this.operationsBuilder.add(this.pathCombiner.getPath(path), value.value.toString(), false, true); this.operationsBuilder.add(this.pathCombiner.getPath(path), value.value.toString(), false, true);
// Remove any section's errors // Remove any section's errors

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

@@ -47,9 +47,9 @@ export abstract class SectionModelComponent implements OnDestroy, OnInit, Sectio
} }
ngOnDestroy(): void { ngOnDestroy(): void {
this.onSectionDestroy();
if (hasValue(this.sectionStatusSub)) { if (hasValue(this.sectionStatusSub)) {
this.sectionStatusSub.unsubscribe(); this.sectionStatusSub.unsubscribe();
} }
this.onSectionDestroy();
} }
} }