From 92f7f3cbe2febd0ae348008017d3dbd6aafa6b93 Mon Sep 17 00:00:00 2001
From: Baptiste Arnaud <contact@baptiste-arnaud.fr>
Date: Tue, 27 Jun 2023 09:18:36 +0200
Subject: [PATCH] :bug: (condition) Improve comparison on dates

---
 .../logic/condition/executeCondition.ts       | 37 +++++++++++--------
 1 file changed, 22 insertions(+), 15 deletions(-)

diff --git a/apps/viewer/src/features/blocks/logic/condition/executeCondition.ts b/apps/viewer/src/features/blocks/logic/condition/executeCondition.ts
index bd2b0d7b1..dcd5064e0 100644
--- a/apps/viewer/src/features/blocks/logic/condition/executeCondition.ts
+++ b/apps/viewer/src/features/blocks/logic/condition/executeCondition.ts
@@ -34,41 +34,39 @@ const executeComparison =
           if (b === '' || !b || !a) return false
           return a.toLowerCase().trim().includes(b.toLowerCase().trim())
         }
-        return compare(contains, inputValue, value)
+        return compare(contains, inputValue, value, 'some')
       }
       case ComparisonOperators.NOT_CONTAINS: {
         const notContains = (a: string | null, b: string | null) => {
           if (b === '' || !b || !a) return true
           return !a.toLowerCase().trim().includes(b.toLowerCase().trim())
         }
-        return compare(notContains, inputValue, value, true)
+        return compare(notContains, inputValue, value)
       }
       case ComparisonOperators.EQUAL: {
         return compare((a, b) => a === b, inputValue, value)
       }
       case ComparisonOperators.NOT_EQUAL: {
-        return compare((a, b) => a !== b, inputValue, value, true)
+        return compare((a, b) => a !== b, inputValue, value)
       }
       case ComparisonOperators.GREATER: {
         if (isNotDefined(inputValue) || isNotDefined(value)) return false
         if (typeof inputValue === 'string') {
           if (typeof value === 'string')
-            return parseFloat(inputValue) > parseFloat(value)
-          return parseFloat(inputValue) > value.length
+            return parseDateOrNumber(inputValue) > parseDateOrNumber(value)
+          return Number(inputValue) > value.length
         }
-        if (typeof value === 'string')
-          return inputValue.length > parseFloat(value)
+        if (typeof value === 'string') return inputValue.length > Number(value)
         return inputValue.length > value.length
       }
       case ComparisonOperators.LESS: {
         if (isNotDefined(inputValue) || isNotDefined(value)) return false
         if (typeof inputValue === 'string') {
           if (typeof value === 'string')
-            return parseFloat(inputValue) < parseFloat(value)
-          return parseFloat(inputValue) < value.length
+            return parseDateOrNumber(inputValue) < parseDateOrNumber(value)
+          return Number(inputValue) < value.length
         }
-        if (typeof value === 'string')
-          return inputValue.length < parseFloat(value)
+        if (typeof value === 'string') return inputValue.length < Number(value)
         return inputValue.length < value.length
       }
       case ComparisonOperators.IS_SET: {
@@ -98,20 +96,29 @@ const compare = (
   compareStrings: (a: string | null, b: string | null) => boolean,
   a: Exclude<Variable['value'], undefined>,
   b: Exclude<Variable['value'], undefined>,
-  defaultReturnValue = false
+  type: 'every' | 'some' = 'every'
 ): boolean => {
   if (!a || typeof a === 'string') {
     if (!b || typeof b === 'string') return compareStrings(a, b)
-    return defaultReturnValue === true
+    return type === 'every'
       ? b.every((b) => compareStrings(a, b))
       : b.some((b) => compareStrings(a, b))
   }
   if (!b || typeof b === 'string') {
-    return defaultReturnValue === true
+    return type === 'every'
       ? a.every((a) => compareStrings(a, b))
       : a.some((a) => compareStrings(a, b))
   }
-  if (defaultReturnValue === true)
+  if (type === 'every')
     return a.every((a) => b.every((b) => compareStrings(a, b)))
   return a.some((a) => b.some((b) => compareStrings(a, b)))
 }
+
+const parseDateOrNumber = (value: string): number => {
+  const parsed = Number(value)
+  if (isNaN(parsed)) {
+    const time = Date.parse(value)
+    return time
+  }
+  return parsed
+}