From dc88b71e02ae741c351ca5e5b8dfe69302e338cd Mon Sep 17 00:00:00 2001
From: Andres Galindo <agalin920@gmail.com>
Date: Tue, 23 Jul 2024 12:37:38 -0700
Subject: [PATCH] Fix/table sort by display date field by accounting for empty
 date values (#2864)

Co-authored-by: Stuart Runyan <shrunyan@gmail.com>
---
 .../content-editor/src/app/views/ItemList/index.tsx | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/apps/content-editor/src/app/views/ItemList/index.tsx b/src/apps/content-editor/src/app/views/ItemList/index.tsx
index 8e572918f7..f3ee800eaa 100644
--- a/src/apps/content-editor/src/app/views/ItemList/index.tsx
+++ b/src/apps/content-editor/src/app/views/ItemList/index.tsx
@@ -334,9 +334,16 @@ export const ItemList = () => {
             : b.data[sort] - a.data[sort];
         }
         if (dataType === "date" || dataType === "datetime") {
-          return (
-            new Date(b.data[sort]).getTime() - new Date(a.data[sort]).getTime()
-          );
+          if (!a.data[sort]) {
+            return 1;
+          } else if (!b.data[sort]) {
+            return -1;
+          } else {
+            return (
+              new Date(b.data[sort]).getTime() -
+              new Date(a.data[sort]).getTime()
+            );
+          }
         }
         const aValue =
           dataType === "images" ? a.data[sort]?.filename : a.data[sort];