Fixes (#2643)

* Sort areas alphabetically in device card

* Fix background color of registry editors when using themes

* Fix area/entity reg dialog being disabled after deletion

* Better fix card background

* Warn user when system health component not loaded

src/data/system_health.ts

@@ -1,17 +1,18 @@
 import { HomeAssistant } from "../types";
 
+export interface HomeAssistantSystemHealthInfo {
+  version: string;
+  dev: boolean;
+  hassio: boolean;
+  virtualenv: string;
+  python_version: string;
+  docker: boolean;
+  arch: string;
+  timezone: string;
+  os_name: string;
+}
+
 export interface SystemHealthInfo {
-  homeassistant: {
-    version: string;
-    dev: boolean;
-    hassio: boolean;
-    virtualenv: string;
-    python_version: string;
-    docker: boolean;
-    arch: string;
-    timezone: string;
-    os_name: string;
-  };
   [domain: string]: { [key: string]: string | number | boolean };
 }
 

src/panels/config/area_registry/dialog-area-registry-detail.ts

@@ -97,6 +97,7 @@ class DialogAreaDetail extends LitElement {
   }
 
   private async _updateEntry() {
+    this._submitting = true;
     try {
       const values: AreaRegistryEntryMutableParams = {
         name: this._name.trim(),
@@ -109,12 +110,19 @@ class DialogAreaDetail extends LitElement {
       this._params = undefined;
     } catch (err) {
       this._error = err;
+    } finally {
+      this._submitting = false;
     }
   }
 
   private async _deleteEntry() {
-    if (await this._params!.removeEntry()) {
+    this._submitting = true;
-      this._params = undefined;
+    try {
+      if (await this._params!.removeEntry()) {
+        this._params = undefined;
+      }
+    } finally {
+      this._submitting = false;
     }
   }
 

src/panels/config/area_registry/ha-config-area-registry.ts

@@ -162,7 +162,6 @@ All devices in this area will become unassigned.`)
         display: block;
         max-width: 600px;
         margin: 16px auto;
-        background-color: white;
       }
       .empty {
         text-align: center;

src/panels/config/config-entries/ha-config-entries.js

@@ -145,7 +145,7 @@ class HaConfigEntries extends NavigateMixin(PolymerElement) {
       });
 
     fetchAreaRegistry(this.hass).then((areas) => {
-      this._areas = areas;
+      this._areas = areas.sort((a, b) => compare(a.name, b.name));
     });
   }
 

src/panels/config/entity_registry/dialog-entity-registry-detail.ts

@@ -123,25 +123,27 @@ class DialogEntityRegistryDetail extends LitElement {
   }
 
   private async _updateEntry(): Promise<void> {
+    this._submitting = true;
     try {
-      this._submitting = true;
       await this._params!.updateEntry({
         name: this._name.trim() || null,
         new_entity_id: this._entityId.trim(),
       });
       this._params = undefined;
     } catch (err) {
-      this._submitting = false;
       this._error = err;
+    } finally {
+      this._submitting = false;
     }
   }
 
   private async _deleteEntry(): Promise<void> {
     this._submitting = true;
-
+    try {
-    if (await this._params!.removeEntry()) {
+      if (await this._params!.removeEntry()) {
-      this._params = undefined;
+        this._params = undefined;
-    } else {
+      }
+    } finally {
       this._submitting = false;
     }
   }

src/panels/config/entity_registry/ha-config-entity-registry.ts

@@ -150,7 +150,6 @@ Deleting an entry will not remove the entity from Home Assistant. To do this, yo
       }
       paper-card {
         display: block;
-        background-color: white;
       }
       paper-icon-item {
         cursor: pointer;

src/panels/dev-info/system-health-card.ts

@@ -95,7 +95,16 @@ class SystemHealthCard extends LitElement {
   }
 
   private async _fetchInfo() {
-    this._info = await fetchSystemHealthInfo(this.hass!);
+    try {
+      this._info = await fetchSystemHealthInfo(this.hass!);
+    } catch (err) {
+      this._info = {
+        system_health: {
+          error:
+            "System Health component is not loaded. Add 'system_health:' to configuration.yaml",
+        },
+      };
+    }
   }
 
   static get styles(): CSSResult {

src/translations/en.json

@@ -35,6 +35,7 @@
     "sensor": "Sensor",
     "sun": "Sun",
     "switch": "Switch",
+    "system_health": "System Health",
     "updater": "Updater",
     "vacuum": "Vacuum",
     "weblink": "Weblink",