jeans/frontend
jeans/frontend
1
0
Fork 0
mirror of https://github.com/home-assistant/frontend.git synced 2025-07-25 18:26:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move groups up, after areas, move devices down (#14741)

Browse Source
This commit is contained in:
Bram Kragten 2022-12-13 17:01:59 +01:00 committed by GitHub
parent 1da8a974f8
commit f7aecb0d6d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/panels/lovelace/common/generate-lovelace-config.ts
View File

@ -304,19 +304,13 @@ export const generateViewConfig = (
path: string, path: string,
title: string | undefined, title: string | undefined,
icon: string | undefined, icon: string | undefined,
entities: HassEntities, entities: HassEntities
groupOrders: { [entityId: string]: number }
): LovelaceViewConfig => { ): LovelaceViewConfig => {
const splitted = splitByGroups(entities);
splitted.groups.sort(
(gr1, gr2) => groupOrders[gr1.entity_id] - groupOrders[gr2.entity_id]
);
const ungroupedEntitites: { [domain: string]: string[] } = {}; const ungroupedEntitites: { [domain: string]: string[] } = {};
// Organize ungrouped entities in ungrouped things // Organize ungrouped entities in ungrouped things
for (const entityId of Object.keys(splitted.ungrouped)) { for (const entityId of Object.keys(entities)) {
const state = splitted.ungrouped[entityId]; const state = entities[entityId];
const domain = computeStateDomain(state); const domain = computeStateDomain(state);
if (!(domain in ungroupedEntitites)) { if (!(domain in ungroupedEntitites)) {
@ -384,15 +378,6 @@ export const generateViewConfig = (
delete ungroupedEntitites.person; delete ungroupedEntitites.person;
} }
for (const groupEntity of splitted.groups) {
cards.push(
...computeCards(entities, groupEntity.attributes.entity_id, {
title: computeStateName(groupEntity),
show_header_toggle: groupEntity.attributes.control !== "hidden",
})
);
}
// Group helper entities in a single card // Group helper entities in a single card
const helperEntities: string[] = []; const helperEntities: string[] = [];
@ -480,13 +465,28 @@ export const generateDefaultViewConfig = (
states states
); );
const splittedByGroups = splitByGroups(splittedByAreaDevice.otherEntities);
splittedByGroups.groups.sort(
(gr1, gr2) => groupOrders[gr1.entity_id] - groupOrders[gr2.entity_id]
);
const groupCards: LovelaceCardConfig[] = [];
for (const groupEntity of splittedByGroups.groups) {
groupCards.push(
...computeCards(entities, groupEntity.attributes.entity_id, {
title: computeStateName(groupEntity),
show_header_toggle: groupEntity.attributes.control !== "hidden",
})
);
}
const config = generateViewConfig( const config = generateViewConfig(
localize, localize,
path, path,
title, title,
icon, icon,
splittedByAreaDevice.otherEntities, splittedByGroups.ungrouped
groupOrders
); );
const areaCards: LovelaceCardConfig[] = []; const areaCards: LovelaceCardConfig[] = [];
@ -568,9 +568,11 @@ export const generateDefaultViewConfig = (
config.cards!.unshift( config.cards!.unshift(
...areaCards, ...areaCards,
...(energyCard ? [energyCard] : []), ...groupCards,
...deviceCards ...(energyCard ? [energyCard] : [])
); );
config.cards!.push(...deviceCards);
return config; return config;
}; };