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

Merge branch 'dev' into bugfix/user-website-error

Browse source
This commit is contained in:
Mike Cao 2023-08-18 13:32:21 -10:00 • committed by GitHub
commit 907253926e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 31 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

25
components/pages/settings/users/UserWebsites.js
View file

@ -2,15 +2,13 @@ import useApi from 'hooks/useApi';
import WebsitesTable from 'components/pages/settings/websites/WebsitesTable';
import useMessages from 'hooks/useMessages';
import useApiFilter from 'hooks/useApiFilter';
import Page from 'components/layout/Page';
import useConfig from 'hooks/useConfig';
export function UserWebsites({ userId }) {
const { cloudMode } = useConfig();
const { formatMessage, messages } = useMessages();
const { filter, page, pageSize, handlePageSizeChange, handleFilterChange, handlePageChange } = useApiFilter();
const { filter, page, pageSize, handleFilterChange, handlePageChange, handlePageSizeChange } =
useApiFilter();
const { get, useQuery } = useApi();
const { data, isLoading, error } = useQuery(['user:websites', userId, filter, page, pageSize], () =>
const { data, isLoading } = useQuery(['user:websites', userId, filter, page, pageSize], () =>
get(`/users/${userId}/websites`, {
filter,
page,
@ -20,19 +18,18 @@ export function UserWebsites({ userId }) {
const hasData = data && data.length !== 0;
return (
<Page loading={isLoading} error={error}>
<div>
{hasData && (
<WebsitesTable
data={data}
onFilterChange={handleFilterChange}
onPageChange={handlePageChange}
<WebsitesTable
data={data}
onFilterChange={handleFilterChange}
onPageChange={handlePageChange}
onPageSizeChange={handlePageSizeChange}
filterValue={filter}
showEditButton={!cloudMode}
/>)
}
/>
)}
{!hasData && formatMessage(messages.noDataAvailable)}
</Page>
</div>
);
}