hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-10 11:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

[DURACOM-152] Section visibility read-only

Browse Source
This commit is contained in:
Alisa Ismailati
2023-06-15 12:42:29 +02:00
parent 2c7cf18be5
commit fda4ef77e4
3 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -249,6 +249,8 @@ describe('SubmissionSectionFormComponent test suite', () => {
formConfigService.findByHref.and.returnValue(createSuccessfulRemoteDataObject$(testFormConfiguration));
sectionsServiceStub.getSectionData.and.returnValue(observableOf(sectionData));
sectionsServiceStub.getSectionServerErrors.and.returnValue(observableOf([]));
sectionsServiceStub.isSectionReadOnly.and.returnValue(observableOf(false));
spyOn(comp, 'initForm');
spyOn(comp, 'subscriptions');

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

@@ -118,6 +118,12 @@ export class SubmissionSectionFormComponent extends SectionModelComponent {
protected subs: Subscription[] = [];
protected submissionObject: SubmissionObject;
/**
* A flag representing if this section is readonly
*/
protected isSectionReadonly = false;
/**
* The FormComponent reference
*/
@@ -175,13 +181,15 @@ export class SubmissionSectionFormComponent extends SectionModelComponent {
this.sectionService.getSectionData(this.submissionId, this.sectionData.id, this.sectionData.sectionType),
this.submissionObjectService.findById(this.submissionId, true, false, followLink('item')).pipe(
getFirstSucceededRemoteData(),
getRemoteDataPayload())
getRemoteDataPayload()),
this.sectionService.isSectionReadOnly(this.submissionId, this.sectionData.id, this.submissionService.getSubmissionScope())
])),
take(1))
.subscribe(([sectionData, submissionObject]: [WorkspaceitemSectionFormObject, SubmissionObject]) => {
.subscribe(([sectionData, submissionObject, isSectionReadOnly]: [WorkspaceitemSectionFormObject, SubmissionObject, boolean]) => {
if (isUndefined(this.formModel)) {
// this.sectionData.errorsToShow = [];
this.submissionObject = submissionObject;
this.isSectionReadonly = isSectionReadOnly;
// Is the first loading so init form
this.initForm(sectionData);
this.sectionData.data = sectionData;
@@ -286,11 +294,11 @@ export class SubmissionSectionFormComponent extends SectionModelComponent {
this.formConfig,
this.collectionId,
sectionData,
this.submissionService.getSubmissionScope()
this.submissionService.getSubmissionScope(),
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);
} catch (e) {
const msg: string = this.translate.instant('error.submission.sections.init-form-error') + e.toString();
const sectionError: SubmissionSectionError = {

5
src/app/submission/sections/sections.service.ts
View File

@@ -334,8 +334,9 @@ export class SectionsService {
filter((sectionObj) => hasValue(sectionObj)),
map((sectionObj: SubmissionSectionObject) => {
return isNotEmpty(sectionObj.visibility)
&& sectionObj.visibility.other === 'READONLY'
&& submissionScope !== SubmissionScopeType.WorkspaceItem;
&& ((sectionObj.visibility.other === 'READONLY' && submissionScope !== SubmissionScopeType.WorkspaceItem)
|| (sectionObj.visibility.main === 'READONLY' && submissionScope === SubmissionScopeType.WorkspaceItem)
);
}),
distinctUntilChanged());
}