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.

Update ListTable display of items.

Mike Cao8d85e3fcdb5d
diff --git a/src/app/(main)/websites/[id]/WebsiteDetails.js b/src/app/(main)/websites/[id]/WebsiteDetails.js
index 78996b781..c6ad1acc9 100644
--- a/src/app/(main)/websites/[id]/WebsiteDetails.js
+++ b/src/app/(main)/websites/[id]/WebsiteDetails.js
@@ -9,7 +9,7 @@ import WebsiteChart from './WebsiteChart';
import WebsiteMenuView from './WebsiteMenuView';
import WebsiteHeader from './WebsiteHeader';
import WebsiteMetricsBar from './WebsiteMetricsBar';
-import WebsiteTableView from '../WebsiteTableView';
+import WebsiteTableView from './WebsiteTableView';
export default function WebsiteDetails({ websiteId }) {
const { data: website, isLoading, error } = useWebsite(websiteId);
diff --git a/src/app/(main)/websites/[id]/WebsiteMenuView.js b/src/app/(main)/websites/[id]/WebsiteMenuView.js
index 51c5e8c7c..a7cfb0f2c 100644
--- a/src/app/(main)/websites/[id]/WebsiteMenuView.js
+++ b/src/app/(main)/websites/[id]/WebsiteMenuView.js
@@ -1,4 +1,4 @@
-import { Text } from 'react-basics';
+import { Icons, Icon, Text } from 'react-basics';
import BrowsersTable from 'components/metrics/BrowsersTable';
import CountriesTable from 'components/metrics/CountriesTable';
import RegionsTable from 'components/metrics/RegionsTable';
@@ -110,6 +110,9 @@ export default function WebsiteMenuView({ websiteId, websiteDomain }) {
<div className={styles.layout}>
<div className={styles.menu}>
<LinkButton href={pathname} className={styles.back}>
+ <Icon rotate={180}>
+ <Icons.ArrowRight />
+ </Icon>
<Text>{formatMessage(labels.back)}</Text>
</LinkButton>
<SideNav items={items} selectedKey={view} shallow={true} />
@@ -122,6 +125,7 @@ export default function WebsiteMenuView({ websiteId, websiteDomain }) {
animate={false}
showFilters={true}
virtualize={true}
+ itemCount={25}
/>
</div>
</div>
diff --git a/src/app/(main)/websites/WebsiteTableView.js b/src/app/(main)/websites/[id]/WebsiteTableView.js
similarity index 100%
rename from src/app/(main)/websites/WebsiteTableView.js
rename to src/app/(main)/websites/[id]/WebsiteTableView.js
diff --git a/src/components/common/LinkButton.js b/src/components/common/LinkButton.js
index 26f7251fd..6ae593007 100644
--- a/src/components/common/LinkButton.js
+++ b/src/components/common/LinkButton.js
@@ -3,11 +3,15 @@ import Link from 'next/link';
import { useLocale } from 'components/hooks';
import styles from './LinkButton.module.css';
-export function LinkButton({ href, className, children }) {
+export function LinkButton({ href, className, variant, children }) {
const { dir } = useLocale();
return (
- <Link className={classNames(styles.button, className)} href={href} dir={dir}>
+ <Link
+ className={classNames(styles.button, className, { [styles[variant]]: true })}
+ href={href}
+ dir={dir}
+ >
{children}
</Link>
);
diff --git a/src/components/common/LinkButton.module.css b/src/components/common/LinkButton.module.css
index ae8a3b627..5561f536f 100644
--- a/src/components/common/LinkButton.module.css
+++ b/src/components/common/LinkButton.module.css
@@ -26,3 +26,82 @@
.button:visited {
color: var(--base900);
}
+
+.button.disabled {
+ color: var(--disabled-color) !important;
+ background-color: var(--disabled-background) !important;
+ border-color: transparent !important;
+ pointer-events: none;
+}
+
+.button.primary {
+ color: var(--light50);
+ background: var(--primary400);
+}
+
+.button.primary:hover {
+ color: var(--light50);
+ background: var(--primary500);
+}
+
+.button.primary:active {
+ color: var(--light50);
+ background: var(--primary600);
+}
+
+.button.secondary {
+ border: 1px solid var(--border-color);
+ background: var(--base50);
+}
+
+.button.secondary:hover {
+ background: var(--base75);
+}
+
+.button.secondary:active {
+ background: var(--base100);
+}
+
+.button.quiet {
+ color: var(--base900);
+ background: transparent;
+}
+
+.button.quiet:hover {
+ background: var(--base100);
+}
+
+.button.quiet:active {
+ background: var(--base200);
+}
+
+.button.danger {
+ color: var(--light50);
+ background: var(--red800);
+}
+
+.button.danger:hover {
+ color: var(--light50);
+ background: var(--red900);
+}
+
+.button.danger:active {
+ color: var(--light50);
+ background: var(--red1000);
+}
+
+.button.size-sm {
+ font-size: var(--font-size-sm);
+ height: calc(var(--base-height) * 0.75);
+ padding: 0 calc(var(--size600) * 0.75);
+}
+
+.button.size-md {
+ font-size: var(--font-size-md);
+}
+
+.button.size-lg {
+ font-size: var(--font-size-lg);
+ height: calc(var(--base-height) * 1.25);
+ padding: 0 calc(var(--size600) * 1.25);
+}
diff --git a/src/components/common/Pager.js b/src/components/common/Pager.js
index f35c2ab0c..a21d35d98 100644
--- a/src/components/common/Pager.js
+++ b/src/components/common/Pager.js
@@ -26,7 +26,7 @@ export function Pager({ page, pageSize, count, onPageChange, className }) {
return (
<div className={classNames(styles.pager, className)}>
- <div>{formatMessage(labels.numberOfRecords, { x: count })}</div>
+ <div className={styles.count}>{formatMessage(labels.numberOfRecords, { x: count })}</div>
<div className={styles.nav}>
<Button onClick={() => handlePageChange(-1)} disabled={firstPage}>
<Icon rotate={90}>
diff --git a/src/components/common/Pager.module.css b/src/components/common/Pager.module.css
index 0ed5e1f45..880c1b401 100644
--- a/src/components/common/Pager.module.css
+++ b/src/components/common/Pager.module.css
@@ -16,6 +16,11 @@
justify-content: center;
}
+.count {
+ color: var(--base600);
+ font-weight: 700;
+}
+
@media only screen and (max-width: 992px) {
.pager {
grid-template-columns: repeat(2, 1fr);
diff --git a/src/components/metrics/ListTable.js b/src/components/metrics/ListTable.js
index e4ea5ea8d..1b988450b 100644
--- a/src/components/metrics/ListTable.js
+++ b/src/components/metrics/ListTable.js
@@ -1,4 +1,3 @@
-import useMeasure from 'react-use-measure';
import { FixedSizeList } from 'react-window';
import { useSpring, animated, config } from '@react-spring/web';
import classNames from 'classnames';
@@ -7,6 +6,8 @@ import { formatLongNumber } from 'lib/format';
import useMessages from 'components/hooks/useMessages';
import styles from './ListTable.module.css';
+const ITEM_SIZE = 30;
+
export function ListTable({
data = [],
title,
@@ -16,9 +17,9 @@ export function ListTable({
animate = true,
virtualize = false,
showPercentage = true,
+ itemCount = 10,
}) {
const { formatMessage, labels } = useMessages();
- const [ref, bounds] = useMeasure();
const getRow = row => {
const { x: label, y: value, z: percent } = row;
@@ -45,10 +46,14 @@ export function ListTable({
<div className={styles.title}>{title}</div>
<div className={styles.metric}>{metric}</div>
</div>
- <div ref={ref} className={styles.body}>
+ <div className={styles.body}>
{data?.length === 0 && <Empty />}
{virtualize && data.length > 0 ? (
- <FixedSizeList height={bounds.height} itemCount={data.length} itemSize={30}>
+ <FixedSizeList
+ height={itemCount * ITEM_SIZE}
+ itemCount={data.length}
+ itemSize={ITEM_SIZE}
+ >
{Row}
</FixedSizeList>
) : (
diff --git a/src/components/metrics/MetricsTable.js b/src/components/metrics/MetricsTable.js
index d36bc91e1..1d64b714b 100644
--- a/src/components/metrics/MetricsTable.js
+++ b/src/components/metrics/MetricsTable.js
@@ -1,6 +1,5 @@
import { useMemo } from 'react';
-import { Loading, Icon, Text, Button } from 'react-basics';
-import Link from 'next/link';
+import { Loading, Icon, Text } from 'react-basics';
import firstBy from 'thenby';
import classNames from 'classnames';
import useApi from 'components/hooks/useApi';
@@ -8,12 +7,13 @@ import { percentFilter } from 'lib/filters';
import useDateRange from 'components/hooks/useDateRange';
import useNavigation from 'components/hooks/useNavigation';
import ErrorMessage from 'components/common/ErrorMessage';
+import LinkButton from 'components/common/LinkButton';
import ListTable from './ListTable';
import { DEFAULT_ANIMATION_DURATION } from 'lib/constants';
import Icons from 'components/icons';
import useMessages from 'components/hooks/useMessages';
-import styles from './MetricsTable.module.css';
import useLocale from 'components/hooks/useLocale';
+import styles from './MetricsTable.module.css';
export function MetricsTable({
websiteId,
@@ -103,14 +103,12 @@ export function MetricsTable({
{data && !error && <ListTable {...props} data={filteredData} className={className} />}
<div className={styles.footer}>
{data && !error && limit && (
- <Link href={makeUrl({ view: type })}>
- <Button variant="quiet">
- <Text>{formatMessage(labels.more)}</Text>
- <Icon size="sm" rotate={dir === 'rtl' ? 180 : 0}>
- <Icons.ArrowRight />
- </Icon>
- </Button>
- </Link>
+ <LinkButton href={makeUrl({ view: type })} variant="quiet">
+ <Text>{formatMessage(labels.more)}</Text>
+ <Icon size="sm" rotate={dir === 'rtl' ? 180 : 0}>
+ <Icons.ArrowRight />
+ </Icon>
+ </LinkButton>
)}
</div>
</div>
diff --git a/src/components/metrics/MetricsTable.module.css b/src/components/metrics/MetricsTable.module.css
index fc3bc51e4..c00e4356c 100644
--- a/src/components/metrics/MetricsTable.module.css
+++ b/src/components/metrics/MetricsTable.module.css
@@ -1,7 +1,6 @@
.container {
position: relative;
min-height: 430px;
- height: 100%;
display: flex;
flex-direction: column;
flex: 1;