From 6862dd974f4f3ba7bde27d339e36a823405f9e37 Mon Sep 17 00:00:00 2001
From: Bram Kragten <mail@bramkragten.nl>
Date: Wed, 5 Dec 2018 16:35:20 +0100
Subject: [PATCH 1/2] View should have cards

---
 src/panels/lovelace/editor/hui-edit-view.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/panels/lovelace/editor/hui-edit-view.ts b/src/panels/lovelace/editor/hui-edit-view.ts
index 85502fe22cb6..9c38430b365c 100644
--- a/src/panels/lovelace/editor/hui-edit-view.ts
+++ b/src/panels/lovelace/editor/hui-edit-view.ts
@@ -22,6 +22,7 @@ import {
   addView,
   updateViewConfig,
   LovelaceViewConfig,
+  LovelaceCardConfig,
 } from "../../../data/lovelace";
 import { fireEvent } from "../../../common/dom/fire_event";
 import { hassLocalizeLitMixin } from "../../../mixins/lit-localize-mixin";
@@ -78,8 +79,8 @@ export class HuiEditView extends hassLocalizeLitMixin(LitElement) {
           (changedProperties.get("viewConfig") as LovelaceViewConfig).id)
     ) {
       const { cards, badges, ...viewConfig } = this.viewConfig;
-      this._badges = processEditorEntities(badges);
       this._config = viewConfig;
+      this._badges = processEditorEntities(badges);
     } else if (changedProperties.has("add")) {
       this._config = {};
       this._badges = [];
@@ -227,6 +228,7 @@ export class HuiEditView extends hassLocalizeLitMixin(LitElement) {
 
     try {
       if (this.add) {
+        this._config.cards = [];
         await addView(this.hass!, this._config, "json");
       } else {
         await updateViewConfig(

From 0d8e3ae32676c53f8e9fe0c84eef2325ba99ad97 Mon Sep 17 00:00:00 2001
From: Bram Kragten <mail@bramkragten.nl>
Date: Wed, 5 Dec 2018 16:37:53 +0100
Subject: [PATCH 2/2] Don't need CardConfig yet

---
 src/panels/lovelace/editor/hui-edit-view.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/panels/lovelace/editor/hui-edit-view.ts b/src/panels/lovelace/editor/hui-edit-view.ts
index 9c38430b365c..b100ae0c48ce 100644
--- a/src/panels/lovelace/editor/hui-edit-view.ts
+++ b/src/panels/lovelace/editor/hui-edit-view.ts
@@ -22,7 +22,6 @@ import {
   addView,
   updateViewConfig,
   LovelaceViewConfig,
-  LovelaceCardConfig,
 } from "../../../data/lovelace";
 import { fireEvent } from "../../../common/dom/fire_event";
 import { hassLocalizeLitMixin } from "../../../mixins/lit-localize-mixin";