amigan/stillbox
amigan/stillbox
1
1
Fork 0
Code Issues 33 Pull requests Projects Releases Packages Wiki Activity Actions

Fix incidents filters; don't use two stage pagination

Browse source 
Closes #103
This commit is contained in:
Daniel Ponte 2025-02-17 19:40:03 -05:00
parent ed36ec25ab
commit 64cbef6a7f
1 changed files with 6 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
client/stillbox/src/app/incidents/incidents.component.ts
View file

@ -60,8 +60,6 @@ export class FmtDatePipe implements PipeTransform {
} }
} }
const reqPageSize = 200;
@Component({ @Component({
selector: 'app-incidents', selector: 'app-incidents',
imports: [ imports: [
@ -93,7 +91,6 @@ export class IncidentsComponent {
columns = ['select', 'startTime', 'endTime', 'name', 'numCalls', 'edit']; columns = ['select', 'startTime', 'endTime', 'name', 'numCalls', 'edit'];
curPage = <PageEvent>{ pageIndex: 0, pageSize: 0 }; curPage = <PageEvent>{ pageIndex: 0, pageSize: 0 };
currentSet!: IncidentRecord[]; currentSet!: IncidentRecord[];
currentServerPage = 0; // page is never 0, forces load
isLoading = true; isLoading = true;
selection = new SelectionModel<IncidentRecord>(true, []); selection = new SelectionModel<IncidentRecord>(true, []);
@ -105,9 +102,8 @@ export class IncidentsComponent {
}); });
subscriptions = new Subscription(); subscriptions = new Subscription();
pageWindow = 0;
fetchIncidents = new BehaviorSubject<IncidentsListParams>( fetchIncidents = new BehaviorSubject<IncidentsListParams>(
this.buildParams(this.curPage, this.curPage.pageIndex), this.buildParams(this.curPage),
); );
constructor( constructor(
@ -125,14 +121,14 @@ export class IncidentsComponent {
return numSelected === numRows; return numSelected === numRows;
} }
buildParams(p: PageEvent, serverPage: number): IncidentsListParams { buildParams(p: PageEvent): IncidentsListParams {
const par: IncidentsListParams = { const par: IncidentsListParams = {
start: start:
this.form.controls['start'].value != null this.form.controls['start'].value != null
? new Date(this.form.controls['start'].value!) ? new Date(this.form.controls['start'].value!)
: null, : null,
page: serverPage, page: p.pageIndex + 1,
perPage: reqPageSize, perPage: p.pageSize,
end: end:
this.form.controls['end'].value != null this.form.controls['end'].value != null
? new Date(this.form.controls['end'].value!) ? new Date(this.form.controls['end'].value!)
@ -175,19 +171,7 @@ export class IncidentsComponent {
} }
getIncidents(p: PageEvent, force?: boolean) { getIncidents(p: PageEvent, force?: boolean) {
const pageStart = p.pageIndex * p.pageSize; this.fetchIncidents.next(this.buildParams(p));
const serverPage = Math.floor(pageStart / reqPageSize) + 1;
this.pageWindow = pageStart % reqPageSize;
if (serverPage == this.currentServerPage && !force && this.currentSet) {
this.incsResult.next(
this.incsResult
? this.currentSet.slice(this.pageWindow, this.pageWindow + p.pageSize)
: [],
);
} else {
this.currentServerPage = serverPage;
this.fetchIncidents.next(this.buildParams(p, serverPage));
}
} }
zeroPage(): PageEvent { zeroPage(): PageEvent {
@ -204,7 +188,6 @@ export class IncidentsComponent {
ngOnInit() { ngOnInit() {
this.form.valueChanges.pipe(debounceTime(300)).subscribe(() => { this.form.valueChanges.pipe(debounceTime(300)).subscribe(() => {
this.currentServerPage = 0;
this.setPage(this.zeroPage(), true); this.setPage(this.zeroPage(), true);
}); });
this.subscriptions.add( this.subscriptions.add(
@ -230,14 +213,7 @@ export class IncidentsComponent {
this.isLoading = false; this.isLoading = false;
this.count = incidents.count; this.count = incidents.count;
this.currentSet = incidents.incidents; this.currentSet = incidents.incidents;
this.incsResult.next( this.incsResult.next(this.currentSet);
this.currentSet
? this.currentSet.slice(
this.pageWindow,
this.pageWindow + this.perPage,
)
: [],
);
}), }),
); );
this.subscriptions.add( this.subscriptions.add(