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

113500: Fix for warning on first describe step

Browse Source
This commit is contained in:
lotte
2024-03-27 13:27:44 +01:00
parent 404ccd9b0e
commit 993ce1ab16
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -192,7 +192,7 @@ export class SubmissionSectionFormComponent extends SectionModelComponent {
this.submissionObject = submissionObject; this.submissionObject = submissionObject;
this.isSectionReadonly = isSectionReadOnly; this.isSectionReadonly = isSectionReadOnly;
// Is the first loading so init form // Is the first loading so init form
this.initForm(sectionData); this.initForm(sectionData, this.sectionData.errorsToShow, this.sectionData.serverValidationErrors);
this.sectionData.data = sectionData; this.sectionData.data = sectionData;
this.subscriptions(); this.subscriptions();
this.isLoading = false; this.isLoading = false;
@@ -296,7 +296,7 @@ export class SubmissionSectionFormComponent extends SectionModelComponent {
* @param sectionData * @param sectionData
* the section data retrieved from the server * the section data retrieved from the server
*/ */
initForm(sectionData: WorkspaceitemSectionFormObject): void { initForm(sectionData: WorkspaceitemSectionFormObject, errorsToShow: SubmissionSectionError[], serverValidationErrors: SubmissionSectionError[]): void {
try { try {
this.formModel = this.formBuilderService.modelFromConfiguration( this.formModel = this.formBuilderService.modelFromConfiguration(
this.submissionId, this.submissionId,
@@ -307,7 +307,7 @@ export class SubmissionSectionFormComponent extends SectionModelComponent {
this.isSectionReadonly this.isSectionReadonly
); );
const sectionMetadata = this.sectionService.computeSectionConfiguredMetadata(this.formConfig); 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) { } catch (e) {
const msg: string = this.translate.instant('error.submission.sections.init-form-error') + e.toString(); const msg: string = this.translate.instant('error.submission.sections.init-form-error') + e.toString();
const sectionError: SubmissionSectionError = { const sectionError: SubmissionSectionError = {
@@ -327,7 +327,10 @@ export class SubmissionSectionFormComponent extends SectionModelComponent {
* @param errors * @param errors
* the section errors retrieved from the server * the section errors 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)) { if (isNotEmpty(sectionData) && !isEqual(sectionData, this.sectionData.data)) {
this.sectionData.data = sectionData; this.sectionData.data = sectionData;
@@ -335,7 +338,7 @@ export class SubmissionSectionFormComponent extends SectionModelComponent {
this.isUpdating = true; this.isUpdating = true;
this.formModel = null; this.formModel = null;
this.cdr.detectChanges(); this.cdr.detectChanges();
this.initForm(sectionData); this.initForm(sectionData, errors, sectionState.serverValidationErrors);
this.checksForErrors(errors); this.checksForErrors(errors);
this.isUpdating = false; this.isUpdating = false;
this.cdr.detectChanges(); this.cdr.detectChanges();
@@ -389,7 +392,7 @@ export class SubmissionSectionFormComponent extends SectionModelComponent {
.subscribe((sectionState: SubmissionSectionObject) => { .subscribe((sectionState: SubmissionSectionObject) => {
this.fieldsOnTheirWayToBeRemoved = new Map(); this.fieldsOnTheirWayToBeRemoved = new Map();
this.sectionMetadata = sectionState.metadata; this.sectionMetadata = sectionState.metadata;
this.updateForm(sectionState.data as WorkspaceitemSectionFormObject, sectionState.errorsToShow); this.updateForm(sectionState);
}) })
); );
} }