Skip to content

Group helpers not in an area in a single card #11690

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
balloob merged 1 commit into from
Feb 15, 2022
Merged

Group helpers not in an area in a single card #11690

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 35 additions & 7 deletions src/panels/lovelace/common/generate-lovelace-config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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[] = [];
Expand Down Expand Up @@ -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]]
),
Expand All @@ -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(
Expand All @@ -370,7 +398,7 @@ export const generateViewConfig = (
entities[entityId],
]),
{
title: domainToName(localize, domain),
title: domainTranslations[domain],
}
)
);
Expand Down
5 changes: 5 additions & 0 deletions src/translations/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down