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

Andrea Barbasso · atarix83 · commit c677e3ecd78d · 2025-03-07T17:20:10.000Z
[DSC-2168] fix adding multiple meta tags to the item page

Approved-by: Giuseppe Digilio
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': [

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': [`