[DSC-1504] Adjust services, comps, tests for CRIS9

Refs: DURACOM-317, DSC-1504

Author: kshepherd

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

@@ -17,16 +17,24 @@ import { provideMockStore } from '@ngrx/store/testing';
 import { TranslateModule } from '@ngx-translate/core';
 import { of } from 'rxjs';
 
+import { APP_DATA_SERVICES_MAP } from '../../../config/app-config.interface';
 import { Audit } from '../../core/audit/model/audit.model';
+import { AuthService } from '../../core/auth/auth.service';
+import { AuthRequestService } from '../../core/auth/auth-request.service';
+import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
 import { AuditDataService } from '../../core/data/audit-data.service';
 import { CollectionDataService } from '../../core/data/collection-data.service';
 import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
-//import { APP_DATA_SERVICES_MAP } from '../../core/data-services-map-type';
+import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
+import { ItemDataService } from '../../core/data/item-data.service';
 import { PaginationService } from '../../core/pagination/pagination.service';
 import { Item } from '../../core/shared/item.model';
 import { MockActivatedRoute } from '../../shared/mocks/active-router.mock';
 import { RouterMock } from '../../shared/mocks/router.mock';
-import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../shared/remote-data.utils';
 import { AuditMock } from '../../shared/testing/audit.mock';
 import { PaginationServiceStub } from '../../shared/testing/pagination-service.stub';
 import { createPaginatedList } from '../../shared/testing/utils.test';
@@ -38,8 +46,13 @@ describe('ObjectAuditLogsComponent', () => {
   let fixture: ComponentFixture<ObjectAuditLogsComponent>;
 
   let auditService: AuditDataService;
+  let authRequestService: AuthRequestService;
   let audits: Audit[];
   let dSpaceObjectDataService: DSpaceObjectDataService;
+  let itemDataService: ItemDataService;
+  let authorizationService: AuthorizationDataService;
+  let dsoNameService: DSONameService;
+  let authService: AuthService;
   let collectionService;
   let activatedRoute;
   let locationStub: Location;
@@ -56,16 +69,31 @@ describe('ObjectAuditLogsComponent', () => {
       getOtherObject: of(new Audit()),
     });
     dSpaceObjectDataService = jasmine.createSpyObj('DSpaceObjectDataService', { findById: createSuccessfulRemoteDataObject$(mockItem) });
+    itemDataService = jasmine.createSpyObj('ItemDataService', {
+      findById: createSuccessfulRemoteDataObject$(mockItem),
+    });
     collectionService = jasmine.createSpyObj('CollectionDataService',
       { findOwningCollectionFor: createSuccessfulRemoteDataObject$(createPaginatedList([{ id : 'collectionId' }])) },
     );
     activatedRoute = new MockActivatedRoute({ objectId: mockItemId });
     activatedRoute.paramMap = of({
       get: () => mockItemId,
     });
+    activatedRoute.data = of({
+      dso: createSuccessfulRemoteDataObject(mockItem),
+    });
     locationStub = jasmine.createSpyObj('location', {
       back: jasmine.createSpy('back'),
     });
+    authorizationService = jasmine.createSpyObj('AuthorizationDataService', {
+      isAuthorized: of(true),
+    });
+    dsoNameService = jasmine.createSpyObj('DSONameService', {
+      getName: 'Test Item',
+    });
+    authService = jasmine.createSpyObj('AuthService', {
+      isAuthenticated: of(true),
+    });
   }
 
   beforeEach(waitForAsync(() => {
@@ -80,13 +108,18 @@ describe('ObjectAuditLogsComponent', () => {
       ],
       providers: [
         { provide: AuditDataService, useValue: auditService },
+        { provide: AuthRequestService, useValue: authRequestService },
         { provide: PaginationService, useValue: new PaginationServiceStub() },
         { provide: DSpaceObjectDataService, useValue: dSpaceObjectDataService },
+        { provide: ItemDataService, useValue: itemDataService },
         { provide: ActivatedRoute, useValue: activatedRoute },
         { provide: Router, useValue: new RouterMock() },
         { provide: CollectionDataService, useValue: collectionService },
-        //{ provide: APP_DATA_SERVICES_MAP, useValue: new Map() },
+        { provide: APP_DATA_SERVICES_MAP, useValue: new Map() },
         { provide: Location, useValue: locationStub },
+        { provide: AuthorizationDataService, useValue: authorizationService },
+        { provide: DSONameService, useValue: dsoNameService },
+        { provide: AuthService, useValue: authService },
         provideMockStore({}),
       ],
       schemas: [NO_ERRORS_SCHEMA],
@@ -113,12 +146,16 @@ describe('ObjectAuditLogsComponent', () => {
       expect(component.setAudits).toHaveBeenCalled();
     }));
 
-    it('should set object id', (done) => {
+    it('should set object id', fakeAsync(() => {
+      tick();
+      fixture.detectChanges();
+
       component.objectId$.subscribe((id) => {
         expect(id).toEqual(mockItemId);
         expect(component.objectId).toEqual(id);
-        done();
       });
-    });
+
+      tick();
+    }));
   });
 });

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

