jeans/frontend
jeans/frontend
1
0
Fork 0
mirror of https://github.com/home-assistant/frontend.git synced 2025-07-26 02:36:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix saving Lovelace config (#9041)

Browse Source
This commit is contained in:
Bram Kragten 2021-04-29 18:05:58 +02:00 committed by GitHub
parent 65a30bf60c
commit 542f169b36
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/panels/lovelace/ha-panel-lovelace.ts
View File

@ -363,11 +363,22 @@ class LovelacePanel extends LitElement {
mode: previousMode, mode: previousMode,
} = this.lovelace!; } = this.lovelace!;
newConfig = this._checkLovelaceConfig(newConfig); newConfig = this._checkLovelaceConfig(newConfig);
let conf: LovelaceConfig;
// If strategy defined, apply it here.
if (newConfig.strategy) {
conf = await generateLovelaceDashboardStrategy({
config: newConfig,
hass: this.hass!,
narrow: this.narrow,
});
} else {
conf = newConfig;
}
try { try {
// Optimistic update // Optimistic update
this._updateLovelace({ this._updateLovelace({
config: newConfig, config: conf,
rawConfig: undefined, rawConfig: newConfig,
mode: "storage", mode: "storage",
}); });
this._ignoreNextUpdateEvent = true; this._ignoreNextUpdateEvent = true;

6
src/panels/lovelace/hui-editor.ts
View File

@ -115,8 +115,8 @@ class LovelaceFullConfigEditor extends LitElement {
!this._saving && !this._saving &&
oldLovelace && oldLovelace &&
this.lovelace && this.lovelace &&
oldLovelace.config !== this.lovelace.config && oldLovelace.rawConfig !== this.lovelace.rawConfig &&
!deepEqual(oldLovelace.config, this.lovelace.config) !deepEqual(oldLovelace.rawConfig, this.lovelace.rawConfig)
) { ) {
showToast(this, { showToast(this, {
message: this.hass!.localize( message: this.hass!.localize(
@ -124,7 +124,7 @@ class LovelaceFullConfigEditor extends LitElement {
), ),
action: { action: {
action: () => { action: () => {
this.yamlEditor.value = safeDump(this.lovelace!.config); this.yamlEditor.value = safeDump(this.lovelace!.rawConfig);
}, },
text: this.hass!.localize( text: this.hass!.localize(
"ui.panel.lovelace.editor.raw_editor.reload" "ui.panel.lovelace.editor.raw_editor.reload"