Merge remote-tracking branch 'remotes/origin/main' into authorities_and_controlled_vocabularies

# Conflicts:
#	src/app/core/integration/models/authority.value.ts
#	src/app/shared/chips/models/chips-item.model.ts
#	src/app/shared/chips/models/chips.model.ts
#	src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
#	src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.components.ts
#	src/app/shared/form/builder/models/form-field-metadata-value.model.ts
This commit is contained in:
Giuseppe Digilio
2020-09-03 09:36:39 +02:00
110 changed files with 560 additions and 517 deletions

View File

@@ -36,7 +36,7 @@
[fileId]="fileIndexes[fileList.indexOf(fileEntry)]"
[fileIndex]="fileList.indexOf(fileEntry)"
[fileName]="fileNames[fileList.indexOf(fileEntry)]"
[sectionId]="'upload'"
[sectionId]="sectionData.id"
[submissionId]="submissionId"></ds-submission-upload-section-file>
<div class="row">
<div class="col-md-12">

View File

@@ -97,7 +97,7 @@ describe('SubmissionSectionUploadComponent test suite', () => {
},
errors: [],
header: 'submit.progressbar.describe.upload',
id: 'upload',
id: 'upload-id',
sectionType: SectionsType.Upload
};
submissionId = mockSubmissionId;