yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-07 15:49:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v5/main' into v5/expand-nested-components

Browse Source
This commit is contained in:
Bassel Kanso 2024-06-19 14:55:24 +03:00 committed by GitHub
commit 84f58c470c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/core/content-manager/admin/src/pages/ListView/ListViewPage.tsx
View File

@ -97,7 +97,7 @@ const ListViewPage = () => {
}); });
const params = React.useMemo(() => buildValidParams(query), [query]); const params = React.useMemo(() => buildValidParams(query), [query]);
const { data, error, isLoading } = useGetAllDocumentsQuery({ const { data, error, isFetching } = useGetAllDocumentsQuery({
model, model,
params, params,
}); });
@ -170,7 +170,7 @@ const ListViewPage = () => {
return formattedHeaders; return formattedHeaders;
}, [displayedHeaders, formatMessage, list, runHookWaterfall, schema?.options?.draftAndPublish]); }, [displayedHeaders, formatMessage, list, runHookWaterfall, schema?.options?.draftAndPublish]);
if (isLoading) { if (isFetching) {
return <Page.Loading />; return <Page.Loading />;
} }
@ -239,7 +239,7 @@ const ListViewPage = () => {
/> />
<Layouts.Content> <Layouts.Content>
<Flex gap={4} direction="column" alignItems="stretch"> <Flex gap={4} direction="column" alignItems="stretch">
<Table.Root rows={results} headers={tableHeaders} isLoading={isLoading}> <Table.Root rows={results} headers={tableHeaders} isLoading={isFetching}>
<TableActionsBar /> <TableActionsBar />
<Table.Content> <Table.Content>
<Table.Head> <Table.Head>