feat: add server-side table sorting

This commit is contained in:
2026-06-17 10:59:50 +05:30
parent db11a512bf
commit bd0782a55f
28 changed files with 209 additions and 29 deletions

View File

@@ -81,6 +81,7 @@ export function useClientColumns({
columns.push({
id: 'actions',
header: () => <div className="text-right">Actions</div>,
enableSorting: false,
cell: ({ row }) => {
const client = row.original;
return (

View File

@@ -1,7 +1,7 @@
'use client';
import type { ReactNode } from 'react';
import type { ColumnDef } from '@tanstack/react-table';
import type { ColumnDef, SortingState } from '@tanstack/react-table';
import { DataTable } from '@/components/data-table';
import type { Client } from '@/types';
@@ -14,8 +14,10 @@ interface ClientTableProps {
skip: number;
limit: number;
total: number;
sorting: SortingState;
onPageChange: (skip: number) => void;
onLimitChange: (limit: number) => void;
onSortingChange: (sorting: SortingState) => void;
}
export function ClientTable({
@@ -26,8 +28,10 @@ export function ClientTable({
skip,
limit,
total,
sorting,
onPageChange,
onLimitChange,
onSortingChange,
}: ClientTableProps) {
return (
<DataTable
@@ -44,6 +48,8 @@ export function ClientTable({
onPageChange,
onLimitChange,
}}
sorting={sorting}
onSortingChange={onSortingChange}
/>
);
}

View File

@@ -1,6 +1,7 @@
'use client';
import { useCallback, useState } from 'react';
import type { SortingState } from '@tanstack/react-table';
import { useDebounce } from '@/hooks/useDebounce';
@@ -9,6 +10,7 @@ export type ClientStatusFilter = 'all' | 'active' | 'inactive';
export function useClientFilters() {
const [skip, setSkip] = useState(0);
const [limit, setLimitValue] = useState(10);
const [sorting, setSortingValue] = useState<SortingState>([]);
const [searchTerm, setSearchTermValue] = useState('');
const [statusFilter, setStatusFilterValue] = useState<ClientStatusFilter>('all');
const debouncedSearchTerm = useDebounce(searchTerm.trim(), 400);
@@ -28,11 +30,18 @@ export function useClientFilters() {
setSkip(0);
}, []);
const setSorting = useCallback((value: SortingState) => {
setSortingValue(value);
setSkip(0);
}, []);
return {
skip,
setSkip,
limit,
setLimit,
sorting,
setSorting,
searchTerm,
debouncedSearchTerm,
setSearchTerm,

View File

@@ -2,7 +2,9 @@
import { useMemo } from 'react';
import { useQuery } from '@tanstack/react-query';
import type { SortingState } from '@tanstack/react-table';
import { getServerSortParams } from '@/components/data-table/sorting';
import { clientService } from '@/services/api';
import type { ClientListParams } from '@/types';
import { clientKeys } from '../queries/clientKeys';
@@ -13,6 +15,7 @@ interface UseClientsQueryParams {
limit: number;
searchTerm: string;
statusFilter: ClientStatusFilter;
sorting: SortingState;
}
function buildClientListParams({
@@ -20,22 +23,22 @@ function buildClientListParams({
limit,
searchTerm,
statusFilter,
sorting,
}: UseClientsQueryParams): ClientListParams {
return {
skip,
limit,
search_term: searchTerm || undefined,
is_active: statusFilter === 'all' ? undefined : statusFilter === 'active',
sort_by: 'created_at',
sort_order: 'desc',
...getServerSortParams(sorting),
};
}
export function useClientsQuery(params: UseClientsQueryParams) {
const { skip, limit, searchTerm, statusFilter } = params;
const { skip, limit, searchTerm, statusFilter, sorting } = params;
const listParams = useMemo(
() => buildClientListParams({ skip, limit, searchTerm, statusFilter }),
[limit, searchTerm, skip, statusFilter],
() => buildClientListParams({ skip, limit, searchTerm, statusFilter, sorting }),
[limit, searchTerm, skip, sorting, statusFilter],
);
return useQuery({

View File

@@ -26,6 +26,8 @@ export default function ClientsPage() {
setSkip,
limit,
setLimit,
sorting,
setSorting,
searchTerm,
debouncedSearchTerm,
setSearchTerm,
@@ -38,6 +40,7 @@ export default function ClientsPage() {
limit,
searchTerm: debouncedSearchTerm,
statusFilter,
sorting,
});
const clientForm = useClientForm({
onSaved: () => setIsSheetOpen(false),
@@ -112,8 +115,10 @@ export default function ClientsPage() {
skip={skip}
limit={limit}
total={total}
sorting={sorting}
onPageChange={setSkip}
onLimitChange={setLimit}
onSortingChange={setSorting}
/>
<PoweredBy />

View File

@@ -65,6 +65,7 @@ export function usePlanColumns({
{
id: 'limits',
header: 'Limits',
enableSorting: false,
cell: ({ row }) => (
<div className="text-xs text-muted-foreground">
<p>{row.original.max_projects} projects</p>
@@ -96,6 +97,7 @@ export function usePlanColumns({
columns.push({
id: 'actions',
header: () => <div className="text-right">Actions</div>,
enableSorting: false,
cell: ({ row }) => {
const plan = row.original;
return (

View File

@@ -1,7 +1,7 @@
'use client';
import type { ReactNode } from 'react';
import type { ColumnDef } from '@tanstack/react-table';
import type { ColumnDef, SortingState } from '@tanstack/react-table';
import { DataTable } from '@/components/data-table';
import type { Plan } from '@/types';
@@ -14,8 +14,10 @@ interface PlanTableProps {
skip: number;
limit: number;
total: number;
sorting: SortingState;
onPageChange: (skip: number) => void;
onLimitChange: (limit: number) => void;
onSortingChange: (sorting: SortingState) => void;
}
export function PlanTable({
@@ -26,8 +28,10 @@ export function PlanTable({
skip,
limit,
total,
sorting,
onPageChange,
onLimitChange,
onSortingChange,
}: PlanTableProps) {
return (
<DataTable
@@ -44,6 +48,8 @@ export function PlanTable({
onPageChange,
onLimitChange,
}}
sorting={sorting}
onSortingChange={onSortingChange}
/>
);
}

View File

@@ -1,6 +1,7 @@
'use client';
import { useState } from 'react';
import type { SortingState } from '@tanstack/react-table';
import { useDebounce } from '@/hooks/useDebounce';
export type PlanStatusFilter = 'all' | 'active' | 'inactive';
@@ -8,6 +9,7 @@ export type PlanStatusFilter = 'all' | 'active' | 'inactive';
export function usePlanFilters() {
const [skip, setSkip] = useState(0);
const [limit, setLimitValue] = useState(10);
const [sorting, setSortingValue] = useState<SortingState>([]);
const [searchTerm, setSearchTerm] = useState('');
const [statusFilter, setStatusFilter] = useState<PlanStatusFilter>('all');
const debouncedSearchTerm = useDebounce(searchTerm, 400);
@@ -27,11 +29,18 @@ export function usePlanFilters() {
setSkip(0);
};
const setSorting = (value: SortingState) => {
setSortingValue(value);
setSkip(0);
};
return {
skip,
setSkip,
limit,
setLimit,
sorting,
setSorting,
searchTerm,
debouncedSearchTerm,
setSearchTerm: updateSearchTerm,

View File

@@ -2,7 +2,9 @@
import { useMemo } from 'react';
import { useQuery } from '@tanstack/react-query';
import type { SortingState } from '@tanstack/react-table';
import { getServerSortParams } from '@/components/data-table/sorting';
import { mapPermissionTree } from '@/components/permission-tree';
import { permissionService, planService } from '@/services/api';
import type { PlanListParams } from '@/types';
@@ -15,6 +17,7 @@ interface UsePlansQueryParams {
limit: number;
searchTerm: string;
statusFilter: PlanStatusFilter;
sorting: SortingState;
}
function buildPlanListParams({
@@ -22,14 +25,14 @@ function buildPlanListParams({
limit,
searchTerm,
statusFilter,
sorting,
}: UsePlansQueryParams): PlanListParams {
return {
skip,
limit,
search_term: searchTerm || undefined,
is_active: statusFilter === 'all' ? undefined : statusFilter === 'active',
sort_by: 'created_at',
sort_order: 'desc',
...getServerSortParams(sorting),
};
}

View File

@@ -28,6 +28,8 @@ export default function PlansPage() {
setSkip,
limit,
setLimit,
sorting,
setSorting,
searchTerm,
debouncedSearchTerm,
setSearchTerm,
@@ -40,6 +42,7 @@ export default function PlansPage() {
limit,
searchTerm: debouncedSearchTerm,
statusFilter,
sorting,
});
const permissionsQuery = useOrganizationPermissionTreeQuery(isSheetOpen);
@@ -166,8 +169,10 @@ export default function PlansPage() {
skip={skip}
limit={limit}
total={total}
sorting={sorting}
onPageChange={setSkip}
onLimitChange={setLimit}
onSortingChange={setSorting}
/>
<PoweredBy />

View File

@@ -66,6 +66,7 @@ export function useRoleColumns({
columns.push({
id: 'actions',
header: () => <div className="text-right">Actions</div>,
enableSorting: false,
cell: ({ row }) => {
const role = row.original;
return (

View File

@@ -1,6 +1,6 @@
'use client';
import type { ColumnDef } from '@tanstack/react-table';
import type { ColumnDef, SortingState } from '@tanstack/react-table';
import type { ReactNode } from 'react';
import { DataTable } from '@/components/data-table';
@@ -14,8 +14,10 @@ interface RoleTableProps {
skip: number;
limit: number;
total: number;
sorting: SortingState;
onPageChange: (skip: number) => void;
onLimitChange: (limit: number) => void;
onSortingChange: (sorting: SortingState) => void;
}
export function RoleTable({
@@ -26,8 +28,10 @@ export function RoleTable({
skip,
limit,
total,
sorting,
onPageChange,
onLimitChange,
onSortingChange,
}: RoleTableProps) {
return (
<DataTable
@@ -44,6 +48,8 @@ export function RoleTable({
onPageChange,
onLimitChange,
}}
sorting={sorting}
onSortingChange={onSortingChange}
/>
);
}

View File

@@ -1,6 +1,7 @@
'use client';
import { useEffect, useState } from 'react';
import type { SortingState } from '@tanstack/react-table';
export type StatusFilter = 'all' | 'active' | 'inactive';
@@ -9,6 +10,7 @@ const SEARCH_DEBOUNCE_MS = 400;
export function useRoleFilters() {
const [skip, setSkip] = useState(0);
const [limit, setLimitValue] = useState(10);
const [sorting, setSortingValue] = useState<SortingState>([]);
const [searchTerm, setSearchTermValue] = useState('');
const [debouncedSearchTerm, setDebouncedSearchTerm] = useState('');
const [statusFilter, setStatusFilterValue] = useState<StatusFilter>('all');
@@ -36,11 +38,18 @@ export function useRoleFilters() {
setSkip(0);
};
const setSorting = (value: SortingState) => {
setSortingValue(value);
setSkip(0);
};
return {
skip,
setSkip,
limit,
setLimit,
sorting,
setSorting,
searchTerm,
debouncedSearchTerm,
setSearchTerm,

View File

@@ -1,9 +1,11 @@
'use client';
import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
import type { SortingState } from '@tanstack/react-table';
import { useMemo } from 'react';
import { toast } from 'sonner';
import { getServerSortParams } from '@/components/data-table/sorting';
import { mapPermissionTree } from '@/components/permission-tree';
import { permissionService, roleService } from '@/services/api';
import type { Role, RoleListParams } from '@/types';
@@ -16,6 +18,7 @@ interface UseRolesQueryParams {
limit: number;
searchTerm: string;
statusFilter: StatusFilter;
sorting: SortingState;
}
function buildRoleListParams({
@@ -23,22 +26,22 @@ function buildRoleListParams({
limit,
searchTerm,
statusFilter,
sorting,
}: UseRolesQueryParams): RoleListParams {
return {
skip,
limit,
search_term: searchTerm || undefined,
effective_status: statusFilter === 'all' ? undefined : statusFilter === 'active',
sort_by: 'created_at',
sort_order: 'desc',
...getServerSortParams(sorting),
};
}
export function useRolesQuery(params: UseRolesQueryParams) {
const { skip, limit, searchTerm, statusFilter } = params;
const { skip, limit, searchTerm, statusFilter, sorting } = params;
const listParams = useMemo(
() => buildRoleListParams({ skip, limit, searchTerm, statusFilter }),
[limit, searchTerm, skip, statusFilter],
() => buildRoleListParams({ skip, limit, searchTerm, statusFilter, sorting }),
[limit, searchTerm, skip, sorting, statusFilter],
);
return useQuery({

View File

@@ -31,6 +31,8 @@ export default function RolesPage() {
setSkip,
limit,
setLimit,
sorting,
setSorting,
searchTerm,
debouncedSearchTerm,
setSearchTerm,
@@ -43,6 +45,7 @@ export default function RolesPage() {
limit,
searchTerm: debouncedSearchTerm,
statusFilter,
sorting,
});
const permissionsQuery = usePermissionsTreeQuery(isSheetOpen);
const roleForm = useRoleForm({
@@ -125,8 +128,10 @@ export default function RolesPage() {
skip={skip}
limit={limit}
total={total}
sorting={sorting}
onPageChange={setSkip}
onLimitChange={setLimit}
onSortingChange={setSorting}
/>
<PoweredBy />

View File

@@ -82,6 +82,7 @@ export function useTenantColumns({
columns.push({
id: 'actions',
header: () => <div className="text-right">Actions</div>,
enableSorting: false,
cell: ({ row }) => {
const tenant = row.original;
return (

View File

@@ -1,7 +1,7 @@
'use client';
import type { ReactNode } from 'react';
import type { ColumnDef } from '@tanstack/react-table';
import type { ColumnDef, SortingState } from '@tanstack/react-table';
import { DataTable } from '@/components/data-table';
import type { Tenant } from '@/types';
@@ -14,8 +14,10 @@ interface TenantTableProps {
skip: number;
limit: number;
total: number;
sorting: SortingState;
onPageChange: (skip: number) => void;
onLimitChange: (limit: number) => void;
onSortingChange: (sorting: SortingState) => void;
}
export function TenantTable({
@@ -26,8 +28,10 @@ export function TenantTable({
skip,
limit,
total,
sorting,
onPageChange,
onLimitChange,
onSortingChange,
}: TenantTableProps) {
return (
<DataTable
@@ -44,6 +48,8 @@ export function TenantTable({
onPageChange,
onLimitChange,
}}
sorting={sorting}
onSortingChange={onSortingChange}
/>
);
}

View File

@@ -1,6 +1,7 @@
'use client';
import { useCallback, useState } from 'react';
import type { SortingState } from '@tanstack/react-table';
import { useDebounce } from '@/hooks/useDebounce';
@@ -9,6 +10,7 @@ export type TenantStatusFilter = 'all' | 'active' | 'inactive';
export function useTenantFilters() {
const [skip, setSkip] = useState(0);
const [limit, setLimitValue] = useState(10);
const [sorting, setSortingValue] = useState<SortingState>([]);
const [searchTerm, setSearchTermValue] = useState('');
const [statusFilter, setStatusFilterValue] = useState<TenantStatusFilter>('all');
const debouncedSearchTerm = useDebounce(searchTerm.trim(), 400);
@@ -28,11 +30,18 @@ export function useTenantFilters() {
setSkip(0);
}, []);
const setSorting = useCallback((value: SortingState) => {
setSortingValue(value);
setSkip(0);
}, []);
return {
skip,
setSkip,
limit,
setLimit,
sorting,
setSorting,
searchTerm,
debouncedSearchTerm,
setSearchTerm,

View File

@@ -2,7 +2,9 @@
import { useMemo } from 'react';
import { useQuery } from '@tanstack/react-query';
import type { SortingState } from '@tanstack/react-table';
import { getServerSortParams } from '@/components/data-table/sorting';
import { clientService, planService, tenantService } from '@/services/api';
import type { TenantListParams } from '@/types';
@@ -14,6 +16,7 @@ interface UseTenantsQueryParams {
limit: number;
searchTerm: string;
statusFilter: TenantStatusFilter;
sorting: SortingState;
}
const clientLookupParams = {
@@ -37,14 +40,14 @@ function buildTenantListParams({
limit,
searchTerm,
statusFilter,
sorting,
}: UseTenantsQueryParams): TenantListParams {
return {
skip,
limit,
search_term: searchTerm || undefined,
is_active: statusFilter === 'all' ? undefined : statusFilter === 'active',
sort_by: 'created_at',
sort_order: 'desc',
...getServerSortParams(sorting),
};
}

View File

@@ -31,6 +31,8 @@ export default function TenantsPage() {
setSkip,
limit,
setLimit,
sorting,
setSorting,
searchTerm,
debouncedSearchTerm,
setSearchTerm,
@@ -43,6 +45,7 @@ export default function TenantsPage() {
limit,
searchTerm: debouncedSearchTerm,
statusFilter,
sorting,
});
const clientsLookupQuery = useClientLookupQuery(isSheetOpen);
const plansLookupQuery = usePlanLookupQuery(isSheetOpen);
@@ -163,8 +166,10 @@ export default function TenantsPage() {
skip={skip}
limit={limit}
total={total}
sorting={sorting}
onPageChange={setSkip}
onLimitChange={setLimit}
onSortingChange={setSorting}
/>
<PoweredBy />

View File

@@ -58,6 +58,7 @@ export function useUserColumns({
{
accessorKey: 'roles',
header: 'Roles',
enableSorting: false,
cell: ({ row }) => (
<div className="flex flex-wrap gap-1">
{row.original.roles?.length ? (
@@ -93,6 +94,7 @@ export function useUserColumns({
columns.push({
id: 'actions',
header: () => <div className="text-right">Actions</div>,
enableSorting: false,
cell: ({ row }) => {
const user = row.original;
return (

View File

@@ -1,7 +1,7 @@
'use client';
import type { ReactNode } from 'react';
import type { ColumnDef } from '@tanstack/react-table';
import type { ColumnDef, SortingState } from '@tanstack/react-table';
import { DataTable } from '@/components/data-table';
import type { AdministrationUser } from '@/types';
@@ -14,8 +14,10 @@ interface UserTableProps {
skip: number;
limit: number;
total: number;
sorting: SortingState;
onPageChange: (skip: number) => void;
onLimitChange: (limit: number) => void;
onSortingChange: (sorting: SortingState) => void;
}
export function UserTable({
@@ -26,8 +28,10 @@ export function UserTable({
skip,
limit,
total,
sorting,
onPageChange,
onLimitChange,
onSortingChange,
}: UserTableProps) {
return (
<DataTable
@@ -44,6 +48,8 @@ export function UserTable({
onPageChange,
onLimitChange,
}}
sorting={sorting}
onSortingChange={onSortingChange}
/>
);
}

View File

@@ -2,6 +2,7 @@
import { useDebounce } from '@/hooks/useDebounce';
import type { UserStatus } from '@/types';
import type { SortingState } from '@tanstack/react-table';
import { useCallback, useState } from 'react';
export type StatusFilter = 'all' | UserStatus;
@@ -9,6 +10,7 @@ export type StatusFilter = 'all' | UserStatus;
export function useUserFilters() {
const [skip, setSkip] = useState(0);
const [limit, setLimitValue] = useState(10);
const [sorting, setSortingValue] = useState<SortingState>([]);
const [searchTerm, setSearchTermValue] = useState('');
const [statusFilter, setStatusFilterValue] = useState<StatusFilter>('all');
const debouncedSearchTerm = useDebounce(searchTerm.trim(), 400);
@@ -28,11 +30,18 @@ export function useUserFilters() {
setSkip(0);
}, []);
const setSorting = useCallback((value: SortingState) => {
setSortingValue(value);
setSkip(0);
}, []);
return {
skip,
setSkip,
limit,
setLimit,
sorting,
setSorting,
searchTerm,
debouncedSearchTerm,
setSearchTerm,

View File

@@ -2,7 +2,9 @@
import { useMemo } from 'react';
import { useQuery } from '@tanstack/react-query';
import type { SortingState } from '@tanstack/react-table';
import { getServerSortParams } from '@/components/data-table/sorting';
import { userService } from '@/services/api';
import type { UserListParams } from '@/types';
import { userKeys } from '../queries/userKeys';
@@ -13,6 +15,7 @@ interface UseUsersQueryParams {
limit: number;
searchTerm: string;
statusFilter: StatusFilter;
sorting: SortingState;
}
function buildUserListParams({
@@ -20,22 +23,22 @@ function buildUserListParams({
limit,
searchTerm,
statusFilter,
sorting,
}: UseUsersQueryParams): UserListParams {
return {
skip,
limit,
search_term: searchTerm || undefined,
effective_status: statusFilter === 'all' ? undefined : statusFilter,
sort_by: 'created_at',
sort_order: 'desc',
...getServerSortParams(sorting),
};
}
export function useUsersQuery(params: UseUsersQueryParams) {
const { skip, limit, searchTerm, statusFilter } = params;
const { skip, limit, searchTerm, statusFilter, sorting } = params;
const listParams = useMemo(
() => buildUserListParams({ skip, limit, searchTerm, statusFilter }),
[limit, searchTerm, skip, statusFilter],
() => buildUserListParams({ skip, limit, searchTerm, statusFilter, sorting }),
[limit, searchTerm, skip, sorting, statusFilter],
);
return useQuery({

View File

@@ -27,6 +27,8 @@ export default function UsersPage() {
setSkip,
limit,
setLimit,
sorting,
setSorting,
searchTerm,
debouncedSearchTerm,
setSearchTerm,
@@ -39,6 +41,7 @@ export default function UsersPage() {
limit,
searchTerm: debouncedSearchTerm,
statusFilter,
sorting,
});
const userForm = useUserForm({
onSaved: () => setIsSheetOpen(false),
@@ -128,8 +131,10 @@ export default function UsersPage() {
skip={skip}
limit={limit}
total={total}
sorting={sorting}
onPageChange={setSkip}
onLimitChange={setLimit}
onSortingChange={setSorting}
/>
<PoweredBy />