Merged in task/dspace-cris-2023_02_x/DSC-2215_item_access_conditions (pull request DSpace#2920)

[CST-16309] update status handling

Approved-by: Giuseppe Digilio

Author: danieleninfo

src/app/core/config/models/config-submission-access.model.ts

@@ -37,6 +37,12 @@ export class SubmissionAccessModel extends ConfigObject {
   @autoserialize
   singleAccessCondition: boolean;
 
+  /**
+   * Whether the field is mandatory
+   */
+  @autoserialize
+  required: boolean;
+
   /**
    * The links to all related resources returned by the rest api.
    */

src/app/shared/mocks/submission.mock.ts

@@ -3868,6 +3868,95 @@ export const mockAccessesFormData = {
   ]
 };
 
+export const mockAccessesServiceData = {
+  discoverable: true,
+  accessConditions: [
+    {
+      accessConditionGroup: {
+        name: [
+          {
+            value: 'openaccess',
+            language: null,
+            authority: null,
+            display: 'openaccess',
+            confidence: -1,
+            place: 0,
+            otherInformation: null
+          }
+        ],
+      },
+    },
+    {
+      accessConditionGroup: {
+        name: [
+          {
+            value: 'lease',
+            language: null,
+            authority: null,
+            display: 'lease',
+            confidence: -1,
+            place: 0,
+            otherInformation: null
+          }
+        ],
+        endDate: [
+          {
+            value: {
+              year: 2019,
+              month: 1,
+              day: 16
+            },
+            language: null,
+            authority: null,
+            display: {
+              year: 2019,
+              month: 1,
+              day: 16
+            },
+            confidence: -1,
+            place: 0,
+            otherInformation: null
+          }
+        ],
+      }
+    },
+    {
+      accessConditionGroup: {
+        name: [
+          {
+            value: 'embargo',
+            language: null,
+            authority: null,
+            display: 'lease',
+            confidence: -1,
+            place: 0,
+            otherInformation: null
+          }
+        ],
+        startDate: [
+          {
+            value: {
+              year: 2019,
+              month: 1,
+              day: 16
+            },
+            language: null,
+            authority: null,
+            display: {
+              year: 2019,
+              month: 1,
+              day: 16
+            },
+            confidence: -1,
+            place: 0,
+            otherInformation: null
+          }
+        ],
+      }
+    }
+  ]
+};
+
 // mockDeduplicationMatches id for Workflow decision
 export const mockDeduplicationWorkflowId = '78ca1d06-cce7-4ee9-abda-46440d9b0bb7';
 // mockDeduplicationMatches id for Submitter decision

src/app/submission/sections/accesses/section-accesses.component.spec.ts

@@ -41,7 +41,7 @@ import {
 } from '@ng-dynamic-forms/core';
 import { AppState } from '../../../app.reducer';
 import { getMockFormService } from '../../../shared/mocks/form-service.mock';
-import { mockAccessesFormData } from '../../../shared/mocks/submission.mock';
+import { mockAccessesFormData, mockAccessesServiceData } from '../../../shared/mocks/submission.mock';
 import { accessConditionChangeEvent, checkboxChangeEvent } from '../../../shared/testing/form-event.stub';
 import { XSRFService } from '../../../core/xsrf/xsrf.service';
 import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
@@ -120,6 +120,7 @@ describe('SubmissionSectionAccessesComponent', () => {
         formService.validateAllFormFields.and.callFake(() => null);
         formService.isValid.and.returnValue(observableOf(true));
         formService.getFormData.and.returnValue(observableOf(mockAccessesFormData));
+        sectionsServiceStub.getSectionErrors.and.returnValue(observableOf(null));
         submissionAccessesConfigService.findByHref.and.returnValue(createSuccessfulRemoteDataObject$(accessConditionSectionConfigRes) as any);
         fixture.detectChanges();
       }));
