Jelajahi Sumber

Remember the sort order on the billing list (#352)

Every other list page keeps the column it was last sorted by in a cookie, so
coming back through the sidebar lands on the same order. Billing never joined
them: its sort lived only in the URL, and a bare /billing reverted to newest
first.

It now resolves through the same helper, so the first paint on the server is
already in the remembered order rather than flashing the default.
Bernt Christian Egeland 2 bulan lalu
induk
melakukan
5506995d87

+ 2 - 0
src/app/(authenticated)/billing/billing-client.tsx

@@ -34,6 +34,7 @@ import {
 } from 'lucide-react'
 } from 'lucide-react'
 import { cn } from '@/lib/utils'
 import { cn } from '@/lib/utils'
 import { useFormatCurrency } from '@/components/currency-settings-context'
 import { useFormatCurrency } from '@/components/currency-settings-context'
+import { useRememberedSort } from '@/hooks/use-remembered-sort'
 
 
 interface BillingRecord {
 interface BillingRecord {
   id: string
   id: string
@@ -105,6 +106,7 @@ export default function BillingClient({
   const searchParams = useSearchParams()
   const searchParams = useSearchParams()
   const [isPending, startTransition] = useTransition()
   const [isPending, startTransition] = useTransition()
   const tableNav = useTableKeyboardNav()
   const tableNav = useTableKeyboardNav()
+  useRememberedSort('billing')
 
 
   const createQueryString = useCallback(
   const createQueryString = useCallback(
     (params: Record<string, string>) => {
     (params: Record<string, string>) => {

+ 6 - 2
src/app/(authenticated)/billing/page.tsx

@@ -1,3 +1,4 @@
+import { resolveListSort } from '@/lib/list-sort-preference.server'
 import { getBillingHistory } from '@/features/billing/Actions/billingActions'
 import { getBillingHistory } from '@/features/billing/Actions/billingActions'
 import { getSettings } from '@/features/settings/Actions/settingsActions'
 import { getSettings } from '@/features/settings/Actions/settingsActions'
 import { SETTING_KEYS } from '@/features/settings/Schema/settingsSchema'
 import { SETTING_KEYS } from '@/features/settings/Schema/settingsSchema'
@@ -22,8 +23,11 @@ export default async function BillingPage({
   const pageSize = Number(params.pageSize) || 20
   const pageSize = Number(params.pageSize) || 20
   const search = params.search || ''
   const search = params.search || ''
   const statusFilter = params.status || 'all'
   const statusFilter = params.status || 'all'
-  const sortBy = params.sortBy || ''
-  const sortOrder = (params.sortOrder as 'asc' | 'desc') || 'desc'
+  // No column asked for anywhere means the list keeps its own default, which
+  // getBillingHistory reads as newest first.
+  const sort = await resolveListSort('billing', params, { sortBy: undefined, sortOrder: 'desc' })
+  const sortBy = sort.sortBy || ''
+  const sortOrder = sort.sortOrder
 
 
   const [result, settingsResult] = await Promise.all([
   const [result, settingsResult] = await Promise.all([
     getBillingHistory({ page, pageSize, search, status: statusFilter, sortBy, sortOrder }),
     getBillingHistory({ page, pageSize, search, status: statusFilter, sortBy, sortOrder }),

+ 1 - 0
src/lib/list-sort-preference.ts

@@ -20,6 +20,7 @@ export type ListKey =
   | 'inventory'
   | 'inventory'
   | 'inspections'
   | 'inspections'
   | 'laborPresets'
   | 'laborPresets'
+  | 'billing'
 
 
 export const LIST_SORT_COOKIE = 'listSort'
 export const LIST_SORT_COOKIE = 'listSort'