@@ -8,40 +8,50 @@ import {
 } from '@angular/core';
 import {
   ActivatedRoute,
-  ParamMap,
+  Data,
   Router,
   RouterLink,
 } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
 import {
+  combineLatest,
   forkJoin,
   Observable,
+  of,
 } from 'rxjs';
 import {
   filter,
   map,
   mergeMap,
   switchMap,
+  take,
   tap,
 } from 'rxjs/operators';
 
 import { getDSORoute } from '../../app-routing-paths';
+import { COLLECTION_PAGE_LINKS_TO_FOLLOW } from '../../collection-page/collection-page.resolver';
 import { Audit } from '../../core/audit/model/audit.model';
+import { AuthService } from '../../core/auth/auth.service';
 import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
 import { SortDirection } from '../../core/cache/models/sort-options.model';
 import { AuditDataService } from '../../core/data/audit-data.service';
 import { CollectionDataService } from '../../core/data/collection-data.service';
 import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
+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 { 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 { DSpaceObject } from '../../core/shared/dspace-object.model';
+import { Collection } from '../../core/shared/collection.model';
+import { Item } from '../../core/shared/item.model';
 import {
   getFirstCompletedRemoteData,
   getFirstSucceededRemoteDataPayload,
 } from '../../core/shared/operators';
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
+import { createFailedRemoteDataObject } from '../../shared/remote-data.utils';
 import { AuditTableComponent } from '../audit-table/audit-table.component';
 /**
  * Component displaying a list of all audit about a object in a paginated table
@@ -61,7 +71,7 @@ export class ObjectAuditLogsComponent implements OnInit {
   /**
    * The object extracted from the route.
    */
-  object: DSpaceObject;
+  object: Item;
 
   /**
    * List of all audits
@@ -100,25 +110,43 @@ export class ObjectAuditLogsComponent implements OnInit {
 
   objectRoute: string;
 
+  owningCollection$: Observable<Collection>;
+
   constructor(protected route: ActivatedRoute,
               protected router: Router,
               protected auditService: AuditDataService,
               protected paginationService: PaginationService,
               protected collectionDataService: CollectionDataService,
               protected dsoNameService: DSONameService,
               protected dSpaceObjectDataService: DSpaceObjectDataService,
+              protected itemService: ItemDataService,
               protected location: Location,
+              protected authorizationService: AuthorizationDataService,
+              protected authService: AuthService,
   ) {}
 
+
   ngOnInit(): void {
-    this.objectId$ = this.route.paramMap.pipe(
-      map((paramMap: ParamMap) => paramMap.get('id')),
-      switchMap((id: string) => this.dSpaceObjectDataService.findById(id, true, true)),
+    this.objectId$ = this.route.data.pipe(
+      switchMap((data: Data) => {
+        const d = this.itemService.findById(data.dso.payload.id, true, true);
+        return d;
+      }),
       getFirstSucceededRemoteDataPayload(),
       tap((object) => {
+        this.object = object;
         this.objectRoute = getDSORoute(object);
         this.objectId = object.id;
         this.objectName = this.dsoNameService.getName(object);
+        this.owningCollection$ = this.collectionDataService.findOwningCollectionFor(
+          object,
+          true,
+          false,
+          ...COLLECTION_PAGE_LINKS_TO_FOLLOW,
+        ).pipe(
+          getFirstCompletedRemoteData(),
+          map(data => data?.payload),
+        );
         this.setAudits();
       }),
       map(dso => dso.id),
@@ -130,19 +158,29 @@ export class ObjectAuditLogsComponent implements OnInit {
    */
   setAudits() {
     const config$ = this.paginationService.getFindListOptions(this.pageConfig.id, this.config);
+    const isAdmin$ = this.isCurrentUserAdmin();
+    const parentCommunity$ = this.owningCollection$.pipe(
+      switchMap(collection => collection.parentCommunity),
+      getFirstCompletedRemoteData(),
+      map(data => data?.payload),
+    );
 
-    this.auditsRD$ = config$.pipe(
-      switchMap((config) =>
-        this.auditService.findByObject(this.objectId, config, false).pipe(
-          getFirstCompletedRemoteData(),
-        ),
-      ),
-      filter(data => data && data?.payload?.page?.length > 0),
+    this.auditsRD$ = combineLatest([isAdmin$, config$, this.owningCollection$, parentCommunity$]).pipe(
+      mergeMap(([isAdmin, config, owningCollection, parentCommunity]) => {
+        if (isAdmin) {
+          return this.auditService.findByObject(this.objectId, config, owningCollection.id, parentCommunity.id, true)
+            .pipe(
+              getFirstCompletedRemoteData(),
+            );
+        } else {
+          return of(createFailedRemoteDataObject<PaginatedList<Audit>>('You do not have permission'));
+        }
+      }),
+      filter(data => data !== null),
       map((audits) => {
         audits.payload?.page.forEach((audit) => {
           audit.hasDetails = this.auditService.auditHasDetails(audit);
         });
-
         return audits;
       }),
       mergeMap(auditsRD => {
@@ -174,4 +212,18 @@ export class ObjectAuditLogsComponent implements OnInit {
   goBack(): void {
     this.location.back();
   }
+
+  isCurrentUserAdmin(): Observable<boolean> {
+    return combineLatest([
+      this.authorizationService.isAuthorized(FeatureID.IsCollectionAdmin),
+      this.authorizationService.isAuthorized(FeatureID.IsCommunityAdmin),
+      this.authorizationService.isAuthorized(FeatureID.AdministratorOf),
+    ]).pipe(
+      map(([isCollectionAdmin, isCommunityAdmin, isSiteAdmin]) => {
+        return isCollectionAdmin || isCommunityAdmin || isSiteAdmin;
+      }),
+      take(1),
+    );
+  }
+
 }

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

@@ -11,24 +11,24 @@ import {
   TranslateModule,
 } from '@ngx-translate/core';
 
-import { RequestParam } from '../cache/models/request-param.model';
-import { CoreState } from '../core-state.model';
-import { followLink } from '../shared/follow-link-config.model';
-import { AuditMock } from '../testing/audit.mock';
-import { HALEndpointServiceStub } from '../testing/hal-endpoint-service.stub';
-import { getMockRequestService } from '../testing/request.service.mock';
-import { TranslateLoaderMock } from '../testing/translate-loader.mock';
+import { getMockRequestService } from '../../shared/mocks/request.service.mock';
+import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
+import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import { AuditMock } from '../../shared/testing/audit.mock';
+import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
 import {
   createPaginatedList,
   createRequestEntry$,
-} from '../testing/utils.test';
-import { createSuccessfulRemoteDataObject$ } from '../utilities/remote-data.utils';
+} from '../../shared/testing/utils.test';
+import { followLink } from '../../shared/utils/follow-link-config.model';
+import { RequestParam } from '../cache/models/request-param.model';
+import { CoreState } from '../core-state.model';
+import { FindListOptions } from '../data/find-list-options.model';
+import { RequestService } from '../data/request.service';
 import {
   AUDIT_FIND_BY_OBJECT_SEARCH_METHOD,
   AuditDataService,
 } from './audit-data.service';
-import { FindListOptions } from './find-list-options.model';
-import { RequestService } from './request.service';
 
 describe('AuditDataService', () => {
   let service: AuditDataService;