mirrors/mempool
1
0
Fork 0
mirror of https://github.com/mempool/mempool.git synced 2024-12-28 01:04:28 +01:00
Code Issues Projects Releases Wiki Activity

Fix javascript crash when disable hashrate/difficulty chart line

Browse Source
This commit is contained in:
nymkappa 2022-03-16 17:56:05 +01:00
parent 5bc1dfcfba
commit 07deaa23ef
No known key found for this signature in database
GPG Key ID: E155910B16E8BD04
1 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -117,7 +117,7 @@ export class HashrateChartComponent implements OnInit {
}; };
}), }),
retryWhen((errors) => errors.pipe( retryWhen((errors) => errors.pipe(
delay(60000) delay(60000)
)) ))
); );
}), }),
@ -134,8 +134,8 @@ export class HashrateChartComponent implements OnInit {
const yyyy = lastBlock.getFullYear(); const yyyy = lastBlock.getFullYear();
title = { title = {
textStyle: { textStyle: {
color: 'grey', color: 'grey',
fontSize: 15 fontSize: 15
}, },
text: `Indexing in progess - ${yyyy}-${mm}-${dd}`, text: `Indexing in progess - ${yyyy}-${mm}-${dd}`,
left: 'center', left: 'center',
@ -176,24 +176,36 @@ export class HashrateChartComponent implements OnInit {
align: 'left', align: 'left',
}, },
borderColor: '#000', borderColor: '#000',
formatter: function (data) { formatter: function (ticks) {
let hashrateString = '';
let difficultyString = '';
let hashratePowerOfTen: any = selectPowerOfTen(1); let hashratePowerOfTen: any = selectPowerOfTen(1);
let hashrate = data[0].data[1];
let difficultyPowerOfTen = hashratePowerOfTen;
let difficulty = data[1].data[1];
if (this.isMobile()) { for (const tick of ticks) {
hashratePowerOfTen = selectPowerOfTen(data[0].data[1]); if (tick.seriesIndex === 0) { // Hashrate
hashrate = Math.round(data[0].data[1] / hashratePowerOfTen.divider); let hashrate = tick.data[1];
difficultyPowerOfTen = selectPowerOfTen(data[1].data[1]); if (this.isMobile()) {
difficulty = Math.round(data[1].data[1] / difficultyPowerOfTen.divider); hashratePowerOfTen = selectPowerOfTen(tick.data[1]);
hashrate = Math.round(tick.data[1] / hashratePowerOfTen.divider);
}
hashrateString = `${tick.marker} ${tick.seriesName}: ${formatNumber(hashrate, this.locale, '1.0-0')} ${hashratePowerOfTen.unit}H/s`;
} else if (tick.seriesIndex === 1) { // Difficulty
let difficultyPowerOfTen = hashratePowerOfTen;
let difficulty = tick.data[1];
if (this.isMobile()) {
difficultyPowerOfTen = selectPowerOfTen(tick.data[1]);
difficulty = Math.round(tick.data[1] / difficultyPowerOfTen.divider);
}
difficultyString = `${tick.marker} ${tick.seriesName}: ${formatNumber(difficulty, this.locale, '1.2-2')} ${difficultyPowerOfTen.unit}`;
}
} }
const date = new Date(data[0].data[0]).toLocaleDateString(this.locale, { year: 'numeric', month: 'short', day: 'numeric' }); const date = new Date(ticks[0].data[0]).toLocaleDateString(this.locale, { year: 'numeric', month: 'short', day: 'numeric' });
return ` return `
<b style="color: white; margin-left: 18px">${date}</b><br> <b style="color: white; margin-left: 18px">${date}</b><br>
<span>${data[0].marker} ${data[0].seriesName}: ${formatNumber(hashrate, this.locale, '1.0-0')} ${hashratePowerOfTen.unit}H/s</span><br> <span>${hashrateString}</span><br>
<span>${data[1].marker} ${data[1].seriesName}: ${formatNumber(difficulty, this.locale, '1.2-2')} ${difficultyPowerOfTen.unit}</span> <span>${difficultyString}</span>
`; `;
}.bind(this) }.bind(this)
}, },