wip: constant value

bitfocus · Feb 23, 2025 · 20ebd61 · 20ebd61
1 parent 4b5a677
commit 20ebd61
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 7 deletions.
diff --git a/companion/lib/Resources/LocalVariableEntityDefinitions.ts b/companion/lib/Resources/LocalVariableEntityDefinitions.ts
@@ -3,6 +3,7 @@ import { EntityModelType } from '@companion-app/shared/Model/EntityModel.js'
 import { InternalActionInputField, InternalFeedbackInputField } from '@companion-app/shared/Model/Options.js'
 
 export enum LocalVariableEntityDefinitionType {
+	ConstantValue = 'constant-value',
 	DynamicExpression = 'dynamic-expression',
 }
 
@@ -25,6 +26,31 @@ const commonOptions: (InternalActionInputField | InternalFeedbackInputField)[] =
 ]
 
 export const LocalVariableEntityDefinitions: Record<LocalVariableEntityDefinitionType, ClientEntityDefinition> = {
+	[LocalVariableEntityDefinitionType.ConstantValue]: {
+		entityType: EntityModelType.LocalVariable,
+		label: 'Constant Value',
+		description: 'A constant value that can be used in other fields',
+		options: [
+			...commonOptions,
+			{
+				id: 'value',
+				label: 'Value',
+				type: 'textinput',
+				default: '1',
+				isExpression: false,
+				// useVariables: {
+				// 	local: true,
+				// },
+			},
+		],
+		feedbackType: null,
+		feedbackStyle: undefined,
+		hasLearn: false,
+		learnTimeout: undefined,
+		showInvert: false,
+		showButtonPreview: false,
+		supportsChildGroups: [],
+	},
 	[LocalVariableEntityDefinitionType.DynamicExpression]: {
 		entityType: EntityModelType.LocalVariable,
 		label: 'Reusable Expression',

diff --git a/companion/lib/Variables/Util.ts b/companion/lib/Variables/Util.ts
@@ -199,14 +199,18 @@ export class VariablesAndExpressionParser {
 			if (variable.type !== EntityModelType.LocalVariable || variable.connectionId !== 'internal') continue
 			if (!variable.options.name) continue
 
+			const fullId = `$(local:${variable.options.name})`
+
 			// TODO-localvariable: can this be made stricter?
 			const definitionId = variable.definitionId as LocalVariableEntityDefinitionType
 			switch (definitionId) {
+				case LocalVariableEntityDefinitionType.ConstantValue: {
+					this.#localValues.set(fullId, variable.options.value)
+					break
+				}
 				case LocalVariableEntityDefinitionType.DynamicExpression: {
 					let computedResult: CompanionVariableValue | undefined = undefined
 
-					const fullId = `$(local:${variable.options.name})`
-
 					const expression = variable.options.expression
 					this.#localValues.set(fullId, () => {
 						if (computedResult !== undefined) return computedResult

diff --git a/webui/src/Services/Controls/ControlEntitiesService.ts b/webui/src/Services/Controls/ControlEntitiesService.ts
@@ -117,11 +117,14 @@ export function useControlEntitiesEditorService(
 				})
 			},
 
-			setEnabled: (entityId: string, enabled: boolean) => {
-				socket.emitPromise('controls:entity:enabled', [controlId, listId, entityId, enabled]).catch((e) => {
-					console.error('Failed to enable/disable entity', e)
-				})
-			},
+			setEnabled:
+				entityModelType !== EntityModelType.LocalVariable
+					? (entityId: string, enabled: boolean) => {
+							socket.emitPromise('controls:entity:enabled', [controlId, listId, entityId, enabled]).catch((e) => {
+								console.error('Failed to enable/disable entity', e)
+							})
+						}
+					: undefined,
 
 			setHeadline: (entityId: string, headline: string) => {
 				socket.emitPromise('controls:entity:set-headline', [controlId, listId, entityId, headline]).catch((e) => {