feat: add else block to 'logic: if' action

bitfocus · Jan 24, 2025 · a7b597f · a7b597f
1 parent 84d3665
commit a7b597f
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/companion/lib/Internal/BuildingBlocks.ts b/companion/lib/Internal/BuildingBlocks.ts
@@ -205,6 +205,12 @@ export class InternalBuildingBlocks implements InternalModuleFragment {
 						label: 'Then',
 						entityTypeLabel: 'action',
 					},
+					{
+						type: EntityModelType.Action,
+						groupId: 'else_actions',
+						label: 'Else',
+						entityTypeLabel: 'action',
+					},
 				],
 			},
 		}
@@ -284,15 +290,11 @@ export class InternalBuildingBlocks implements InternalModuleFragment {
 			if (extras.abortDelayed.aborted) return true
 
 			const conditionValues = action.getChildren('condition')?.getChildBooleanFeedbackValues() ?? []
-			if (!booleanAnd(false, conditionValues)) {
-				// Condition failed, abort
-				return true
-			}
 
+			const executeGroup = booleanAnd(false, conditionValues) ? 'actions' : 'else_actions'
+			const childActions = action.getChildren(executeGroup)?.getDirectEntities() ?? []
 			const executeSequential = extras.executionMode === 'sequential'
 
-			const childActions = action.getChildren('actions')?.getDirectEntities() ?? []
-
 			return this.#actionRunner
 				.runMultipleActions(childActions, extras, executeSequential)
 				.catch((e) => {