feat(ota): allow sorting by ota update avaliable state

resolves #1819
nurikk · Nov 19, 2023 · a298487 · a298487
1 parent 1213a79
commit a298487
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/src/components/grid/ReactTableCom.tsx b/src/components/grid/ReactTableCom.tsx
@@ -14,13 +14,14 @@ import {
 import cx from 'classnames';
 import { useTranslation } from 'react-i18next';
 
-import debounce from 'lodash/debounce';
 import { local } from '@toolz/local-storage';
+type PartialTableState = Partial<TableState<Record<string, unknown>>>;
 
 interface Props {
     id: string;
     columns: Array<Column<any>>;
     data: Array<any>;
+    initialState?: PartialTableState;
 }
 
 type GlobalFilterProps = {
@@ -86,8 +87,9 @@ const stateReducer = (
     return newState;
 };
 
-export const Table: React.FC<Props> = ({ columns, data, id }) => {
-    const initialState = local.getItem<Partial<TableState<Record<string, unknown>>>>(getStorageKey(id)) || {};
+
+export const Table: React.FC<Props> = ({ columns, data, id, initialState={} }) => {
+    const storedOrDefaultState = local.getItem<PartialTableState>(getStorageKey(id)) || initialState;
     const { getTableProps, getTableBodyProps, headerGroups, rows, prepareRow, state, visibleColumns, setGlobalFilter } =
         useTable<Record<string, unknown>>(
             {
@@ -97,7 +99,7 @@ export const Table: React.FC<Props> = ({ columns, data, id }) => {
                 data,
                 autoResetSortBy: false,
                 autoResetFilters: false,
-                initialState,
+                initialState: storedOrDefaultState,
             },
             useGlobalFilter,
             useSortBy,

diff --git a/src/components/ota-page/index.tsx b/src/components/ota-page/index.tsx
@@ -152,6 +152,9 @@ class OtaPage extends Component<PropsFromStore & OtaApi & WithTranslation<'ota'>
                         {t('check_all')}
                     </Button>
                 ),
+                accessor: ({ state }) => {
+                    return (((state?.update ?? {}) as OTAState).state) + ''
+                },
                 id: 'check_all',
                 Cell: ({
                     row: {
@@ -168,6 +171,16 @@ class OtaPage extends Component<PropsFromStore & OtaApi & WithTranslation<'ota'>
                         id="otaDevices"
                         columns={columns as unknown as Column<Record<string, unknown>>[]}
                         data={otaDevices}
+                        initialState={
+                            {
+                                sortBy: [
+                                    {
+                                        id: "check_all",
+                                        desc: false
+                                    }
+                                ]
+                            }
+                        }
                     />
                 </div>
             </div>