Merge remote-tracking branch 'origin/main' into #1206

# Conflicts:
#	src/app/submission/edit/submission-edit.component.ts
This commit is contained in:
Giuseppe Digilio
2021-07-02 13:12:04 +02:00
117 changed files with 1724 additions and 782 deletions

View File

@@ -17,6 +17,7 @@ import { Item } from '../../core/shared/item.model';
import { getAllSucceededRemoteData } from '../../core/shared/operators';
import { ItemDataService } from '../../core/data/item-data.service';
import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
import { SubmissionJsonPatchOperationsService } from '../../core/submission/submission-json-patch-operations.service';
import { SubmissionError } from '../objects/submission-objects.reducer';
import parseSectionErrors from '../utils/parseSectionErrors';
@@ -93,6 +94,7 @@ export class SubmissionEditComponent implements OnDestroy, OnInit {
* @param {ItemDataService} itemDataService
* @param {SubmissionService} submissionService
* @param {TranslateService} translate
* @param {SubmissionJsonPatchOperationsService} submissionJsonPatchOperationsService
*/
constructor(private changeDetectorRef: ChangeDetectorRef,
private notificationsService: NotificationsService,
@@ -100,7 +102,8 @@ export class SubmissionEditComponent implements OnDestroy, OnInit {
private router: Router,
private itemDataService: ItemDataService,
private submissionService: SubmissionService,
private translate: TranslateService) {
private translate: TranslateService,
private submissionJsonPatchOperationsService: SubmissionJsonPatchOperationsService) {
}
/**
@@ -159,5 +162,7 @@ export class SubmissionEditComponent implements OnDestroy, OnInit {
this.subs
.filter((sub) => hasValue(sub))
.forEach((sub) => sub.unsubscribe());
this.submissionJsonPatchOperationsService.deletePendingJsonPatchOperations();
}
}