From c7a892dd5014fc7e63a81bcf91966e73faea6929 Mon Sep 17 00:00:00 2001 From: Philip Allgaier Date: Tue, 12 Jan 2021 00:49:25 +0100 Subject: [PATCH 1/3] Ensure we always show an error --- src/panels/config/automation/ha-automation-editor.ts | 4 ++-- src/panels/config/script/ha-script-editor.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/panels/config/automation/ha-automation-editor.ts b/src/panels/config/automation/ha-automation-editor.ts index 996daed1736b..ea0d65322bf3 100644 --- a/src/panels/config/automation/ha-automation-editor.ts +++ b/src/panels/config/automation/ha-automation-editor.ts @@ -502,9 +502,9 @@ export class HaAutomationEditor extends KeyboardShortcutMixin(LitElement) { } }, (errors) => { - this._errors = errors.body.message; + this._errors = errors.body.message || errors.body; showToast(this, { - message: errors.body.message, + message: errors.body.message || errors.body, }); throw errors; } diff --git a/src/panels/config/script/ha-script-editor.ts b/src/panels/config/script/ha-script-editor.ts index 76c0f886b0a4..b34f8287bdcd 100644 --- a/src/panels/config/script/ha-script-editor.ts +++ b/src/panels/config/script/ha-script-editor.ts @@ -660,9 +660,9 @@ export class HaScriptEditor extends KeyboardShortcutMixin(LitElement) { } }, (errors) => { - this._errors = errors.body.message; + this._errors = errors.body.message || errors.body; showToast(this, { - message: errors.body.message, + message: errors.body.message || errors.body, }); throw errors; } From 3553748f21069236afa401b7681a417365523a74 Mon Sep 17 00:00:00 2001 From: Philip Allgaier Date: Wed, 13 Jan 2021 19:07:45 +0100 Subject: [PATCH 2/3] Update src/panels/config/automation/ha-automation-editor.ts Co-authored-by: Bram Kragten --- src/panels/config/automation/ha-automation-editor.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/panels/config/automation/ha-automation-editor.ts b/src/panels/config/automation/ha-automation-editor.ts index ea0d65322bf3..fbd05ed4db39 100644 --- a/src/panels/config/automation/ha-automation-editor.ts +++ b/src/panels/config/automation/ha-automation-editor.ts @@ -502,7 +502,7 @@ export class HaAutomationEditor extends KeyboardShortcutMixin(LitElement) { } }, (errors) => { - this._errors = errors.body.message || errors.body; + this._errors = errors.body.message || errors.error || errors.body; showToast(this, { message: errors.body.message || errors.body, }); From aa7b2e5478a15da98e4fda51e2847b9fc9c131df Mon Sep 17 00:00:00 2001 From: Philip Allgaier Date: Wed, 13 Jan 2021 19:10:31 +0100 Subject: [PATCH 3/3] Changes from review --- src/panels/config/automation/ha-automation-editor.ts | 2 +- src/panels/config/script/ha-script-editor.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/panels/config/automation/ha-automation-editor.ts b/src/panels/config/automation/ha-automation-editor.ts index fbd05ed4db39..14e1cd110480 100644 --- a/src/panels/config/automation/ha-automation-editor.ts +++ b/src/panels/config/automation/ha-automation-editor.ts @@ -504,7 +504,7 @@ export class HaAutomationEditor extends KeyboardShortcutMixin(LitElement) { (errors) => { this._errors = errors.body.message || errors.error || errors.body; showToast(this, { - message: errors.body.message || errors.body, + message: errors.body.message || errors.error || errors.body, }); throw errors; } diff --git a/src/panels/config/script/ha-script-editor.ts b/src/panels/config/script/ha-script-editor.ts index b34f8287bdcd..054872eb3976 100644 --- a/src/panels/config/script/ha-script-editor.ts +++ b/src/panels/config/script/ha-script-editor.ts @@ -660,9 +660,9 @@ export class HaScriptEditor extends KeyboardShortcutMixin(LitElement) { } }, (errors) => { - this._errors = errors.body.message || errors.body; + this._errors = errors.body.message || errors.error || errors.body; showToast(this, { - message: errors.body.message || errors.body, + message: errors.body.message || errors.error || errors.body, }); throw errors; }