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

Merge pull request #3264 from mempool/mononaut/fix-mining-dashboard-updates

Browse Source 
Fix stale mining dashboard data
This commit is contained in:
softsimon 2023-03-09 14:42:28 +09:00 committed by GitHub
commit 7557c47502
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 81 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
frontend/src/app/components/hashrate-chart/hashrate-chart.component.ts
View File

@ -1,7 +1,7 @@
import { ChangeDetectionStrategy, Component, Inject, Input, LOCALE_ID, OnInit, HostBinding } from '@angular/core'; import { ChangeDetectionStrategy, Component, Inject, Input, LOCALE_ID, OnInit, HostBinding } from '@angular/core';
import { EChartsOption, graphic } from 'echarts'; import { EChartsOption, graphic } from 'echarts';
import { Observable } from 'rxjs'; import { merge, Observable, of } from 'rxjs';
import { map, share, startWith, switchMap, tap } from 'rxjs/operators'; import { map, mergeMap, 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';
import { formatNumber } from '@angular/common'; import { formatNumber } from '@angular/common';
@ -84,7 +84,8 @@ export class HashrateChartComponent implements OnInit {
} }
}); });
this.hashrateObservable$ = this.radioGroupForm.get('dateSpan').valueChanges this.hashrateObservable$ = merge(
this.radioGroupForm.get('dateSpan').valueChanges
.pipe( .pipe(
startWith(this.radioGroupForm.controls.dateSpan.value), startWith(this.radioGroupForm.controls.dateSpan.value),
switchMap((timespan) => { switchMap((timespan) => {
@ -95,9 +96,17 @@ export class HashrateChartComponent implements OnInit {
firstRun = false; firstRun = false;
this.miningWindowPreference = timespan; this.miningWindowPreference = timespan;
this.isLoading = true; this.isLoading = true;
return this.apiService.getHistoricalHashrate$(timespan) return this.apiService.getHistoricalHashrate$(this.timespan);
})
),
this.stateService.chainTip$
.pipe( .pipe(
tap((response) => { switchMap(() => {
return this.apiService.getHistoricalHashrate$(this.timespan);
})
)
).pipe(
tap((response: any) => {
const data = response.body; const data = response.body;
// We generate duplicated data point so the tooltip works nicely // We generate duplicated data point so the tooltip works nicely
@ -154,8 +163,6 @@ export class HashrateChartComponent implements OnInit {
currentHashrate: data.currentHashrate, currentHashrate: data.currentHashrate,
}; };
}), }),
);
}),
share() share()
); );
} }

6
frontend/src/app/components/pool-ranking/pool-ranking.component.ts
View File

@ -2,7 +2,7 @@ import { ChangeDetectionStrategy, Component, Input, NgZone, OnInit, HostBinding
import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms'; import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
import { ActivatedRoute, Router } from '@angular/router'; import { ActivatedRoute, Router } from '@angular/router';
import { EChartsOption, PieSeriesOption } from 'echarts'; import { EChartsOption, PieSeriesOption } from 'echarts';
import { concat, Observable } from 'rxjs'; import { merge, Observable } from 'rxjs';
import { map, share, startWith, switchMap, tap } from 'rxjs/operators'; import { map, share, startWith, switchMap, tap } from 'rxjs/operators';
import { SeoService } from '../../services/seo.service'; import { SeoService } from '../../services/seo.service';
import { StorageService } from '../..//services/storage.service'; import { StorageService } from '../..//services/storage.service';
@ -73,7 +73,7 @@ export class PoolRankingComponent implements OnInit {
} }
}); });
this.miningStatsObservable$ = concat( this.miningStatsObservable$ = merge(
this.radioGroupForm.get('dateSpan').valueChanges this.radioGroupForm.get('dateSpan').valueChanges
.pipe( .pipe(
startWith(this.radioGroupForm.controls.dateSpan.value), // (trigger when the page loads) startWith(this.radioGroupForm.controls.dateSpan.value), // (trigger when the page loads)
@ -89,7 +89,7 @@ export class PoolRankingComponent implements OnInit {
return this.miningService.getMiningStats(this.miningWindowPreference); return this.miningService.getMiningStats(this.miningWindowPreference);
}) })
), ),
this.stateService.blocks$ this.stateService.chainTip$
.pipe( .pipe(
switchMap(() => { switchMap(() => {
return this.miningService.getMiningStats(this.miningWindowPreference); return this.miningService.getMiningStats(this.miningWindowPreference);