hazza/yel-dspace-angular
1
0
Fork 0
forked from hazza/dspace-angular
Code Pull Requests Activity

Merge branch 'w2p-113500_submission-describe-warning-7.6' into w2p-113500_submission-describe-warning_contribution

Browse Source
This commit is contained in:
lotte
2024-04-03 19:05:34 +02:00
parent b3b3ef8203 722bd6f7f5
commit bff5de066b
2 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/app/submission/sections/form/section-form.component.ts
View File

@@ -224,7 +224,7 @@ export class SubmissionSectionFormComponent extends SectionModelComponent {
this.submissionObject = submissionObject;
this.isSectionReadonly = isSectionReadOnly;
// Is the first loading so init form
this.initForm(sectionData);
this.initForm(sectionData, this.sectionData.errorsToShow, this.sectionData.serverValidationErrors);
this.sectionData.data = sectionData;
this.subscriptions();
this.isLoading = false;
@@ -328,7 +328,7 @@ export class SubmissionSectionFormComponent extends SectionModelComponent {
* @param sectionData
* the section data retrieved from the server
*/
initForm(sectionData: WorkspaceitemSectionFormObject): void {
initForm(sectionData: WorkspaceitemSectionFormObject, errorsToShow: SubmissionSectionError[], serverValidationErrors: SubmissionSectionError[]): void {
try {
this.formModel = this.formBuilderService.modelFromConfiguration(
this.submissionId,
@@ -339,7 +339,7 @@ export class SubmissionSectionFormComponent extends SectionModelComponent {
this.isSectionReadonly,
);
const sectionMetadata = this.sectionService.computeSectionConfiguredMetadata(this.formConfig);
this.sectionService.updateSectionData(this.submissionId, this.sectionData.id, sectionData, this.sectionData.errorsToShow, this.sectionData.serverValidationErrors, sectionMetadata);
this.sectionService.updateSectionData(this.submissionId, this.sectionData.id, sectionData, errorsToShow, serverValidationErrors, sectionMetadata);
} catch (e) {
const msg: string = this.translate.instant('error.submission.sections.init-form-error') + e.toString();
const sectionError: SubmissionSectionError = {
@@ -356,12 +356,13 @@ export class SubmissionSectionFormComponent extends SectionModelComponent {
/**
* Update form model
*
* @param sectionData
* the section data retrieved from the server
* @param errors
* the section errors retrieved from the server
* @param sectionState
* the section state retrieved from the server
*/
updateForm(sectionData: WorkspaceitemSectionFormObject, errors: SubmissionSectionError[]): void {
updateForm(sectionState: SubmissionSectionObject): void {
const sectionData = sectionState.data as WorkspaceitemSectionFormObject;
const errors = sectionState.errorsToShow;
if (isNotEmpty(sectionData) && !isEqual(sectionData, this.sectionData.data)) {
this.sectionData.data = sectionData;
@@ -369,7 +370,7 @@ export class SubmissionSectionFormComponent extends SectionModelComponent {
this.isUpdating = true;
this.formModel = null;
this.cdr.detectChanges();
this.initForm(sectionData);
this.initForm(sectionData, errors, sectionState.serverValidationErrors);
this.checksForErrors(errors);
this.isUpdating = false;
this.cdr.detectChanges();
@@ -423,7 +424,7 @@ export class SubmissionSectionFormComponent extends SectionModelComponent {
.subscribe((sectionState: SubmissionSectionObject) => {
this.fieldsOnTheirWayToBeRemoved = new Map();
this.sectionMetadata = sectionState.metadata;
this.updateForm(sectionState.data as WorkspaceitemSectionFormObject, sectionState.errorsToShow);
this.updateForm(sectionState);
}),
);
}