Remove all nonNulls

CruGlobal · Oct 14, 2024 · d4e8b81 · d4e8b81
1 parent feeffb8
commit d4e8b81
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/pages/api/Schema/reports/financialAccounts/financialEntries/financialEntries.graphql b/pages/api/Schema/reports/financialAccounts/financialEntries/financialEntries.graphql
@@ -23,7 +23,7 @@ type FinancialAccountEntry {
   currency: String
   code: String
   description: String
-  entryDate: ISO8601Date!
+  entryDate: ISO8601Date
   type: String
   category: FinancialAccountCategory!
 }

diff --git a/...ialAccountsReport/AccountTransactions/AccountTransactionTable/AccountTransactionTable.tsx b/...ialAccountsReport/AccountTransactions/AccountTransactionTable/AccountTransactionTable.tsx
@@ -70,7 +70,7 @@ interface TransactionRow {
   currency?: Maybe<string>;
   expenseAmount?: Maybe<string>;
   incomeAmount?: Maybe<string>;
-  entryDate: DateTime<boolean>;
+  entryDate: DateTime<boolean> | string;
 }
 
 const createTransactionRow = (
@@ -86,7 +86,9 @@ const createTransactionRow = (
     ...amounts,
     categoryName: entry.category.name ?? entry.category.code ?? '',
     categoryCode: entry.category.code ?? '',
-    entryDate: DateTime.fromISO(entry.entryDate),
+    entryDate: entry.entryDate
+      ? DateTime.fromISO(entry.entryDate)
+      : 'No entry date',
   };
 };
 
@@ -187,7 +189,11 @@ export const AccountTransactionTable: React.FC<TableProps> = ({
   }, [entries, currency, openingBalance, closingBalance, activeFilters]);
 
   const Date: RenderCell = ({ row }) => (
-    <Typography>{dateFormatShort(row.entryDate, locale)}</Typography>
+    <Typography>
+      {typeof row.entryDate === 'string'
+        ? row.entryDate
+        : dateFormatShort(row.entryDate, locale)}
+    </Typography>
   );
   const Category: RenderCell = ({ row }) => (
     <Box>

diff --git a/src/components/Reports/FinancialAccountsReport/AccountTransactions/AccountTransactions.tsx b/src/components/Reports/FinancialAccountsReport/AccountTransactions/AccountTransactions.tsx
@@ -120,7 +120,9 @@ export const AccountTransactions: React.FC = () => {
     ];
     const convertDataToArray = data.financialAccountEntries.entries.map(
       (entry) => [
-        dateFormatShort(DateTime.fromISO(entry.entryDate), locale),
+        entry.entryDate
+          ? dateFormatShort(DateTime.fromISO(entry.entryDate), locale)
+          : 'No entry date',
         entry.description ?? '',
         entry.category?.name ?? entry.category?.code ?? '',
         entry.type === FinancialAccountEntryTypeEnum.Debit