Merged in task/dspace-cris-2023_02_x/DSC-2298 (pull request DSpace#3047)

[DSC-2298] remove whitespaces by default in identifier links

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

@@ -11,6 +11,8 @@ import { LayoutField } from '../../../../../../../core/layout/models/box.model';
 import { MetadataValue } from '../../../../../../../core/shared/metadata.models';
 import { FieldRenderingType } from '../metadata-box.decorator';
 import { ResolverStrategyService } from '../../../../../../services/resolver-strategy.service';
+import { APP_CONFIG } from '../../../../../../../../config/app-config.interface';
+import { environment } from '../../../../../../../../environments/environment';
 
 describe('IdentifierComponent', () => {
   let component: IdentifierComponent;
@@ -84,7 +86,8 @@ describe('IdentifierComponent', () => {
         { provide: 'metadataValueProvider', useValue: doiMetadataValueWithoutSubType },
         { provide: 'renderingSubTypeProvider', useValue: '' },
         { provide: 'tabNameProvider', useValue: '' },
-        { provide: ResolverStrategyService, useClass: ResolverStrategyService }
+        { provide: ResolverStrategyService, useClass: ResolverStrategyService },
+        { provide: APP_CONFIG, useValue: environment }
       ],
       declarations: [IdentifierComponent]
     })
@@ -223,4 +226,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

@@ -139,7 +139,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

@@ -4,6 +4,8 @@ import { AdditionalMetadataComponent } from './additional-metadata.component';
 import { Item } from '../../../../core/shared/item.model';
 import { VocabularyService } from '../../../../core/submission/vocabularies/vocabulary.service';
 import { VocabularyServiceStub } from '../../../testing/vocabulary-service.stub';
+import { APP_CONFIG } from '../../../../../config/app-config.interface';
+import { environment } from '../../../../../environments/environment';
 
 describe('AdditionalMetadataComponent', () => {
   let component: AdditionalMetadataComponent;
@@ -24,7 +26,8 @@ describe('AdditionalMetadataComponent', () => {
     await TestBed.configureTestingModule({
       declarations: [ AdditionalMetadataComponent ],
       providers: [
-        { provide: VocabularyService, useValue: new VocabularyServiceStub() }
+        { provide: VocabularyService, useValue: new VocabularyServiceStub() },
+        { provide: APP_CONFIG, useValue: environment }
       ],
     })
     .compileComponents();
@@ -40,4 +43,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

@@ -130,7 +130,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

@@ -389,6 +389,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/'