Merge pull request #5470 from guillermo-escire/feature/5314

Fix #5314: The keyword now performs a search and returns the correct …

Author: tdonohue

src/app/item-page/field-components/metadata-values/metadata-values.component.html

@@ -4,15 +4,30 @@
     <!--
     Choose a template. Priority: vocabulary, markdown, link, browse link.
     -->
-      <ng-container *ngTemplateOutlet="(isVocabulary ? controlledVocabulary : (renderMarkdown ? markdown : (hasLink(mdValue) ? (hasValue(img) ? linkImg : link) : (hasBrowseDefinition() ? browselink : simple))));
-        context: {value: (isVocabulary ? mdValue : mdValue.value), img}">
-    </ng-container>
+      <ng-container
+        *ngTemplateOutlet="
+          isVocabulary ? controlledVocabulary :
+          renderMarkdown ? markdown :
+          hasLink(mdValue) ? (hasValue(img) ? linkImg : link) :
+          hasSearchFilter() ? searchlink :
+          hasBrowseDefinition() ? browselink : simple;
+          context: { value: (isVocabulary ? mdValue : mdValue.value), img: img }
+        ">
+      </ng-container>
     @if (!last) {
       <span class="separator" [innerHTML]="separator"></span>
     }
   }
 </ds-metadata-field-wrapper>
 
+<ng-template #searchlink let-value="value">
+  <a class="ds-search-link"
+     [routerLink]="['/search']"
+     [queryParams]="getSearchQueryParams(value)">
+    {{ value }}
+  </a>
+</ng-template>
+
 <!-- Render value as markdown -->
 <ng-template #markdown let-value="value">
   <span class="dont-break-out" [dsMarkdown]="value">

src/app/item-page/field-components/metadata-values/metadata-values.component.spec.ts

@@ -8,6 +8,8 @@ import {
   waitForAsync,
 } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
+import { ActivatedRoute } from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
 import { APP_CONFIG } from '@dspace/config/app-config.interface';
 import { buildPaginatedList } from '@dspace/core/data/paginated-list.model';
 import { MetadataValue } from '@dspace/core/shared/metadata.models';
