tidy up acceleration dashboard

This commit is contained in:
Mononaut 2023-07-21 14:24:36 +09:00
parent 14ad0c8ecb
commit 6cf40489e5
No known key found for this signature in database
GPG Key ID: A3F058E41374C04E
2 changed files with 8 additions and 8 deletions

View File

@ -2,7 +2,6 @@ import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core
import { Observable, of } from 'rxjs'; import { Observable, of } from 'rxjs';
import { switchMap } from 'rxjs/operators'; import { switchMap } from 'rxjs/operators';
import { ApiService } from '../../services/api.service'; import { ApiService } from '../../services/api.service';
import { StateService } from '../../services/state.service';
@Component({ @Component({
selector: 'app-acceleration-stats', selector: 'app-acceleration-stats',
@ -13,9 +12,10 @@ import { StateService } from '../../services/state.service';
export class AccelerationStatsComponent implements OnInit { export class AccelerationStatsComponent implements OnInit {
@Input() timespan: '24h' | '1w' = '24h'; @Input() timespan: '24h' | '1w' = '24h';
public accelerationStats$: Observable<any>; public accelerationStats$: Observable<any>;
private lastBlockHeight: number;
constructor(private apiService: ApiService, private stateService: StateService) { } constructor(
private apiService: ApiService,
) { }
ngOnInit(): void { ngOnInit(): void {
this.accelerationStats$ = this.apiService.getAccelerations$(this.timespan).pipe( this.accelerationStats$ = this.apiService.getAccelerations$(this.timespan).pipe(

View File

@ -1,6 +1,6 @@
import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Inject, Input, LOCALE_ID, NgZone, OnInit } from '@angular/core'; import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Inject, Input, LOCALE_ID, NgZone, OnInit } from '@angular/core';
import { EChartsOption, graphic } from 'echarts'; import { EChartsOption, graphic } from 'echarts';
import { Observable, Subscription, combineLatest, of } from 'rxjs'; import { Observable, combineLatest, of } from 'rxjs';
import { map, share, startWith, switchMap, tap } from 'rxjs/operators'; import { map, share, startWith, switchMap, tap } from 'rxjs/operators';
import { ApiService } from '../../services/api.service'; import { ApiService } from '../../services/api.service';
import { SeoService } from '../../services/seo.service'; import { SeoService } from '../../services/seo.service';
@ -158,11 +158,11 @@ export class BlockFeeRatesGraphComponent implements OnInit {
avg += seriesData['Median'][i - y][1]; avg += seriesData['Median'][i - y][1];
} }
avg /= maResolution; avg /= maResolution;
medianMa.push([seriesData['Median'][i][0], avg]); medianMa.push([seriesData['Median'][i][0], avg, seriesData['Median'][i][2]]);
} }
series.push({ series.push({
zlevel: 1, zlevel: 1,
name: 'MA', name: 'Moving average',
data: medianMa, data: medianMa,
type: 'line', type: 'line',
showSymbol: false, showSymbol: false,
@ -231,9 +231,9 @@ export class BlockFeeRatesGraphComponent implements OnInit {
for (const rate of data.reverse()) { for (const rate of data.reverse()) {
if (weightMode) { if (weightMode) {
tooltip += `${rate.marker} ${rate.seriesName}: ${rate.data[1] / 4} sats/WU<br>`; tooltip += `${rate.marker} ${rate.seriesName}: ${(rate.data[1] / 4).toFixed(2)} sats/WU<br>`;
} else { } else {
tooltip += `${rate.marker} ${rate.seriesName}: ${rate.data[1]} sats/vByte<br>`; tooltip += `${rate.marker} ${rate.seriesName}: ${rate.data[1].toFixed(2)} sats/vByte<br>`;
} }
} }