@@ -183,6 +184,7 @@ describe('SubmissionSectionAccessesComponent', () => {
         formService.validateAllFormFields.and.callFake(() => null);
         formService.isValid.and.returnValue(observableOf(true));
         formService.getFormData.and.returnValue(observableOf(mockAccessesFormData));
+        sectionsServiceStub.getSectionErrors.and.returnValue(observableOf(null));
         submissionAccessesConfigService.findByHref.and.returnValue(createSuccessfulRemoteDataObject$(accessConditionSectionSingleAccessConfigRes) as any);
         fixture.detectChanges();
       }));
@@ -264,6 +266,7 @@ describe('SubmissionSectionAccessesComponent', () => {
       formService.validateAllFormFields.and.callFake(() => null);
       formService.isValid.and.returnValue(observableOf(true));
       formService.getFormData.and.returnValue(observableOf(mockAccessesFormData));
+      sectionsServiceStub.getSectionErrors.and.returnValue(observableOf(null));
       fixture.detectChanges();
     }));
 
@@ -277,4 +280,82 @@ describe('SubmissionSectionAccessesComponent', () => {
     });
 
   });
+
+  describe('when section is required', () => {
+
+    const service = getSectionAccessesService();
+
+    beforeEach(async () => {
+      await TestBed.configureTestingModule({
+        imports: [
+          BrowserModule,
+          TranslateModule.forRoot()
+        ],
+        declarations: [SubmissionSectionAccessesComponent, FormComponent],
+        providers: [
+          { provide: SectionsService, useValue: sectionsServiceStub },
+          { provide: SubmissionAccessesConfigDataService, useValue: submissionAccessesConfigService },
+          { provide: SectionAccessesService, useValue: service },
+          { provide: SectionFormOperationsService, useValue: sectionFormOperationsService },
+          { provide: JsonPatchOperationsBuilder, useValue: operationsBuilder },
+          { provide: TranslateService, useValue: getMockTranslateService() },
+          { provide: FormService, useValue: getMockFormService() },
+          { provide: Store, useValue: storeStub },
+          { provide: XSRFService, useValue: {} },
+          { provide: SubmissionJsonPatchOperationsService, useValue: SubmissionJsonPatchOperationsServiceStub },
+          { provide: 'sectionDataProvider', useValue: sectionData },
+          { provide: 'submissionIdProvider', useValue: '1508' },
+          FormBuilderService
+        ]
+      })
+        .compileComponents();
+    });
+
+    beforeEach(inject([Store], (store: Store<AppState>) => {
+      fixture = TestBed.createComponent(SubmissionSectionAccessesComponent);
+      component = fixture.componentInstance;
+      formService = TestBed.inject(FormService);
+      formService.validateAllFormFields.and.callFake(() => null);
+      formService.isValid.and.returnValue(observableOf(true));
+      formService.getFormData.and.returnValue(observableOf(mockAccessesFormData));
+      sectionsServiceStub.getSectionErrors.and.returnValue(observableOf(null));
+      submissionAccessesConfigService.findByHref.and.returnValue(createSuccessfulRemoteDataObject$(accessConditionSectionConfigRes) as any);
+      fixture.detectChanges();
+    }));
+
+    it('should have section status invalid on init', (done) => {
+      component.required$.next(true);
+      service.getAccessesData.and.returnValue(observableOf({}));
+      fixture.detectChanges();
+
+      component.getSectionStatus().subscribe(status => {
+        expect(status).toEqual(false);
+        done();
+      });
+    });
+
+    it('should have section status valid if there are data and no error', (done) => {
+      service.getAccessesData.and.returnValue(observableOf(mockAccessesServiceData));
+      component.required$.next(true);
+      fixture.detectChanges();
+
+      component.getSectionStatus().subscribe(status => {
+        expect(status).toEqual(true);
+        done();
+      });
+    });
+
+    it('should have section status invalid if there are data and errors', (done) => {
+      service.getAccessesData.and.returnValue(observableOf(mockAccessesServiceData));
+      component.required$.next(true);
+      sectionsServiceStub.getSectionErrors.and.returnValue(observableOf({error: 'testError'}));
+
+      fixture.detectChanges();
+
+      component.getSectionStatus().subscribe(status => {
+        expect(status).toEqual(false);
+        done();
+      });
+    });
+  });
 });

