From d97b650c4a18aaeb8417b17d1c5caf85e8987b69 Mon Sep 17 00:00:00 2001 From: OZGCloud <ozgcloud@mgm-tp.com> Date: Mon, 9 Dec 2024 13:59:12 +0100 Subject: [PATCH] Revert "OZG-6477 7306 listResource bug, missing debounce" This reverts commit 2e3871da19d9733f49129bdc94ff4c033f4e1fef. --- .../src/lib/resource/list-resource.service.spec.ts | 12 ++++++------ .../src/lib/resource/list-resource.service.ts | 3 +-- 2 files changed, 7 insertions(+), 8 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 fd9d99e060..5238a23c74 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 @@ -85,23 +85,23 @@ describe('ListResourceService', () => { isInvalidResourceCombinationSpy = jest.spyOn(ResourceUtil, 'isInvalidResourceCombination').mockReturnValue(true); }); - it('should handle config resource changed after debounce time', fakeAsync(() => { + it('should handle config resource changed', fakeAsync(() => { service.getList().subscribe(); - tick(300); + tick(); expect(service.handleChanges).toHaveBeenCalledWith(listStateResource, baseResource); })); - it('should handle null configresource after debounce time', fakeAsync(() => { + it('should handle null configresource', fakeAsync(() => { service.getList().subscribe(); - tick(300); + tick(); expect(service.handleNullConfigResource).toHaveBeenCalledWith(baseResource); })); - it('should call isInvalidResourceCombinationSpy after debounce time', fakeAsync(() => { + it('should call isInvalidResourceCombinationSpy', fakeAsync(() => { service.getList().subscribe(); - tick(300); + tick(); expect(isInvalidResourceCombinationSpy).toHaveBeenCalled(); })); 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 52668215e4..8dba0ba679 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 @@ -23,7 +23,7 @@ */ import { Resource, ResourceUri, getUrl, hasLink } from '@ngxp/rest'; import { isEqual, isNil, isNull } from 'lodash-es'; -import { BehaviorSubject, Observable, combineLatest, debounce, filter, first, interval, map, startWith, tap } from 'rxjs'; +import { BehaviorSubject, Observable, combineLatest, filter, first, map, startWith, tap } from 'rxjs'; import { isNotNull, isNotUndefined } from '../tech.util'; import { CreateResourceData, ListItemResource, ListResourceServiceConfig } from './resource.model'; import { ResourceRepository } from './resource.repository'; @@ -64,7 +64,6 @@ export class ResourceListService<B extends Resource, T extends ListResource, I e public getList(): Observable<StateResource<T>> { return combineLatest([this.listResource.asObservable(), this.getConfigResource()]).pipe( - debounce(() => interval(300)), tap(([stateResource, configResource]) => { this.handleChanges(stateResource, configResource); }), -- GitLab