From 4c3c554ed5df64f27033602ba7d32cfb867b470b Mon Sep 17 00:00:00 2001
From: Brandon Rothweiler <brandonrothweiler@gmail.com>
Date: Mon, 14 Feb 2022 23:12:02 -0500
Subject: [PATCH] Improve `stripPrefixFromEntityName` to handle colon separator

---
 .../entity/strip_prefix_from_entity_name.ts   | 30 ++++++++++++-------
 .../device-detail/ha-device-entities-card.ts  |  4 +--
 .../common/generate-lovelace-config.ts        |  2 +-
 3 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/src/common/entity/strip_prefix_from_entity_name.ts b/src/common/entity/strip_prefix_from_entity_name.ts
index 1efa3704d564..e976b7b18fb6 100644
--- a/src/common/entity/strip_prefix_from_entity_name.ts
+++ b/src/common/entity/strip_prefix_from_entity_name.ts
@@ -1,24 +1,32 @@
+const SUFFIXES = [" ", ": "];
+
 /**
  * Strips a device name from an entity name.
  * @param entityName the entity name
- * @param lowerCasedPrefixWithSpaceSuffix the prefix to strip, lower cased with a space suffix
+ * @param lowerCasedPrefix the prefix to strip, lower cased
  * @returns
  */
 export const stripPrefixFromEntityName = (
   entityName: string,
-  lowerCasedPrefixWithSpaceSuffix: string
+  lowerCasedPrefix: string
 ) => {
-  if (!entityName.toLowerCase().startsWith(lowerCasedPrefixWithSpaceSuffix)) {
-    return undefined;
-  }
+  const lowerCasedEntityName = entityName.toLowerCase();
+
+  for (const suffix of SUFFIXES) {
+    const lowerCasedPrefixWithSuffix = `${lowerCasedPrefix}${suffix}`;
 
-  const newName = entityName.substring(lowerCasedPrefixWithSpaceSuffix.length);
+    if (lowerCasedEntityName.startsWith(lowerCasedPrefixWithSuffix)) {
+      const newName = entityName.substring(lowerCasedPrefixWithSuffix.length);
+
+      // If first word already has an upper case letter (e.g. from brand name)
+      // leave as-is, otherwise capitalize the first word.
+      return hasUpperCase(newName.substr(0, newName.indexOf(" ")))
+        ? newName
+        : newName[0].toUpperCase() + newName.slice(1);
+    }
+  }
 
-  // If first word already has an upper case letter (e.g. from brand name)
-  // leave as-is, otherwise capitalize the first word.
-  return hasUpperCase(newName.substr(0, newName.indexOf(" ")))
-    ? newName
-    : newName[0].toUpperCase() + newName.slice(1);
+  return undefined;
 };
 
 const hasUpperCase = (str: string): boolean => str.toLowerCase() !== str;
diff --git a/src/panels/config/devices/device-detail/ha-device-entities-card.ts b/src/panels/config/devices/device-detail/ha-device-entities-card.ts
index 3b4d4611456b..ebfbd159dd53 100644
--- a/src/panels/config/devices/device-detail/ha-device-entities-card.ts
+++ b/src/panels/config/devices/device-detail/ha-device-entities-card.ts
@@ -165,7 +165,7 @@ export class HaDeviceEntitiesCard extends LitElement {
       const stateObj = this.hass.states[entry.entity_id];
       const name = stripPrefixFromEntityName(
         computeStateName(stateObj),
-        `${this.deviceName} `.toLowerCase()
+        this.deviceName.toLowerCase()
       );
       if (name) {
         config.name = name;
@@ -198,7 +198,7 @@ export class HaDeviceEntitiesCard extends LitElement {
             ${name
               ? stripPrefixFromEntityName(
                   name,
-                  `${this.deviceName} `.toLowerCase()
+                  this.deviceName.toLowerCase()
                 ) || name
               : entry.entity_id}
           </div>
diff --git a/src/panels/lovelace/common/generate-lovelace-config.ts b/src/panels/lovelace/common/generate-lovelace-config.ts
index cc608f06e8f2..8821d349f2af 100644
--- a/src/panels/lovelace/common/generate-lovelace-config.ts
+++ b/src/panels/lovelace/common/generate-lovelace-config.ts
@@ -96,7 +96,7 @@ export const computeCards = (
   const entities: Array<string | LovelaceRowConfig> = [];
 
   const titlePrefix = entityCardOptions.title
-    ? `${entityCardOptions.title} `.toLowerCase()
+    ? entityCardOptions.title.toLowerCase()
     : undefined;
 
   const footerEntities: ButtonsHeaderFooterConfig["entities"] = [];