From a9349a57e11776bfd2dfcb8b1fdf1c7445b70d41 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Mon, 9 Dec 2024 14:04:54 +0100
Subject: [PATCH] OZG-6477-7306 list Resource fix
---
.../src/lib/resource/list-resource.service.spec.ts | 8 --------
.../src/lib/resource/list-resource.service.ts | 12 ------------
2 files changed, 20 deletions(-)
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 5238a23c74..76fac14c0b 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 8dba0ba679..50cee3aa72 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));
--
GitLab