@@ -28,18 +30,10 @@ let comp: MetadataValuesComponent;
 let fixture: ComponentFixture<MetadataValuesComponent>;
 
 const mockMetadata = [
-  {
-    language: 'en_US',
-    value: '1234',
-  },
-  {
-    language: 'en_US',
-    value: 'a publisher',
-  },
-  {
-    language: 'en_US',
-    value: 'desc',
-  }] as MetadataValue[];
+  { language: 'en_US', value: '1234' },
+  { language: 'en_US', value: 'a publisher' },
+  { language: 'en_US', value: 'desc' },
+] as MetadataValue[];
 const mockSeperator = '<br/>';
 const mockLabel = 'fake.message';
 const vocabularyServiceMock = {
@@ -58,15 +52,28 @@ const controlledMetadata = {
 describe('MetadataValuesComponent', () => {
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
-      imports: [TranslateModule.forRoot({
-        loader: {
-          provide: TranslateLoader,
-          useClass: TranslateLoaderMock,
-        },
-      }), MetadataValuesComponent],
+      imports: [
+        RouterTestingModule.withRoutes([]),
+        TranslateModule.forRoot({
+          loader: {
+            provide: TranslateLoader,
+            useClass: TranslateLoaderMock,
+          },
+        }),
+        MetadataValuesComponent,
+      ],
       providers: [
         { provide: APP_CONFIG, useValue: environment },
         { provide: VocabularyService, useValue: vocabularyServiceMock },
+        {
+          provide: ActivatedRoute,
+          useValue: {
+            snapshot: {},
+            params: of({}),
+            queryParams: of({}),
+            data: of({}),
+          },
+        },
       ],
       schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(MetadataValuesComponent, {
@@ -103,43 +110,48 @@ describe('MetadataValuesComponent', () => {
 
   it('should return correct target and rel for internal links', () => {
     spyOn(comp, 'hasInternalLink').and.returnValue(true);
-    const urlValue = '/internal-link';
-    const result = comp.getLinkAttributes(urlValue);
+    const result = comp.getLinkAttributes('/internal-link');
     expect(result.target).toBe('_self');
     expect(result.rel).toBe('');
   });
 
   it('should return correct target and rel for external links', () => {
     spyOn(comp, 'hasInternalLink').and.returnValue(false);
-    const urlValue = 'https://www.dspace.org';
-    const result = comp.getLinkAttributes(urlValue);
+    const result = comp.getLinkAttributes('https://www.dspace.org');
     expect(result.target).toBe('_blank');
     expect(result.rel).toBe('noopener noreferrer');
   });
 
   it('should detect controlled vocabulary metadata', () => {
-    const result = comp.isControlledVocabulary(controlledMetadata);
-    expect(result).toBeTrue();
+    expect(comp.isControlledVocabulary(controlledMetadata)).toBeTrue();
   });
 
   it('should return translated vocabulary value when available', (done) => {
-    const vocabEntry = {
-      display: 'Translated Value',
-    };
-
     vocabularyServiceMock.getPublicVocabularyEntryByID.and.returnValue(
-      of(
-        createSuccessfulRemoteDataObject(
-          buildPaginatedList(new PageInfo(), [vocabEntry]),
-        ),
-      ),
+      of(createSuccessfulRemoteDataObject(
+        buildPaginatedList(new PageInfo(), [{ display: 'Translated Value' }]),
+      )),
     );
-
     comp.getVocabularyValue(controlledMetadata).subscribe((value) => {
       expect(value).toBe('Translated Value');
       done();
     });
   });
 
+  it('should render search link when searchFilter is present', () => {
+    comp.searchFilter = 'subject';
+    expect(comp.hasSearchFilter()).toBeTrue();
+    expect(comp.getSearchQueryParams('test')).toEqual({ 'f.subject': 'test,equals' });
+  });
+
+  it('should render browse link when browseDefinition is provided', () => {
+    comp.browseDefinition = {
+      id: 'subject',
+      metadataKeys: [],
+      order: 0,
+      getRenderType: () => 'metadata',
+    } as any;
+    expect(comp.hasBrowseDefinition()).toBeTrue();
+  });
 
 });

src/app/item-page/field-components/metadata-values/metadata-values.component.ts

@@ -103,10 +103,24 @@ export class MetadataValuesComponent implements OnChanges {
 
   hasValue = hasValue;
 
+  /**
+   * Optional metadata field used to build search links for values.
+   * If defined, values will link to the search page using this field as filter.
+   */
+  @Input() searchFilter?: string;
+
   ngOnChanges(changes: SimpleChanges): void {
     this.renderMarkdown = !!this.appConfig.markdown.enabled && this.enableMarkdown;
   }
 
+  /**
+   * Determines whether a search filter has been configured for this metadata field.
+   * Used to decide if values should be rendered as search links.
+   */
+  hasSearchFilter(): boolean {
+    return !!this.searchFilter;
+  }
+
   /**
    * Does this metadata value have a configured link to a browse definition?
    */
@@ -126,6 +140,17 @@ export class MetadataValuesComponent implements OnChanges {
     return false;
   }
 
+  /**
+   * Builds query parameters for the search page based on the configured search filter.
+   * The metadata value is used as the search term for the specified field.
+   *
+   * @param value The metadata value to search for.
+   * @returns Query parameters object for Angular router navigation.
+   */
+  getSearchQueryParams(value: string): any {
+    return { [`f.${this.searchFilter}`]: `${value},equals` };
+  }
+
   /**
    * Whether the metadata is a controlled vocabulary
    * @param value A MetadataValue being displayed

src/app/item-page/simple/field-components/specific-field/item-page-field.component.html

@@ -5,7 +5,8 @@
     [label]="label"
     [enableMarkdown]="enableMarkdown"
     [urlRegex]="urlRegex"
-    [browseDefinition]="browseDefinition|async"
-    [img]="img"
-  ></ds-metadata-values>
+    [browseDefinition]="browseDefinition | async"
+    [searchFilter]="searchFilter"
+    [img]="img">
+  </ds-metadata-values>
 </div>

src/app/item-page/simple/field-components/specific-field/item-page-field.component.ts

@@ -55,7 +55,7 @@ export class ItemPageFieldComponent {
     /**
      * Fields (schema.element.qualifier) used to render their values.
      */
-    fields: string[];
+    @Input() fields: string[];
 
     /**
      * Label i18n key for the rendered metadata
@@ -78,6 +78,13 @@ export class ItemPageFieldComponent {
      */
     img: ImageField;
 
+    /**
+     * Search filter used when rendering subject metadata as search links.
+     */
+    get searchFilter(): string | undefined {
+      return this.fields?.includes('dc.subject') ? 'subject' : undefined;
+    }
+
     /**
      * Return browse definition that matches any field used in this component if it is configured as a browse
      * link in dspace.cfg (webui.browse.link.<n>)