fix(audit): update subject type to DSpaceObject and streamline template rendering

ref: DSC-2753

Author: vins01-4science

src/app/audit-page/object-audit-overview/object-audit-overview.component.html

@@ -5,7 +5,8 @@ <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>
-    @let audits = (auditsRD$ | async)?.payload;
+    @let auditRD = (auditsRD$ | async);
+    @let audits = auditRD?.payload;
     @if (audits) {
       @if (audits.totalElements === 0) {
         <div>
@@ -30,7 +31,7 @@ <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>
@@ -45,13 +46,10 @@ <h4 class="mt-4 mb-4">{{ object.name }} (<em>{{object.type}}</em>)</h4>
                     <td>{{ audit.timeStamp | date:dateFormat}}</td>
                     <td>
                       @if (object.id === audit.objectUUID) {
-                        <span>
-                          <!-- object.id === audit.objectUUID -->
-                          @let subject = (audit.subject | async);
-                          @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>
@@ -69,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 (audits?.statusCode === 404) {
+    @if (auditRD?.statusCode === 404) {
       <h4 class="mt-4 mb-4">{{'audit.object.overview.disabled.message' | translate}}</h4>
     }
   }

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

@@ -8,7 +8,6 @@ import {
 import { By } from '@angular/platform-browser';
 import { RouterTestingModule } from '@angular/router/testing';
 import { TranslateModule } from '@ngx-translate/core';
-import { createPaginatedList } from '@shared/testing/utils.test';
 import { of } from 'rxjs';
 
 import {
@@ -28,6 +27,7 @@ import {
   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';
 

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

@@ -7,7 +7,6 @@ import {
   OnInit,
 } from '@angular/core';
 import { RouterLink } from '@angular/router';
-import { getFirstCompletedRemoteData } from '@core/shared/operators';
 import { TranslateModule } from '@ngx-translate/core';
 import {
   combineLatest,
@@ -29,6 +28,7 @@ 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';
 

src/app/core/audit/audit-data.service.ts

@@ -30,6 +30,7 @@ import { PaginatedList } from '../data/paginated-list.model';
 import { RemoteData } from '../data/remote-data';
 import { RequestService } from '../data/request.service';
 import { EPerson } from '../eperson/models/eperson.model';
+import { DSpaceObject } from '../shared/dspace-object.model';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { getFirstSucceededRemoteDataPayload } from '../shared/operators';
 import { Audit } from './model/audit.model';
@@ -40,7 +41,7 @@ export const AUDIT_FIND_BY_OBJECT_SEARCH_METHOD = 'findByObject';
 
 export type AuditDetails = Audit & {
   epersonName: Observable<string>,
-  subject: Observable<any>
+  subject: Observable<DSpaceObject>
 };
 
 
@@ -163,13 +164,13 @@ export class AuditDataService extends IdentifiableDataService<Audit> {
     return Object.assign(
       rdAudit,
       {
-        payload: Object.assign(rdAudit?.payload, {
+        payload: Object.assign(rdAudit?.payload || {}, {
           page: (rdAudit?.payload?.page || [])?.map(
             (audit) => {
               return Object.assign(
                 audit, {
                   epersonName: this.getEpersonName(audit),
-                  subject: this.getOtherObject(audit, audit.objectUUID),
+                  subject: this.getOtherObject(audit, audit.objectUUID) as Observable<DSpaceObject>,
                 });
             },
           ),

src/app/shared/testing/audit.mock.ts

@@ -1,6 +1,6 @@
-import { AuditDetails } from '@core/audit/audit-data.service';
 import { of } from 'rxjs';
 
+import { AuditDetails } from '../../core/audit/audit-data.service';
 import { Audit } from '../../core/audit/model/audit.model';
 import { EPerson } from '../../core/eperson/models/eperson.model';