Upstream
/
Plan
mirror of https://github.com/plan-player-analytics/Plan.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed sorting for plugin tables that have raw numbers

This commit is contained in:
Aurora Lahtela 2023-10-21 11:12:34 +03:00
parent eac25b5e77
commit edf86155d1
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Plan/react/dashboard/src/components/table/DataTablesTable.js
View File

@ -123,7 +123,9 @@ const DataTablesTable = ({id, rowKeyFunction, options, colorClass}) => {
if (valA === undefined && valB === undefined) return 0;
if (valA === undefined) return sortReversed ? 1 : -1;
if (valB === undefined) return sortReversed ? 1 : -1;
if (typeof valA === 'number' && typeof valB === 'number') {
const isNumberA = typeof valA === 'number' || !isNaN(valA);
const isNumberB = typeof valB === 'number' || !isNaN(valB);
if (isNumberA && isNumberB) {
return sortReversed ? valA - valB : valB - valA;
}
return sortReversed ? valB.localeCompare(valA) : valA.localeCompare(valB);
@ -269,7 +271,8 @@ const DataTablesTable = ({id, rowKeyFunction, options, colorClass}) => {
</React.Fragment>)}
</tbody>
</table>
<p className={"dataTables_info float-start"} style={{maxWidth: "40%", textOverflow: "ellipsis", whiteSpace: "nowrap"}}>
<p className={"dataTables_info float-start"}
style={{maxWidth: "40%", textOverflow: "ellipsis", whiteSpace: "nowrap"}}>
<Trans i18nKey={"html.label.table.showNofM"}
defaults={"Showing {{n}} of {{m}} entries"}
values={{