watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-07 14:17:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Refactored filter logic.

Browse source
This commit is contained in:
Mike Cao 2023-04-01 15:44:30 -07:00
parent 57c3d03cc8
commit 74192cd695
18 changed files with 205 additions and 296 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/common/ErrorMessage.module.css
View file

@ -5,9 +5,9 @@
transform: translate(-50%, -50%);
margin: auto;
display: flex;
z-index: var(--z-index-above);
background-color: var(--base50);
padding: 10px;
z-index: 1;
}
.icon {

2
components/common/FilterLink.js
View file

@ -14,7 +14,7 @@ export default function FilterLink({ id, value, label, externalUrl }) {
return (
<div className={styles.row}>
{!value && <span className={styles.empty}>{label || formatMessage(labels.unknown)}</span>}
{!value && `(${label || formatMessage(labels.unknown)})`}
{value && (
<Link
href={resolveUrl({ [id]: value })}

4
components/common/FilterLink.module.css
View file

@ -30,7 +30,3 @@
.icon {
cursor: pointer;
}
.empty {
color: var(--base400);
}

5
components/layout/Page.js
View file

@ -1,10 +1,13 @@
import classNames from 'classnames';
import { Banner, Loading } from 'react-basics';
import useMessages from 'hooks/useMessages';
import styles from './Page.module.css';
export default function Page({ className, error, loading, children }) {
const { formatMessage, messages } = useMessages();
if (error) {
return <Banner variant="error">Something went wrong.</Banner>;
return <Banner variant="error">{formatMessage(messages.error)}</Banner>;
}
if (loading) {

2
components/metrics/PagesTable.js
View file

@ -28,7 +28,7 @@ export default function PagesTable({ websiteId, showFilters, ...props }) {
];
const renderLink = ({ x }) => {
return <FilterLink id={view} value={x || `(${formatMessage(labels.none)})`} />;
return <FilterLink id={view} value={x || formatMessage(labels.none)} />;
};
return (

6
components/metrics/ReferrersTable.js
View file

@ -5,13 +5,13 @@ import useMessages from 'hooks/useMessages';
export default function ReferrersTable({ websiteId, ...props }) {
const { formatMessage, labels } = useMessages();
const renderLink = ({ w: link, x: referrer }) => {
const renderLink = ({ x: referrer }) => {
return (
<FilterLink
id="referrer"
value={referrer}
externalUrl={link}
label={!referrer && `(${formatMessage(labels.none)})`}
externalUrl={`https://${referrer}`}
label={!referrer && formatMessage(labels.none)}
/>
);
};