diff --git a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.spec.ts b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.spec.ts index c4afdcb850..6e2ded334b 100644 --- a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.spec.ts +++ b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.spec.ts @@ -36,10 +36,8 @@ import { WorkspaceitemDataService } from '../../../../core/submission/workspacei import { SearchService } from '../../../../core/shared/search/search.service'; import { mockRouteService } from '../../../../item-page/simple/item-types/shared/item.component.spec'; import { - BrowseDefinitionDataServiceStub, - browseServiceStub, + BrowseDefinitionDataServiceStub } from '../../../../shared/testing/browse-definition-data-service.stub'; -import { BrowseService } from '../../../../core/browse/browse.service'; import { BrowseDefinitionDataService } from '../../../../core/browse/browse-definition-data.service'; let comp: JournalComponent; @@ -107,7 +105,6 @@ describe('JournalComponent', () => { { provide: WorkspaceitemDataService, useValue: {} }, { provide: SearchService, useValue: {} }, { provide: RouteService, useValue: mockRouteService }, - { provide: BrowseService, useValue: browseServiceStub }, { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub } ], diff --git a/src/app/item-page/simple/item-types/publication/publication.component.spec.ts b/src/app/item-page/simple/item-types/publication/publication.component.spec.ts index b56471fbb9..211ec102bc 100644 --- a/src/app/item-page/simple/item-types/publication/publication.component.spec.ts +++ b/src/app/item-page/simple/item-types/publication/publication.component.spec.ts @@ -38,10 +38,8 @@ import { WorkspaceitemDataService } from '../../../../core/submission/workspacei import { SearchService } from '../../../../core/shared/search/search.service'; import { BrowseDefinitionDataService } from '../../../../core/browse/browse-definition-data.service'; import { - BrowseDefinitionDataServiceStub, - browseServiceStub, + BrowseDefinitionDataServiceStub } from '../../../../shared/testing/browse-definition-data-service.stub'; -import { BrowseService } from '../../../../core/browse/browse.service'; const noMetadata = new MetadataMap(); @@ -95,7 +93,6 @@ describe('PublicationComponent', () => { { provide: SearchService, useValue: {} }, { provide: RouteService, useValue: mockRouteService }, { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub }, - { provide: BrowseService, useValue: browseServiceStub }, ], schemas: [NO_ERRORS_SCHEMA] diff --git a/src/app/item-page/simple/item-types/shared/item.component.spec.ts b/src/app/item-page/simple/item-types/shared/item.component.spec.ts index 13e3b9686d..5bf08fc004 100644 --- a/src/app/item-page/simple/item-types/shared/item.component.spec.ts +++ b/src/app/item-page/simple/item-types/shared/item.component.spec.ts @@ -40,11 +40,9 @@ import { VersionHistoryDataService } from '../../../../core/data/version-history import { RouterTestingModule } from '@angular/router/testing'; import { AuthorizationDataService } from '../../../../core/data/feature-authorization/authorization-data.service'; import { ResearcherProfileDataService } from '../../../../core/profile/researcher-profile-data.service'; -import { BrowseService } from '../../../../core/browse/browse.service'; import { BrowseDefinitionDataService } from '../../../../core/browse/browse-definition-data.service'; import { - BrowseDefinitionDataServiceStub, - browseServiceStub, + BrowseDefinitionDataServiceStub } from '../../../../shared/testing/browse-definition-data-service.stub'; import { buildPaginatedList } from '../../../../core/data/paginated-list.model'; @@ -135,7 +133,6 @@ export function getItemPageFieldsTest(mockItem: Item, component) { { provide: AuthorizationDataService, useValue: authorizationService }, { provide: ResearcherProfileDataService, useValue: {} }, { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub }, - { provide: BrowseService, useValue: browseServiceStub } ], schemas: [NO_ERRORS_SCHEMA] @@ -455,7 +452,6 @@ describe('ItemComponent', () => { { provide: RouteService, useValue: mockRouteService }, { provide: AuthorizationDataService, useValue: {} }, { provide: ResearcherProfileDataService, useValue: {} }, - { provide: BrowseService, useValue: browseServiceStub } ], schemas: [NO_ERRORS_SCHEMA] }).overrideComponent(ItemComponent, { diff --git a/src/app/item-page/simple/item-types/shared/item.component.ts b/src/app/item-page/simple/item-types/shared/item.component.ts index 8e9cd389a7..93e6a0b346 100644 --- a/src/app/item-page/simple/item-types/shared/item.component.ts +++ b/src/app/item-page/simple/item-types/shared/item.component.ts @@ -4,11 +4,9 @@ import { Item } from '../../../../core/shared/item.model'; import { getItemPageRoute } from '../../../item-page-routing-paths'; import { RouteService } from '../../../../core/services/route.service'; import { Observable } from 'rxjs'; -import { BrowseService } from '../../../../core/browse/browse.service'; import { getDSpaceQuery, isIiifEnabled, isIiifSearchEnabled } from './item-iiif-utils'; import { filter, map, take } from 'rxjs/operators'; import { Router } from '@angular/router'; -import { BrowseDefinition } from '../../../../core/shared/browse-definition.model'; @Component({ selector: 'ds-item', @@ -51,14 +49,10 @@ export class ItemComponent implements OnInit { */ iiifQuery$: Observable; - browseDefinitions: BrowseDefinition[]; - browseDefinitions$: Observable; - mediaViewer; constructor(protected routeService: RouteService, - protected router: Router, - protected browseService: BrowseService) { + protected router: Router) { this.mediaViewer = environment.mediaViewer; } @@ -90,9 +84,5 @@ export class ItemComponent implements OnInit { if (this.iiifSearchEnabled) { this.iiifQuery$ = getDSpaceQuery(this.object, this.routeService); } - // get browse definitions - this.browseDefinitions$ = this.browseService.getBrowseDefinitions().pipe( - map((data) => data.payload.page as BrowseDefinition[]) - ); } } diff --git a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.spec.ts b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.spec.ts index f085400cb9..4b7da40abe 100644 --- a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.spec.ts +++ b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.spec.ts @@ -39,10 +39,8 @@ import { SearchService } from '../../../../core/shared/search/search.service'; import { ItemVersionsSharedService } from '../../../versions/item-versions-shared.service'; import { BrowseDefinitionDataService } from '../../../../core/browse/browse-definition-data.service'; import { - BrowseDefinitionDataServiceStub, - browseServiceStub, + BrowseDefinitionDataServiceStub } from '../../../../shared/testing/browse-definition-data-service.stub'; -import { BrowseService } from '../../../../core/browse/browse.service'; const noMetadata = new MetadataMap(); @@ -98,7 +96,6 @@ describe('UntypedItemComponent', () => { { provide: ItemVersionsSharedService, useValue: {} }, { provide: RouteService, useValue: mockRouteService }, { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub }, - { provide: BrowseService, useValue: browseServiceStub }, ], schemas: [NO_ERRORS_SCHEMA] }).overrideComponent(UntypedItemComponent, { diff --git a/src/app/item-page/simple/item-types/versioned-item/versioned-item.component.spec.ts b/src/app/item-page/simple/item-types/versioned-item/versioned-item.component.spec.ts index 5b4c5171fc..b29c7e58f3 100644 --- a/src/app/item-page/simple/item-types/versioned-item/versioned-item.component.spec.ts +++ b/src/app/item-page/simple/item-types/versioned-item/versioned-item.component.spec.ts @@ -21,10 +21,6 @@ import { Version } from '../../../../core/shared/version.model'; import { RouteService } from '../../../../core/services/route.service'; import { TranslateLoaderMock } from '../../../../shared/testing/translate-loader.mock'; import { ItemSharedModule } from '../../../item-shared.module'; -import { - browseServiceStub, -} from '../../../../shared/testing/browse-definition-data-service.stub'; -import { BrowseService } from '../../../../core/browse/browse.service'; const mockItem: Item = Object.assign(new Item(), { bundles: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])), @@ -82,7 +78,6 @@ describe('VersionedItemComponent', () => { { provide: SearchService, useValue: {} }, { provide: ItemDataService, useValue: {} }, { provide: RouteService, useValue: mockRouteService }, - { provide: BrowseService, useValue: browseServiceStub }, ] }).compileComponents(); versionService = TestBed.inject(VersionDataService); diff --git a/src/app/item-page/simple/item-types/versioned-item/versioned-item.component.ts b/src/app/item-page/simple/item-types/versioned-item/versioned-item.component.ts index 016ac26d0c..6855d9c4dc 100644 --- a/src/app/item-page/simple/item-types/versioned-item/versioned-item.component.ts +++ b/src/app/item-page/simple/item-types/versioned-item/versioned-item.component.ts @@ -17,7 +17,6 @@ import { Item } from '../../../../core/shared/item.model'; import { ItemDataService } from '../../../../core/data/item-data.service'; import { WorkspaceItem } from '../../../../core/submission/models/workspaceitem.model'; import { RouteService } from '../../../../core/services/route.service'; -import { BrowseService } from '../../../../core/browse/browse.service'; @Component({ selector: 'ds-versioned-item', @@ -36,10 +35,9 @@ export class VersionedItemComponent extends ItemComponent { private workspaceItemDataService: WorkspaceitemDataService, private searchService: SearchService, private itemService: ItemDataService, - protected routeService: RouteService, - protected browseService: BrowseService, + protected routeService: RouteService ) { - super(routeService, router, browseService); + super(routeService, router); } /** diff --git a/src/app/shared/testing/browse-definition-data-service.stub.ts b/src/app/shared/testing/browse-definition-data-service.stub.ts index 7dfbd0d804..42f4020483 100644 --- a/src/app/shared/testing/browse-definition-data-service.stub.ts +++ b/src/app/shared/testing/browse-definition-data-service.stub.ts @@ -38,12 +38,6 @@ export const mockData: BrowseDefinition[] = [ }) ]; -export const browseServiceStub = { - getBrowseDefinitions(): Observable>> { - return observableOf(createSuccessfulRemoteDataObject(buildPaginatedList(new PageInfo(), mockData))); - }, -}; - export const BrowseDefinitionDataServiceStub: any = { /**