From 8b4690ad8d2254c6bf5445cf3e86c6e26a50a31c Mon Sep 17 00:00:00 2001 From: Shubham Verma <25576658+ShubhamVerma1811@users.noreply.github.com> Date: Sat, 9 Oct 2021 19:50:15 +0530 Subject: [PATCH] fix: refresh button crash --- components/common/RefreshButton.js | 23 ++++++++++++----------- components/metrics/WebsiteChart.js | 8 +++++++- components/metrics/WebsiteHeader.js | 13 ++++++------- 3 files changed, 25 insertions(+), 19 deletions(-) diff --git a/components/common/RefreshButton.js b/components/common/RefreshButton.js index 91a43ab8..0a9dbb70 100644 --- a/components/common/RefreshButton.js +++ b/components/common/RefreshButton.js @@ -1,26 +1,27 @@ -import React, { useState, useEffect } from 'react'; -import PropTypes from 'prop-types'; -import { useDispatch, useSelector } from 'react-redux'; -import { FormattedMessage } from 'react-intl'; -import { setDateRange } from 'redux/actions/websites'; -import Button from './Button'; -import Refresh from 'assets/redo.svg'; import Dots from 'assets/ellipsis-h.svg'; +import Refresh from 'assets/redo.svg'; import useDateRange from 'hooks/useDateRange'; -import { getDateRange } from '../../lib/date'; import useLocale from 'hooks/useLocale'; +import { DEFAULT_DATE_RANGE } from 'lib/constants'; +import PropTypes from 'prop-types'; +import { useEffect, useState } from 'react'; +import { FormattedMessage } from 'react-intl'; +import { useDispatch, useSelector } from 'react-redux'; +import { setDateRange } from 'redux/actions/websites'; +import { getDateRange } from '../../lib/date'; +import Button from './Button'; -function RefreshButton({ websiteId }) { +function RefreshButton({ websiteId, createdAt }) { const dispatch = useDispatch(); const { locale } = useLocale(); - const [dateRange] = useDateRange(websiteId); + const [dateRange] = useDateRange(websiteId, DEFAULT_DATE_RANGE, createdAt); const [loading, setLoading] = useState(false); const completed = useSelector(state => state.queries[`/api/website/${websiteId}/stats`]); function handleClick() { if (dateRange) { setLoading(true); - dispatch(setDateRange(websiteId, getDateRange(dateRange.value, locale))); + dispatch(setDateRange(websiteId, getDateRange(dateRange.value, locale, createdAt))); } } diff --git a/components/metrics/WebsiteChart.js b/components/metrics/WebsiteChart.js index 95740ac9..fab9627b 100644 --- a/components/metrics/WebsiteChart.js +++ b/components/metrics/WebsiteChart.js @@ -70,7 +70,13 @@ export default function WebsiteChart({ return (