watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-06 05:37:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Refactor part 2: Electric Boogaloo. Standardize way of passing filter parameters.

Browse source
This commit is contained in:
Mike Cao 2025-07-04 01:23:11 -07:00
parent f26f1b0581
commit cdf391d5c2
90 changed files with 867 additions and 709 deletions
Download patch file Download diff file Expand all files Collapse all files

41
src/components/common/DataGrid.tsx
View file

@ -6,13 +6,13 @@ import { LoadingPanel } from '@/components/common/LoadingPanel';
const DEFAULT_SEARCH_DELAY = 600;
export interface DataTableProps {
export interface DataGridProps {
queryResult: any;
searchDelay?: number;
allowSearch?: boolean;
allowPaging?: boolean;
autoFocus?: boolean;
renderEmpty?: () => ReactNode;
renderActions?: () => ReactNode;
children: ReactNode | ((data: any) => ReactNode);
}
@ -20,12 +20,13 @@ export function DataGrid({
queryResult,
searchDelay = 600,
allowSearch,
allowPaging,
allowPaging = true,
autoFocus,
renderActions,
children,
}: DataTableProps) {
}: DataGridProps) {
const { formatMessage, labels } = useMessages();
const { data, error, isLoading, isFetching, setParams } = queryResult || {};
const { data, error, isLoading, isFetching, setParams } = queryResult;
const { router, updateParams } = useNavigation();
const [search, setSearch] = useState('');
@ -43,29 +44,33 @@ export function DataGrid({
return (
<Column gap="4" minHeight="300px">
{allowSearch && (data || search) && (
<Row width="280px" alignItems="center">
<Row alignItems="center" justifyContent="space-between">
<SearchField
value={search}
onSearch={handleSearch}
delay={searchDelay || DEFAULT_SEARCH_DELAY}
autoFocus={autoFocus}
placeholder={formatMessage(labels.search)}
style={{ width: '280px' }}
/>
{renderActions?.()}
</Row>
)}
<LoadingPanel data={data} isLoading={isLoading} isFetching={isFetching} error={error}>
<Column>
{data ? (typeof children === 'function' ? children(data) : children) : null}
</Column>
{allowPaging && data && (
<Row marginTop="6">
<Pager
page={data.page}
pageSize={data.pageSize}
count={data.count}
onPageChange={handlePageChange}
/>
</Row>
{data && (
<>
<Column>{typeof children === 'function' ? children(data) : children}</Column>
{allowPaging && data && (
<Row marginTop="6">
<Pager
page={data.page}
pageSize={data.pageSize}
count={data.count}
onPageChange={handlePageChange}
/>
</Row>
)}
</>
)}
</LoadingPanel>
</Column>