[DURACOM-317] refactor, fix other object reference

Author: FrancescoMolinaro

src/app/app.menus.ts

@@ -94,6 +94,8 @@ export const MENUS = buildMenuStructure({
         MenuRoute.ITEM_PAGE,
       ),
       AuditLogsMenuProvider.onRoute(
+        MenuRoute.COMMUNITY_PAGE,
+        MenuRoute.COLLECTION_PAGE,
         MenuRoute.ITEM_PAGE,
       ),
       OrcidMenuProvider.onRoute(

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

@@ -63,17 +63,13 @@
                 <td>{{ audit.subjectType }}</td>
               } @else {
                 <td>
-                  @if (object && object.id === audit.objectUUID) {
-                    <span>
-                      @if (audit.otherAuditObject; as dso) {
-                        {{ dsoNameService.getName(dso) }} <em>({{ dso.type }})</em>
-                      } @else {
-                        {{ dataNotAvailable }}
-                      }
-                    </span>
-                  } @else {
-                    {{ dataNotAvailable }}
-                  }
+                  <span>
+                    @if (audit.otherAuditObject; as dso) {
+                      {{ dsoNameService.getName(dso) }} <em>({{ dso.type }})</em>
+                    } @else {
+                      {{ dataNotAvailable }}
+                    }
+                  </span>
                 </td>
               }
             </tr>

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

@@ -3,16 +3,20 @@
     <h1 class="flex-grow-1">{{'audit.object.overview.title' | translate}}</h1>
   </div>
 
-  @if (objectId) {
-    <h2 class="h4 mt-4 mb-4">{{ objectName }}</h2>
+  @if (objectId$ | async) {
+    <div class="h4 my-4">
+      <a [routerLink]="objectRoute">{{ objectName }}</a>
+    </div>
     @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', objectId]"><i class="fas fa-arrow-left"></i>{{ 'audit.object.back' | translate }}</a>
+    <button class="btn btn-light mt-3" (click)="goBack()">
+      <i class="fas fa-arrow-left"></i>{{ 'audit.object.back' | translate }}
+    </button>
     @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.spec.ts

@@ -1,3 +1,4 @@
+import { Location } from '@angular/common';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import {
   ComponentFixture,
@@ -21,7 +22,7 @@ import { APP_DATA_SERVICES_MAP } from 'src/config/app-config.interface';
 
 import { AuditDataService } from '../../core/audit/audit-data.service';
 import { Audit } from '../../core/audit/model/audit.model';
-import { ItemDataService } from '../../core/data/item-data.service';
+import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
 import { PaginationService } from '../../core/pagination/pagination.service';
 import { MockActivatedRoute } from '../../shared/mocks/active-router.mock';
 import { RouterMock } from '../../shared/mocks/router.mock';
@@ -38,25 +39,32 @@ describe('ObjectAuditOverviewComponent', () => {
 
   let auditService: AuditDataService;
   let audits: Audit[];
-  let itemService: ItemDataService;
+  let dSpaceObjectDataService: DSpaceObjectDataService;
   let collectionService;
   let activatedRoute;
-
+  let locationStub: Location;
+  const mockItem = new Item();
+  const mockItemId = '1234';
+  mockItem.id = mockItemId;
 
   function init() {
     audits = [ AuditMock ];
     auditService = jasmine.createSpyObj('auditService', {
       findByObject: createSuccessfulRemoteDataObject$(createPaginatedList(audits)),
       getEpersonName: of('Eperson Name'),
       auditHasDetails: false,
+      getOtherObject: of(new Audit()),
     });
-    itemService = jasmine.createSpyObj('ItemService', { findById: createSuccessfulRemoteDataObject$(new Item()) });
+    dSpaceObjectDataService = jasmine.createSpyObj('DSpaceObjectDataService', { findById: createSuccessfulRemoteDataObject$(mockItem) });
     collectionService = jasmine.createSpyObj('CollectionDataService',
       { findOwningCollectionFor: createSuccessfulRemoteDataObject$(createPaginatedList([{ id : 'collectionId' }])) },
     );
-    activatedRoute = new MockActivatedRoute({ objectId: '1234' });
+    activatedRoute = new MockActivatedRoute({ objectId: mockItemId });
     activatedRoute.paramMap = of({
-      get: () => '1234',
+      get: () => mockItemId,
+    });
+    locationStub = jasmine.createSpyObj('location', {
+      back: jasmine.createSpy('back'),
     });
   }
 
@@ -73,11 +81,12 @@ describe('ObjectAuditOverviewComponent', () => {
       providers: [
         { provide: AuditDataService, useValue: auditService },
         { provide: PaginationService, useValue: new PaginationServiceStub() },
-        { provide: ItemDataService, useValue: itemService },
+        { provide: DSpaceObjectDataService, useValue: dSpaceObjectDataService },
         { provide: ActivatedRoute, useValue: activatedRoute },
         { provide: Router, useValue: new RouterMock() },
         { provide: CollectionDataService, useValue: collectionService },
         { provide: APP_DATA_SERVICES_MAP, useValue: new Map() },
+        { provide: Location, useValue: locationStub },
         provideMockStore({}),
       ],
       schemas: [NO_ERRORS_SCHEMA],
@@ -104,8 +113,12 @@ describe('ObjectAuditOverviewComponent', () => {
       expect(component.setAudits).toHaveBeenCalled();
     }));
 
-    it('should set owning collection', () => {
-      expect(component.owningCollection$).toBeTruthy();
+    it('should set object id', (done) => {
+      component.objectId$.subscribe((id) => {
+        expect(id).toEqual(mockItemId);
+        expect(component.objectId).toEqual(id);
+        done();
+      });
     });
   });
 });

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

@@ -1,7 +1,9 @@
-import { AsyncPipe } from '@angular/common';
+import {
+  AsyncPipe,
+  Location,
+} from '@angular/common';
 import {
   Component,
-  OnDestroy,
   OnInit,
 } from '@angular/core';
 import {
@@ -12,38 +14,38 @@ import {
 } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
 import {
-  combineLatest,
   forkJoin,
   Observable,
-  Subscription,
 } from 'rxjs';
 import {
   filter,
   map,
   mergeMap,
-  switchMap, tap,
+  switchMap,
+  tap,
 } from 'rxjs/operators';
 
-import { COLLECTION_PAGE_LINKS_TO_FOLLOW } from '../../collection-page/collection-page.resolver';
+import { getDSORoute } from '../../app-routing-paths';
 import {
   AUDIT_PERSON_NOT_AVAILABLE,
   AuditDataService,
 } from '../../core/audit/audit-data.service';
 import { Audit } from '../../core/audit/model/audit.model';
+import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
 import { SortDirection } from '../../core/cache/models/sort-options.model';
 import { CollectionDataService } from '../../core/data/collection-data.service';
+import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
 import { FindListOptions } from '../../core/data/find-list-options.model';
-import { ItemDataService } from '../../core/data/item-data.service';
 import { PaginatedList } from '../../core/data/paginated-list.model';
 import { RemoteData } from '../../core/data/remote-data';
 import { PaginationService } from '../../core/pagination/pagination.service';
-import { Collection } from '../../core/shared/collection.model';
-import { Item } from '../../core/shared/item.model';
-import {getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload} from '../../core/shared/operators';
+import { DSpaceObject } from '../../core/shared/dspace-object.model';
+import {
+  getFirstCompletedRemoteData,
+  getFirstSucceededRemoteDataPayload,
+} from '../../core/shared/operators';
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
 import { AuditTableComponent } from '../audit-table/audit-table.component';
-import {DSONameService} from '../../core/breadcrumbs/dso-name.service';
-import {DSpaceObjectDataService} from '../../core/data/dspace-object-data.service';
 /**
  * Component displaying a list of all audit about a object in a paginated table
  */
@@ -58,12 +60,12 @@ import {DSpaceObjectDataService} from '../../core/data/dspace-object-data.servic
   ],
   standalone: true,
 })
-export class ObjectAuditOverviewComponent implements OnInit, OnDestroy {
+export class ObjectAuditOverviewComponent implements OnInit {
 
   /**
    * The object extracted from the route.
    */
-  object: Item;
+  object: DSpaceObject;
 
   /**
    * List of all audits
@@ -94,40 +96,39 @@ export class ObjectAuditOverviewComponent implements OnInit, OnDestroy {
    */
   dateFormat = 'yyyy-MM-dd HH:mm:ss';
 
+  objectId$: Observable<string>;
+
   objectId: string;
 
   objectName: string;
 
-  dataNotAvailable = AUDIT_PERSON_NOT_AVAILABLE;
+  objectRoute: string;
 
-  sub: Subscription;
+  dataNotAvailable = AUDIT_PERSON_NOT_AVAILABLE;
 
   constructor(protected route: ActivatedRoute,
               protected router: Router,
               protected auditService: AuditDataService,
-              protected itemService: ItemDataService,
               protected paginationService: PaginationService,
               protected collectionDataService: CollectionDataService,
               protected dsoNameService: DSONameService,
               protected dSpaceObjectDataService: DSpaceObjectDataService,
+              protected location: Location,
   ) {}
 
   ngOnInit(): void {
-    this.sub = this.route.paramMap.pipe(
+    this.objectId$ = this.route.paramMap.pipe(
       map((paramMap: ParamMap) => paramMap.get('objectId')),
       switchMap((id: string) => this.dSpaceObjectDataService.findById(id, true, true)),
       getFirstSucceededRemoteDataPayload(),
-    ).subscribe((dso) => {
-      this.objectId = dso.id;
-      this.objectName = this.dsoNameService.getName(dso);
-      this.setAudits();
-    });
-  }
-
-  ngOnDestroy(): void {
-    if (this.sub) {
-      this.sub.unsubscribe();
-    }
+      tap((object) => {
+        this.objectRoute = getDSORoute(object);
+        this.objectId = object.id;
+        this.objectName = this.dsoNameService.getName(object);
+        this.setAudits();
+      }),
+      map(dso => dso.id),
+    );
   }
 
   /**
@@ -138,7 +139,7 @@ export class ObjectAuditOverviewComponent implements OnInit, OnDestroy {
 
     this.auditsRD$ = config$.pipe(
       switchMap((config) =>
-        this.auditService.findByObject(this.objectId, config).pipe(
+        this.auditService.findByObject(this.objectId, config, false).pipe(
           getFirstCompletedRemoteData(),
         ),
       ),
@@ -175,4 +176,8 @@ export class ObjectAuditOverviewComponent implements OnInit, OnDestroy {
       }),
     );
   }
+
+  goBack(): void {
+    this.location.back();
+  }
 }

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

@@ -89,7 +89,7 @@ export class AuditOverviewComponent implements OnInit {
   setAudits() {
     this.auditsRD$ = this.paginationService.getFindListOptions(this.pageId, this.config).pipe(
       switchMap((config) => {
-        return this.auditService.findAll(config, true, true, followLink('eperson'));
+        return this.auditService.findAll(config, false, true, followLink('eperson'));
       }),
       filter(data => data && data?.payload?.page?.length > 0),
       map((audits) => {

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

@@ -62,18 +62,17 @@ export class AuditDataService extends IdentifiableDataService<Audit>{
    *
    * @param objectId The objectId id
    * @param options The [[FindListOptions]] object
-   * @param collUuid The Uuid of the collection
-   * @param commUuid The Uuid of the community
+   * @param useCachedVersionIfAvailable
    * @return Observable<RemoteData<PaginatedList<Audit>>>
    */
-  findByObject(objectId: string, options: FindListOptions = {}): Observable<RemoteData<PaginatedList<Audit>>> {
+  findByObject(objectId: string, options: FindListOptions = {}, useCachedVersionIfAvailable = true): Observable<RemoteData<PaginatedList<Audit>>> {
     const searchMethod = AUDIT_FIND_BY_OBJECT_SEARCH_METHOD;
     const searchParams = [new RequestParam('object', objectId)];
 
     const optionsWithObject = Object.assign(new FindListOptions(), options, {
       searchParams,
     });
-    return this.searchData.searchBy(searchMethod, optionsWithObject, true, true, followLink('eperson'));
+    return this.searchData.searchBy(searchMethod, optionsWithObject, useCachedVersionIfAvailable, true, followLink('eperson'));
   }
 
   /**

src/assets/i18n/en.json5

@@ -957,7 +957,7 @@
 
   "audit.overview.breadcrumbs": "Audit Logs Overview",
 
-  "audit.object.back": "Back to Item",
+  "audit.object.back": "Back",
 
   "audit.object.breadcrumbs": "Subject Audit Logs",