Display services as services and not devices (#6798)

* Display services as services and not devices * remove seperator * Add comma * Update src/panels/config/integrations/ha-integration-card.ts Co-authored-by: Bram Kragten <mail@bramkragten.nl> * Fix spacing * Remove check Co-authored-by: Bram Kragten <mail@bramkragten.nl>
home-assistant · Sep 6, 2020 · 3fd7899 · 3fd7899
1 parent 8f8a2ce
commit 3fd7899
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 4 deletions.
diff --git a/src/panels/config/integrations/ha-integration-card.ts b/src/panels/config/integrations/ha-integration-card.ts
@@ -137,6 +137,7 @@ export class HaIntegrationCard extends LitElement {
 
   private _renderSingleEntry(item: ConfigEntryExtended): TemplateResult {
     const devices = this._getDevices(item);
+    const services = this._getServices(item);
     const entities = this._getEntities(item);
 
     return html`
@@ -168,7 +169,7 @@ export class HaIntegrationCard extends LitElement {
           <h3>
             ${item.localized_domain_name === item.title ? "" : item.title}
           </h3>
-          ${devices.length || entities.length
+          ${devices.length || services.length || entities.length
             ? html`
                 <div>
                   ${devices.length
@@ -180,10 +181,22 @@ export class HaIntegrationCard extends LitElement {
                             "count",
                             devices.length
                           )}</a
+                        >${services.length ? "," : ""}
+                      `
+                    : ""}
+                  ${services.length
+                    ? html`
+                        <a
+                          href=${`/config/devices/dashboard?historyBack=1&config_entry=${item.entry_id}`}
+                          >${this.hass.localize(
+                            "ui.panel.config.integrations.config_entry.services",
+                            "count",
+                            services.length
+                          )}</a
                         >
                       `
                     : ""}
-                  ${devices.length && entities.length
+                  ${(devices.length || services.length) && entities.length
                     ? this.hass.localize("ui.common.and")
                     : ""}
                   ${entities.length
@@ -304,8 +317,21 @@ export class HaIntegrationCard extends LitElement {
     if (!this.deviceRegistryEntries) {
       return [];
     }
-    return this.deviceRegistryEntries.filter((device) =>
-      device.config_entries.includes(configEntry.entry_id)
+    return this.deviceRegistryEntries.filter(
+      (device) =>
+        device.config_entries.includes(configEntry.entry_id) &&
+        device.entry_type !== "service"
+    );
+  }
+
+  private _getServices(configEntry: ConfigEntry): DeviceRegistryEntry[] {
+    if (!this.deviceRegistryEntries) {
+      return [];
+    }
+    return this.deviceRegistryEntries.filter(
+      (device) =>
+        device.config_entries.includes(configEntry.entry_id) &&
+        device.entry_type === "service"
     );
   }
 

diff --git a/src/translations/en.json b/src/translations/en.json
@@ -1638,6 +1638,7 @@
           "config_entry": {
             "devices": "{count} {count, plural,\n  one {device}\n  other {devices}\n}",
             "entities": "{count} {count, plural,\n  one {entity}\n  other {entities}\n}",
+            "services": "{count} {count, plural,\n  one {service}\n  other {services}\n}",
             "rename": "Rename",
             "options": "Options",
             "system_options": "System options",