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

Merge branch 'master' into OZG-7078-bugfix

parents 1367e30d 13fb8b82
Branches
Tags
No related merge requests found
......@@ -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();
......
......@@ -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));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment