ambiser
/
umami
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: refresh button crash

pull/816/head
Shubham Verma 2021-10-09 19:50:15 +05:30
parent 34e7552812
commit 6caff7df0e
3 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
components/common/RefreshButton.js
View File

@ -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 Dots from 'assets/ellipsis-h.svg';
import Refresh from 'assets/redo.svg';
import useDateRange from 'hooks/useDateRange'; import useDateRange from 'hooks/useDateRange';
import { getDateRange } from '../../lib/date';
import useLocale from 'hooks/useLocale'; 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 dispatch = useDispatch();
const { locale } = useLocale(); const { locale } = useLocale();
const [dateRange] = useDateRange(websiteId); const [dateRange] = useDateRange(websiteId, DEFAULT_DATE_RANGE, createdAt);
const [loading, setLoading] = useState(false); const [loading, setLoading] = useState(false);
const completed = useSelector(state => state.queries[`/api/website/${websiteId}/stats`]); const completed = useSelector(state => state.queries[`/api/website/${websiteId}/stats`]);
function handleClick() { function handleClick() {
if (dateRange) { if (dateRange) {
setLoading(true); setLoading(true);
dispatch(setDateRange(websiteId, getDateRange(dateRange.value, locale))); dispatch(setDateRange(websiteId, getDateRange(dateRange.value, locale, createdAt)));
} }
} }

8
components/metrics/WebsiteChart.js
View File

@ -70,7 +70,13 @@ export default function WebsiteChart({
return ( return (
<div className={styles.container}> <div className={styles.container}>
<WebsiteHeader websiteId={websiteId} title={title} domain={domain} showLink={showLink} /> <WebsiteHeader
websiteId={websiteId}
title={title}
domain={domain}
showLink={showLink}
createdAt={createdAt}
/>
<div className={classNames(styles.header, 'row')}> <div className={classNames(styles.header, 'row')}>
<StickyHeader <StickyHeader
className={classNames(styles.metrics, 'col row')} className={classNames(styles.metrics, 'col row')}

13
components/metrics/WebsiteHeader.js
View File

@ -1,15 +1,14 @@
import React from 'react'; import Arrow from 'assets/arrow-right.svg';
import { FormattedMessage } from 'react-intl'; import Favicon from 'components/common/Favicon';
import Link from 'components/common/Link'; import Link from 'components/common/Link';
import PageHeader from 'components/layout/PageHeader';
import RefreshButton from 'components/common/RefreshButton'; import RefreshButton from 'components/common/RefreshButton';
import ButtonLayout from 'components/layout/ButtonLayout'; import ButtonLayout from 'components/layout/ButtonLayout';
import Favicon from 'components/common/Favicon'; import PageHeader from 'components/layout/PageHeader';
import { FormattedMessage } from 'react-intl';
import ActiveUsers from './ActiveUsers'; import ActiveUsers from './ActiveUsers';
import Arrow from 'assets/arrow-right.svg';
import styles from './WebsiteHeader.module.css'; import styles from './WebsiteHeader.module.css';
export default function WebsiteHeader({ websiteId, title, domain, showLink = false }) { export default function WebsiteHeader({ websiteId, title, domain, showLink = false, createdAt }) {
const header = showLink ? ( const header = showLink ? (
<> <>
<Favicon domain={domain} /> <Favicon domain={domain} />
@ -29,7 +28,7 @@ export default function WebsiteHeader({ websiteId, title, domain, showLink = fal
<div className={styles.title}>{header}</div> <div className={styles.title}>{header}</div>
<ActiveUsers className={styles.active} websiteId={websiteId} /> <ActiveUsers className={styles.active} websiteId={websiteId} />
<ButtonLayout align="right"> <ButtonLayout align="right">
<RefreshButton websiteId={websiteId} /> <RefreshButton websiteId={websiteId} createdAt={createdAt} />
{showLink && ( {showLink && (
<Link <Link
href="/website/[...id]" href="/website/[...id]"