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

Guard for null badges (#3841)

Browse Source 
* Guard for null badges

* Check for null badges on load and save
This commit is contained in:
Bram Kragten 2019-10-02 18:29:36 +02:00 committed by Paulus Schoutsen
parent b927a3ef29
commit 7add8a2ea0
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/panels/lovelace/editor/view-editor/hui-edit-view.ts
View File

@ -215,9 +215,9 @@ export class HuiEditView extends LitElement {
this._saving = true;
const viewConf: LovelaceViewConfig = {
cards: this._cards,
badges: this._badges!.map((entityConf) => entityConf.entity),
...this._config,
badges: this._badges!.map((entityConf) => entityConf.entity),
cards: this._cards,
};
const lovelace = this.lovelace!;

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

@ -249,7 +249,17 @@ class LovelacePanel extends LitElement {
this._setLovelaceConfig(conf, confMode);
}
private _checkLovelaceConfig(config: LovelaceConfig) {
// Somehow there can be badges with value null, we remove those
config.views.forEach((view) => {
if (view.badges) {
view.badges = view.badges.filter(Boolean);
}
});
}
private _setLovelaceConfig(config: LovelaceConfig, mode: Lovelace["mode"]) {
this._checkLovelaceConfig(config);
this.lovelace = {
config,
mode,
@ -273,6 +283,7 @@ class LovelacePanel extends LitElement {
},
saveConfig: async (newConfig: LovelaceConfig): Promise<void> => {
const { config: previousConfig, mode: previousMode } = this.lovelace!;
this._checkLovelaceConfig(newConfig);
try {
// Optimistic update
this._updateLovelace({

3
src/panels/lovelace/views/hui-view.ts
View File

@ -262,8 +262,7 @@ export class HUIView extends LitElement {
}
const elements: HUIView["_badges"] = [];
// It's possible that a null value was stored as a badge entry
const badges = processConfigEntities(config.badges.filter(Boolean));
const badges = processConfigEntities(config.badges);
for (const badge of badges) {
const element = document.createElement("ha-state-label-badge");
const entityId = badge.entity;