From 5a9f7013bab70bc242729aca802f8efa806eab4a Mon Sep 17 00:00:00 2001 From: Jesse Chan Date: Wed, 30 Mar 2022 21:47:39 -0700 Subject: [PATCH] TransferRateGraph: fix blank graph in some cases --- .../src/javascript/components/sidebar/TransferData.tsx | 4 ++-- client/src/javascript/stores/TransferDataStore.ts | 10 ++++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/client/src/javascript/components/sidebar/TransferData.tsx b/client/src/javascript/components/sidebar/TransferData.tsx index 99ca55a8..f9526dfd 100644 --- a/client/src/javascript/components/sidebar/TransferData.tsx +++ b/client/src/javascript/components/sidebar/TransferData.tsx @@ -10,14 +10,14 @@ import type {TransferRateGraphEventHandlers, TransferRateGraphInspectorPoint} fr const TransferData: FC = observer(() => { const [graphInspectorPoint, setGraphInspectorPoint] = useState(null); - const [sidebarWidth, setSidebarWidth] = useState(0); + const [sidebarWidth, setSidebarWidth] = useState(250); const rateGraphHandlerRefs = useRef(null); return ( { - if (contentRect.offset != null) { + if (contentRect.offset?.width) { setSidebarWidth(contentRect.offset.width); } }} diff --git a/client/src/javascript/stores/TransferDataStore.ts b/client/src/javascript/stores/TransferDataStore.ts index c52efb04..9137dc84 100644 --- a/client/src/javascript/stores/TransferDataStore.ts +++ b/client/src/javascript/stores/TransferDataStore.ts @@ -6,9 +6,9 @@ export const TRANSFER_DIRECTIONS: Readonly> = ['downloa class TransferDataStore { transferRates: TransferHistory = { - download: new Array(30).fill(0), - upload: new Array(30).fill(0), - timestamps: new Array(30).fill(Date.now()), + download: [0, 0], + upload: [0, 0], + timestamps: [Date.now() - 5000, Date.now()], }; transferSummary: TransferSummary = { @@ -41,7 +41,9 @@ class TransferDataStore { } handleFetchTransferHistorySuccess(transferData: TransferHistory) { - this.transferRates = transferData; + if (transferData.timestamps.length > 1) { + this.transferRates = transferData; + } } handleTransferSummaryFullUpdate(transferSummary: TransferSummary) {