Skip to content
Snippets Groups Projects
Commit a9349a57 authored by OZGCloud's avatar OZGCloud
Browse files

OZG-6477-7306 list Resource fix

parent d97b650c
Branches
Tags
No related merge requests found
...@@ -80,7 +80,6 @@ describe('ListResourceService', () => { ...@@ -80,7 +80,6 @@ describe('ListResourceService', () => {
beforeEach(() => { beforeEach(() => {
service.listResource.next(listStateResource); service.listResource.next(listStateResource);
service.handleNullConfigResource = jest.fn();
service.handleChanges = jest.fn(); service.handleChanges = jest.fn();
isInvalidResourceCombinationSpy = jest.spyOn(ResourceUtil, 'isInvalidResourceCombination').mockReturnValue(true); isInvalidResourceCombinationSpy = jest.spyOn(ResourceUtil, 'isInvalidResourceCombination').mockReturnValue(true);
}); });
...@@ -92,13 +91,6 @@ describe('ListResourceService', () => { ...@@ -92,13 +91,6 @@ describe('ListResourceService', () => {
expect(service.handleChanges).toHaveBeenCalledWith(listStateResource, baseResource); 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(() => { it('should call isInvalidResourceCombinationSpy', fakeAsync(() => {
service.getList().subscribe(); service.getList().subscribe();
tick(); tick();
......
...@@ -35,7 +35,6 @@ import { ...@@ -35,7 +35,6 @@ import {
createStateResource, createStateResource,
doIfLoadingRequired, doIfLoadingRequired,
getEmbeddedResources, getEmbeddedResources,
isEmptyStateResource,
isInvalidResourceCombination, isInvalidResourceCombination,
isLoadingRequired, isLoadingRequired,
isStateResoureStable, isStateResoureStable,
...@@ -67,7 +66,6 @@ export class ResourceListService<B extends Resource, T extends ListResource, I e ...@@ -67,7 +66,6 @@ export class ResourceListService<B extends Resource, T extends ListResource, I e
tap(([stateResource, configResource]) => { tap(([stateResource, configResource]) => {
this.handleChanges(stateResource, configResource); this.handleChanges(stateResource, configResource);
}), }),
tap(([, configResource]) => this.handleNullConfigResource(configResource)),
filter(([stateResource]) => !isInvalidResourceCombination(stateResource, this.baseResource)), filter(([stateResource]) => !isInvalidResourceCombination(stateResource, this.baseResource)),
mapToFirst<T, B>(), mapToFirst<T, B>(),
startWith(createEmptyStateResource<T>(true)), startWith(createEmptyStateResource<T>(true)),
...@@ -103,20 +101,10 @@ export class ResourceListService<B extends Resource, T extends ListResource, I e ...@@ -103,20 +101,10 @@ export class ResourceListService<B extends Resource, T extends ListResource, I e
return isNotNull(configResource) && isLoadingRequired(stateResource) && this.hasListLinkRel(); return isNotNull(configResource) && isLoadingRequired(stateResource) && this.hasListLinkRel();
} }
handleNullConfigResource(configResource: B): void {
if (this.shouldClearStateResource(configResource)) {
this.clearCurrentListResource();
}
}
private clearCurrentListResource(): void { private clearCurrentListResource(): void {
this.listResource.next(createEmptyStateResource()); this.listResource.next(createEmptyStateResource());
} }
shouldClearStateResource(configResource: B): boolean {
return isNull(configResource) && !isEmptyStateResource(this.listResource.value);
}
public create(toCreate: unknown): Observable<Resource> { public create(toCreate: unknown): Observable<Resource> {
this.verifyBeforeCreation(); this.verifyBeforeCreation();
return this.repository.createResource(this.buildCreateResourceData(toCreate, this.config.createLinkRel)); return this.repository.createResource(this.buildCreateResourceData(toCreate, this.config.createLinkRel));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment