[TLC-380] Simplify / strip browse service from components

This commit is contained in:
Kim Shepherd
2023-01-26 16:33:37 +13:00
parent bf9041f25f
commit 72afd0cafd
8 changed files with 7 additions and 43 deletions

View File

@@ -36,10 +36,8 @@ import { WorkspaceitemDataService } from '../../../../core/submission/workspacei
import { SearchService } from '../../../../core/shared/search/search.service'; import { SearchService } from '../../../../core/shared/search/search.service';
import { mockRouteService } from '../../../../item-page/simple/item-types/shared/item.component.spec'; import { mockRouteService } from '../../../../item-page/simple/item-types/shared/item.component.spec';
import { import {
BrowseDefinitionDataServiceStub, BrowseDefinitionDataServiceStub
browseServiceStub,
} from '../../../../shared/testing/browse-definition-data-service.stub'; } from '../../../../shared/testing/browse-definition-data-service.stub';
import { BrowseService } from '../../../../core/browse/browse.service';
import { BrowseDefinitionDataService } from '../../../../core/browse/browse-definition-data.service'; import { BrowseDefinitionDataService } from '../../../../core/browse/browse-definition-data.service';
let comp: JournalComponent; let comp: JournalComponent;
@@ -107,7 +105,6 @@ describe('JournalComponent', () => {
{ provide: WorkspaceitemDataService, useValue: {} }, { provide: WorkspaceitemDataService, useValue: {} },
{ provide: SearchService, useValue: {} }, { provide: SearchService, useValue: {} },
{ provide: RouteService, useValue: mockRouteService }, { provide: RouteService, useValue: mockRouteService },
{ provide: BrowseService, useValue: browseServiceStub },
{ provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub } { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub }
], ],

View File

@@ -38,10 +38,8 @@ import { WorkspaceitemDataService } from '../../../../core/submission/workspacei
import { SearchService } from '../../../../core/shared/search/search.service'; import { SearchService } from '../../../../core/shared/search/search.service';
import { BrowseDefinitionDataService } from '../../../../core/browse/browse-definition-data.service'; import { BrowseDefinitionDataService } from '../../../../core/browse/browse-definition-data.service';
import { import {
BrowseDefinitionDataServiceStub, BrowseDefinitionDataServiceStub
browseServiceStub,
} from '../../../../shared/testing/browse-definition-data-service.stub'; } from '../../../../shared/testing/browse-definition-data-service.stub';
import { BrowseService } from '../../../../core/browse/browse.service';
const noMetadata = new MetadataMap(); const noMetadata = new MetadataMap();
@@ -95,7 +93,6 @@ describe('PublicationComponent', () => {
{ provide: SearchService, useValue: {} }, { provide: SearchService, useValue: {} },
{ provide: RouteService, useValue: mockRouteService }, { provide: RouteService, useValue: mockRouteService },
{ provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub }, { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub },
{ provide: BrowseService, useValue: browseServiceStub },
], ],
schemas: [NO_ERRORS_SCHEMA] schemas: [NO_ERRORS_SCHEMA]

View File

