Skip to content

RuleEngine can handle datetime fields #1126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marcomontalbano merged 1 commit into from
May 14, 2026
Merged

RuleEngine can handle datetime fields #1126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/app-elements/src/ui/forms/CodeEditor/fetchCoreResourcesSuggestions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ interface PublicResourcesResponse {
| "json"
desc: string
name: string
format?: "datetime" | (string & {})
}
>
relationships: Record<
Expand Down
4 changes: 4 additions & 0 deletions packages/app-elements/src/ui/forms/RuleEngine/Condition/ConditionMatcher.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@ 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"]
Expand Down
2 changes: 1 addition & 1 deletion packages/app-elements/src/ui/forms/RuleEngine/json_schema/order_rules.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "https://json-schema.org/draft/2020-12/schema",
"$id": "1.2.0",
"$id": "1.2.1",
"title": "Rules for order context",
"description": "Rules payload within order context for the rules engine of Commerce Layer.",
"properties": {
Expand Down
89 changes: 87 additions & 2 deletions packages/app-elements/src/ui/forms/RuleEngine/json_schema/organization_config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "https://json-schema.org/draft/2020-12/schema",
"$id": "1.0.1",
"$id": "1.0.2",
"title": "Valid config for organizations in CommerceLayer",
"description": "Payload to use when using the config field of the Organization on CommerceLayer.",
"type": "object",
Expand Down Expand Up @@ -40,6 +40,18 @@
}
},
"additionalProperties": false
},
"returns": {
"type": "object",
"description": "Returns app settings.",
"properties": {
"return_reasons": {
"type": "array",
"description": "Predefined return reason labels; shoppers can still submit a custom reason.",
"items": { "type": "string", "minLength": 1 }
}
},
"additionalProperties": false
}
}
},
Expand All @@ -54,6 +66,7 @@
"properties": {
"guest_orders": {
"type": "boolean",
"disabled": true,
"default": false,
"description": "Allow JWT bearer token to see guest orders."
}
Expand All @@ -62,6 +75,7 @@
"stream": {
"type": "object",
"additionalProperties": false,
"enterprise": true,
"description": "Stream pusher configuration.",
"properties": {
"scope": {
Expand All @@ -75,6 +89,7 @@
"anomalies": {
"type": "object",
"additionalProperties": false,
"enterprise": true,
"description": "Configs for anomalies alerts",
"properties": {
"orders": {
Expand All @@ -92,6 +107,76 @@
}
}
}
},
"well-known": {
"additionalProperties": false,
"type": "object",
"description": "Well-known metadata references for storefronts (resolved by Core).",
"properties": {
"shopping": {
"type": "object",
"additionalProperties": false,
"description": "Shopping well-known configuration; locale_scopes values are market references.",
"properties": {
"client_id": {
"type": "string",
"description": "OAuth client id for the shopping experience."
},
"locale_scopes": {
"type": "object",
"description": "Locale tag to market reference mapping.",
"patternProperties": {
"^[A-Za-z]{2,3}(-[A-Za-z0-9]{2,8})*$": {
"type": "object",
"additionalProperties": false,
"required": ["id"],
"properties": {
"id": {
"type": "string",
"description": "Market id reference (hashid) to be resolved by Core."
}
}
}
},
"additionalProperties": false
},
"ui": {
"type": "object",
"additionalProperties": false,
"description": "UI host and Content-Security-Policy hints.",
"properties": {
"domain": {
"type": "string",
"description": "Optional storefront UI domain."
},
"csp": {
"type": "object",
"additionalProperties": false,
"description": "CSP domain lists (absolute http(s) URIs).",
"properties": {
"resourceDomains": {
"type": "array",
"items": { "$ref": "#/$defs/url" }
},
"baseUriDomains": {
"type": "array",
"items": { "$ref": "#/$defs/url" }
},
"connectDomains": {
"type": "array",
"items": { "$ref": "#/$defs/url" }
},
"frameDomains": {
"type": "array",
"items": { "$ref": "#/$defs/url" }
}
}
}
}
}
}
}
}
}
},
"$defs": {
Expand Down Expand Up @@ -248,7 +333,7 @@
},
"recipients": {
"type": "string",
"description": "Comma separated list of email recipients for the notifications (ex: test0@commercelayer.io,test1@sommercelayer.io)."
"description": "Add comma separated emails to notify."
}
}
}
2 changes: 1 addition & 1 deletion packages/app-elements/src/ui/forms/RuleEngine/json_schema/price_rules.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "https://json-schema.org/draft/2020-12/schema",
"$id": "1.2.0",
"$id": "1.2.1",
"title": "Rules for price context",
"description": "Rules payload within price context for the rules engine of Commerce Layer.",
"properties": {
Expand Down
Loading