Skip to content

Commit 8dc75ec

Browse files
committed
Mods
1 parent 8a99e2a commit 8dc75ec

2 files changed

Lines changed: 22 additions & 10 deletions

File tree

src/components/ha-selector/ha-selector-object.ts

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -95,10 +95,19 @@ export class HaObjectSelector extends LitElement {
9595
.filter(Boolean)
9696
.join(" · ");
9797

98-
const labelHeader = this._computeLabel({
99-
name: labelField,
100-
selector: labelSelector,
101-
});
98+
const overviewLabels = this.selector.object!.overview_labels || false;
99+
100+
const labelField =
101+
this.selector.object!.label_field ||
102+
Object.keys(this.selector.object!.fields!)[0];
103+
104+
const labelSelector = this.selector.object!.fields![labelField].selector;
105+
const labelHeader = overviewLabels
106+
? `${this._computeLabel({
107+
name: labelField,
108+
selector: labelSelector,
109+
})}: `
110+
: "";
102111

103112
let description = "";
104113
let descriptionHeader = "";
@@ -114,10 +123,12 @@ export class HaObjectSelector extends LitElement {
114123
descriptionSelector
115124
)
116125
: "";
117-
descriptionHeader = this._computeLabel({
118-
name: descriptionField,
119-
selector: descriptionSelector,
120-
});
126+
descriptionHeader = overviewLabels
127+
? `${this._computeLabel({
128+
name: descriptionField,
129+
selector: descriptionSelector,
130+
})}: `
131+
: "";
121132
}
122133

123134
const reorderable = this.selector.object!.multiple || false;
@@ -133,10 +144,10 @@ export class HaObjectSelector extends LitElement {
133144
></ha-svg-icon>
134145
`
135146
: nothing}
136-
<div slot="headline" class="label">${labelHeader}: ${label}</div>
147+
<div slot="headline" class="label">${labelHeader}${label}</div>
137148
${description
138149
? html`<div slot="supporting-text" class="description">
139-
${descriptionHeader}: ${description}
150+
${descriptionHeader}${description}
140151
</div>`
141152
: nothing}
142153
<ha-icon-button

src/data/selector.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -416,6 +416,7 @@ export interface ObjectSelector {
416416
label_field?: string;
417417
description_field?: string;
418418
translation_key?: string;
419+
overview_labels?: boolean;
419420
fields?: Record<string, ObjectSelectorField>;
420421
multiple?: boolean;
421422
} | null;

0 commit comments

Comments
 (0)