@@ -40,11 +40,9 @@ import { VersionHistoryDataService } from '../../../../core/data/version-history
import { RouterTestingModule } from '@angular/router/testing'; import { RouterTestingModule } from '@angular/router/testing';
import { AuthorizationDataService } from '../../../../core/data/feature-authorization/authorization-data.service'; import { AuthorizationDataService } from '../../../../core/data/feature-authorization/authorization-data.service';
import { ResearcherProfileDataService } from '../../../../core/profile/researcher-profile-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 { BrowseDefinitionDataService } from '../../../../core/browse/browse-definition-data.service';
import { import {
BrowseDefinitionDataServiceStub, BrowseDefinitionDataServiceStub
browseServiceStub,
} from '../../../../shared/testing/browse-definition-data-service.stub'; } from '../../../../shared/testing/browse-definition-data-service.stub';
import { buildPaginatedList } from '../../../../core/data/paginated-list.model'; import { buildPaginatedList } from '../../../../core/data/paginated-list.model';
@@ -135,7 +133,6 @@ export function getItemPageFieldsTest(mockItem: Item, component) {
{ provide: AuthorizationDataService, useValue: authorizationService }, { provide: AuthorizationDataService, useValue: authorizationService },
{ provide: ResearcherProfileDataService, useValue: {} }, { provide: ResearcherProfileDataService, useValue: {} },
{ provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub }, { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub },
{ provide: BrowseService, useValue: browseServiceStub }
], ],
schemas: [NO_ERRORS_SCHEMA] schemas: [NO_ERRORS_SCHEMA]
@@ -455,7 +452,6 @@ describe('ItemComponent', () => {
{ provide: RouteService, useValue: mockRouteService }, { provide: RouteService, useValue: mockRouteService },
{ provide: AuthorizationDataService, useValue: {} }, { provide: AuthorizationDataService, useValue: {} },
{ provide: ResearcherProfileDataService, useValue: {} }, { provide: ResearcherProfileDataService, useValue: {} },
{ provide: BrowseService, useValue: browseServiceStub }
], ],
schemas: [NO_ERRORS_SCHEMA] schemas: [NO_ERRORS_SCHEMA]
}).overrideComponent(ItemComponent, { }).overrideComponent(ItemComponent, {

View File

@@ -4,11 +4,9 @@ import { Item } from '../../../../core/shared/item.model';
import { getItemPageRoute } from '../../../item-page-routing-paths'; import { getItemPageRoute } from '../../../item-page-routing-paths';
import { RouteService } from '../../../../core/services/route.service'; import { RouteService } from '../../../../core/services/route.service';
import { Observable } from 'rxjs'; import { Observable } from 'rxjs';
import { BrowseService } from '../../../../core/browse/browse.service';
import { getDSpaceQuery, isIiifEnabled, isIiifSearchEnabled } from './item-iiif-utils'; import { getDSpaceQuery, isIiifEnabled, isIiifSearchEnabled } from './item-iiif-utils';
import { filter, map, take } from 'rxjs/operators'; import { filter, map, take } from 'rxjs/operators';
import { Router } from '@angular/router'; import { Router } from '@angular/router';
import { BrowseDefinition } from '../../../../core/shared/browse-definition.model';
@Component({ @Component({
selector: 'ds-item', selector: 'ds-item',
@@ -51,14 +49,10 @@ export class ItemComponent implements OnInit {
*/ */
iiifQuery$: Observable<string>; iiifQuery$: Observable<string>;
browseDefinitions: BrowseDefinition[];
browseDefinitions$: Observable<BrowseDefinition[]>;
mediaViewer; mediaViewer;
constructor(protected routeService: RouteService, constructor(protected routeService: RouteService,
protected router: Router, protected router: Router) {
protected browseService: BrowseService) {
this.mediaViewer = environment.mediaViewer; this.mediaViewer = environment.mediaViewer;
} }
@@ -90,9 +84,5 @@ export class ItemComponent implements OnInit {
if (this.iiifSearchEnabled) { if (this.iiifSearchEnabled) {
this.iiifQuery$ = getDSpaceQuery(this.object, this.routeService); this.iiifQuery$ = getDSpaceQuery(this.object, this.routeService);
} }
// get browse definitions
this.browseDefinitions$ = this.browseService.getBrowseDefinitions().pipe(
map((data) => data.payload.page as BrowseDefinition[])
);
} }
} }

View File

@@ -39,10 +39,8 @@ import { SearchService } from '../../../../core/shared/search/search.service';
import { ItemVersionsSharedService } from '../../../versions/item-versions-shared.service'; import { ItemVersionsSharedService } from '../../../versions/item-versions-shared.service';
import { BrowseDefinitionDataService } from '../../../../core/browse/browse-definition-data.service'; import { BrowseDefinitionDataService } from '../../../../core/browse/browse-definition-data.service';
import { import {
BrowseDefinitionDataServiceStub, BrowseDefinitionDataServiceStub
browseServiceStub,
} from '../../../../shared/testing/browse-definition-data-service.stub'; } from '../../../../shared/testing/browse-definition-data-service.stub';
import { BrowseService } from '../../../../core/browse/browse.service';
const noMetadata = new MetadataMap(); const noMetadata = new MetadataMap();
@@ -98,7 +96,6 @@ describe('UntypedItemComponent', () => {
{ provide: ItemVersionsSharedService, useValue: {} }, { provide: ItemVersionsSharedService, useValue: {} },
{ provide: RouteService, useValue: mockRouteService }, { provide: RouteService, useValue: mockRouteService },
{ provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub }, { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub },
{ provide: BrowseService, useValue: browseServiceStub },
], ],
schemas: [NO_ERRORS_SCHEMA] schemas: [NO_ERRORS_SCHEMA]
}).overrideComponent(UntypedItemComponent, { }).overrideComponent(UntypedItemComponent, {

View File

@@ -21,10 +21,6 @@ import { Version } from '../../../../core/shared/version.model';
import { RouteService } from '../../../../core/services/route.service'; import { RouteService } from '../../../../core/services/route.service';
import { TranslateLoaderMock } from '../../../../shared/testing/translate-loader.mock'; import { TranslateLoaderMock } from '../../../../shared/testing/translate-loader.mock';
import { ItemSharedModule } from '../../../item-shared.module'; 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(), { const mockItem: Item = Object.assign(new Item(), {
bundles: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])), bundles: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
@@ -82,7 +78,6 @@ describe('VersionedItemComponent', () => {
{ provide: SearchService, useValue: {} }, { provide: SearchService, useValue: {} },
{ provide: ItemDataService, useValue: {} }, { provide: ItemDataService, useValue: {} },
{ provide: RouteService, useValue: mockRouteService }, { provide: RouteService, useValue: mockRouteService },
{ provide: BrowseService, useValue: browseServiceStub },
] ]
}).compileComponents(); }).compileComponents();
versionService = TestBed.inject(VersionDataService); versionService = TestBed.inject(VersionDataService);

