andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-07 08:19:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix sort when click on icon and 3-way sort cycle

Browse Source
This commit is contained in:
proddy
2022-04-24 19:18:19 -04:00
parent 271b36c602
commit c80d5c6bbf
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
interface/src/project/DashboardData.tsx
View File

@@ -24,7 +24,7 @@ import { useSnackbar } from 'notistack';
import { Table } from '@table-library/react-table-library/table'; import { Table } from '@table-library/react-table-library/table';
import { useTheme } from '@table-library/react-table-library/theme'; import { useTheme } from '@table-library/react-table-library/theme';
import { useSort } from '@table-library/react-table-library/sort'; import { useSort, SortToggleType } from '@table-library/react-table-library/sort';
import { Header, HeaderRow, HeaderCell, Body, Row, Cell } from '@table-library/react-table-library/table'; import { Header, HeaderRow, HeaderCell, Body, Row, Cell } from '@table-library/react-table-library/table';
import { useRowSelect } from '@table-library/react-table-library/select'; import { useRowSelect } from '@table-library/react-table-library/select';
@@ -270,6 +270,7 @@ const DashboardData: FC = () => {
iconUp: <KeyboardArrowUpOutlinedIcon />, iconUp: <KeyboardArrowUpOutlinedIcon />,
iconDown: <KeyboardArrowDownOutlinedIcon /> iconDown: <KeyboardArrowDownOutlinedIcon />
}, },
sortToggleType: SortToggleType.AlternateWithReset,
sortFns: { sortFns: {
NAME: (array) => array.sort((a, b) => a.id.slice(2).localeCompare(b.id.slice(2))) NAME: (array) => array.sort((a, b) => a.id.slice(2).localeCompare(b.id.slice(2)))
} }

10
interface/src/project/SettingsCustomization.tsx
View File

@@ -18,7 +18,7 @@ import {
import { Table } from '@table-library/react-table-library/table'; import { Table } from '@table-library/react-table-library/table';
import { useTheme } from '@table-library/react-table-library/theme'; import { useTheme } from '@table-library/react-table-library/theme';
import { useSort } from '@table-library/react-table-library/sort'; import { useSort, SortToggleType } from '@table-library/react-table-library/sort';
import { Header, HeaderRow, HeaderCell, Body, Row, Cell } from '@table-library/react-table-library/table'; import { Header, HeaderRow, HeaderCell, Body, Row, Cell } from '@table-library/react-table-library/table';
import { useSnackbar } from 'notistack'; import { useSnackbar } from 'notistack';
@@ -145,17 +145,13 @@ const SettingsCustomization: FC = () => {
iconUp: <KeyboardArrowUpOutlinedIcon />, iconUp: <KeyboardArrowUpOutlinedIcon />,
iconDown: <KeyboardArrowDownOutlinedIcon /> iconDown: <KeyboardArrowDownOutlinedIcon />
}, },
sortToggleType: SortToggleType.AlternateWithReset,
sortFns: { sortFns: {
NAME: (array) => array.sort((a, b) => a.id.localeCompare(b.id)) NAME: (array) => array.sort((a, b) => a.id.localeCompare(b.id))
} }
} }
); );
const sort_name = () => {
console.log(entity_sort);
entity_sort.fns.onToggleSort({ sortKey: 'NAME' });
};
const fetchDevices = useCallback(async () => { const fetchDevices = useCallback(async () => {
try { try {
setDevices((await EMSESP.readDevices()).data); setDevices((await EMSESP.readDevices()).data);
@@ -434,7 +430,7 @@ const SettingsCustomization: FC = () => {
fullWidth fullWidth
style={{ fontSize: '14px', justifyContent: 'flex-start' }} style={{ fontSize: '14px', justifyContent: 'flex-start' }}
endIcon={getSortIcon(entity_sort.state, 'NAME')} endIcon={getSortIcon(entity_sort.state, 'NAME')}
onClick={() => sort_name()} onClick={() => entity_sort.fns.onToggleSort({ sortKey: 'NAME' })}
> >
NAME NAME
</Button> </Button>