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

Sort battery level column using numeric sort (#14926)

Browse Source 
fixes undefined
This commit is contained in:
karwosts 2023-01-23 12:10:01 -08:00 committed by GitHub
parent 81e4f083f9
commit e242fbe148
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/components/data-table/ha-data-table.ts
View File

@ -200,7 +200,6 @@ export class HaDataTable extends LitElement {
Object.values(clonedColumns).forEach( Object.values(clonedColumns).forEach(
(column: ClonedDataTableColumnData) => { (column: ClonedDataTableColumnData) => {
delete column.title; delete column.title;
delete column.type;
delete column.template; delete column.template;
} }
); );

15
src/components/data-table/sort_filter_worker.ts
View File

@ -55,11 +55,16 @@ const sortData = (
? b[column.valueColumn || sortColumn][column.filterKey] ? b[column.valueColumn || sortColumn][column.filterKey]
: b[column.valueColumn || sortColumn]; : b[column.valueColumn || sortColumn];
if (typeof valA === "string") { if (column.type === "numeric") {
valA = valA.toUpperCase(); valA = isNaN(valA) ? undefined : Number(valA);
} valB = isNaN(valB) ? undefined : Number(valB);
if (typeof valB === "string") { } else {
valB = valB.toUpperCase(); if (typeof valA === "string") {
valA = valA.toUpperCase();
}
if (typeof valB === "string") {
valB = valB.toUpperCase();
}
} }
// Ensure "undefined" is always sorted to the bottom // Ensure "undefined" is always sorted to the bottom