diff --git a/alfa-client/libs/tech-shared/src/lib/resource/list-resource.service.spec.ts b/alfa-client/libs/tech-shared/src/lib/resource/list-resource.service.spec.ts index 5238a23c74cd94b4b5a4004bcc2d46e7b7eb3e18..76fac14c0bfe11b7f9b97a634e922aad14a417ca 100644 --- a/alfa-client/libs/tech-shared/src/lib/resource/list-resource.service.spec.ts +++ b/alfa-client/libs/tech-shared/src/lib/resource/list-resource.service.spec.ts @@ -80,7 +80,6 @@ describe('ListResourceService', () => { beforeEach(() => { service.listResource.next(listStateResource); - service.handleNullConfigResource = jest.fn(); service.handleChanges = jest.fn(); isInvalidResourceCombinationSpy = jest.spyOn(ResourceUtil, 'isInvalidResourceCombination').mockReturnValue(true); }); @@ -92,13 +91,6 @@ describe('ListResourceService', () => { expect(service.handleChanges).toHaveBeenCalledWith(listStateResource, baseResource); })); - it('should handle null configresource', fakeAsync(() => { - service.getList().subscribe(); - tick(); - - expect(service.handleNullConfigResource).toHaveBeenCalledWith(baseResource); - })); - it('should call isInvalidResourceCombinationSpy', fakeAsync(() => { service.getList().subscribe(); tick(); diff --git a/alfa-client/libs/tech-shared/src/lib/resource/list-resource.service.ts b/alfa-client/libs/tech-shared/src/lib/resource/list-resource.service.ts index 8dba0ba6790fe0a0eab24eb04299722e787e5809..50cee3aa72fb828211d7a70dadc5cdca3d5f55c2 100644 --- a/alfa-client/libs/tech-shared/src/lib/resource/list-resource.service.ts +++ b/alfa-client/libs/tech-shared/src/lib/resource/list-resource.service.ts @@ -35,7 +35,6 @@ import { createStateResource, doIfLoadingRequired, getEmbeddedResources, - isEmptyStateResource, isInvalidResourceCombination, isLoadingRequired, isStateResoureStable, @@ -67,7 +66,6 @@ export class ResourceListService<B extends Resource, T extends ListResource, I e tap(([stateResource, configResource]) => { this.handleChanges(stateResource, configResource); }), - tap(([, configResource]) => this.handleNullConfigResource(configResource)), filter(([stateResource]) => !isInvalidResourceCombination(stateResource, this.baseResource)), mapToFirst<T, B>(), startWith(createEmptyStateResource<T>(true)), @@ -103,20 +101,10 @@ export class ResourceListService<B extends Resource, T extends ListResource, I e return isNotNull(configResource) && isLoadingRequired(stateResource) && this.hasListLinkRel(); } - handleNullConfigResource(configResource: B): void { - if (this.shouldClearStateResource(configResource)) { - this.clearCurrentListResource(); - } - } - private clearCurrentListResource(): void { this.listResource.next(createEmptyStateResource()); } - shouldClearStateResource(configResource: B): boolean { - return isNull(configResource) && !isEmptyStateResource(this.listResource.value); - } - public create(toCreate: unknown): Observable<Resource> { this.verifyBeforeCreation(); return this.repository.createResource(this.buildCreateResourceData(toCreate, this.config.createLinkRel));