Merge branch 'dspace-cris-2023_02_x' into task/dspace-cris-2023_02_x/DSC-2227

FrancescoMolinaro · FrancescoMolinaro · commit 34ce94a43438 · 2025-03-20T17:04:15.000+01:00
diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
@@ -17,7 +17,7 @@ import {
   HEALTH_PAGE_PATH,
   INFO_MODULE_PATH,
   INTERNAL_SERVER_ERROR,
-  LEGACY_BITSTREAM_MODULE_PATH,
+  LEGACY_BITSTREAM_MODULE_PATH, PAGE_NOT_FOUND_PATH,
   PROFILE_MODULE_PATH,
   REGISTER_PATH,
   REQUEST_COPY_MODULE_PATH,
@@ -54,8 +54,8 @@ import {
 @NgModule({
   imports: [
     RouterModule.forRoot([
-      { path: INTERNAL_SERVER_ERROR, component: ThemedPageInternalServerErrorComponent },
-      { path: ERROR_PAGE , component: ThemedPageErrorComponent },
+      { path: INTERNAL_SERVER_ERROR, component: ThemedPageInternalServerErrorComponent, data: { title: INTERNAL_SERVER_ERROR } },
+      { path: ERROR_PAGE , component: ThemedPageErrorComponent, data: { title: ERROR_PAGE}  },
       {
         path: '',
         canActivate: [AuthBlockingGuard],
@@ -67,7 +67,10 @@ import {
             path: 'reload/:rnd',
             component: ThemedPageNotFoundComponent,
             pathMatch: 'full',
-            canActivate: [ReloadGuard]
+            canActivate: [ReloadGuard],
+            data: {
+              title: PAGE_NOT_FOUND_PATH
+            }
           },
           {
             path: 'home',
@@ -268,7 +271,10 @@ import {
           },
           {
             path: FORBIDDEN_PATH,
-            component: ThemedForbiddenComponent
+            component: ThemedForbiddenComponent,
+            data: {
+              title: FORBIDDEN_PATH
+            }
           },
           {
             path: STATISTICS_PAGE_PATH,
@@ -307,7 +313,7 @@ import {
             loadChildren: () => import('./invitation/invitation.module')
               .then((m) => m.InvitationModule)
           },
-          { path: '**', pathMatch: 'full', component: ThemedPageNotFoundComponent, canActivate: [RedirectService] },
+          { path: '**', pathMatch: 'full', component: ThemedPageNotFoundComponent, canActivate: [RedirectService], data: { title: PAGE_NOT_FOUND_PATH }  },
         ]
       }
     ], {
diff --git a/src/app/core/config/models/config-submission-access.model.ts b/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.
    */
diff --git a/src/app/core/metadata/metadata.service.spec.ts b/src/app/core/metadata/metadata.service.spec.ts
@@ -83,7 +83,9 @@ describe('MetadataService', () => {
     meta = jasmine.createSpyObj('meta', {
       updateTag: {},
       addTag: {},
-      removeTag: {}
+      removeTag: {},
+      removeTagElement: {},
+      getTags: ['1', '2'],
     });
     title = jasmine.createSpyObj({
       setTitle: {}
@@ -156,7 +158,8 @@ describe('MetadataService', () => {
       name: 'citation_title',
       content: 'Test PowerPoint Document',
     });
-    expect(meta.updateTag).toHaveBeenCalledWith({ name: 'citation_author', content: 'Doe, Jane' });
+    expect(meta.addTag).toHaveBeenCalledWith({ name: 'citation_author', content: 'Doe, Jane' });
+    expect(meta.addTag).toHaveBeenCalledWith({ name: 'citation_author', content: 'Doe, John' });
     expect(meta.updateTag).toHaveBeenCalledWith({
       name: 'citation_publication_date',
       content: '1650-06-26',
@@ -169,6 +172,13 @@ describe('MetadataService', () => {
     });
   }));
 
+  it('items page should remove multiple tags', fakeAsync(() => {
+    metadataService.clearMetaTags();
+    expect(meta.getTags).toHaveBeenCalledWith('name="title"');
+    expect(meta.getTags).toHaveBeenCalledWith('name="description"');
+    expect(meta.removeTagElement).toHaveBeenCalledTimes(4);
+  }));
+
   it('items page should set meta tags as published Thesis', fakeAsync(() => {
     (metadataService as any).processRouteChange({
       data: {
diff --git a/src/app/core/metadata/metadata.service.ts b/src/app/core/metadata/metadata.service.ts
@@ -268,9 +268,7 @@ export class MetadataService {
    * Add <meta name="citation_author" ... >  to the <head>
    */
   private setCitationAuthorTags(): void {
-    // limit author to first 20 entries to avoid issue with item page rendering
-    const values: string[] = this.getMetaTagValues(['dc.author', 'dc.contributor.author', 'dc.creator'])
-      .slice(0, this.appConfig.item.metatagLimit);
+    const values: string[] = this.getMetaTagValues(['dc.author', 'dc.contributor.author', 'dc.creator']);
     this.addMetaTags('citation_author', values);
   }
 
@@ -720,18 +718,19 @@ export class MetadataService {
     return this.currentObject.value.allMetadataValues(keys);
   }
 
-  protected addMetaTag(name: string, content: string, isProperty = false): void {
+  protected addMetaTag(name: string, content: string, isProperty = false, isMultiple = false): void {
     if (content) {
       const tag = isProperty ? { name, property: name, content } as MetaDefinition
         : { name, content } as MetaDefinition;
-      this.meta.updateTag(tag);
+      isMultiple ? this.meta.addTag(tag) : this.meta.updateTag(tag);
       this.storeTag(name);
     }
   }
 
   private addMetaTags(name: string, content: string[]): void {
-    for (const value of content) {
-      this.addMetaTag(name, value);
+    // limit meta tags with the same name to avoid issues with page rendering
+    for (const value of content.slice(0, this.appConfig.item.metatagLimit)) {
+      this.addMetaTag(name, value, false, true);
     }
   }
 
@@ -746,7 +745,9 @@ export class MetadataService {
       take(1)
     ).subscribe((tagsInUse: string[]) => {
       for (const name of tagsInUse) {
-        this.meta.updateTag({name, content: ''});
+        this.meta.getTags(`name="${name}"`).forEach((tag) => {
+          this.meta.removeTagElement(tag);
+        });
       }
       this.store.dispatch(new ClearMetaTagAction());
     });
diff --git a/src/app/shared/mocks/item.mock.ts b/src/app/shared/mocks/item.mock.ts
@@ -182,6 +182,10 @@ export const ItemMock: Item = Object.assign(new Item(), {
       {
         language: 'en_US',
         value: 'Doe, Jane'
+      },
+      {
+        language: 'en_US',
+        value: 'Doe, John'
       }
     ],
     'dc.date.accessioned': [
diff --git a/src/app/shared/mocks/submission.mock.ts b/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
diff --git a/src/app/submission/sections/accesses/section-accesses.component.spec.ts b/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();
+      });
+    });
+  });
 });
diff --git a/src/app/submission/sections/accesses/section-accesses.component.ts b/src/app/submission/sections/accesses/section-accesses.component.ts
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5

Original file line number	Diff line number	Diff line change
`@@ -182,6 +182,10 @@ export const ItemMock: Item = Object.assign(new Item(), {`
`182`	`182`	`{`
`183`	`183`	`language: 'en_US',`
`184`	`184`	`value: 'Doe, Jane'`
	`185`	`+ },`
	`186`	`+ {`
	`187`	`+ language: 'en_US',`
	`188`	`+ value: 'Doe, John'`
`185`	`189`	`}`
`186`	`190`	`],`
`187`	`191`	`'dc.date.accessioned': [`