jeans/frontend
jeans/frontend
1
0
Fork 0
mirror of https://github.com/home-assistant/frontend.git synced 2025-07-24 09:46:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow name in state content for badges (#21576)

Browse Source
This commit is contained in:
Paul Bottein 2024-08-05 17:14:10 +02:00 committed by GitHub
parent 5c30c1647c
commit 4719775926
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 66 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
src/components/entity/ha-entity-state-content-picker.ts
View File

@ -81,6 +81,9 @@ class HaEntityStatePicker extends LitElement {
@property({ type: Boolean }) public required = false;
@property({ type: Boolean, attribute: "allow-name" }) public allowName =
false;
@property() public label?: string;
@property() public value?: string[] | string;
@ -95,43 +98,55 @@ class HaEntityStatePicker extends LitElement {
return !(!changedProps.has("_opened") && this._opened);
}
private options = memoizeOne((entityId?: string, stateObj?: HassEntity) => {
const domain = entityId ? computeDomain(entityId) : undefined;
return [
{
label: this.hass.localize("ui.components.state-content-picker.state"),
value: "state",
},
{
label: this.hass.localize(
"ui.components.state-content-picker.last_changed"
),
value: "last_changed",
},
{
label: this.hass.localize(
"ui.components.state-content-picker.last_updated"
),
value: "last_updated",
},
...(domain
? STATE_DISPLAY_SPECIAL_CONTENT.filter((content) =>
STATE_DISPLAY_SPECIAL_CONTENT_DOMAINS[domain]?.includes(content)
).map((content) => ({
label: this.hass.localize(
`ui.components.state-content-picker.${content}`
),
value: content,
}))
: []),
...Object.keys(stateObj?.attributes ?? {})
.filter((a) => !HIDDEN_ATTRIBUTES.includes(a))
.map((attribute) => ({
value: attribute,
label: this.hass.formatEntityAttributeName(stateObj!, attribute),
})),
];
});
private options = memoizeOne(
(entityId?: string, stateObj?: HassEntity, allowName?: boolean) => {
const domain = entityId ? computeDomain(entityId) : undefined;
return [
{
label: this.hass.localize("ui.components.state-content-picker.state"),
value: "state",
},
...(allowName
? [
{
label: this.hass.localize(
"ui.components.state-content-picker.name"
),
value: "name",
},
]
: []),
{
label: this.hass.localize(
"ui.components.state-content-picker.last_changed"
),
value: "last_changed",
},
{
label: this.hass.localize(
"ui.components.state-content-picker.last_updated"
),
value: "last_updated",
},
...(domain
? STATE_DISPLAY_SPECIAL_CONTENT.filter((content) =>
STATE_DISPLAY_SPECIAL_CONTENT_DOMAINS[domain]?.includes(content)
).map((content) => ({
label: this.hass.localize(
`ui.components.state-content-picker.${content}`
),
value: content,
}))
: []),
...Object.keys(stateObj?.attributes ?? {})
.filter((a) => !HIDDEN_ATTRIBUTES.includes(a))
.map((attribute) => ({
value: attribute,
label: this.hass.formatEntityAttributeName(stateObj!, attribute),
})),
];
}
);
private _filter = "";
@ -146,7 +161,7 @@ class HaEntityStatePicker extends LitElement {
? this.hass.states[this.entityId]
: undefined;
const options = this.options(this.entityId, stateObj);
const options = this.options(this.entityId, stateObj, this.allowName);
const optionItems = options.filter(
(option) => !this._value.includes(option.value)
);

1
src/components/ha-selector/ha-selector-ui-state-content.ts
View File

@ -36,6 +36,7 @@ export class HaSelectorUiStateContent extends SubscribeMixin(LitElement) {
.helper=${this.helper}
.disabled=${this.disabled}
.required=${this.required}
.allowName=${this.selector.ui_state_content?.allow_name}
></ha-entity-state-content-picker>
`;
}

1
src/data/selector.ts
View File

@ -461,6 +461,7 @@ export interface UiStateContentSelector {
// eslint-disable-next-line @typescript-eslint/ban-types
ui_state_content: {
entity_id?: string;
allow_name?: boolean;
} | null;
}

1
src/panels/lovelace/badges/hui-entity-badge.ts
View File

@ -144,6 +144,7 @@ export class HuiEntityBadge extends LitElement implements LovelaceBadge {
.stateObj=${stateObj}
.hass=${this.hass}
.content=${this._config.state_content}
.name=${this._config.name}
>
</state-display>
`;

1
src/panels/lovelace/cards/hui-tile-card.ts
View File

@ -251,6 +251,7 @@ export class HuiTileCard extends LitElement implements LovelaceCard {
.stateObj=${stateObj}
.hass=${this.hass}
.content=${this._config.state_content}
.name=${this._config.name}
>
</state-display>
`;

4
src/panels/lovelace/editor/config-elements/hui-entity-badge-editor.ts
View File

@ -122,7 +122,9 @@ export class HuiEntityBadgeEditor
{
name: "state_content",
selector: {
ui_state_content: {},
ui_state_content: {
allow_name: true,
},
},
context: {
filter_entity: "entity",

5
src/state-display/state-display.ts
View File

@ -55,6 +55,8 @@ class StateDisplay extends LitElement {
@property({ attribute: false }) public content?: StateContent;
@property({ attribute: false }) public name?: string;
protected createRenderRoot() {
return this;
}
@ -88,6 +90,9 @@ class StateDisplay extends LitElement {
return this.hass!.formatEntityState(stateObj);
}
if (content === "name") {
return html`${this.name || stateObj.attributes.friendly_name}`;
}
// Check last-changed for backwards compatibility
if (content === "last_changed" || content === "last-changed") {
return html`

1
src/translations/en.json
View File

@ -1026,6 +1026,7 @@
},
"state-content-picker": {
"state": "State",
"name": "Name",
"last_changed": "Last changed",
"last_updated": "Last updated",
"remaining_time": "Remaining time",