Merged in task/dspace-cris-2025_02_x/DSC-2753 (pull request DSpace#4133)

vins01-4science · vins01-4science · commit f39a6d6b6271 · 2026-02-20T08:27:04.000Z
Task/dspace cris 2025 02 x/DSC-2753

Approved-by: Fapohunda, Adamo
diff --git a/src/app/audit-page/object-audit-overview/object-audit-overview.component.html b/src/app/audit-page/object-audit-overview/object-audit-overview.component.html
@@ -5,7 +5,9 @@ <h2 class="flex-grow-1">{{'audit.object.overview.title' | translate}}</h2>
 
   @if (object) {
     <h4 class="mt-4 mb-4">{{ object.name }} (<em>{{object.type}}</em>)</h4>
-    @if ((auditsRD$ | async)?.payload; as audits) {
+    @let auditRD = (auditsRD$ | async);
+    @let audits = auditRD?.payload;
+    @if (audits) {
       @if (audits.totalElements === 0) {
         <div>
           No audits found.
@@ -29,22 +31,25 @@ <h4 class="mt-4 mb-4">{{ object.name }} (<em>{{object.type}}</em>)</h4>
                 </tr>
               </thead>
               <tbody>
-                @for (audit of audits.page; track audit) {
+                @for (audit of audits.page; track audit.id) {
                   <tr>
                     <!-- <td><a [routerLink]="['/auditlogs/', audit.id]">{{audit.id}}</a></td> -->
                     <td>{{ audit.eventType }}</td>
-                    <td *ngVar="(getEpersonName(audit) | async) as ePersonName">{{ePersonName}}</td>
+                    <td>
+                      @let epersonName = (audit?.epersonName | async);
+                      @if (epersonName) {
+                        <span>{{epersonName}}</span>
+                      } @else {
+                        <em>{{ 'audit.overview.table.eperson.anonymous' | translate }}</em>
+                      }
+                    </td>
                     <td>{{ audit.timeStamp | date:dateFormat}}</td>
                     <td>
                       @if (object.id === audit.objectUUID) {
-                        <span>
-                          <!-- object.id === audit.objectUUID -->
-                          @if ((getOtherObject(audit, object.id) | async); as subject) {
-                            @if (subject) {
-                              {{ subject.name }} <em>({{ subject.type }})</em>
-                            }
-                          }
-                        </span>
+                        @let subject =  $any(audit.subject | async);
+                        @if (subject) {
+                          <span>{{ subject?.name }} <em>({{ subject?.type }})</em></span>
+                        }
                       }
                       @if (object.id === audit.subjectUUID) {
                         <span>
@@ -62,7 +67,7 @@ <h4 class="mt-4 mb-4">{{ object.name }} (<em>{{object.type}}</em>)</h4>
       <a class="btn btn-light mt-3" [routerLink]="['/items', object.id]"><i class="fas fa-arrow-left"></i> Back to Item</a>
       <!-- <a class="btn btn-light mt-3" [routerLink]="'/auditlogs'">{{'audit.detail.back' | translate}}</a> -->
     }
-    @if ((auditsRD$ | async)?.statusCode === 404) {
+    @if (auditRD?.statusCode === 404) {
       <h4 class="mt-4 mb-4">{{'audit.object.overview.disabled.message' | translate}}</h4>
     }
   }
diff --git a/src/app/audit-page/object-audit-overview/object-audit-overview.component.ts b/src/app/audit-page/object-audit-overview/object-audit-overview.component.ts
@@ -26,8 +26,10 @@ import {
 } from 'rxjs/operators';
 
 import { COLLECTION_PAGE_LINKS_TO_FOLLOW } from '../../collection-page/collection-page.resolver';
-import { AuditDataService } from '../../core/audit/audit-data.service';
-import { Audit } from '../../core/audit/model/audit.model';
+import {
+  AuditDataService,
+  AuditDetails,
+} from '../../core/audit/audit-data.service';
 import { AuthService } from '../../core/auth/auth.service';
 import { SortDirection } from '../../core/cache/models/sort-options.model';
 import { CollectionDataService } from '../../core/data/collection-data.service';
@@ -44,7 +46,6 @@ import { Item } from '../../core/shared/item.model';
 import { getFirstCompletedRemoteData } from '../../core/shared/operators';
 import { PaginationComponent } from '../../shared/pagination/pagination.component';
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
-import { VarDirective } from '../../shared/utils/var.directive';
 
 /**
  * Component displaying a list of all audit about a object in a paginated table
@@ -58,7 +59,6 @@ import { VarDirective } from '../../shared/utils/var.directive';
     PaginationComponent,
     RouterLink,
     TranslateModule,
-    VarDirective,
   ],
 })
 export class ObjectAuditOverviewComponent implements OnInit {
@@ -71,7 +71,7 @@ export class ObjectAuditOverviewComponent implements OnInit {
   /**
    * List of all audits
    */
-  auditsRD$: Observable<RemoteData<PaginatedList<Audit>>>;
+  auditsRD$: Observable<RemoteData<PaginatedList<AuditDetails>>>;
 
   /**
    * The current pagination configuration for the page used by the FindAll method
@@ -143,9 +143,13 @@ export class ObjectAuditOverviewComponent implements OnInit {
 
 
     this.auditsRD$ = combineLatest([isAdmin$, config$, this.owningCollection$, parentCommunity$]).pipe(
-      mergeMap(([isAdmin, config,  owningCollection, parentCommunity]) => {
+      mergeMap(([isAdmin, config, owningCollection, parentCommunity]) => {
         if (isAdmin) {
-          return this.auditService.findByObject(this.object.id, config, owningCollection.id, parentCommunity.id);
+          return this.auditService.findByObject(this.object.id, config, owningCollection.id, parentCommunity.id)
+            .pipe(
+              getFirstCompletedRemoteData(),
+              map(data => this.auditService.mapToAuditDetails(data)),
+            );
         }
 
         return of(null);
@@ -166,16 +170,5 @@ export class ObjectAuditOverviewComponent implements OnInit {
     );
   }
 
-  /**
-   * Get the name of an EPerson by ID
-   * @param audit  Audit object
-   */
-  getEpersonName(audit: Audit): Observable<string> {
-    return this.auditService.getEpersonName(audit);
-  }
-
-  getOtherObject(audit: Audit, contextObjectId: string): Observable<any> {
-    return this.auditService.getOtherObject(audit, contextObjectId);
-  }
 
 }
diff --git a/src/app/audit-page/overview/audit-overview.component.html b/src/app/audit-page/overview/audit-overview.component.html
@@ -3,16 +3,18 @@
     <h2 class="flex-grow-1">{{'audit.overview.title' | translate}}</h2>
   </div>
 
-  @if (isAdmin$ | async) {
-    @if ((auditsRD$ | async)?.payload?.totalElements === 0) {
+  @let isAdmin = (isAdmin$ | async);
+  @if (isAdmin) {
+    @let audits = (auditsRD$ | async)?.payload;
+    @if (audits?.totalElements === 0) {
       <div>
         No audits found.
       </div>
     }
-    @if ((auditsRD$ | async)?.payload?.totalElements > 0) {
+    @if (audits?.totalElements > 0) {
       <ds-pagination
         [paginationOptions]="pageConfig"
-        [collectionSize]="(auditsRD$ | async)?.payload?.totalElements"
+        [collectionSize]="audits?.totalElements"
         [hideGear]="true"
         [hidePagerWhenSinglePage]="true">
         <div class="table-responsive">
@@ -30,7 +32,8 @@ <h2 class="flex-grow-1">{{'audit.overview.title' | translate}}</h2>
               </tr>
             </thead>
             <tbody>
-              @for (audit of (auditsRD$ | async)?.payload?.page; track audit) {
+              @for (audit of audits?.page; track audit.id) {
+                @let epersonName = (audit.epersonName | async);
                 <tr>
                   <td><a [routerLink]="['/auditlogs/', audit.id]">{{audit.id}}</a></td>
                   <td>{{ audit.eventType }}</td>
@@ -40,7 +43,13 @@ <h2 class="flex-grow-1">{{'audit.overview.title' | translate}}</h2>
                   <td>{{ audit.objectType }}</td>
                   <td>{{ audit.subjectUUID }}</td>
                   <td>{{ audit.subjectType }}</td>
-                  <td *ngVar="(getEpersonName(audit) | async) as ePersonName">{{ePersonName}}</td>
+                  <td>
+                    @if (epersonName) {
+                      <span>{{epersonName}}</span>
+                    } @else {
+                      <span><em>{{ 'audit.overview.table.eperson.anonymous' | translate }}</em></span>
+                    }
+                  </td>
                   <td>{{ audit.timeStamp | date:dateFormat}}</td>
                 </tr>
               }
diff --git a/src/app/audit-page/overview/audit-overview.component.spec.ts b/src/app/audit-page/overview/audit-overview.component.spec.ts
@@ -1,6 +1,7 @@
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import {
   ComponentFixture,
+  fakeAsync,
   TestBed,
   waitForAsync,
 } from '@angular/core/testing';
@@ -9,34 +10,49 @@ import { RouterTestingModule } from '@angular/router/testing';
 import { TranslateModule } from '@ngx-translate/core';
 import { of } from 'rxjs';
 
-import { AuditDataService } from '../../core/audit/audit-data.service';
+import {
+  AuditDataService,
+  AuditDetails,
+} from '../../core/audit/audit-data.service';
 import { Audit } from '../../core/audit/model/audit.model';
 import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
 import { PaginationService } from '../../core/pagination/pagination.service';
 import { PaginationComponent } from '../../shared/pagination/pagination.component';
-import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { AuditMock } from '../../shared/testing/audit.mock';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../shared/remote-data.utils';
+import {
+  AuditDetailsMock,
+  AuditMock,
+} from '../../shared/testing/audit.mock';
 import { PaginationServiceStub } from '../../shared/testing/pagination-service.stub';
 import { createPaginatedList } from '../../shared/testing/utils.test';
 import { VarDirective } from '../../shared/utils/var.directive';
 import { AuditOverviewComponent } from './audit-overview.component';
 
-describe('AuditOverviewComponent', () => {
+fdescribe('AuditOverviewComponent', () => {
   let component: AuditOverviewComponent;
   let fixture: ComponentFixture<AuditOverviewComponent>;
 
   let auditService: AuditDataService;
   let authorizationService: any;
   let audits: Audit[];
+  let auditDetails: AuditDetails[];
   const paginationService = new PaginationServiceStub();
 
   function init() {
-    audits = [ AuditMock, AuditMock, AuditMock ];
-    auditService = jasmine.createSpyObj('processService', {
+    audits = [AuditMock, AuditMock, AuditMock];
+    auditDetails = [AuditDetailsMock, AuditDetailsMock, AuditDetailsMock];
+    auditService = jasmine.createSpyObj('auditService', {
       findAll: createSuccessfulRemoteDataObject$(createPaginatedList(audits)),
       getEpersonName: of('Eperson Name'),
+      mapToAuditDetails: createSuccessfulRemoteDataObject(createPaginatedList(auditDetails)),
+    });
+
+    authorizationService = jasmine.createSpyObj('authorizationService', {
+      isAuthorized: jasmine.createSpy('isAuthorized'),
     });
-    authorizationService = jasmine.createSpyObj('authorizationService', ['isAuthorized']);
   }
 
   beforeEach(waitForAsync(() => {
@@ -54,13 +70,13 @@ describe('AuditOverviewComponent', () => {
 
   describe('if the current user is an admin', () => {
 
-    beforeEach(() => {
-      authorizationService.isAuthorized.and.callFake(() => of(true));
+    beforeEach(fakeAsync(() => {
+      authorizationService.isAuthorized.and.returnValue(of(true));
 
       fixture = TestBed.createComponent(AuditOverviewComponent);
       component = fixture.componentInstance;
       fixture.detectChanges();
-    });
+    }));
 
     describe('table structure', () => {
       let rowElements;
@@ -118,7 +134,7 @@ describe('AuditOverviewComponent', () => {
       it('should display the eperson name in the seventh column', () => {
         rowElements.forEach((rowElement, index) => {
           const el = rowElement.query(By.css('td:nth-child(7)')).nativeElement;
-          expect(el.textContent).toContain('Eperson Name');
+          expect(el.textContent).toContain('Eperson Test');
         });
       });
 
diff --git a/src/app/audit-page/overview/audit-overview.component.ts b/src/app/audit-page/overview/audit-overview.component.ts
@@ -12,20 +12,25 @@ import {
   combineLatest,
   Observable,
 } from 'rxjs';
-import { mergeMap } from 'rxjs/operators';
+import {
+  map,
+  mergeMap,
+} from 'rxjs/operators';
 
-import { AuditDataService } from '../../core/audit/audit-data.service';
-import { Audit } from '../../core/audit/model/audit.model';
+import {
+  AuditDataService,
+  AuditDetails,
+} from '../../core/audit/audit-data.service';
 import { SortDirection } from '../../core/cache/models/sort-options.model';
 import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
 import { FeatureID } from '../../core/data/feature-authorization/feature-id';
 import { FindListOptions } from '../../core/data/find-list-options.model';
 import { PaginatedList } from '../../core/data/paginated-list.model';
 import { RemoteData } from '../../core/data/remote-data';
 import { PaginationService } from '../../core/pagination/pagination.service';
+import { getFirstCompletedRemoteData } from '../../core/shared/operators';
 import { PaginationComponent } from '../../shared/pagination/pagination.component';
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
-import { VarDirective } from '../../shared/utils/var.directive';
 
 /**
  * Component displaying a list of all audit in a paginated table
@@ -39,15 +44,14 @@ import { VarDirective } from '../../shared/utils/var.directive';
     PaginationComponent,
     RouterLink,
     TranslateModule,
-    VarDirective,
   ],
 })
 export class AuditOverviewComponent implements OnInit {
 
   /**
    * List of all audits
    */
-  auditsRD$: Observable<RemoteData<PaginatedList<Audit>>>;
+  auditsRD$: Observable<RemoteData<PaginatedList<AuditDetails>>>;
 
   /**
    * Whether user is admin
@@ -101,7 +105,11 @@ export class AuditOverviewComponent implements OnInit {
     this.auditsRD$ = combineLatest([this.isAdmin$, config$]).pipe(
       mergeMap(([isAdmin, config]) => {
         if (isAdmin) {
-          return this.auditService.findAll(config);
+          return this.auditService.findAll(config)
+            .pipe(
+              getFirstCompletedRemoteData(),
+              map(data => this.auditService.mapToAuditDetails(data)),
+            );
         }
       }),
     );
@@ -111,12 +119,4 @@ export class AuditOverviewComponent implements OnInit {
     return this.authorizationService.isAuthorized(FeatureID.AdministratorOf, undefined, undefined);
   }
 
-  /**
-   * Get the name of an EPerson by ID
-   * @param audit  Audit object
-   */
-  getEpersonName(audit: Audit): Observable<string> {
-    return this.auditService.getEpersonName(audit);
-  }
-
 }
diff --git a/src/app/core/audit/audit-data.service.ts b/src/app/core/audit/audit-data.service.ts
diff --git a/src/app/shared/testing/audit.mock.ts b/src/app/shared/testing/audit.mock.ts
