diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-result/admin-notify-logs-result.component.spec.ts b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-result/admin-notify-logs-result.component.spec.ts index 4359bd3cf9..e59a52198d 100644 --- a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-result/admin-notify-logs-result.component.spec.ts +++ b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-result/admin-notify-logs-result.component.spec.ts @@ -1,14 +1,40 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { AdminNotifyLogsResultComponent } from './admin-notify-logs-result.component'; +import { ActivatedRoute, Router } from '@angular/router'; +import { MockActivatedRoute } from '../../../../shared/mocks/active-router.mock'; +import { provideMockStore } from '@ngrx/store/testing'; +import { HALEndpointService } from '../../../../core/shared/hal-endpoint.service'; +import { ObjectCacheService } from '../../../../core/cache/object-cache.service'; +import { RequestService } from '../../../../core/data/request.service'; +import { RemoteDataBuildService } from '../../../../core/cache/builders/remote-data-build.service'; +import { TranslateModule } from '@ngx-translate/core'; +import { RouterStub } from '../../../../shared/testing/router.stub'; +import { RouteService } from '../../../../core/services/route.service'; +import { routeServiceStub } from '../../../../shared/testing/route-service.stub'; -describe('AdminNotifyLogsComponent', () => { +describe('AdminNotifyLogsResultComponent', () => { let component: AdminNotifyLogsResultComponent; let fixture: ComponentFixture; + let objectCache: ObjectCacheService; + let requestService: RequestService; + let halService: HALEndpointService; + let rdbService: RemoteDataBuildService; beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [ AdminNotifyLogsResultComponent ] + imports: [TranslateModule.forRoot()], + declarations: [ AdminNotifyLogsResultComponent ], + providers: [ + { provide: RouteService, useValue: routeServiceStub }, + { provide: Router, useValue: new RouterStub() }, + { provide: ActivatedRoute, useValue: new MockActivatedRoute() }, + { provide: HALEndpointService, useValue: halService }, + { provide: ObjectCacheService, useValue: objectCache }, + { provide: RequestService, useValue: requestService }, + { provide: RemoteDataBuildService, useValue: rdbService }, + provideMockStore({}), + ] }) .compileComponents(); diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-result/admin-notify-logs-result.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-result/admin-notify-logs-result.component.ts index a5dc37289a..30523a8b72 100644 --- a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-result/admin-notify-logs-result.component.ts +++ b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-result/admin-notify-logs-result.component.ts @@ -48,6 +48,7 @@ export class AdminNotifyLogsResultComponent implements OnInit{ } /** + * Get resolved url from route * * @param route url path * @returns url path diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.ts index 47486cc6a5..ac76e40287 100644 --- a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.ts +++ b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.ts @@ -53,20 +53,16 @@ export class AdminNotifySearchResultComponent extends TabulatableResultListEleme * Keys to be not shown in detail * @private */ - private hiddenKeys: string[] = [ - 'target', - 'object', - 'context', - 'origin', - '_links', - 'metadata', - 'thumbnail', - 'item', - 'accessStatus', - 'queueStatus', - 'notificationId', - 'notificationType', - 'message' + private messageKeys: string[] = [ + 'type', + 'id', + 'coarNotifyType', + 'activityStreamType', + 'inReplyTo', + 'queueAttempts', + 'queueLastStartTime', + 'queueStatusLabel', + 'queueTimeout' ]; /** @@ -105,10 +101,8 @@ export class AdminNotifySearchResultComponent extends TabulatableResultListEleme openDetailModal(notifyMessage: AdminNotifyMessage) { const modalRef = this.modalService.open(AdminNotifyDetailModalComponent); const messageToOpen = {...notifyMessage}; - // we exclude not necessary or not readable keys - const messageKeys = Object.keys(messageToOpen).filter(key => !this.hiddenKeys.includes(key)); - messageKeys.forEach(key => { + this.messageKeys.forEach(key => { if (this.dateTypeKeys.includes(key)) { messageToOpen[key] = this.datePipe.transform(messageToOpen[key], this.dateFormat); } @@ -117,7 +111,7 @@ export class AdminNotifySearchResultComponent extends TabulatableResultListEleme messageToOpen.message = JSON.stringify(JSON.parse(notifyMessage.message), null, 2); modalRef.componentInstance.notifyMessage = messageToOpen; - modalRef.componentInstance.notifyMessageKeys = messageKeys; + modalRef.componentInstance.notifyMessageKeys = this.messageKeys; } /** diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index 47a30533a6..01572565b6 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -3609,6 +3609,10 @@ "sorting.queue_attempts.ASC": "Queue attempted Ascending", + "NOTIFY.incoming.involvedItems.search.results.head": "Related items", + + "NOTIFY.outgoing.involvedItems.search.results.head": "Related items", + "type.notify-detail-modal": "Type", "id.notify-detail-modal": "Id",