Skip to content

armgit / umami

Public Imported from GitHub
0

Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.

Added error message component. Update fetch hook.

Mike Caoca8a6fe049c1
diff --git a/assets/exclamation-triangle.svg b/assets/exclamation-triangle.svg
new file mode 100644
index 000000000..46bef5bcb
--- /dev/null
+++ b/assets/exclamation-triangle.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512"><path d="M270.2 160h35.5c3.4 0 6.1 2.8 6 6.2l-7.5 196c-.1 3.2-2.8 5.8-6 5.8h-20.5c-3.2 0-5.9-2.5-6-5.8l-7.5-196c-.1-3.4 2.6-6.2 6-6.2zM288 388c-15.5 0-28 12.5-28 28s12.5 28 28 28 28-12.5 28-28-12.5-28-28-28zm281.5 52L329.6 24c-18.4-32-64.7-32-83.2 0L6.5 440c-18.4 31.9 4.6 72 41.6 72H528c36.8 0 60-40 41.5-72zM528 480H48c-12.3 0-20-13.3-13.9-24l240-416c6.1-10.6 21.6-10.7 27.7 0l240 416c6.2 10.6-1.5 24-13.8 24z"/></svg>
\ No newline at end of file
diff --git a/components/common/ErrorMessage.js b/components/common/ErrorMessage.js
new file mode 100644
index 000000000..5747f2269
--- /dev/null
+++ b/components/common/ErrorMessage.js
@@ -0,0 +1,14 @@
+import React from 'react';
+import { FormattedMessage } from 'react-intl';
+import Icon from './Icon';
+import Exclamation from 'assets/exclamation-triangle.svg';
+import styles from './ErrorMessage.module.css';
+
+export default function ErrorMessage() {
+ return (
+ <div className={styles.error}>
+ <Icon icon={<Exclamation />} className={styles.icon} size="large" />
+ <FormattedMessage id="message.failure" defaultMessage="Something went wrong." />
+ </div>
+ );
+}
diff --git a/components/common/ErrorMessage.module.css b/components/common/ErrorMessage.module.css
new file mode 100644
index 000000000..232b5f84b
--- /dev/null
+++ b/components/common/ErrorMessage.module.css
@@ -0,0 +1,13 @@
+.error {
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ transform: translate(-50%, -50%);
+ margin: auto;
+ display: flex;
+ z-index: 1;
+}
+
+.icon {
+ margin-right: 10px;
+}
diff --git a/components/metrics/MetricsBar.js b/components/metrics/MetricsBar.js
index f5d888d44..b7a47a105 100644
--- a/components/metrics/MetricsBar.js
+++ b/components/metrics/MetricsBar.js
@@ -2,6 +2,7 @@ import React, { useState } from 'react';
import { FormattedMessage } from 'react-intl';
import classNames from 'classnames';
import Loading from 'components/common/Loading';
+import ErrorMessage from 'components/common/ErrorMessage';
import useFetch from 'hooks/useFetch';
import useDateRange from 'hooks/useDateRange';
import { formatShortTime, formatNumber, formatLongNumber } from 'lib/format';
@@ -17,7 +18,7 @@ export default function MetricsBar({ websiteId, token, className }) {
query: { url },
} = usePageQuery();
- const { data } = useFetch(
+ const { data, error, loading } = useFetch(
`/api/website/${websiteId}/metrics`,
{
start_at: +startDate,
@@ -40,9 +41,9 @@ export default function MetricsBar({ websiteId, token, className }) {
return (
<div className={classNames(styles.bar, className)} onClick={handleSetFormat}>
- {!data ? (
- <Loading />
- ) : (
+ {!data && loading && <Loading />}
+ {error && <ErrorMessage />}
+ {data && !error && (
<>
<MetricCard
label={<FormattedMessage id="metrics.views" defaultMessage="Views" />}
diff --git a/components/metrics/MetricsTable.js b/components/metrics/MetricsTable.js
index 3ac8a395d..6850a3bf9 100644
--- a/components/metrics/MetricsTable.js
+++ b/components/metrics/MetricsTable.js
@@ -13,6 +13,7 @@ import { formatNumber, formatLongNumber } from 'lib/format';
import useDateRange from 'hooks/useDateRange';
import usePageQuery from 'hooks/usePageQuery';
import styles from './MetricsTable.module.css';
+import ErrorMessage from '../common/ErrorMessage';
export default function MetricsTable({
websiteId,
@@ -36,7 +37,7 @@ export default function MetricsTable({
query: { url },
} = usePageQuery();
- const { data } = useFetch(
+ const { data, loading, error } = useFetch(
`/api/website/${websiteId}/rankings`,
{
type,
@@ -61,7 +62,7 @@ export default function MetricsTable({
return items;
}
return [];
- }, [data, dataFilter, filterOptions]);
+ }, [data, error, dataFilter, filterOptions]);
const handleSetFormat = () => setFormat(state => !state);
@@ -86,8 +87,9 @@ export default function MetricsTable({
return (
<div className={classNames(styles.container, className)}>
- {!data && <Loading />}
- {data && (
+ {!data && loading && <Loading />}
+ {error && <ErrorMessage />}
+ {data && !error && (
<>
<div className={styles.header}>
<div className={styles.title}>{title}</div>
diff --git a/components/metrics/WebsiteChart.js b/components/metrics/WebsiteChart.js
index ea86ad3ec..6a07afe5e 100644
--- a/components/metrics/WebsiteChart.js
+++ b/components/metrics/WebsiteChart.js
@@ -13,6 +13,7 @@ import usePageQuery from 'hooks/usePageQuery';
import { getDateArray, getDateLength } from 'lib/date';
import Times from 'assets/times.svg';
import styles from './WebsiteChart.module.css';
+import ErrorMessage from '../common/ErrorMessage';
export default function WebsiteChart({
websiteId,
@@ -31,7 +32,7 @@ export default function WebsiteChart({
query: { url },
} = usePageQuery();
- const { data, loading } = useFetch(
+ const { data, loading, error } = useFetch(
`/api/website/${websiteId}/pageviews`,
{
start_at: +startDate,
@@ -83,6 +84,7 @@ export default function WebsiteChart({
</div>
<div className="row">
<div className="col">
+ {error && <ErrorMessage />}
<PageviewsChart
websiteId={websiteId}
data={{ pageviews, uniques }}
diff --git a/hooks/useFetch.js b/hooks/useFetch.js
index 907f45af8..0eb82b138 100644
--- a/hooks/useFetch.js
+++ b/hooks/useFetch.js
@@ -25,7 +25,13 @@ export default function useFetch(url, params = {}, options = {}) {
dispatch(updateQuery({ url, time: performance.now() - time, completed: Date.now() }));
- setData(data);
+ if (status >= 400) {
+ setError(data);
+ setData(null);
+ } else {
+ setData(data);
+ }
+
setStatus(status);
onDataLoad(data);
} catch (e) {
diff --git a/package.json b/package.json
index f5fe6909e..0d602350b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "umami",
- "version": "0.76.0",
+ "version": "0.77.0",
"description": "A simple, fast, website analytics alternative to Google Analytics. ",
"author": "Mike Cao <[email protected]>",
"license": "MIT",