[DURACOM-317] fix/improve audit view

Author: steph-ieffam

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

@@ -14,10 +14,10 @@
           <th>{{ 'audit.overview.table.eperson' | translate }}</th>
           <th>{{ 'audit.overview.table.timestamp' | translate }}</th>
           @if (isOverviewPage) {
-            <th>{{ 'audit.overview.table.objectUUID' | translate }}</th>
-            <th>{{ 'audit.overview.table.objectType' | translate }}</th>
             <th>{{ 'audit.overview.table.subjectUUID' | translate }}</th>
             <th>{{ 'audit.overview.table.subjectType' | translate }}</th>
+            <th>{{ 'audit.overview.table.objectUUID' | translate }}</th>
+            <th>{{ 'audit.overview.table.objectType' | translate }}</th>
           } @else {
             <th>{{ 'audit.overview.table.other' | translate }}</th>
           }
@@ -55,7 +55,11 @@
                   }
                 </td>
                 <td>{{ audit.objectType }}</td>
-                <td>{{ audit.subjectUUID }}</td>
+                <td>
+                  @if (audit.subjectUUID) {
+                    <a [routerLink]="['/auditlogs/object/', audit.subjectUUID]">{{audit.subjectUUID}}</a>
+                  }
+                </td>
                 <td>{{ audit.subjectType }}</td>
               } @else {
                 <td>

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

@@ -3,16 +3,16 @@
     <h1 class="flex-grow-1">{{'audit.object.overview.title' | translate}}</h1>
   </div>
 
-  @if (object) {
-    <h2 class="h4 mt-4 mb-4">{{ object.name }} (<em>{{object.type}}</em>)</h2>
+  @if (objectId) {
+    <!--<h2 class="h4 mt-4 mb-4">{{ object.name }} (<em>{{object.type}}</em>)</h2>-->
     @if ((auditsRD$ | async)?.payload; as audits) {
       <ds-audit-table
         [audits]="audits"
         [pageConfig]="pageConfig"
         [object]="object"
       ></ds-audit-table>
     }
-    <a class="btn btn-light mt-3" [routerLink]="['/items', object.id]"><i class="fas fa-arrow-left"></i>{{ 'audit.object.back' | translate }}</a>
+    <a class="btn btn-light mt-3" [routerLink]="['/items', objectId]"><i class="fas fa-arrow-left"></i>{{ 'audit.object.back' | translate }}</a>
     @if ((auditsRD$ | async)?.statusCode === 404) {
       <h2 class="h4 mt-4 mb-4">{{'audit.object.overview.disabled.message' | translate}}</h2>
     }

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

@@ -21,7 +21,7 @@ import {
   filter,
   map,
   mergeMap,
-  switchMap,
+  switchMap, tap,
 } from 'rxjs/operators';
 
 import { COLLECTION_PAGE_LINKS_TO_FOLLOW } from '../../collection-page/collection-page.resolver';
@@ -92,7 +92,7 @@ export class ObjectAuditOverviewComponent implements OnInit, OnDestroy {
    */
   dateFormat = 'yyyy-MM-dd HH:mm:ss';
 
-  owningCollection$: Observable<Collection>;
+  objectId: string;
 
   dataNotAvailable = AUDIT_PERSON_NOT_AVAILABLE;
 
@@ -108,19 +108,9 @@ export class ObjectAuditOverviewComponent implements OnInit, OnDestroy {
 
   ngOnInit(): void {
     this.sub = this.route.paramMap.pipe(
-      switchMap((paramMap: ParamMap) => this.itemService.findById(paramMap.get('objectId'))),
-      getFirstCompletedRemoteData(),
-    ).subscribe((rd) => {
-      this.object = rd.payload;
-      this.owningCollection$ = this.collectionDataService.findOwningCollectionFor(
-        this.object,
-        true,
-        false,
-        ...COLLECTION_PAGE_LINKS_TO_FOLLOW,
-      ).pipe(
-        getFirstCompletedRemoteData(),
-        map(data => data?.payload),
-      );
+      map((paramMap: ParamMap) => paramMap.get('objectId')),
+    ).subscribe((id) => {
+      this.objectId = id;
       this.setAudits();
     });
   }
@@ -136,15 +126,11 @@ export class ObjectAuditOverviewComponent implements OnInit, OnDestroy {
    */
   setAudits() {
     const config$ = this.paginationService.getFindListOptions(this.pageConfig.id, this.config);
-    const parentCommunity$ = this.owningCollection$.pipe(
-      switchMap(collection => collection.parentCommunity),
-      getFirstCompletedRemoteData(),
-      map(data => data?.payload),
-    );
 
-    this.auditsRD$ = combineLatest([ config$, this.owningCollection$, parentCommunity$]).pipe(
-      switchMap(([config,  owningCollection, parentCommunity]) =>
-        this.auditService.findByObject(this.object.id, config, owningCollection.id, parentCommunity.id).pipe(
+    this.auditsRD$ = config$.pipe(
+      tap(console.log),
+      switchMap((config) =>
+        this.auditService.findByObject(this.objectId, config).pipe(
           getFirstCompletedRemoteData(),
         ),
       ),
@@ -160,7 +146,7 @@ export class ObjectAuditOverviewComponent implements OnInit, OnDestroy {
         const updatedAudits$ = auditsRD.payload.page.map(audit => {
           return forkJoin({
             epersonName: this.auditService.getEpersonName(audit),
-            otherAuditObject: this.auditService.getOtherObject(audit, this.object.id),
+            otherAuditObject: this.auditService.getOtherObject(audit, this.objectId),
           }).pipe(
             map(({ epersonName, otherAuditObject }) =>
               Object.assign(new Audit(), audit, { epersonName, otherAuditObject }),

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

@@ -66,17 +66,10 @@ export class AuditDataService extends IdentifiableDataService<Audit>{
    * @param commUuid The Uuid of the community
    * @return Observable<RemoteData<PaginatedList<Audit>>>
    */
-  findByObject(objectId: string, options: FindListOptions = {}, collUuid?: string, commUuid?: string): Observable<RemoteData<PaginatedList<Audit>>> {
+  findByObject(objectId: string, options: FindListOptions = {}): Observable<RemoteData<PaginatedList<Audit>>> {
     const searchMethod = AUDIT_FIND_BY_OBJECT_SEARCH_METHOD;
     const searchParams = [new RequestParam('object', objectId)];
 
-    if (hasValue(commUuid)) {
-      searchParams.push(new RequestParam('commUuid', commUuid));
-    }
-
-    if (hasValue(collUuid)) {
-      searchParams.push(new RequestParam('collUuid', collUuid));
-    }
     const optionsWithObject = Object.assign(new FindListOptions(), options, {
       searchParams,
     });