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

Fixed dashboard ordering issue. Closes #1414

Browse source
This commit is contained in:
Mike Cao 2022-08-29 20:57:34 -07:00
parent d4eddaa636
commit fb39ce8822
4 changed files with 21 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

7
components/pages/WebsiteList.js
View file

@ -6,8 +6,8 @@ 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 { sortArrayByMap } from 'lib/array';
import { useMemo } from 'react';
import { firstBy } from 'thenby';
const messages = defineMessages({
noWebsites: {
@ -25,7 +25,10 @@ export default function WebsiteList({ websites, showCharts, limit }) {
const { formatMessage } = useIntl();
const ordered = useMemo(
() => sortArrayByMap(websites, websiteOrder, 'website_id'),
() =>
websites
.map(website => ({ ...website, order: websiteOrder.indexOf(website.website_id) || 0 }))
.sort(firstBy('order')),
[websites, websiteOrder],
);