101654: Fixed relationship fields not being hidden when they are out of scope

This commit is contained in:
Alexandre Vryghem
2023-05-12 17:18:44 +02:00
parent a6a10200d2
commit b318d7281a
2 changed files with 42 additions and 3 deletions

View File

@@ -38,6 +38,7 @@ import { WorkflowItem } from '../../../core/submission/models/workflowitem.model
import { SubmissionObject } from '../../../core/submission/models/submission-object.model';
import { SubmissionSectionObject } from '../../objects/submission-section-object.model';
import { SubmissionSectionError } from '../../objects/submission-section-error.model';
import { FormRowModel } from '../../../core/config/models/config-submission-form.model';
/**
* This component represents a section that contains a Form.
@@ -255,9 +256,15 @@ export class SubmissionSectionFormComponent extends SectionModelComponent {
* @private
*/
private inCurrentSubmissionScope(field: string): boolean {
const scope = this.formConfig?.rows.find(row => {
return row.fields?.[0]?.selectableMetadata?.[0]?.metadata === field;
}).fields?.[0]?.scope;
const scope = this.formConfig?.rows.find((row: FormRowModel) => {
if (row.fields?.[0]?.selectableMetadata) {
return row.fields?.[0]?.selectableMetadata?.[0]?.metadata === field;
} else if (row.fields?.[0]?.selectableRelationship) {
return row.fields?.[0]?.selectableRelationship.relationshipType === field.replace(/^relationship\./g, '');
} else {
return false;
}
})?.fields?.[0]?.scope;
switch (scope) {
case SubmissionScopeType.WorkspaceItem: {