From bf9041f25ffa4f6b97e502dc1da65b7249846762 Mon Sep 17 00:00:00 2001 From: Kim Shepherd Date: Thu, 26 Jan 2023 16:21:15 +1300 Subject: [PATCH] [TLC-380] Fix mock service to return proper payload --- .../browse-definition-data-service.stub.ts | 26 +++++-------------- 1 file changed, 6 insertions(+), 20 deletions(-) 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 f56b01e26a..7dfbd0d804 100644 --- a/src/app/shared/testing/browse-definition-data-service.stub.ts +++ b/src/app/shared/testing/browse-definition-data-service.stub.ts @@ -11,6 +11,8 @@ import { distinctUntilChanged, map, startWith } from 'rxjs/operators'; import { isEmpty, isNotEmpty } from '../empty.util'; import { createSuccessfulRemoteDataObject } from '../remote-data.utils'; import { PageInfo } from '../../core/shared/page-info.model'; +import { FollowLinkConfig } from '../utils/follow-link-config.model'; +import { RequestParam } from '../../core/cache/models/request-param.model'; // This data is in post-serialized form (metadata -> metadataKeys) export const mockData: BrowseDefinition[] = [ @@ -63,29 +65,13 @@ export const BrowseDefinitionDataServiceStub: any = { * @param metadatumKey * @param linkPath */ - findByFields(metadataKeys: string[]): Observable { + findByFields(metadataKeys: string[]): Observable> { let searchKeyArray: string[] = []; metadataKeys.forEach((metadataKey) => { searchKeyArray = searchKeyArray.concat(BrowseService.toSearchKeyArray(metadataKey)); }); - return this.findAllLinked().pipe( - getRemoteDataPayload(), - getPaginatedListPayload(), - map((browseDefinitions: BrowseDefinition[]) => browseDefinitions - .find((def: BrowseDefinition) => { - const matchingKeys = def.metadataKeys.find((key: string) => searchKeyArray.indexOf(key) >= 0); - return isNotEmpty(matchingKeys); - }) - ), - map((def: BrowseDefinition) => { - if (isEmpty(def) || isEmpty(def.id)) { - //throw new Error(`A browse definition for field ${metadataKey} isn't configured`); - } else { - return def; - } - }), - startWith(undefined), - distinctUntilChanged() - ); + // Return just the first, as a pretend match + return observableOf(createSuccessfulRemoteDataObject(mockData[0])); } + };