[DURACOM-317] fix table links, fix tests

Author: FrancescoMolinaro

src/app/audit-page/audit-table/audit-table.component.html

@@ -51,21 +51,33 @@
               @if (isOverviewPage) {
                 <td>
                   @if (audit.objectUUID) {
-                    <a [routerLink]="[getObjectRoute$(audit.object) | async]">{{audit.objectUUID}}</a>
+                    <ng-container *ngVar="(getObjectRoute$(audit.objectUUID) | async) as objectRoute">
+                      @if (objectRoute !== ('/' + auditPath)) {
+                        <a [routerLink]="[objectRoute]">{{audit.objectUUID}}</a>
+                      } @else {
+                        <span>{{audit.objectUUID}}</span>
+                      }
+                    </ng-container>
                   }
                 </td>
                 <td>{{ audit.objectType }}</td>
                 <td>
                   @if (audit.subjectUUID) {
-                    <a [routerLink]="[getObjectRoute$(audit.subject) | async]">{{audit.subjectUUID}}</a>
+                    <ng-container *ngVar="(getObjectRoute$(audit.subjectUUID) | async) as subjectRoute">
+                      @if (subjectRoute !== ('/' + auditPath)) {
+                        <a [routerLink]="[subjectRoute]">{{audit.subjectUUID}}</a>
+                      } @else {
+                        <span>{{audit.subjectUUID}}</span>
+                      }
+                    </ng-container>
                   }
                 </td>
                 <td>{{ audit.subjectType }}</td>
               } @else {
                 <td>
                   <span>
                     @if (audit.otherAuditObject; as dso) {
-                      {{ dsoNameService.getName(dso) }} <em>({{ dso.type }})</em>
+                      {{ getDsoName(dso) }} <em>({{ dso.type }})</em>
                     } @else {
                       {{ dataNotAvailable }}
                     }

src/app/audit-page/audit-table/audit-table.component.spec.ts

@@ -8,9 +8,12 @@ import { By } from '@angular/platform-browser';
 import { RouterTestingModule } from '@angular/router/testing';
 import { Audit } from '@dspace/core/audit/model/audit.model';
 import { DSONameService } from '@dspace/core/breadcrumbs/dso-name.service';
+import { DSpaceObjectDataService } from '@dspace/core/data/dspace-object-data.service';
 import { PaginatedList } from '@dspace/core/data/paginated-list.model';
+import { DSpaceObject } from '@dspace/core/shared/dspace-object.model';
 import { AuditMock } from '@dspace/core/testing/audit.mock';
 import { DSONameServiceMock } from '@dspace/core/testing/dso-name.service.mock';
+import { createSuccessfulRemoteDataObject$ } from '@dspace/core/utilities/remote-data.utils';
 import { TranslateModule } from '@ngx-translate/core';
 import { PaginationComponent } from 'src/app/shared/pagination/pagination.component';
 
@@ -21,6 +24,8 @@ describe('AuditTableComponent', () => {
   let fixture: ComponentFixture<AuditTableComponent>;
 
   let audits = new PaginatedList() as PaginatedList<Audit>;
+  const dSpaceObjectDataService = jasmine.createSpyObj('DSpaceObjectDataService', { findById: createSuccessfulRemoteDataObject$(new DSpaceObject()) });
+
 
   beforeEach(waitForAsync(() => {
     audits.page = [ AuditMock ];
@@ -33,6 +38,7 @@ describe('AuditTableComponent', () => {
       ],
       providers: [
         { provide: DSONameService, useValue: new DSONameServiceMock() },
+        { provide: DSpaceObjectDataService, useValue: dSpaceObjectDataService },
       ],
       schemas: [NO_ERRORS_SCHEMA],
     })

src/app/audit-page/audit-table/audit-table.component.ts

@@ -11,9 +11,10 @@ import {
 } from '@angular/core';
 import { RouterLink } from '@angular/router';
 import { AUDIT_PERSON_NOT_AVAILABLE } from '@dspace/core/data/audit-data.service';
-import { RemoteData } from '@dspace/core/data/remote-data';
+import { DSpaceObjectDataService } from '@dspace/core/data/dspace-object-data.service';
 import { PaginationComponentOptions } from '@dspace/core/pagination/pagination-component-options.model';
 import { getDSORoute } from '@dspace/core/router/utils/dso-route.utils';
+import { getFirstSucceededRemoteDataPayload } from '@dspace/core/shared/operators';
 import { URLCombiner } from '@dspace/core/url-combiner/url-combiner';
 import { NgbCollapseModule } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
@@ -66,6 +67,11 @@ export class AuditTableComponent {
    */
   @Input() object: DSpaceObject;
 
+  /**
+   * Path for audit logs
+   */
+  readonly auditPath = 'auditlogs';
+
   protected readonly dataNotAvailable = AUDIT_PERSON_NOT_AVAILABLE;
 
   /**
@@ -74,8 +80,9 @@ export class AuditTableComponent {
   protected readonly dateFormat = 'yyyy-MM-dd HH:mm:ss';
 
   constructor(
-    public dsoNameService: DSONameService,
+    private dsoNameService: DSONameService,
     private changeDetectorRef: ChangeDetectorRef,
+    private dsoDataService: DSpaceObjectDataService,
   ) {}
 
 
@@ -84,9 +91,14 @@ export class AuditTableComponent {
     this.changeDetectorRef.detectChanges();
   }
 
-  getObjectRoute$(dso: Observable<RemoteData<DSpaceObject>>): Observable<string> {
-    return dso.pipe(
-      map(resolvedDso =>  new URLCombiner(getDSORoute(resolvedDso.payload), 'auditlogs').toString()),
+  getObjectRoute$(id: string): Observable<string> {
+    return this.dsoDataService.findById(id).pipe(
+      getFirstSucceededRemoteDataPayload(),
+      map(resolvedDso =>  new URLCombiner(getDSORoute(resolvedDso), this.auditPath).toString()),
     );
   }
+
+  getDsoName(dso: DSpaceObject): string {
+    return this.dsoNameService.getName(dso);
+  }
 }

src/app/shared/menu/providers/audit-item.menu.spec.ts

@@ -38,7 +38,7 @@ describe('AuditLogsMenuProvider', () => {
 
   const configurationDataService = jasmine.createSpyObj('configurationDataService', {
     findByPropertyName: createSuccessfulRemoteDataObject$(Object.assign(new ConfigurationProperty(), {
-      name: 'context-menu-entry.audit.enabled',
+      name: 'audit.context-menu-entry.enabled',
       values: [
         'true',
       ],