From a768870f97c0453462e1f860e52131bd03538cd2 Mon Sep 17 00:00:00 2001
From: Marco Montalbano <marco.montalbano@commercelayer.io>
Date: Thu, 14 May 2026 14:54:18 +0200
Subject: [PATCH] fix: RuleEngine can handle datetime fields with proper Date
 component

---
 .../fetchCoreResourcesSuggestions.ts          | 22 +++++++++++++------
 .../RuleEngine/Condition/ConditionMatcher.tsx |  4 ----
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/packages/app-elements/src/ui/forms/CodeEditor/fetchCoreResourcesSuggestions.ts b/packages/app-elements/src/ui/forms/CodeEditor/fetchCoreResourcesSuggestions.ts
index 2a9daa6b7..16208a1ae 100644
--- a/packages/app-elements/src/ui/forms/CodeEditor/fetchCoreResourcesSuggestions.ts
+++ b/packages/app-elements/src/ui/forms/CodeEditor/fetchCoreResourcesSuggestions.ts
@@ -239,15 +239,23 @@ export async function atPath(
       if (className == null) {
         const field = acc.resource?.fields.find(([key]) => key === attr)?.[1]
 
+        if (field == null) {
+          return acc
+        }
+
+        let fieldType = field.type
+
+        if (fieldType === "string" && field?.format === "datetime") {
+          fieldType = "datetime"
+        }
+
         return {
           ...acc,
-          field:
-            field != null
-              ? {
-                  ...field,
-                  name: attr,
-                }
-              : undefined,
+          field: {
+            ...field,
+            type: fieldType,
+            name: attr,
+          },
         }
       }
 
diff --git a/packages/app-elements/src/ui/forms/RuleEngine/Condition/ConditionMatcher.tsx b/packages/app-elements/src/ui/forms/RuleEngine/Condition/ConditionMatcher.tsx
index f36dc65b3..1b172f8b4 100644
--- a/packages/app-elements/src/ui/forms/RuleEngine/Condition/ConditionMatcher.tsx
+++ b/packages/app-elements/src/ui/forms/RuleEngine/Condition/ConditionMatcher.tsx
@@ -26,10 +26,6 @@ export function ConditionMatcher({
     fieldType = guessFieldType((item as ItemWithValue | null)?.value)
   }
 
-  if (fieldType === "string" && infos?.field?.format === "datetime") {
-    fieldType = "datetime"
-  }
-
   const resourceId = infos?.resource?.id
 
   const AGGREGATED_RESOURCE = ["tag"]