From f1427b0ee25011e1bd8a749c9c7fee7f81aca833 Mon Sep 17 00:00:00 2001
From: Fernando Chavez <fernando.chavez@strapi.io>
Date: Mon, 17 Jun 2024 10:35:29 +0200
Subject: [PATCH 1/2] fix(content-manager): add isFetching to loading check

---
 .../content-manager/admin/src/pages/ListView/ListViewPage.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/core/content-manager/admin/src/pages/ListView/ListViewPage.tsx b/packages/core/content-manager/admin/src/pages/ListView/ListViewPage.tsx
index 4bf3fffc3b..d811ef387a 100644
--- a/packages/core/content-manager/admin/src/pages/ListView/ListViewPage.tsx
+++ b/packages/core/content-manager/admin/src/pages/ListView/ListViewPage.tsx
@@ -97,7 +97,7 @@ const ListViewPage = () => {
   });
 
   const params = React.useMemo(() => buildValidParams(query), [query]);
-  const { data, error, isLoading } = useGetAllDocumentsQuery({
+  const { data, error, isLoading, isFetching } = useGetAllDocumentsQuery({
     model,
     params,
   });
@@ -170,7 +170,7 @@ const ListViewPage = () => {
     return formattedHeaders;
   }, [displayedHeaders, formatMessage, list, runHookWaterfall, schema?.options?.draftAndPublish]);
 
-  if (isLoading) {
+  if (isLoading || isFetching) {
     return <Page.Loading />;
   }
 

From e740c642d70f0363c1b84389e63e1709992d2d58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fernando=20Ch=C3=A1vez?= <fernando.chavez@strapi.io>
Date: Tue, 18 Jun 2024 11:07:26 +0200
Subject: [PATCH 2/2] fix(content-manager): only check for isFetching

---
 .../admin/src/pages/ListView/ListViewPage.tsx               | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/core/content-manager/admin/src/pages/ListView/ListViewPage.tsx b/packages/core/content-manager/admin/src/pages/ListView/ListViewPage.tsx
index d811ef387a..efa0c11a86 100644
--- a/packages/core/content-manager/admin/src/pages/ListView/ListViewPage.tsx
+++ b/packages/core/content-manager/admin/src/pages/ListView/ListViewPage.tsx
@@ -97,7 +97,7 @@ const ListViewPage = () => {
   });
 
   const params = React.useMemo(() => buildValidParams(query), [query]);
-  const { data, error, isLoading, isFetching } = useGetAllDocumentsQuery({
+  const { data, error, isFetching } = useGetAllDocumentsQuery({
     model,
     params,
   });
@@ -170,7 +170,7 @@ const ListViewPage = () => {
     return formattedHeaders;
   }, [displayedHeaders, formatMessage, list, runHookWaterfall, schema?.options?.draftAndPublish]);
 
-  if (isLoading || isFetching) {
+  if (isFetching) {
     return <Page.Loading />;
   }
 
@@ -239,7 +239,7 @@ const ListViewPage = () => {
       />
       <Layouts.Content>
         <Flex gap={4} direction="column" alignItems="stretch">
-          <Table.Root rows={results} headers={tableHeaders} isLoading={isLoading}>
+          <Table.Root rows={results} headers={tableHeaders} isLoading={isFetching}>
             <TableActionsBar />
             <Table.Content>
               <Table.Head>