machankura/mempool
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't reload after setting graph preference setting.

Browse Source 
refs #365
This commit is contained in:
softsimon 2021-04-19 10:50:24 +04:00
parent 220d9afd97
commit f0d46d6ed8
No known key found for this signature in database
GPG Key ID: 488D7DCFB5A430D7
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
frontend/src/app/components/statistics/statistics.component.html
View File

@ -14,7 +14,8 @@
<div class="card mb-3" *ngIf="mempoolStats.length"> <div class="card mb-3" *ngIf="mempoolStats.length">
<div class="card-header"> <div class="card-header">
<i class="fa fa-area-chart"></i> <span i18n="statistics.memory-by-vBytes">Mempool by vBytes (sat/vByte)</span> <i class="fa fa-area-chart"></i> <span i18n="statistics.memory-by-vBytes">Mempool by vBytes (sat/vByte)</span>
<form [formGroup]="radioGroupForm" style="float: right;" (click)='saveGraphPreference()'>
<form [formGroup]="radioGroupForm" style="float: right;" (click)="saveGraphPreference()">
<div class="spinner-border text-light bootstrap-spinner" *ngIf="spinnerLoading"></div> <div class="spinner-border text-light bootstrap-spinner" *ngIf="spinnerLoading"></div>
<div class="btn-group btn-group-toggle" ngbRadioGroup name="radioBasic" formControlName="dateSpan"> <div class="btn-group btn-group-toggle" ngbRadioGroup name="radioBasic" formControlName="dateSpan">
<label ngbButtonLabel class="btn-primary btn-sm"> <label ngbButtonLabel class="btn-primary btn-sm">

25
frontend/src/app/components/statistics/statistics.component.ts
View File

@ -46,17 +46,13 @@ export class StatisticsComponent implements OnInit {
private stateService: StateService, private stateService: StateService,
private seoService: SeoService, private seoService: SeoService,
private storageService: StorageService, private storageService: StorageService,
) { ) { }
this.graphWindowPreference = this.storageService.getValue('graphWindowPreference') ? this.storageService.getValue('graphWindowPreference').trim() : '2h';
this.radioGroupForm = this.formBuilder.group({
dateSpan: this.graphWindowPreference
});
}
ngOnInit() { ngOnInit() {
this.seoService.setTitle($localize`:@@5d4f792f048fcaa6df5948575d7cb325c9393383:Graphs`); this.seoService.setTitle($localize`:@@5d4f792f048fcaa6df5948575d7cb325c9393383:Graphs`);
this.stateService.networkChanged$.subscribe((network) => this.network = network); this.stateService.networkChanged$.subscribe((network) => this.network = network);
this.inverted = this.storageService.getValue('inverted-graph') === 'true'; this.inverted = this.storageService.getValue('inverted-graph') === 'true';
this.graphWindowPreference = this.storageService.getValue('graphWindowPreference') ? this.storageService.getValue('graphWindowPreference').trim() : '2h';
const isMobile = window.innerWidth <= 767.98; const isMobile = window.innerWidth <= 767.98;
let labelHops = isMobile ? 48 : 24; let labelHops = isMobile ? 48 : 24;
@ -64,6 +60,10 @@ export class StatisticsComponent implements OnInit {
labelHops = 96; labelHops = 96;
} }
this.radioGroupForm = this.formBuilder.group({
dateSpan: this.graphWindowPreference
});
const labelInterpolationFnc = (value: any, index: any) => { const labelInterpolationFnc = (value: any, index: any) => {
switch (this.graphWindowPreference) { switch (this.graphWindowPreference) {
case '2h': case '2h':
@ -116,24 +116,24 @@ export class StatisticsComponent implements OnInit {
.pipe( .pipe(
switchMap(() => { switchMap(() => {
this.spinnerLoading = true; this.spinnerLoading = true;
if (this.graphWindowPreference === '2h') { if (this.radioGroupForm.controls.dateSpan.value === '2h') {
this.websocketService.want(['blocks', 'live-2h-chart']); this.websocketService.want(['blocks', 'live-2h-chart']);
return this.apiService.list2HStatistics$(); return this.apiService.list2HStatistics$();
} }
this.websocketService.want(['blocks']); this.websocketService.want(['blocks']);
if (this.graphWindowPreference === '24h') { if (this.radioGroupForm.controls.dateSpan.value === '24h') {
return this.apiService.list24HStatistics$(); return this.apiService.list24HStatistics$();
} }
if (this.graphWindowPreference === '1w') { if (this.radioGroupForm.controls.dateSpan.value === '1w') {
return this.apiService.list1WStatistics$(); return this.apiService.list1WStatistics$();
} }
if (this.graphWindowPreference === '1m') { if (this.radioGroupForm.controls.dateSpan.value === '1m') {
return this.apiService.list1MStatistics$(); return this.apiService.list1MStatistics$();
} }
if (this.graphWindowPreference === '3m') { if (this.radioGroupForm.controls.dateSpan.value === '3m') {
return this.apiService.list3MStatistics$(); return this.apiService.list3MStatistics$();
} }
if (this.graphWindowPreference === '6m') { if (this.radioGroupForm.controls.dateSpan.value === '6m') {
return this.apiService.list6MStatistics$(); return this.apiService.list6MStatistics$();
} }
return this.apiService.list1YStatistics$(); return this.apiService.list1YStatistics$();
@ -171,6 +171,5 @@ export class StatisticsComponent implements OnInit {
saveGraphPreference() { saveGraphPreference() {
this.storageService.setValue('graphWindowPreference', this.radioGroupForm.controls.dateSpan.value); this.storageService.setValue('graphWindowPreference', this.radioGroupForm.controls.dateSpan.value);
document.location.reload();
} }
} }