From a332ccf190c61f9224a71e1bbe5934cba73f19af Mon Sep 17 00:00:00 2001
From: Brian Ingles <brianingles@deephaven.io>
Date: Thu, 2 Mar 2023 10:43:21 -0600
Subject: [PATCH] Handling additional space + text

[#1108]
---
 .../ConditionalFormattingUtils.test.ts                       | 2 +-
 .../conditional-formatting/ConditionalFormattingUtils.ts     | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/iris-grid/src/sidebar/conditional-formatting/ConditionalFormattingUtils.test.ts b/packages/iris-grid/src/sidebar/conditional-formatting/ConditionalFormattingUtils.test.ts
index bacf03a853..787be57c20 100644
--- a/packages/iris-grid/src/sidebar/conditional-formatting/ConditionalFormattingUtils.test.ts
+++ b/packages/iris-grid/src/sidebar/conditional-formatting/ConditionalFormattingUtils.test.ts
@@ -225,7 +225,7 @@ describe('isDateConditionValid', () => {
       '2023-02-23T00:00:00 NY',
       '2023-02-23 NY',
     ],
-    invalid: ['blah', '2023-02-23'],
+    invalid: ['blah', '2023-02-23', '2023-02-23T00:00:00 NY blah'],
     empty: '',
     undefined,
   };
diff --git a/packages/iris-grid/src/sidebar/conditional-formatting/ConditionalFormattingUtils.ts b/packages/iris-grid/src/sidebar/conditional-formatting/ConditionalFormattingUtils.ts
index 3f52825118..16376a1cfe 100644
--- a/packages/iris-grid/src/sidebar/conditional-formatting/ConditionalFormattingUtils.ts
+++ b/packages/iris-grid/src/sidebar/conditional-formatting/ConditionalFormattingUtils.ts
@@ -718,7 +718,10 @@ export function isDateConditionValid(condition: DateCondition, value?: string) {
       return true;
 
     default: {
-      const [dateTimeString, tzCode] = (value ?? '').split(' ');
+      const [dateTimeString, ...rest] = (value ?? '').split(' ');
+      // Reconstitute all tokens after the first ' ' in case the user included garbage data at the end
+      // e.g. '2020-01-01 NY blah'
+      const tzCode = rest.join(' ');
 
       try {
         DateUtils.parseDateTimeString(dateTimeString);