From 9c8d683a19efbd0f01da30a6d2fa23273b7ab2fd Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Mon, 14 Feb 2022 23:13:35 -0800
Subject: [PATCH] Group helpers not in an area in a single card (#11690)

---
 .../common/generate-lovelace-config.ts        | 42 +++++++++++++++----
 src/translations/en.json                      |  5 +++
 2 files changed, 40 insertions(+), 7 deletions(-)

diff --git a/src/panels/lovelace/common/generate-lovelace-config.ts b/src/panels/lovelace/common/generate-lovelace-config.ts
index cc608f06e8..2f9a9560c8 100644
--- a/src/panels/lovelace/common/generate-lovelace-config.ts
+++ b/src/panels/lovelace/common/generate-lovelace-config.ts
@@ -26,6 +26,7 @@ import {
 } from "../cards/types";
 import { LovelaceRowConfig } from "../entity-rows/types";
 import { ButtonsHeaderFooterConfig } from "../header-footer/types";
+import { HELPER_DOMAINS } from "../../config/helpers/const";
 
 const HIDE_DOMAIN = new Set([
   "automation",
@@ -281,7 +282,7 @@ export const generateViewConfig = (
     ungroupedEntitites[domain].push(state.entity_id);
   });
 
-  let cards: LovelaceCardConfig[] = [];
+  const cards: LovelaceCardConfig[] = [];
 
   if ("person" in ungroupedEntitites) {
     const personCards: LovelaceCardConfig[] = [];
@@ -340,8 +341,8 @@ export const generateViewConfig = (
   }
 
   splitted.groups.forEach((groupEntity) => {
-    cards = cards.concat(
-      computeCards(
+    cards.push(
+      ...computeCards(
         groupEntity.attributes.entity_id.map(
           (entityId): [string, HassEntity] => [entityId, entities[entityId]]
         ),
@@ -353,11 +354,38 @@ export const generateViewConfig = (
     );
   });
 
+  // Group helper entities in a single card
+  const helperEntities: string[] = [];
+
+  for (const domain of HELPER_DOMAINS) {
+    if (!(domain in ungroupedEntitites)) {
+      continue;
+    }
+    helperEntities.push(...ungroupedEntitites[domain]);
+    delete ungroupedEntitites[domain];
+  }
+
+  // Prepare translations for cards
+  const domainTranslations: Record<string, string> = {};
+
+  for (const domain of Object.keys(ungroupedEntitites)) {
+    domainTranslations[domain] = domainToName(localize, domain);
+  }
+
+  if (helperEntities.length) {
+    ungroupedEntitites._helpers = helperEntities;
+    domainTranslations._helpers = localize(
+      "ui.panel.lovelace.strategy.original-states.helpers"
+    );
+  }
+
   Object.keys(ungroupedEntitites)
-    .sort()
+    .sort((domain1, domain2) =>
+      stringCompare(domainTranslations[domain1], domainTranslations[domain2])
+    )
     .forEach((domain) => {
-      cards = cards.concat(
-        computeCards(
+      cards.push(
+        ...computeCards(
           ungroupedEntitites[domain]
             .sort((a, b) =>
               stringCompare(
@@ -370,7 +398,7 @@ export const generateViewConfig = (
               entities[entityId],
             ]),
           {
-            title: domainToName(localize, domain),
+            title: domainTranslations[domain],
           }
         )
       );
diff --git a/src/translations/en.json b/src/translations/en.json
index b4892018a6..69ad6d04c8 100755
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -3113,6 +3113,11 @@
         }
       },
       "lovelace": {
+        "strategy": {
+          "original-states": {
+            "helpers": "[%key:ui::panel::config::helpers::caption%]"
+          }
+        },
         "cards": {
           "confirm_delete": "Are you sure you want to delete this card?",
           "show_more_info": "Show more information",