Merged in task/dspace-cris-2024_02_x/DSC-2889 (pull request DSpace#4607)

Task/dspace cris 2024 02 x/DSC-2889

Approved-by: Francesco Molinaro

Author: Andrea Barbasso

src/app/core/data/dspace-rest-response-parsing.service.spec.ts

@@ -0,0 +1,81 @@
+import { getMockObjectCacheService } from '../../shared/mocks/object-cache.service.mock';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
+import { DspaceRestResponseParsingService } from './dspace-rest-response-parsing.service';
+import { RestRequest } from './rest-request.model';
+import { RestRequestMethod } from './rest-request-method';
+
+class TestService extends DspaceRestResponseParsingService {
+  constructor(protected objectCache: ObjectCacheService) {
+    super(objectCache);
+  }
+
+  public ensureSelfLinkForTest(request: RestRequest, response: RawRestResponse): RawRestResponse {
+    return this.ensureSelfLink(request, response);
+  }
+}
+
+describe('DspaceRestResponseParsingService', () => {
+  let service: TestService;
+
+  beforeEach(() => {
+    service = new TestService(getMockObjectCacheService());
+  });
+
+  describe('ensureSelfLink', () => {
+    let warnSpy: jasmine.Spy;
+
+    beforeEach(() => {
+      warnSpy = spyOn(console, 'warn');
+    });
+
+    it('does not replace self link when only query params differ', () => {
+      const request = {
+        uuid: 'request-id',
+        href: 'https://rest.test/server/api/core/items/f639b124-1234-1234-1234-abcdef123456?projection=preventMetadataSecurity',
+        method: RestRequestMethod.GET,
+      } as RestRequest;
+      const response: RawRestResponse = {
+        payload: {
+          _links: {
+            self: {
+              href: 'https://rest.test/server/api/core/items/f639b124-1234-1234-1234-abcdef123456',
+            },
+          },
+        },
+        statusCode: 200,
+        statusText: 'OK',
+      };
+
+      const result = service.ensureSelfLinkForTest(request, response);
+
+      expect(result.payload._links.self.href).toBe('https://rest.test/server/api/core/items/f639b124-1234-1234-1234-abcdef123456');
+      expect(warnSpy).not.toHaveBeenCalled();
+    });
+
+    it('replaces self link when path differs', () => {
+      const request = {
+        uuid: 'request-id',
+        href: 'https://rest.test/server/api/core/items/f639b124-1234-1234-1234-abcdef123456',
+        method: RestRequestMethod.GET,
+      } as RestRequest;
+      const response: RawRestResponse = {
+        payload: {
+          _links: {
+            self: {
+              href: 'https://rest.test/server/api/core/items/some-other-id',
+            },
+          },
+        },
+        statusCode: 200,
+        statusText: 'OK',
+      };
+
+      const result = service.ensureSelfLinkForTest(request, response);
+
+      expect(result.payload._links.self.href).toBe('https://rest.test/server/api/core/items/f639b124-1234-1234-1234-abcdef123456');
+      expect(warnSpy).toHaveBeenCalled();
+    });
+  });
+});
+

src/app/core/data/dspace-rest-response-parsing.service.ts

@@ -60,9 +60,9 @@ export function isRestPaginatedList(halObj: any): boolean {
  * @param url the url to split
  */
 const splitUrlInParts = (url: string): string[] => {
-  return url.split('?')
-    .map((part) => part.split('&'))
-    .reduce((combined, current) => [...combined, ...current]);
+  // Compare link structure only, ignoring query params and hash fragments.
+  const normalizedUrl = url.split('?')[0].split('#')[0];
+  return normalizedUrl.split('/');
 };
 
 @Injectable({ providedIn: 'root' })

src/app/core/shared/image.utils.spec.ts

@@ -0,0 +1,85 @@
+import { getDefaultImageUrlByEntityType } from './image.utils';
+
+describe('Image utils', () => {
+  describe('getDefaultImageUrlByEntityType', () => {
+    const fallbackImage = 'assets/images/file-placeholder.svg';
+
+    it('should return fallback image when entityType is null', (done) => {
+      getDefaultImageUrlByEntityType(null).subscribe((url) => {
+        expect(url).toBe(fallbackImage);
+        done();
+      });
+    });
+
+    it('should return fallback image when entityType is undefined', (done) => {
+      getDefaultImageUrlByEntityType(undefined).subscribe((url) => {
+        expect(url).toBe(fallbackImage);
+        done();
+      });
+    });
+
+    it('should return fallback image when entityType is empty string', (done) => {
+      getDefaultImageUrlByEntityType('').subscribe((url) => {
+        expect(url).toBe(fallbackImage);
+        done();
+      });
+    });
+
+    it('should return the entity-specific placeholder when the image exists', (done) => {
+      spyOn(window, 'Image').and.returnValue({
+        set src(_url: string) {
+          this.onload();
+        },
+        onload: null,
+        onerror: null,
+      } as any);
+
+      getDefaultImageUrlByEntityType('Person').subscribe((url) => {
+        expect(url).toBe('assets/images/person-placeholder.svg');
+        done();
+      });
+    });
+
+    it('should return fallback image when the entity-specific image does not exist', (done) => {
+      spyOn(window, 'Image').and.returnValue({
+        set src(_url: string) {
+          this.onerror();
+        },
+        onload: null,
+        onerror: null,
+      } as any);
+
+      getDefaultImageUrlByEntityType('Person').subscribe((url) => {
+        expect(url).toBe(fallbackImage);
+        done();
+      });
+    });
+
+    it('should lowercase the entityType when building the image path', (done) => {
+      spyOn(window, 'Image').and.returnValue({
+        set src(_url: string) {
+          this.onload();
+        },
+        onload: null,
+        onerror: null,
+      } as any);
+
+      getDefaultImageUrlByEntityType('PUBLICATION').subscribe((url) => {
+        expect(url).toBe('assets/images/publication-placeholder.svg');
+        done();
+      });
+    });
+
+    it('should return fallback image when Image is not defined (SSR)', (done) => {
+      const originalImage = (window as any).Image;
+      delete (window as any).Image;
+
+      getDefaultImageUrlByEntityType('Person').subscribe((url) => {
+        expect(url).toBe(fallbackImage);
+        (window as any).Image = originalImage;
+        done();
+      });
+    });
+  });
+});
+

src/app/core/shared/image.utils.ts

@@ -16,6 +16,9 @@ export const getDefaultImageUrlByEntityType = (entityType: string): Observable<s
 };
 
 const checkImageExists = (url: string): Observable<boolean> =>  {
+  if (typeof Image === 'undefined') {
+    return of(false);
+  }
   return new Observable<boolean>((observer) => {
     const img = new Image();
 

src/app/shared/metadata-link-view/metadata-link-view.component.html

@@ -3,21 +3,26 @@
                   [ngTemplateOutletContext]="{metadataView: metadataView}"></ng-container>
 </div>
 <ng-template class="d-flex" #linkToAuthority let-metadataView="metadataView">
-  <span [dsStickyPopover]="popContent"
+  <span>
+    <a rel="noopener noreferrer"
+       data-test="linkToAuthority"
+       [routerLink]="[relatedDsoRoute]">
+      <span>{{metadataView.value}}</span>
+    </a>
+    <button [dsStickyPopover]="popContent"
+            [stickyPopoverClickable]="true"
         [openDelay]="100"
+            [closeDelay]="300"
         [animation]="true"
+            [placement]="popoverPlacement ?? 'auto'"
         [autoClose]="true"
-        container="body"
-        triggers="mouseenter">
-    <a rel="noopener noreferrer" data-test="linkToAuthority"
-      [routerLink]="[relatedDsoRoute]">
+            class="btn p-0"
+            [attr.aria-label]="'metadata.link.view.popover-toggle' | translate">
       <span dsEntityIcon
             [iconPosition]="iconPosition"
             [entityType]="metadataView.entityType"
-            [entityStyle]="metadataView.entityStyle">
-                {{metadataView.value}}
-        </span>
-    </a>
+            [entityStyle]="metadataView.entityStyle"></span>
+    </button>
   </span>
   <img *ngIf="metadataView.orcidAuthenticated"
        placement="top"

src/app/shared/metadata-link-view/metadata-link-view.component.scss

@@ -8,4 +8,7 @@
   max-width: 400px !important;
   width: 100%;
   min-width: 300px !important;
+  .popover-body {
+    overflow: hidden !important;
+  }
 }

src/app/shared/metadata-link-view/metadata-link-view.component.spec.ts

@@ -20,6 +20,8 @@ import {
 import { VarDirective } from '../utils/var.directive';
 import { MetadataLinkViewComponent } from './metadata-link-view.component';
 import SpyObj = jasmine.SpyObj;
+import { TranslateModule } from '@ngx-translate/core';
+
 import { MetadataLinkViewPopoverComponent } from './metadata-link-view-popover/metadata-link-view-popover.component';
 
 describe('MetadataLinkViewComponent', () => {
@@ -103,9 +105,12 @@ describe('MetadataLinkViewComponent', () => {
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [
+        TranslateModule.forRoot({}),
         NgbTooltipModule,
         RouterTestingModule,
-        MetadataLinkViewComponent, EntityIconDirective, VarDirective,
+        MetadataLinkViewComponent,
+        EntityIconDirective,
+        VarDirective,
       ],
       providers: [
         { provide: ItemDataService, useValue: itemService },

src/app/shared/metadata-link-view/metadata-link-view.component.ts

@@ -13,6 +13,7 @@ import {
   NgbPopoverModule,
   NgbTooltipModule,
 } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
 import {
   Observable,
   of as observableOf,
@@ -59,6 +60,8 @@ import { StickyPopoverDirective } from './sticky-popover.directive';
     NgTemplateOutlet,
     AsyncPipe,
     StickyPopoverDirective,
+    TranslateModule,
+    VarDirective,
   ],
   standalone: true,
 })
@@ -78,6 +81,11 @@ export class MetadataLinkViewComponent implements OnInit {
    * Item of the metadata value
    */
   @Input() item: DSpaceObject;
+
+  /**
+   * Where to place the popover
+   */
+  @Input() popoverPlacement: string;
   /**
    * The metadata name from where to take the value of the cris style
    */