Merged in task/main-cris/DSC-2298 (pull request DSpace#3046)

Task/main cris/DSC-2298

Approved-by: Francesco Molinaro

Author: Andrea Barbasso

src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/identifier/identifier.component.spec.ts

@@ -10,6 +10,8 @@ import {
   TranslateModule,
 } from '@ngx-translate/core';
 
+import { APP_CONFIG } from '../../../../../../../../config/app-config.interface';
+import { environment } from '../../../../../../../../environments/environment';
 import { LayoutField } from '../../../../../../../core/layout/models/box.model';
 import { Item } from '../../../../../../../core/shared/item.model';
 import { MetadataValue } from '../../../../../../../core/shared/metadata.models';
@@ -91,6 +93,7 @@ describe('IdentifierComponent', () => {
         { provide: 'renderingSubTypeProvider', useValue: '' },
         { provide: 'tabNameProvider', useValue: '' },
         { provide: ResolverStrategyService, useClass: ResolverStrategyService },
+        { provide: APP_CONFIG, useValue: environment },
       ],
     })
       .compileComponents();
@@ -228,4 +231,18 @@ describe('IdentifierComponent', () => {
     });
   });
 
+  it('should keep white space in metadata value if shouldKeepWhiteSpaces is true', () => {
+    expect(component.composeLink('keep my white spaces', 'keepMyWhiteSpaces')).toEqual({
+      href: 'https://keepmywhitespaces.com/keep my white spaces',
+      text: 'keep my white spaces',
+    });
+  });
+
+  it('should not keep white space in metadata value if shouldKeepWhiteSpaces is false', () => {
+    expect(component.composeLink('do not keep my white spaces', 'doi')).toEqual({
+      href: 'https://doi.org/donotkeepmywhitespaces',
+      text: 'do not keep my white spaces',
+    });
+  });
+
 });

src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/identifier/identifier.component.ts

@@ -153,7 +153,9 @@ export class IdentifierComponent extends RenderingTypeValueModelComponent implem
     if (metadataValue.startsWith(rep)) {
       value = metadataValue.replace(rep, '');
     }
-    const href = this.resolver.getBaseUrl(urn) + value;
+    const shouldKeepWhiteSpaces = environment.crisLayout
+      .urn?.find((urnConfig) => urnConfig.name === urn)?.shouldKeepWhiteSpaces;
+    const href = this.resolver.getBaseUrl(urn) + (shouldKeepWhiteSpaces ? value : value.replace(/\s/g, ''));
     return this.createMetadataLinkValue(href, value);
   }
 

src/app/shared/object-list/search-result-list-element/additional-metadata/additional-metadata.component.spec.ts

@@ -3,6 +3,8 @@ import {
   TestBed,
 } from '@angular/core/testing';
 
+import { APP_CONFIG } from '../../../../../config/app-config.interface';
+import { environment } from '../../../../../environments/environment';
 import { Item } from '../../../../core/shared/item.model';
 import { VocabularyService } from '../../../../core/submission/vocabularies/vocabulary.service';
 import { MetadataLinkViewComponent } from '../../../metadata-link-view/metadata-link-view.component';
@@ -29,6 +31,7 @@ describe('AdditionalMetadataComponent', () => {
       imports: [AdditionalMetadataComponent],
       providers: [
         { provide: VocabularyService, useValue: new VocabularyServiceStub() },
+        { provide: APP_CONFIG, useValue: environment },
       ],
     })
       .overrideComponent(AdditionalMetadataComponent, { remove: { imports: [MetadataLinkViewComponent] } }).compileComponents();
@@ -44,4 +47,18 @@ describe('AdditionalMetadataComponent', () => {
   it('should create', () => {
     expect(component).toBeTruthy();
   });
+
+  it('should keep white space in metadata value if shouldKeepWhiteSpaces is true', () => {
+    expect(component.composeLink('keep my white spaces', 'keepMyWhiteSpaces')).toEqual({
+      href: 'https://keepmywhitespaces.com/keep my white spaces',
+      text: 'keep my white spaces',
+    });
+  });
+
+  it('should not keep white space in metadata value if shouldKeepWhiteSpaces is false', () => {
+    expect(component.composeLink('do not keep my white spaces', 'doi')).toEqual({
+      href: 'https://doi.org/donotkeepmywhitespaces',
+      text: 'do not keep my white spaces',
+    });
+  });
 });

src/app/shared/object-list/search-result-list-element/additional-metadata/additional-metadata.component.ts

@@ -176,7 +176,9 @@ export class AdditionalMetadataComponent implements OnInit {
     if (metadataValue.startsWith(rep)) {
       value = metadataValue.replace(rep, '');
     }
-    const href = this.resolver.getBaseUrl(urn) + value;
+    const shouldKeepWhiteSpaces = environment.crisLayout
+      .urn?.find((urnConfig) => urnConfig.name === urn)?.shouldKeepWhiteSpaces;
+    const href = this.resolver.getBaseUrl(urn) + (shouldKeepWhiteSpaces ? value : value.replace(/\s/g, ''));
     const text = isNotEmpty(value) && value !== '' ? value : href;
     return {
       href,

src/config/layout-config.interfaces.ts

@@ -3,6 +3,7 @@ import { Config } from './config.interface';
 export interface UrnConfig extends Config {
   name: string;
   baseUrl: string;
+  shouldKeepWhiteSpaces?: boolean;
 }
 
 export interface CrisRefEntityStyleConfig extends Config {

src/environments/environment.test.ts

@@ -485,6 +485,11 @@ export const environment: BuildConfig = {
         name: 'doi',
         baseUrl: 'https://doi.org/',
       },
+      {
+        name: 'keepMyWhiteSpaces',
+        baseUrl: 'https://keepmywhitespaces.com/',
+        shouldKeepWhiteSpaces: true,
+      },
       {
         name: 'hdl',
         baseUrl: 'https://hdl.handle.net/',