Refine paginated query error typing

This commit is contained in:
Kari Lintulaakso
2025-11-13 14:33:31 +02:00
parent 6ffe4abd50
commit 77eb281d9a
2 changed files with 17 additions and 10 deletions
@@ -1,6 +1,8 @@
import { useEffect, useMemo, useState } from 'react'
import { type MRT_ColumnDef } from 'material-react-table'
import { type SequenceQueryArgs, useGetSequencesQuery } from '@/redux/timeUnitReducer'
import type { FetchBaseQueryError } from '@reduxjs/toolkit/query'
import type { SerializedError } from '@reduxjs/toolkit'
import { Sequence } from '@/shared/types'
import { TableView } from '../TableView/TableView'
import { Table } from '@/components/Table/Table'
@@ -27,12 +29,15 @@ export const SequenceTable = ({ selectorFn }: { selectorFn?: (id: Sequence) => v
pagination,
isError,
error,
} = usePaginatedQuery<SequenceQueryArgs, Sequence>(useGetSequencesQuery, {
tableId: TABLE_ID,
queryArg,
manualPageIndex: pageIndex,
manualPageSize: pageSize,
})
} = usePaginatedQuery<SequenceQueryArgs, Sequence, Sequence, FetchBaseQueryError | SerializedError>(
useGetSequencesQuery,
{
tableId: TABLE_ID,
queryArg,
manualPageIndex: pageIndex,
manualPageSize: pageSize,
}
)
useEffect(() => {
if (!pagination) {
+6 -4
View File
@@ -34,12 +34,12 @@ type UsePaginatedQueryOptions<TQueryArg, TRaw, TMapped> = {
manualPageSize?: number
}
type UnknownQueryResult<T> = {
type UnknownQueryResult<T, TError = unknown> = {
data?: T
isFetching?: boolean
isLoading?: boolean
isError?: boolean
error?: unknown
error?: TError
refetch?: () => unknown
}
@@ -128,8 +128,10 @@ export const usePaginatedQuery = <
TQueryArg,
TRaw,
TMapped = TRaw,
TResult extends UnknownQueryResult<ArrayWithFullCount<TRaw> | PaginatedEnvelope<TRaw>> = UnknownQueryResult<
ArrayWithFullCount<TRaw> | PaginatedEnvelope<TRaw>
TError = unknown,
TResult extends UnknownQueryResult<ArrayWithFullCount<TRaw> | PaginatedEnvelope<TRaw>, TError> = UnknownQueryResult<
ArrayWithFullCount<TRaw> | PaginatedEnvelope<TRaw>,
TError
>,
>(
queryHook: QueryHook<TQueryArg, TResult>,