[DSC-2544] fix tests, adapt logic to pre-existing check for link

Author: FrancescoMolinaro

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

@@ -109,6 +109,10 @@ describe('LinkComponent', () => {
   describe('with sub-type label', () => {
     beforeEach(() => {
       component.renderingSubType = 'LABEL';
+      component.metadataValueProvider = Object.assign(new MetadataValue(), metadataValue, {
+        value: '[Default Label](http://rest.api/item/link/id)',
+      });
+      component.metadataValue = component.metadataValueProvider;
       spyOn(translateService, 'instant').and.returnValue(i18nLabel);
       fixture.detectChanges();
     });
@@ -252,7 +256,7 @@ describe('LinkComponent', () => {
 
       expect(result).toEqual({
         label: 'My Label',
-        value: 'https://example.com/path'
+        value: 'https://example.com/path',
       });
     });
 
@@ -262,7 +266,7 @@ describe('LinkComponent', () => {
 
       expect(result).toEqual({
         label: input,
-        value: input
+        value: input,
       });
     });
 
@@ -272,7 +276,7 @@ describe('LinkComponent', () => {
 
       expect(result).toEqual({
         label: '',
-        value: ''
+        value: '',
       });
     });
 

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

@@ -65,7 +65,13 @@ export class LinkComponent extends RenderingTypeValueModelComponent implements O
    * Check if the metadata value is a valid URL
    */
   isValidUrl(): boolean {
-    const value = this.metadataValue.value.trim();
+    let value = this.metadataValue.value.trim();
+
+    // If the subtype is LABEL, the value is in [Label](URL) format — extract the URL part
+    if (hasValue(this.renderingSubType) && this.renderingSubType.toUpperCase() === TYPES.LABEL.toString()) {
+      const parsed = this.parseLabelValue(value);
+      value = parsed.value;
+    }
 
     // Comprehensive URL regex that matches:
     // - URLs with protocols (http, https, ftp, mailto, etc.)
@@ -84,21 +90,21 @@ export class LinkComponent extends RenderingTypeValueModelComponent implements O
     let linkText: string;
     let metadataValue: string;
 
-    if (hasValue(this.renderingSubType) && this.renderingSubType.toUpperCase() === TYPES.EMAIL) {
-        this.isEmail = true;
-        metadataValue = 'mailto:' + this.metadataValue.value;
-        linkText = (hasValue(this.renderingSubType) &&
-        this.renderingSubType.toUpperCase() === TYPES.EMAIL) ? this.metadataValue.value : this.translateService.instant(this.field.label);
-    } else if ((hasValue(this.renderingSubType) && this.renderingSubType.toUpperCase() === TYPES.LABEL)) {
-        // Parse value in format [Label](URL)
-        const parsedValue = this.parseLabelValue(this.metadataValue.value);
-
-        metadataValue = this.getLinkWithProtocol(parsedValue.value);
-        linkText = parsedValue.label;
+    if (hasValue(this.renderingSubType) && this.renderingSubType.toUpperCase() === TYPES.EMAIL.toString()) {
+      this.isEmail = true;
+      metadataValue = 'mailto:' + this.metadataValue.value;
+      linkText = (hasValue(this.renderingSubType) &&
+        this.renderingSubType.toUpperCase() === TYPES.EMAIL.toString()) ? this.metadataValue.value : this.translateService.instant(this.field.label);
+    } else if ((hasValue(this.renderingSubType) && this.renderingSubType.toUpperCase() === TYPES.LABEL.toString())) {
+      // Parse value in format [Label](URL)
+      const parsedValue = this.parseLabelValue(this.metadataValue.value);
+
+      metadataValue = this.getLinkWithProtocol(parsedValue.value);
+      linkText = parsedValue.label;
     } else {
-        // Use same value for link and label, correcting the protocol for link if needed
-        metadataValue = this.getLinkWithProtocol(this.metadataValue.value);
-        linkText = this.metadataValue.value;
+      // Use same value for link and label, correcting the protocol for link if needed
+      metadataValue = this.getLinkWithProtocol(this.metadataValue.value);
+      linkText = this.metadataValue.value;
     }
 
     return {
@@ -117,7 +123,7 @@ export class LinkComponent extends RenderingTypeValueModelComponent implements O
     if (!match) {
       return {
         label: input,
-        value: input
+        value: input,
       };
     }
 

src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/valuepair/valuepair.component.html

@@ -4,10 +4,10 @@
       {{ value$ | async }}
     </span>
   </ng-container>
-</div>
 
-<ng-template #linkTemplate>
+  <ng-template #linkTemplate>
     <a [href]="metadataValue.value" class="text-value">
       {{ value$ | async }}
     </a>
-</ng-template>
+  </ng-template>
+</div>

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

@@ -15,6 +15,7 @@ import {
 import { AuthService } from '../../../../../../../core/auth/auth.service';
 import { LayoutField } from '../../../../../../../core/layout/models/box.model';
 import { Item } from '../../../../../../../core/shared/item.model';
+import { MetadataValue } from '../../../../../../../core/shared/metadata.models';
 import { VocabularyService } from '../../../../../../../core/submission/vocabularies/vocabulary.service';
 import { TranslateLoaderMock } from '../../../../../../../shared/mocks/translate-loader.mock';
 import { AuthServiceStub } from '../../../../../../../shared/testing/auth-service.stub';
@@ -195,7 +196,6 @@ describe('ValuepairComponent', () => {
   });
 
   describe('when the metadata value is a link', () => {
-
     const linkValue = 'https://example.com';
     const testFieldLink: LayoutField = {
       metadata: 'dc.identifier',
@@ -204,7 +204,7 @@ describe('ValuepairComponent', () => {
       fieldType: 'METADATA',
       metadataGroup: null,
       labelAsHeading: false,
-      valuesInline: false
+      valuesInline: false,
     };
 
     const testItemLink = Object.assign(new Item(), {
@@ -217,11 +217,12 @@ describe('ValuepairComponent', () => {
           TranslateModule.forRoot({
             loader: {
               provide: TranslateLoader,
-              useClass: TranslateLoaderMock
-            }
+              useClass: TranslateLoaderMock,
+            },
           }),
+          ValuepairComponent,
+          DsDatePipe,
         ],
-        declarations: [ValuepairComponent, DsDatePipe],
         providers: [
           { provide: VocabularyService, useValue: vocabularyServiceSpy },
           { provide: AuthService, useValue: authService },
@@ -237,8 +238,9 @@ describe('ValuepairComponent', () => {
     beforeEach(() => {
       fixture = TestBed.createComponent(ValuepairComponent);
       component = fixture.componentInstance;
-
-      // Manually emit the value since vocabulary service won't emit
+      component.metadataValue = Object.assign(new MetadataValue(), {
+        value: linkValue,
+      });
       component.value$.next(linkValue);
 
       fixture.detectChanges();
@@ -253,7 +255,7 @@ describe('ValuepairComponent', () => {
       const linkEl = compiled.querySelector('a.text-value') as HTMLAnchorElement;
 
       expect(linkEl).toBeTruthy();
-      expect(linkEl.href).toBe(linkValue + '/'); // Browser adds trailing slash
+      expect(linkEl.href).toBe(linkValue + '/');
       expect(linkEl.textContent.trim()).toBe(linkValue);
     });
   });

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

@@ -1,4 +1,7 @@
-import { AsyncPipe } from '@angular/common';
+import {
+  AsyncPipe,
+  NgIf,
+} from '@angular/common';
 import {
   Component,
   Inject,
@@ -32,7 +35,7 @@ import { RenderingTypeValueModelComponent } from '../rendering-type-value.model'
   templateUrl: './valuepair.component.html',
   styleUrls: ['./valuepair.component.scss'],
   standalone: true,
-  imports: [AsyncPipe],
+  imports: [AsyncPipe, NgIf],
 })
 export class ValuepairComponent extends RenderingTypeValueModelComponent implements OnInit {