Skip to content

Commit a332ccf

Browse files
committed
Handling additional space + text
[#1108]
1 parent 0b98b7d commit a332ccf

2 files changed

Lines changed: 5 additions & 2 deletions

File tree

packages/iris-grid/src/sidebar/conditional-formatting/ConditionalFormattingUtils.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ describe('isDateConditionValid', () => {
225225
'2023-02-23T00:00:00 NY',
226226
'2023-02-23 NY',
227227
],
228-
invalid: ['blah', '2023-02-23'],
228+
invalid: ['blah', '2023-02-23', '2023-02-23T00:00:00 NY blah'],
229229
empty: '',
230230
undefined,
231231
};

packages/iris-grid/src/sidebar/conditional-formatting/ConditionalFormattingUtils.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -718,7 +718,10 @@ export function isDateConditionValid(condition: DateCondition, value?: string) {
718718
return true;
719719

720720
default: {
721-
const [dateTimeString, tzCode] = (value ?? '').split(' ');
721+
const [dateTimeString, ...rest] = (value ?? '').split(' ');
722+
// Reconstitute all tokens after the first ' ' in case the user included garbage data at the end
723+
// e.g. '2020-01-01 NY blah'
724+
const tzCode = rest.join(' ');
722725

723726
try {
724727
DateUtils.parseDateTimeString(dateTimeString);

0 commit comments

Comments
 (0)