Handling additional space + text

[deephaven#1108] [deephaven#1108]
bmingles · Mar 2, 2023 · cc2c1c2 · cc2c1c2
1 parent 0b98b7d
commit cc2c1c2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/__mocks__/dh-core.js b/__mocks__/dh-core.js
@@ -1750,7 +1750,7 @@ class DateWrapper extends LongWrapper {
 
 class TimeZone {
   static getTimeZone(id) {
-    if (id == null || id === '') {
+    if (id == null || id === '' || id.includes(' ')) {
       // Usually there would be a java.lang.IllegalArgumentException for any invalid id.
       // We at least know that '' and undefined, so throw an error.
       throw new Error('Unsupported time zone');

diff --git 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
@@ -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);