From 7185c5548acad9ef74645c1b8e649daee5c61f91 Mon Sep 17 00:00:00 2001 From: FrancescoMolinaro Date: Fri, 5 Jan 2024 17:39:00 +0100 Subject: [PATCH] fix test dependencies, move components in two tabs --- .../admin-notify-dashboard.component.html | 13 ++++-- .../admin-notify-incoming.component.spec.ts | 40 ++++++++++++++++++- .../admin-notify-outgoing.component.spec.ts | 39 +++++++++++++++++- .../admin-notify-search-result.component.ts | 4 +- ...bulatable-objects-loader.component.spec.ts | 25 ++++++++++-- .../tabulatable-objects-loader.component.ts | 2 +- .../search-facet-option.component.spec.ts | 3 +- ...earch-facet-range-option.component.spec.ts | 3 +- ...ch-facet-selected-option.component.spec.ts | 3 +- .../search-facet-filter.component.spec.ts | 3 +- .../search-filter.component.spec.ts | 3 +- .../search-hierarchy-filter.component.spec.ts | 3 +- .../search-range-filter.component.spec.ts | 3 +- .../search-filters.component.spec.ts | 3 +- src/assets/i18n/en.json5 | 4 ++ 15 files changed, 128 insertions(+), 23 deletions(-) diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.html b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.html index a8aae4998b..0184141112 100644 --- a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.html +++ b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.html @@ -12,12 +12,19 @@ -
  • - {{'admin-notify-dashboard.logs' | translate}} +
  • + {{'admin.notify.dashboard.inbound' | translate}} -
    +
    {{'admin.notify.dashboard.inbound' | translate}}
    +
    + +
    • +
  • + {{'admin.notify.dashboard.outbound'| translate}} + +
    {{'admin.notify.dashboard.outbound' | translate}}
    diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.spec.ts b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.spec.ts index dba177f8f8..44ef519164 100644 --- a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.spec.ts +++ b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.spec.ts @@ -3,16 +3,52 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { AdminNotifyIncomingComponent } from './admin-notify-incoming.component'; import { TranslateModule } from '@ngx-translate/core'; import { ActivatedRoute } 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 { SEARCH_CONFIG_SERVICE } from "../../../../my-dspace-page/my-dspace-page.component"; +import { AdminNotifySearchConfigurationService } from "../../config/admin-notify-search-configuration.service"; +import { FILTER_SEARCH } from "../../admin-notify-dashboard.component"; +import { AdminNotifySearchFilterService } from "../../config/admin-notify-filter-service"; +import { FILTER_CONFIG } from "../../../../core/shared/search/search-filter.service"; +import { RouteService } from "../../../../core/services/route.service"; +import { routeServiceStub } from "../../../../shared/testing/route-service.stub"; +import { RequestService } from "../../../../core/data/request.service"; +import { RemoteDataBuildService } from "../../../../core/cache/builders/remote-data-build.service"; +import { getMockRemoteDataBuildService } from "../../../../shared/mocks/remote-data-build.service.mock"; -describe('AdminNotifyLogsComponent', () => { +describe('AdminNotifyIncomingComponent', () => { let component: AdminNotifyIncomingComponent; let fixture: ComponentFixture; + let halService: HALEndpointService; + let requestService: RequestService; + let rdbService: RemoteDataBuildService; + + beforeEach(async () => { + rdbService = getMockRemoteDataBuildService(); + halService = jasmine.createSpyObj('halService', { + 'getRootHref': '/api' + }); + requestService = jasmine.createSpyObj('requestService', { + 'generateRequestId': 'client/1234', + 'send': '', + }); await TestBed.configureTestingModule({ imports: [TranslateModule.forRoot()], declarations: [ AdminNotifyIncomingComponent ], - providers: [ActivatedRoute] + providers: [ + { provide: SEARCH_CONFIG_SERVICE, useValue: AdminNotifySearchConfigurationService }, + { provide: FILTER_SEARCH, useValue: AdminNotifySearchFilterService }, + { provide: FILTER_CONFIG, useValue: AdminNotifySearchConfigurationService }, + { provide: RouteService, useValue: routeServiceStub }, + { provide: ActivatedRoute, useValue: new MockActivatedRoute() }, + { provide: HALEndpointService, useValue: halService }, + { provide: RequestService, useValue: requestService }, + { provide: RemoteDataBuildService, useValue: rdbService }, + provideMockStore({}), + ] }) .compileComponents(); diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.spec.ts b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.spec.ts index 3cb67e9636..0fd565fbf3 100644 --- a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.spec.ts +++ b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.spec.ts @@ -3,16 +3,51 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { AdminNotifyOutgoingComponent } from './admin-notify-outgoing.component'; import { TranslateModule } from '@ngx-translate/core'; import { ActivatedRoute } 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 { SEARCH_CONFIG_SERVICE } from "../../../../my-dspace-page/my-dspace-page.component"; +import { AdminNotifySearchConfigurationService } from "../../config/admin-notify-search-configuration.service"; +import { FILTER_SEARCH } from "../../admin-notify-dashboard.component"; +import { AdminNotifySearchFilterService } from "../../config/admin-notify-filter-service"; +import { FILTER_CONFIG } from "../../../../core/shared/search/search-filter.service"; +import { RouteService } from "../../../../core/services/route.service"; +import { routeServiceStub } from "../../../../shared/testing/route-service.stub"; +import { RequestService } from "../../../../core/data/request.service"; +import { getMockRemoteDataBuildService } from "../../../../shared/mocks/remote-data-build.service.mock"; +import { RemoteDataBuildService } from "../../../../core/cache/builders/remote-data-build.service"; -describe('AdminNotifyLogsComponent', () => { +describe('AdminNotifyOutgoingComponent', () => { let component: AdminNotifyOutgoingComponent; let fixture: ComponentFixture; + let halService: HALEndpointService; + let requestService: RequestService; + let rdbService: RemoteDataBuildService; + beforeEach(async () => { + rdbService = getMockRemoteDataBuildService(); + requestService = jasmine.createSpyObj('requestService', { + 'generateRequestId': 'client/1234', + 'send': '', + }); + halService = jasmine.createSpyObj('halService', { + 'getRootHref': '/api' + }); await TestBed.configureTestingModule({ imports: [TranslateModule.forRoot()], declarations: [ AdminNotifyOutgoingComponent ], - providers: [ActivatedRoute] + providers: [ + { provide: SEARCH_CONFIG_SERVICE, useValue: AdminNotifySearchConfigurationService }, + { provide: FILTER_SEARCH, useValue: AdminNotifySearchFilterService }, + { provide: FILTER_CONFIG, useValue: AdminNotifySearchConfigurationService }, + { provide: RouteService, useValue: routeServiceStub }, + { provide: ActivatedRoute, useValue: new MockActivatedRoute() }, + { provide: HALEndpointService, useValue: halService }, + { provide: RequestService, useValue: requestService }, + { provide: RemoteDataBuildService, useValue: rdbService }, + provideMockStore({}), + ] }) .compileComponents(); 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 8d6430da9f..23d15002a8 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 @@ -12,7 +12,6 @@ import { import { PaginatedList } from '../../../core/data/paginated-list.model'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { AdminNotifyDetailModalComponent } from '../admin-notify-detail-modal/admin-notify-detail-modal.component'; -import { objects } from "../../../shared/search/search-results/search-results.component.spec"; @tabulatableObjectsComponent(PaginatedList, ViewMode.Table, Context.CoarNotify) @Component({ @@ -32,8 +31,7 @@ export class AdminNotifySearchResultComponent extends TabulatableResultListElem * Map messages on init for readable representation */ ngOnInit() { - console.log(this.objects.page.splice(0,2)) - this.notifyMessages = this.objects.page.map(object => { + this.notifyMessages = this.objects?.page.map(object => { const indexableObject = object.indexableObject; indexableObject.coarNotifyType = indexableObject.coarNotifyType.split(':')[1]; indexableObject.queueStatusLabel = QueueStatusMap[indexableObject.queueStatusLabel]; diff --git a/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects-loader.component.spec.ts b/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects-loader.component.spec.ts index 9fe3065714..21fd2b94b2 100644 --- a/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects-loader.component.spec.ts +++ b/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects-loader.component.spec.ts @@ -7,6 +7,15 @@ import { ListableObject } from "../listable-object.model"; import { PaginatedList } from "../../../../core/data/paginated-list.model"; import { Context } from "../../../../core/shared/context.model"; import { GenericConstructor } from "../../../../core/shared/generic-constructor"; +import { TabulatableObjectsDirective } from "./tabulatable-objects.directive"; +import { ListableObjectComponentLoaderComponent } from "../listable-object/listable-object-component-loader.component"; +import { ChangeDetectionStrategy } from "@angular/core"; +import { + ItemListElementComponent +} from "../../../object-list/item-list-element/item-types/item/item-list-element.component"; +import { + TabulatableResultListElementsComponent +} from "../../../object-list/search-result-list-element/tabulatable-search-result/tabulatable-result-list-elements.component"; const testType = 'TestType'; class TestType extends ListableObject { @@ -16,7 +25,7 @@ class TestType extends ListableObject { } class TestTypes extends PaginatedList { - page: TestType[] + page: TestType[] = [new TestType()] } @@ -27,19 +36,27 @@ describe('TabulatableObjectsLoaderComponent', () => { let themeService: ThemeService; beforeEach(async () => { + themeService = jasmine.createSpyObj('themeService', { + getThemeName: 'dspace', + }); await TestBed.configureTestingModule({ - declarations: [ TabulatableObjectsLoaderComponent ], + declarations: [ TabulatableObjectsLoaderComponent, TabulatableObjectsDirective ], providers: [ provideMockStore({}), { provide: ThemeService, useValue: themeService }, ] - }) - .compileComponents(); + }).overrideComponent(TabulatableObjectsLoaderComponent, { + set: { + changeDetection: ChangeDetectionStrategy.Default, + entryComponents: [TabulatableResultListElementsComponent] + } + }).compileComponents(); fixture = TestBed.createComponent(TabulatableObjectsLoaderComponent); component = fixture.componentInstance; component.objects = new TestTypes(); component.context = Context.Search; + spyOn(component, 'getComponent').and.returnValue(TabulatableResultListElementsComponent as any); fixture.detectChanges(); }); diff --git a/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects-loader.component.ts b/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects-loader.component.ts index 467f2a12fe..0ba9e1cdd4 100644 --- a/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects-loader.component.ts +++ b/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects-loader.component.ts @@ -148,7 +148,7 @@ export class TabulatableObjectsLoaderComponent implements OnInit, OnChanges, OnD private instantiateComponent(objects: PaginatedList, changes?: SimpleChanges): void { // objects need to have same render type so we access just the first in the page - const component = this.getComponent(objects.page[0]?.getRenderTypes(), this.viewMode, this.context); + const component = this.getComponent(objects?.page[0]?.getRenderTypes(), this.viewMode, this.context); const viewContainerRef = this.tabulatableObjectsDirective.viewContainerRef; viewContainerRef.clear(); diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.spec.ts index 53acb1d911..8c27774f99 100644 --- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.spec.ts +++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.spec.ts @@ -19,6 +19,7 @@ import { PaginationComponentOptions } from '../../../../../pagination/pagination import { PaginationService } from '../../../../../../core/pagination/pagination.service'; import { PaginationServiceStub } from '../../../../../testing/pagination-service.stub'; import { ShortNumberPipe } from '../../../../../utils/short-number.pipe'; +import { FILTER_SEARCH } from "../../../../../../admin/admin-notify-dashboard/admin-notify-dashboard.component"; describe('SearchFacetOptionComponent', () => { let comp: SearchFacetOptionComponent; @@ -102,7 +103,7 @@ describe('SearchFacetOptionComponent', () => { } }, { - provide: SearchFilterService, useValue: { + provide: FILTER_SEARCH, useValue: { getSelectedValuesForFilter: () => selectedValues, isFilterActiveWithValue: (paramName: string, filterValue: string) => observableOf(true), getPage: (paramName: string) => page, diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.spec.ts index b0acf43c32..0f9655c1d5 100644 --- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.spec.ts +++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.spec.ts @@ -23,6 +23,7 @@ import { PaginationComponentOptions } from '../../../../../pagination/pagination import { PaginationService } from '../../../../../../core/pagination/pagination.service'; import { PaginationServiceStub } from '../../../../../testing/pagination-service.stub'; import { ShortNumberPipe } from '../../../../../utils/short-number.pipe'; +import { FILTER_SEARCH } from "../../../../../../admin/admin-notify-dashboard/admin-notify-dashboard.component"; describe('SearchFacetRangeOptionComponent', () => { let comp: SearchFacetRangeOptionComponent; @@ -76,7 +77,7 @@ describe('SearchFacetRangeOptionComponent', () => { } }, { - provide: SearchFilterService, useValue: { + provide: FILTER_SEARCH, useValue: { isFilterActiveWithValue: (paramName: string, filterValue: string) => observableOf(true), getPage: (paramName: string) => page, /* eslint-disable no-empty,@typescript-eslint/no-empty-function */ diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.spec.ts index 15e418842f..aa58d25d31 100644 --- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.spec.ts +++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.spec.ts @@ -17,6 +17,7 @@ import { SearchFacetSelectedOptionComponent } from './search-facet-selected-opti import { PaginationComponentOptions } from '../../../../../pagination/pagination-component-options.model'; import { PaginationService } from '../../../../../../core/pagination/pagination.service'; import { PaginationServiceStub } from '../../../../../testing/pagination-service.stub'; +import { FILTER_SEARCH } from "../../../../../../admin/admin-notify-dashboard/admin-notify-dashboard.component"; describe('SearchFacetSelectedOptionComponent', () => { let comp: SearchFacetSelectedOptionComponent; @@ -126,7 +127,7 @@ describe('SearchFacetSelectedOptionComponent', () => { } }, { - provide: SearchFilterService, useValue: { + provide: FILTER_SEARCH, useValue: { getSelectedValuesForFilter: () => selectedValues, isFilterActiveWithValue: (paramName: string, filterValue: string) => observableOf(true), getPage: (paramName: string) => page, diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.spec.ts index 92d2e5265b..40852f275d 100644 --- a/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.spec.ts +++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.spec.ts @@ -24,6 +24,7 @@ import { RemoteDataBuildService } from '../../../../../core/cache/builders/remot import { SearchConfigurationServiceStub } from '../../../../testing/search-configuration-service.stub'; import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-page.component'; import { createSuccessfulRemoteDataObject$ } from '../../../../remote-data.utils'; +import { FILTER_SEARCH } from "../../../../../admin/admin-notify-dashboard/admin-notify-dashboard.component"; describe('SearchFacetFilterComponent', () => { let comp: SearchFacetFilterComponent; @@ -100,7 +101,7 @@ describe('SearchFacetFilterComponent', () => { { provide: IN_PLACE_SEARCH, useValue: false }, { provide: REFRESH_FILTER, useValue: new BehaviorSubject(false) }, { - provide: SearchFilterService, useValue: { + provide: FILTER_SEARCH, useValue: { getSelectedValuesForFilter: () => observableOf(selectedValues), isFilterActiveWithValue: (paramName: string, filterValue: string) => true, getPage: (paramName: string) => page, diff --git a/src/app/shared/search/search-filters/search-filter/search-filter.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-filter.component.spec.ts index 7abe45ca8c..8747747ec7 100644 --- a/src/app/shared/search/search-filters/search-filter/search-filter.component.spec.ts +++ b/src/app/shared/search/search-filters/search-filter/search-filter.component.spec.ts @@ -14,6 +14,7 @@ import { SearchConfigurationServiceStub } from '../../../testing/search-configur import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-page.component'; import { SequenceService } from '../../../../core/shared/sequence.service'; import { BrowserOnlyMockPipe } from '../../../testing/browser-only-mock.pipe'; +import { FILTER_SEARCH } from "../../../../admin/admin-notify-dashboard/admin-notify-dashboard.component"; describe('SearchFilterComponent', () => { let comp: SearchFilterComponent; @@ -70,7 +71,7 @@ describe('SearchFilterComponent', () => { providers: [ { provide: SearchService, useValue: searchServiceStub }, { - provide: SearchFilterService, + provide: FILTER_SEARCH, useValue: mockFilterService }, { provide: SEARCH_CONFIG_SERVICE, useValue: new SearchConfigurationServiceStub() }, diff --git a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts index e6c74d8047..6ca5c62334 100644 --- a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts +++ b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts @@ -26,6 +26,7 @@ import { SearchConfigurationServiceStub } from '../../../../testing/search-confi import { VocabularyEntryDetail } from '../../../../../core/submission/vocabularies/models/vocabulary-entry-detail.model'; import { FacetValue} from '../../../models/facet-value.model'; import { SearchFilterConfig } from '../../../models/search-filter-config.model'; +import { FILTER_SEARCH } from "../../../../../admin/admin-notify-dashboard/admin-notify-dashboard.component"; describe('SearchHierarchyFilterComponent', () => { @@ -67,7 +68,7 @@ describe('SearchHierarchyFilterComponent', () => { ], providers: [ { provide: SearchService, useValue: searchService }, - { provide: SearchFilterService, useValue: searchFilterService }, + { provide: FILTER_SEARCH, useValue: searchFilterService }, { provide: RemoteDataBuildService, useValue: {} }, { provide: Router, useValue: router }, { provide: NgbModal, useValue: ngbModal }, diff --git a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.spec.ts index 3a146f5059..7569a33214 100644 --- a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.spec.ts +++ b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.spec.ts @@ -25,6 +25,7 @@ import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-p import { SearchConfigurationServiceStub } from '../../../../testing/search-configuration-service.stub'; import { createSuccessfulRemoteDataObject$ } from '../../../../remote-data.utils'; import { RouteService } from '../../../../../core/services/route.service'; +import { FILTER_SEARCH } from "../../../../../admin/admin-notify-dashboard/admin-notify-dashboard.component"; describe('SearchRangeFilterComponent', () => { let comp: SearchRangeFilterComponent; @@ -106,7 +107,7 @@ describe('SearchRangeFilterComponent', () => { { provide: IN_PLACE_SEARCH, useValue: false }, { provide: REFRESH_FILTER, useValue: new BehaviorSubject(false) }, { - provide: SearchFilterService, useValue: { + provide: FILTER_SEARCH, useValue: { getSelectedValuesForFilter: () => selectedValues, isFilterActiveWithValue: (paramName: string, filterValue: string) => true, getPage: (paramName: string) => page, diff --git a/src/app/shared/search/search-filters/search-filters.component.spec.ts b/src/app/shared/search/search-filters/search-filters.component.spec.ts index 522459b603..212174d241 100644 --- a/src/app/shared/search/search-filters/search-filters.component.spec.ts +++ b/src/app/shared/search/search-filters/search-filters.component.spec.ts @@ -9,6 +9,7 @@ import { SearchFiltersComponent } from './search-filters.component'; import { SearchService } from '../../../core/shared/search/search.service'; import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component'; import { SearchConfigurationServiceStub } from '../../testing/search-configuration-service.stub'; +import { FILTER_SEARCH } from "../../../admin/admin-notify-dashboard/admin-notify-dashboard.component"; describe('SearchFiltersComponent', () => { let comp: SearchFiltersComponent; @@ -36,7 +37,7 @@ describe('SearchFiltersComponent', () => { providers: [ { provide: SearchService, useValue: searchServiceStub }, { provide: SEARCH_CONFIG_SERVICE, useValue: new SearchConfigurationServiceStub() }, - { provide: SearchFilterService, useValue: searchFiltersStub }, + { provide: FILTER_SEARCH, useValue: searchFiltersStub }, ], schemas: [NO_ERRORS_SCHEMA] diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index ce5004832e..60134d54e3 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -3509,6 +3509,10 @@ "search.filters.filter.target.placeholder": "Target", + "search.filters.filter.origin.label": "Search source", + + "search.filters.filter.origin.placeholder": "Source", + "search.filters.filter.queue_status.placeholder": "Queue status", "search.filters.filter.activity_stream_type.placeholder": "Activity stream type",