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

Refactored dashboard sort logic.

Browse source
This commit is contained in:
Mike Cao 2022-08-04 21:37:18 -07:00
parent 42e87a4691
commit 62b032ab19
8 changed files with 32 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

13
components/pages/WebsiteList.js
View file

@ -6,7 +6,7 @@ import EmptyPlaceholder from 'components/common/EmptyPlaceholder';
import Arrow from 'assets/arrow-right.svg';
import styles from './WebsiteList.module.css';
import useDashboard from 'store/dashboard';
import { orderByWebsiteMap } from 'lib/format';
import { sortArrayByMap } from 'lib/array';
import { useMemo } from 'react';
const messages = defineMessages({
@ -20,11 +20,16 @@ const messages = defineMessages({
},
});
export default function WebsiteList({ data, showCharts, limit }) {
export default function WebsiteList({ websites, showCharts, limit }) {
const { websiteOrder } = useDashboard();
const { formatMessage } = useIntl();
const websites = useMemo(() => orderByWebsiteMap(data, websiteOrder), [data, websiteOrder]);
console.log({ websiteOrder });
const ordered = useMemo(
() => sortArrayByMap(websites, websiteOrder, 'website_id'),
[websites, websiteOrder],
);
if (websites.length === 0) {
return (
@ -40,7 +45,7 @@ export default function WebsiteList({ data, showCharts, limit }) {
return (
<div>
{websites.map(({ website_id, name, domain }, index) =>
{ordered.map(({ website_id, name, domain }, index) =>
index < limit ? (
<div key={website_id} className={styles.website}>
<WebsiteChart