feat: add 'inherit' execution mode to action-groups

bitfocus · Dec 15, 2024 · 3a96984 · 3a96984
1 parent 24d98ad
commit 3a96984
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 4 deletions.
diff --git a/companion/lib/Controls/ActionRunner.ts b/companion/lib/Controls/ActionRunner.ts
@@ -143,7 +143,7 @@ export class ControlActionRunner {
 
 	async runActions(
 		actions: ActionInstance[],
-		extras: Omit<RunActionExtras, 'controlId' | 'abortDelayed'>
+		extras: Omit<RunActionExtras, 'controlId' | 'abortDelayed' | 'executionMode'>
 	): Promise<void> {
 		const controller = new AbortController()
 
@@ -160,6 +160,7 @@ export class ControlActionRunner {
 				...extras,
 				controlId: this.#controlId,
 				abortDelayed: controller.signal,
+				executionMode: 'concurrent',
 			})
 			.finally(() => {
 				// If this removes the last chain, trigger a redraw

diff --git a/companion/lib/Instance/Wrapper.ts b/companion/lib/Instance/Wrapper.ts
@@ -927,6 +927,7 @@ export interface RunActionExtras {
 	surfaceId: string | undefined
 	location: ControlLocation | undefined
 	abortDelayed: AbortSignal
+	executionMode: 'sequential' | 'concurrent'
 }
 
 export interface VariableDefinitionTmp {

diff --git a/companion/lib/Internal/BuildingBlocks.ts b/companion/lib/Internal/BuildingBlocks.ts
@@ -98,8 +98,9 @@ export class InternalBuildingBlocks implements InternalModuleFragment {
 						type: 'dropdown',
 						label: 'Execution mode',
 						id: 'execution_mode',
-						default: 'concurrent',
+						default: 'inherit',
 						choices: [
+							{ id: 'inherit', label: 'Inherit' },
 							{ id: 'concurrent', label: 'Concurrent' },
 							{ id: 'sequential', label: 'Sequential' },
 						],
@@ -172,10 +173,28 @@ export class InternalBuildingBlocks implements InternalModuleFragment {
 		} else if (action.action === 'action_group') {
 			if (extras.abortDelayed.aborted) return true
 
-			const executeSequential = action.options.execution_mode === 'sequential'
+			let executeSequential = false
+			switch (action.options.execution_mode) {
+				case 'sequential':
+					executeSequential = true
+					break
+				case 'concurrent':
+					executeSequential = false
+					break
+				case 'inherit':
+					executeSequential = extras.executionMode === 'sequential'
+					break
+				default:
+					this.#logger.error(`Unknown execution mode: ${action.options.execution_mode}`)
+			}
+
+			const newExtras: RunActionExtras = {
+				...extras,
+				executionMode: executeSequential ? 'sequential' : 'concurrent',
+			}
 
 			return this.#actionRunner
-				.runMultipleActions(action.children?.['default'] ?? [], extras, executeSequential)
+				.runMultipleActions(action.children?.['default'] ?? [], newExtras, executeSequential)
 				.catch((e) => {
 					this.#logger.error(`Failed to run actions: ${e.message}`)
 				})