From 046475e7ac1249355c26cdab9fd461394be66c6f Mon Sep 17 00:00:00 2001 From: karwosts <32912880+karwosts@users.noreply.github.com> Date: Wed, 31 May 2023 03:58:22 -0700 Subject: [PATCH] Fix blueprint script editor defaults handling (#16196) --- .../config/automation/blueprint-automation-editor.ts | 9 ++++++++- src/panels/config/script/blueprint-script-editor.ts | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/panels/config/automation/blueprint-automation-editor.ts b/src/panels/config/automation/blueprint-automation-editor.ts index 43b0ccf681..3131a44b26 100644 --- a/src/panels/config/automation/blueprint-automation-editor.ts +++ b/src/panels/config/automation/blueprint-automation-editor.ts @@ -194,7 +194,14 @@ export class HaBlueprintAutomationEditor extends LitElement { } const input = { ...this.config.use_blueprint.input, [key]: value }; - if (value === "" || value === undefined) { + const blueprint = this._blueprint; + const metaValue = + !blueprint || "error" in blueprint + ? undefined + : blueprint?.metadata.input && blueprint?.metadata?.input[key]; + const keyDefault = metaValue && metaValue.default; + + if ((value === "" && !keyDefault) || value === undefined) { delete input[key]; } diff --git a/src/panels/config/script/blueprint-script-editor.ts b/src/panels/config/script/blueprint-script-editor.ts index d6057373af..453a639746 100644 --- a/src/panels/config/script/blueprint-script-editor.ts +++ b/src/panels/config/script/blueprint-script-editor.ts @@ -173,7 +173,14 @@ export class HaBlueprintScriptEditor extends LitElement { } const input = { ...this.config.use_blueprint.input, [key]: value }; - if (value === "" || value === undefined) { + const blueprint = this._blueprint; + const metaValue = + !blueprint || "error" in blueprint + ? undefined + : blueprint?.metadata.input && blueprint?.metadata?.input[key]; + const keyDefault = metaValue && metaValue.default; + + if ((value === "" && !keyDefault) || value === undefined) { delete input[key]; }