Fix data-table sort by unknown column (#24965)

Fix database sort by unknown column
This commit is contained in:
Paul Bottein 2025-04-08 13:05:22 +02:00 committed by GitHub
parent 13aeb02b53
commit 9df5141aac
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 15 additions and 13 deletions

View File

@ -645,15 +645,16 @@ export class HaDataTable extends LitElement {
return;
}
const prom = this.sortColumn
? sortData(
filteredData,
this._sortColumns[this.sortColumn],
this.sortDirection,
this.sortColumn,
this.hass.locale.language
)
: filteredData;
const prom =
this.sortColumn && this._sortColumns[this.sortColumn]
? sortData(
filteredData,
this._sortColumns[this.sortColumn],
this.sortDirection,
this.sortColumn,
this.hass.locale.language
)
: filteredData;
const [data] = await Promise.all([prom, nextRender]);

View File

@ -260,10 +260,11 @@ export class HaTabsSubpageDataTable extends KeyboardShortcutMixin(LitElement) {
<ha-assist-chip
slot="trigger"
.label=${localize("ui.components.subpage-data-table.sort_by", {
sortColumn: this._sortColumn
? ` ${this.columns[this._sortColumn]?.title || this.columns[this._sortColumn]?.label}` ||
""
: "",
sortColumn:
this._sortColumn && this.columns[this._sortColumn]
? ` ${this.columns[this._sortColumn].title || this.columns[this._sortColumn].label}` ||
""
: "",
})}
>
<ha-svg-icon