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

Merge branch 'dev' into dash-inactive

Browse source
This commit is contained in:
Mike Cao 2024-11-18 13:31:30 -08:00 • committed by GitHub
commit 65d09a57d1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
15 changed files with 529 additions and 458 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/app/(main)/dashboard/DashboardEdit.tsx
View file

@ -1,4 +1,4 @@
import { useState, useMemo } from 'react';
import { useState, useMemo, useEffect } from 'react';
import { DragDropContext, Draggable, Droppable } from 'react-beautiful-dnd';
import classNames from 'classnames';
import { Button, Loading } from 'react-basics';
@ -16,12 +16,25 @@ export function DashboardEdit({ teamId }: { teamId: string }) {
const { formatMessage, labels } = useMessages();
const [order, setOrder] = useState(websiteOrder || []);
const [active, setActive] = useState(websiteActive || []);
const [websites, setWebsites] = useState([]);
const {
result,
query: { isLoading },
setParams,
} = useWebsites({ teamId });
const websites = result?.data;
useEffect(() => {
if (result?.data) {
setWebsites(prevWebsites => {
const newWebsites = [...prevWebsites, ...result.data];
if (newWebsites.length < result.count) {
setParams(prevParams => ({ ...prevParams, page: prevParams.page + 1 }));
}
return newWebsites;
});
}
}, [result]);
const ordered = useMemo(() => {
if (websites) {