src/app/submission/sections/accesses/section-accesses.component.ts

@@ -3,7 +3,7 @@ import { Component, Inject, ViewChild } from '@angular/core';
 import { UntypedFormControl } from '@angular/forms';
 
 import { filter, map, mergeMap, take } from 'rxjs/operators';
-import { combineLatest, Observable, of, Subscription } from 'rxjs';
+import { BehaviorSubject, combineLatest, Observable, Subscription } from 'rxjs';
 import { TranslateService } from '@ngx-translate/core';
 
 import { renderSectionFor } from '../sections-decorator';
@@ -42,7 +42,7 @@ import {
   FORM_ACCESS_CONDITION_TYPE_CONFIG,
   FORM_ACCESS_CONDITION_TYPE_LAYOUT
 } from './section-accesses.model';
-import { hasValue, isNotEmpty, isNotNull } from '../../../shared/empty.util';
+import { hasValue, isNotEmpty, isNotNull, isObjectEmpty } from '../../../shared/empty.util';
 import {
   WorkspaceitemSectionAccessesObject
 } from '../../../core/submission/models/workspaceitem-section-accesses.model';
@@ -124,6 +124,11 @@ export class SubmissionSectionAccessesComponent extends SectionModelComponent {
    */
   public canChangeDiscoverable: boolean;
 
+  /**
+   * Whether the section is required
+   */
+  public required$: BehaviorSubject<boolean> = new BehaviorSubject(false);
+
   /**
    * Initialize instance variables
    *
@@ -161,7 +166,7 @@ export class SubmissionSectionAccessesComponent extends SectionModelComponent {
    *    The form model
    */
   public initModelData(formModel: DynamicFormControlModel[]) {
-    this.accessesData.accessConditions.forEach((accessCondition, index) => {
+    this.accessesData.accessConditions?.forEach((accessCondition, index) => {
       Array.of('name', 'startDate', 'endDate')
         .filter((key) => accessCondition.hasOwnProperty(key) && isNotEmpty(accessCondition[key]))
         .forEach((key) => {
@@ -298,9 +303,8 @@ export class SubmissionSectionAccessesComponent extends SectionModelComponent {
       this.canChangeDiscoverable = !!config.canChangeDiscoverable;
       this.accessesData = accessData;
       this.formModel = this.buildFileEditForm();
+      this.required$.next(config.required);
     });
-
-
   }
 
   /**
@@ -309,8 +313,14 @@ export class SubmissionSectionAccessesComponent extends SectionModelComponent {
    * @return Observable<boolean>
    *     the section status
    */
-  protected getSectionStatus(): Observable<boolean> {
-    return of(true);
+  getSectionStatus(): Observable<boolean> {
+    return combineLatest([
+      this.required$,
+      this.sectionService.getSectionErrors(this.submissionId,  this.sectionData.id),
+      this.accessesService.getAccessesData(this.submissionId, this.sectionData.id)
+    ]).pipe(
+      map(([required, errors, accessesData]) => (!required || (required  && isObjectEmpty(errors) && !!accessesData?.accessConditions?.length)))
+    );
   }
 
   /**

src/assets/i18n/en.json5

@@ -6453,6 +6453,8 @@
 
   "submission.sections.submit.progressbar.itemAccessConditions": "Item access conditions",
 
+  "error.validation.accessconditions.required": "You must provide a value for the access condition",
+
   "submission.sections.submit.progressbar.CClicense": "Creative commons license",
 
   "submission.sections.submit.progressbar.custom-url": "Custom url",