View File

@@ -17,7 +17,6 @@ import { Item } from '../../../../core/shared/item.model';
import { ItemDataService } from '../../../../core/data/item-data.service'; import { ItemDataService } from '../../../../core/data/item-data.service';
import { WorkspaceItem } from '../../../../core/submission/models/workspaceitem.model'; import { WorkspaceItem } from '../../../../core/submission/models/workspaceitem.model';
import { RouteService } from '../../../../core/services/route.service'; import { RouteService } from '../../../../core/services/route.service';
import { BrowseService } from '../../../../core/browse/browse.service';
@Component({ @Component({
selector: 'ds-versioned-item', selector: 'ds-versioned-item',
@@ -36,10 +35,9 @@ export class VersionedItemComponent extends ItemComponent {
private workspaceItemDataService: WorkspaceitemDataService, private workspaceItemDataService: WorkspaceitemDataService,
private searchService: SearchService, private searchService: SearchService,
private itemService: ItemDataService, private itemService: ItemDataService,
protected routeService: RouteService, protected routeService: RouteService
protected browseService: BrowseService,
) { ) {
super(routeService, router, browseService); super(routeService, router);
} }
/** /**

View File

@@ -38,12 +38,6 @@ export const mockData: BrowseDefinition[] = [
}) })
]; ];
export const browseServiceStub = {
getBrowseDefinitions(): Observable<RemoteData<PaginatedList<BrowseDefinition>>> {
return observableOf(createSuccessfulRemoteDataObject(buildPaginatedList(new PageInfo(), mockData)));
},
};
export const BrowseDefinitionDataServiceStub: any = { export const BrowseDefinitionDataServiceStub: any = {
/** /**