fixes UI when no data

Vizzuality · Jun 10, 2024 · e623ed5 · e623ed5
1 parent a1fc78d
commit e623ed5
Showing 1 changed file with 11 additions and 11 deletions.
diff --git a/client/src/pages/data/index.tsx b/client/src/pages/data/index.tsx
@@ -1,4 +1,3 @@
-import { useMemo } from 'react';
 import Head from 'next/head';
 import { GetServerSideProps } from 'next';
 import { dehydrate } from '@tanstack/react-query';
@@ -13,17 +12,21 @@ import Search from '@/components/search';
 import { useLasTask } from '@/hooks/tasks';
 
 const AdminDataPage: React.FC = () => {
-  const { data, isFetched } = useSourcingLocations({
+  const { data, isFetched: sourcingLocationsAreFetched } = useSourcingLocations({
     fields: 'updatedAt',
     'page[number]': 1,
     'page[size]': 1,
   });
+
   const { data: lastTask, isFetched: lastTaskIsFetched } = useLasTask();
 
-  const thereIsData = useMemo(
-    () => isFetched && data?.meta?.totalItems > 0,
-    [isFetched, data?.meta?.totalItems],
-  );
+  const hasData = sourcingLocationsAreFetched && data?.meta?.totalItems > 0;
+
+  const showDataTable = hasData && lastTask?.status !== 'processing';
+  const showDataUploader =
+    ['processing', 'failed'].includes(lastTask?.status) ||
+    (!lastTask && lastTaskIsFetched) ||
+    !hasData;
 
   return (
     <AdminLayout
@@ -41,11 +44,8 @@ const AdminDataPage: React.FC = () => {
       <Head>
         <title>Manage data | Landgriffon</title>
       </Head>
-
-      {thereIsData && lastTask?.status !== 'processing' && <AdminDataTable />}
-
-      {(['processing', 'failed'].includes(lastTask?.status) ||
-        (!lastTask && lastTaskIsFetched)) && <AdminDataUploader />}
+      {showDataTable && <AdminDataTable />}
+      {showDataUploader && <AdminDataUploader />}
     </AdminLayout>
   );
 };