diff --git a/resources/js/components/automation-rules/create-automation-rule-dialog.tsx b/resources/js/components/automation-rules/create-automation-rule-dialog.tsx index dfb643a8..05f7fb94 100644 --- a/resources/js/components/automation-rules/create-automation-rule-dialog.tsx +++ b/resources/js/components/automation-rules/create-automation-rule-dialog.tsx @@ -42,7 +42,7 @@ export function CreateAutomationRuleDialog({ const [priority, setPriority] = useState('10'); const [ruleStructure, setRuleStructure] = useState({ groups: [createEmptyGroup()], - groupOperator: 'and', + groupOperator: 'or', }); const [categoryId, setCategoryId] = useState(''); const [note, setNote] = useState(''); diff --git a/resources/js/lib/rule-builder-utils.ts b/resources/js/lib/rule-builder-utils.ts index 674ba7b6..da3bfeaf 100644 --- a/resources/js/lib/rule-builder-utils.ts +++ b/resources/js/lib/rule-builder-utils.ts @@ -218,11 +218,11 @@ export function parseJsonLogic(jsonLogic: JsonLogicRule): RuleStructure { groups: [ { id: crypto.randomUUID(), - operator: 'and', + operator: 'or', conditions: [], }, ], - groupOperator: 'and', + groupOperator: 'or', }; if (!jsonLogic || Object.keys(jsonLogic).length === 0) { @@ -310,7 +310,7 @@ export function parseJsonLogic(jsonLogic: JsonLogicRule): RuleStructure { : defaultStructure.groups[0].conditions, }, ], - groupOperator: 'and', + groupOperator: 'or', }; } } @@ -321,11 +321,11 @@ export function parseJsonLogic(jsonLogic: JsonLogicRule): RuleStructure { groups: [ { id: crypto.randomUUID(), - operator: 'and', + operator: 'or', conditions: [parsed], }, ], - groupOperator: 'and', + groupOperator: 'or', }; } @@ -344,7 +344,7 @@ export function createEmptyCondition(): Condition { export function createEmptyGroup(): ConditionGroup { return { id: crypto.randomUUID(), - operator: 'and', + operator: 'or', conditions: [createEmptyCondition()], }; }