Add query parameters and optimize requests

components/home/charts/cumulative-inflow.tsx

@@ -93,7 +93,7 @@ export default function CumulativeInflow() {
     if (!loading && !errorDailyInflow) {
       formatData();
     }
-  }, [loading, errorDailyInflow]);
+  }, [dataDailyInflow, dataCumulativeInflow, loading, errorDailyInflow]);
 
   return (
     <ChartWrapper title='Inflows' loading={loading}>

components/home/charts/cumulative-users.tsx

@@ -68,7 +68,7 @@ export default function CumulativeUsers() {
     if (!loading || !error) {
       formatData();
     }
-  }, [loading, error]);
+  }, [dataCumulativeNewUsers, loading, error]);
 
   return (
     <ChartWrapper title='Cumulative New Users' loading={loading}>

components/home/charts/date-range.tsx

@@ -1,9 +1,10 @@
-import { useState, useEffect, useContext } from 'react';
+import { useContext, useEffect, useState } from 'react';
+import { useRouter, useSearchParams } from 'next/navigation';
 import Select from 'react-dropdown-select';
 import { Box } from '@chakra-ui/react';
 import moment from 'moment';
 import { DateRange } from 'react-date-range';
-import strftime, { timezone } from 'strftime';
+import strftime from 'strftime';
 import { DataContext } from '../../../contexts/data';
 import 'react-date-range/dist/styles.css';
 import 'react-date-range/dist/theme/default.css';
@@ -13,34 +14,63 @@ const DATA_START_DATE = new Date('2023-06-14T20:00:00.000');
 const DATE_NOW = new Date();
 
 export const DateRangeSelect = () => {
-  const { setDates } = useContext(DataContext);
-
+  const { setDates, dates } = useContext(DataContext);
+  const searchParams = useSearchParams();
+  const router = useRouter();
   const [selectedDateRangeOption, setSelectedDateRangeOption] = useState<number | null>(null);
-  const [rangeState, setRangeState] = useState<
-    { startDate: Date | undefined; endDate: Date | undefined; key: string }[]
-  >([
-    {
-      startDate: DATA_START_DATE,
-      endDate: DATE_NOW,
-      key: 'selection',
-    },
-  ]);
 
-  console.log({
-    startDate: DATA_START_DATE,
-    endDate: new Date(),
+  const isValidDate = (dateString: string) => {
+    return moment(dateString, 'MM-DD-YY', true).isValid();
+  };
+
+  const getInitialDate = (key: string, fallback: Date) => {
+    const param = searchParams.get(key);
+    if (!param || !isValidDate(param)) return fallback;
+    const date = moment(param, 'MM-DD-YY').toDate();
+    if (key === 'from' && date < DATA_START_DATE) return DATA_START_DATE;
+    if (key === 'to' && date > DATE_NOW) return DATE_NOW;
+    return date;
+  };
+
+  const initialFrom = getInitialDate('from', DATA_START_DATE);
+  const initialTo = getInitialDate('to', DATE_NOW);
+  const correctedFrom = initialFrom > initialTo ? DATA_START_DATE : initialFrom;
+  const correctedTo = initialFrom > initialTo ? DATE_NOW : initialTo;
+
+  const [rangeState, setRangeState] = useState({
+    startDate: correctedFrom,
+    endDate: correctedTo,
     key: 'selection',
   });
 
-  const [dataRange, setDataRange] = useState({ fromValue: DATA_START_DATE, toValue: DATE_NOW });
+  const updateQueryParams = (from: Date, to: Date) => {
+    const params = new URLSearchParams(searchParams.toString());
+    if (from) params.set('from', strftime('%m-%d-%y', from));
+    else params.delete('from');
+    if (to) params.set('to', strftime('%m-%d-%y', to));
+    else params.delete('to');
+    router.push(`?${params.toString()}`);
+    window.history.replaceState(null, '', `?${params.toString()}`);
+  };
+
+  useEffect(() => {
+    updateQueryParams(rangeState.startDate, rangeState.endDate);
+    setDates({
+      from: strftime('%Y-%m-%d', rangeState.startDate),
+      to: strftime('%Y-%m-%d', rangeState.endDate),
+    });
+  }, []);
 
   const onChange = (selectedDates: any) => {
     const [start, end] = selectedDates;
     const from = start ? strftime('%Y-%m-%d', new Date(start)) : undefined;
     const to = end ? strftime('%Y-%m-%d', end) : undefined;
-    if (from === to) return;
-    setDataRange({ fromValue: start, toValue: end });
+    if (from === to || !from || !to) return;
+    setRangeState({ startDate: new Date(from), endDate: new Date(to), key: 'selection' });
     setDates({ from, to });
+    if (from && to) {
+      updateQueryParams(start, end);
+    }
   };
 
   const dateRangeOptions = [
@@ -55,16 +85,6 @@ export const DateRangeSelect = () => {
     },
   ];
 
-  useEffect(() => {
-    setRangeState([
-      {
-        startDate: dataRange.fromValue,
-        endDate: dataRange.toValue,
-        key: 'selection',
-      },
-    ]);
-  }, [dataRange.fromValue, dataRange.toValue]);
-
   const onSelectItem = (option: { id: number; label: string; isDefault?: boolean }) => {
     if (option.id == ALL_TIME_ID) {
       onChange([null, null]);
@@ -95,7 +115,6 @@ export const DateRangeSelect = () => {
   }, []);
 
   const onDateRangeChange = (item: any) => {
-    setRangeState([item.selection]);
     if (item.selection.startDate == item.selection.endDate) {
       return;
     }
@@ -105,13 +124,13 @@ export const DateRangeSelect = () => {
   const customContentRenderer = () => {
     return (
       <div style={{ cursor: 'pointer' }}>
-        {dataRange.fromValue &&
-          dataRange.toValue &&
-          `${strftime('%m-%d-%y', dataRange.fromValue)} to ${strftime(
+        {rangeState.startDate &&
+          rangeState.endDate &&
+          `${strftime('%m-%d-%y', rangeState.startDate)} to ${strftime(
             '%m-%d-%y',
-            dataRange.toValue
+            rangeState.endDate
           )}`}
-        {(!dataRange.fromValue || !dataRange.toValue) && 'All time'}
+        {(!rangeState.startDate || !rangeState.endDate) && 'All time'}
       </div>
     );
   };
@@ -124,7 +143,7 @@ export const DateRangeSelect = () => {
             editableDateInputs={true}
             onChange={onDateRangeChange}
             moveRangeOnFirstSelection={false}
-            ranges={rangeState}
+            ranges={[rangeState]}
             showDateDisplay={false}
             fixedHeight={false}
             minDate={DATA_START_DATE}

components/home/charts/funding-rate.tsx

@@ -97,7 +97,7 @@ export default function FundingRate() {
       const uniqueCoins = extractUniqueCoins(dataFundingRate);
       setCoinKeys(uniqueCoins);
     }
-  }, [loading, dataFundingRate]);
+  }, [dataFundingRate, loading, dataFundingRate]);
 
   const formatData = () => {
     if (dataFundingRate) {
@@ -110,7 +110,7 @@ export default function FundingRate() {
     if (!loading && !error) {
       formatData();
     }
-  }, [loading, coinsSelected]);
+  }, [dataFundingRate, loading, coinsSelected]);
 
   const coinSelectors = createCoinSelectors(coinKeys, coinsSelected, setCoinsSelected, formatData);
 

components/home/charts/hlp.tsx

@@ -232,7 +232,7 @@ export default function Hlp() {
     if (!loading && !error) {
       formatData();
     }
-  }, [loading, error]);
+  }, [assetCtxs, dataHlpPositions, dataHlpPnL, loading, error]);
 
   return (
     <ChartWrapper title='HLP' loading={false} controls={controls}>

components/home/charts/liquidator.tsx

@@ -229,7 +229,14 @@ export default function LiquidatorChart(props: any) {
     if (!loading && !error) {
       formatData(coinsSelected);
     }
-  }, [loading, error]);
+  }, [
+    dataCumulativeLiquidated,
+    dataDailyLiquidatedTotal,
+    dataDailyLiquidatedByMargin,
+    dataDailyLiquidatedByCoins,
+    loading,
+    error,
+  ]);
 
   const dataModeToData = (dataMode: string) => {
     switch (dataMode) {

components/home/charts/liquidity.tsx

@@ -232,7 +232,7 @@ export default function Liquidity() {
     if (!loading && !error) {
       formatData();
     }
-  }, [loading, coinKeys]);
+  }, [dataLiqudity, loading, coinKeys]);
 
   let chartData;
   let chartDataCoinKeys;

components/home/charts/open-interest.tsx

@@ -99,7 +99,7 @@ export default function OpenInterestChart() {
     if (!loading && !error) {
       formatData();
     }
-  }, [loading]);
+  }, [dataOpenInterest, loading]);
 
   const coinSelectors = createCoinSelectors(
     coins,

components/home/charts/retail-volume.tsx

@@ -240,7 +240,7 @@ export default function RetailVolumeChart() {
     if (!loading || error) {
       formatData(coinsSelected);
     }
-  }, [loading, error]);
+  }, [dataCumulativeUsdVolume, loading, error]);
 
   const coinSelectors = createCoinSelectors(
     coinKeys,

components/home/charts/top-stats.tsx

@@ -32,27 +32,24 @@ const TopStats = () => {
     REQUESTS[0],
     0,
     'total_users',
-    true
   );
-  const [dataTotalVolume, loadingVol, errorVol] = useRequest(REQUESTS[1], 0, 'chart_data', true);
+  const [dataTotalVolume, loadingVol, errorVol] = useRequest(REQUESTS[1], 0, 'chart_data');
   const [totalVolume, setTotalVolume] = useState<number>(0);
   const [dataTotalDeposits, loadingTotalDeposits, errorTotalDeposits] = useRequest(
     REQUESTS[2],
     0,
-    'total_deposits',
-    true
+    'total_deposits'
   );
   const [dataTotalWithdrawals, loadingTotalWithdrawals, errorTotalWithdrawals] = useRequest(
     REQUESTS[3],
     0,
     'total_withdrawals',
-    true
   );
   const [
     dataTotalNotionalLiquidated,
     loadingTotalNotionalLiquidated,
     errorTotalNotionalLiquidated,
-  ] = useRequest(REQUESTS[4], 0, 'total_notional_liquidated', true);
+  ] = useRequest(REQUESTS[4], 0, 'total_notional_liquidated');
 
   interface TotalVolume {
     time: string;
@@ -73,7 +70,7 @@ const TopStats = () => {
     if (!loadingVol && !errorVol && dataTotalVolume) {
       computeTotalVolume(dataTotalVolume);
     }
-  }, [loadingVol, errorVol]);
+  }, [dataTotalVolume, loadingVol, errorVol]);
 
   return (
     <Grid

components/home/charts/trader-profit.tsx

@@ -98,7 +98,7 @@ export default function TradersProfitLossChart(props: any) {
     if (!loading && !error) {
       formatTradingData();
     }
-  }, [loading, error]);
+  }, [dataCumulativeUserPNL, dataUserPNL, loading, error]);
 
   return (
     <ChartWrapper title='Traders Net PnL' loading={loading}>

components/home/charts/unique-users-coin.tsx

@@ -176,7 +176,7 @@ export default function UniqueUsers() {
     if (!loading && !error) {
       formatData(coinsSelected);
     }
-  }, [loading]);
+  }, [dataCumulativeNewUsers, dataDailyUniqueUsers, dataDailyUniqueUsersByCoin, loading]);
 
   const coinSelectors = createCoinSelectors(coinKeys, coinsSelected, setCoinsSelected, formatData);
 

components/home/charts/volume-num-trades.tsx

@@ -233,7 +233,7 @@ export default function VolumeChart() {
     if (!loading && !error) {
       formatData(coinsSelected);
     }
-  }, [loading, dataMode]);
+  }, [dataDailyTradesByCoin, loading, dataMode]);
 
   const coinSelectors = createCoinSelectors(coinKeys, coinsSelected, setCoinsSelected, formatData);
 

components/home/charts/volume-total.tsx

@@ -113,7 +113,7 @@ export default function TotalVolumeChart() {
     if (!loading && !error) {
       formatData(coinsSelected);
     }
-  }, [loading, error]);
+  }, [dataTotalVolume, loading, error]);
 
   const coinSelectors = createCoinSelectors(
     coins,