fix some nullable issue

fullstacksjs · Aug 14, 2023 · 62c835b · 62c835b
1 parent 945dcbc
commit 62c835b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/app/Dashboard/Households/HouseholdList/HouseholdList.tsx b/app/Dashboard/Households/HouseholdList/HouseholdList.tsx
@@ -38,7 +38,7 @@ export const HouseholdList = () => {
   const { data, loading, error } = useHouseholdListQuery({
     variables: { orderBy: sorting },
   });
-  const households = data?.household;
+  const households = data?.household ?? null;
 
   const columns = [
     householdColumnHelper.display({
@@ -76,14 +76,13 @@ export const HouseholdList = () => {
   ];
 
   const table = useReactTable({
-    data: households!,
+    data: households ?? [],
     columns,
     state: {
       sorting,
     },
     onSortingChange: setSorting,
     getCoreRowModel: getCoreRowModel(),
-    enableSorting: true,
     getSortedRowModel: getSortedRowModel(),
   });
 

diff --git a/app/Dashboard/Projects/ProjectList/ProjectList.tsx b/app/Dashboard/Projects/ProjectList/ProjectList.tsx
@@ -33,7 +33,7 @@ const t = messages.projects.list;
 
 export const ProjectList = () => {
   const { data, loading, error } = useProjectListQuery();
-  const projects = data?.projects;
+  const projects = data?.projects ?? null;
 
   const columns = [
     projectColumnHelper.display({
@@ -52,7 +52,7 @@ export const ProjectList = () => {
       header: t.table.columns.fullDate,
       cell: date => (
         <DateSummery
-          startDate={date.getValue()?.startDate ?? null}
+          startDate={date.getValue()?.startDate}
           endDate={date.getValue()?.endDate}
         />
       ),
@@ -74,7 +74,7 @@ export const ProjectList = () => {
   ];
 
   const table = useReactTable({
-    data: projects!,
+    data: projects ?? [],
     columns,
     getCoreRowModel: getCoreRowModel(),
     getSortedRowModel: getSortedRowModel(),

diff --git a/libs/design/DateSummery/DateSummery.tsx b/libs/design/DateSummery/DateSummery.tsx
@@ -1,7 +1,7 @@
 import { Text } from '@mantine/core';
 
 interface Props {
-  startDate: Date | null;
+  startDate?: Date;
   endDate?: Date;
 }