|
@@ -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 }),
|