dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #13748 from vvlladd28/bug/entity-datasource/load

Browse Source 
Fix race condition in EntitiesDataSource loadEntities by cancelling previous requests
This commit is contained in:
Igor Kulikov 2025-07-23 14:07:12 +03:00 committed by GitHub
commit c6885ca262
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ui-ngx/src/app/modules/home/models/datasource/entity-datasource.ts
View File

@ -15,7 +15,7 @@
///
import { PageLink } from '@shared/models/page/page-link';
import { BehaviorSubject, Observable, of, ReplaySubject } from 'rxjs';
import { BehaviorSubject, Observable, of, ReplaySubject, Subscription } from 'rxjs';
import { emptyPageData, PageData } from '@shared/models/page/page-data';
import { BaseData, HasId } from '@shared/models/base-data';
import { CollectionViewer, DataSource, SelectionModel } from '@angular/cdk/collections';
@ -28,6 +28,7 @@ export class EntitiesDataSource<T extends BaseData<HasId>, P extends PageLink =
private entitiesSubject = new BehaviorSubject<T[]>([]);
private pageDataSubject = new BehaviorSubject<PageData<T>>(emptyPageData<T>());
private currentLoadSubscription: Subscription = null;
public pageData$ = this.pageDataSubject.asObservable();
@ -58,9 +59,12 @@ export class EntitiesDataSource<T extends BaseData<HasId>, P extends PageLink =
}
loadEntities(pageLink: P): Observable<PageData<T>> {
if (this.currentLoadSubscription) {
this.currentLoadSubscription.unsubscribe();
}
this.dataLoading = true;
const result = new ReplaySubject<PageData<T>>();
this.fetchFunction(pageLink).pipe(
this.currentLoadSubscription = this.fetchFunction(pageLink).pipe(
tap(() => {
this.selection.clear();
}),