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.

Add languages table to metrics grid

Chris Walsh9a326a33a0b8
diff --git a/components/metrics/LanguagesTable.js b/components/metrics/LanguagesTable.js
new file mode 100644
index 000000000..2b6cd8686
--- /dev/null
+++ b/components/metrics/LanguagesTable.js
@@ -0,0 +1,31 @@
+import React from 'react';
+import MetricsTable from './MetricsTable';
+import { percentFilter } from 'lib/filters';
+import { FormattedMessage } from 'react-intl';
+import useLanguageNames from 'hooks/useLanguageNames';
+import useLocale from 'hooks/useLocale';
+
+export default function LanguagesTable({ websiteId, onDataLoad, ...props }) {
+ const { locale } = useLocale();
+ const languageNames = useLanguageNames(locale);
+
+ function renderLabel({ x }) {
+ return (
+ <div className={locale}>
+ {languageNames[x] ?? <FormattedMessage id="label.unknown" defaultMessage="Unknown" />}{' '}
+ </div>
+ );
+ }
+
+ return (
+ <MetricsTable
+ {...props}
+ title={<FormattedMessage id="metrics.languages" defaultMessage="Languages" />}
+ type="language"
+ metric={<FormattedMessage id="metrics.visitors" defaultMessage="Visitors" />}
+ websiteId={websiteId}
+ onDataLoad={data => onDataLoad?.(percentFilter(data))}
+ renderLabel={renderLabel}
+ />
+ );
+}
diff --git a/components/metrics/MetricsTable.js b/components/metrics/MetricsTable.js
index 95eb00c37..608e716d6 100644
--- a/components/metrics/MetricsTable.js
+++ b/components/metrics/MetricsTable.js
@@ -23,6 +23,7 @@ export default function MetricsTable({
filterOptions,
limit,
onDataLoad,
+ maxHeight = null,
...props
}) {
const shareToken = useShareToken();
@@ -62,7 +63,10 @@ export default function MetricsTable({
}, [data, error, dataFilter, filterOptions]);
return (
- <div className={classNames(styles.container, className)}>
+ <div
+ className={classNames(styles.container, className)}
+ style={maxHeight ? { minHeight: 0, maxHeight } : {}}
+ >
{!data && loading && <Loading />}
{error && <ErrorMessage />}
{data && !error && <DataTable {...props} data={filteredData} className={className} />}
diff --git a/components/pages/WebsiteDetails.js b/components/pages/WebsiteDetails.js
index a8442ea12..de8c8f060 100644
--- a/components/pages/WebsiteDetails.js
+++ b/components/pages/WebsiteDetails.js
@@ -16,6 +16,7 @@ import BrowsersTable from '../metrics/BrowsersTable';
import OSTable from '../metrics/OSTable';
import DevicesTable from '../metrics/DevicesTable';
import CountriesTable from '../metrics/CountriesTable';
+import LanguagesTable from '../metrics/LanguagesTable';
import EventsTable from '../metrics/EventsTable';
import EventsChart from '../metrics/EventsChart';
import useFetch from 'hooks/useFetch';
@@ -30,6 +31,7 @@ const views = {
os: OSTable,
device: DevicesTable,
country: CountriesTable,
+ language: LanguagesTable,
event: EventsTable,
};
@@ -82,6 +84,10 @@ export default function WebsiteDetails({ websiteId }) {
label: <FormattedMessage id="metrics.countries" defaultMessage="Countries" />,
value: resolve({ view: 'country' }),
},
+ {
+ label: <FormattedMessage id="metrics.languages" defaultMessage="Languages" />,
+ value: resolve({ view: 'language' }),
+ },
{
label: <FormattedMessage id="metrics.events" defaultMessage="Events" />,
value: resolve({ view: 'event' }),
@@ -147,7 +153,8 @@ export default function WebsiteDetails({ websiteId }) {
<WorldMap data={countryData} />
</GridColumn>
<GridColumn xs={12} md={12} lg={4}>
- <CountriesTable {...tableProps} onDataLoad={setCountryData} />
+ <CountriesTable maxHeight={265} {...tableProps} onDataLoad={setCountryData} />
+ <LanguagesTable maxHeight={265} {...tableProps} />
</GridColumn>
</GridRow>
<GridRow className={classNames({ [styles.hidden]: !eventsData?.length > 0 })}>