Browse Source

feat: add automatic and manual refresh for custom trip orders with descending date sorting

develop
parent
commit
9fb1d53abd
  1. 4
      src/features/custom-trip/CustomTripOrderDetailPage.tsx
  2. 55
      src/features/custom-trip/CustomTripPage.tsx
  3. 51
      src/features/custom-trip/components/CustomTripOrdersTab.tsx
  4. 39
      src/features/custom-trip/services/__tests__/custom-trip-api.test.ts
  5. 33
      src/features/custom-trip/services/custom-trip-api.ts

4
src/features/custom-trip/CustomTripOrderDetailPage.tsx

@ -8,7 +8,7 @@ import { Textarea } from '@/components/ui/textarea'
import { Shimmer, ShimmerBox, ShimmerLine } from '@/components/shared/shimmer_frontend'
import { Ic } from '@/icons'
import { toFa, toEn, formatAmount } from '@/lib/utils'
import { formatDualDate, formatDateRangeByLanguage, parseTravelDateRange } from '@/lib/date-utils'
import { formatDualDate, formatDateTimeByLanguage, formatDateRangeByLanguage, parseTravelDateRange } from '@/lib/date-utils'
import { UniversalDatePicker } from '@/components/shared/UniversalDatePicker'
import { useTranslation } from '@/i18n'
import { useBillingBadgeStore } from '@/stores/billing-badge'
@ -1747,7 +1747,7 @@ export default function CustomTripOrderDetailPage() {
<div className="flex items-center justify-between">
<span className="text-muted-foreground text-xs">{t('customTrip.createdDate')}:</span>
<span className="font-mono text-foreground">
{formatDualDate(order.created, language)}
{formatDateTimeByLanguage(order.created, language)}
</span>
</div>
</div>

55
src/features/custom-trip/CustomTripPage.tsx

@ -1,4 +1,4 @@
import React, { useState, useEffect } from 'react'
import React, { useState, useEffect, useCallback, useRef } from 'react'
import { useParams, useNavigate, useSearchParams, useLocation } from 'react-router-dom'
import { Ic, IconName } from '@/icons'
import { Shimmer } from '@/components/shared/shimmer_frontend'
@ -59,6 +59,7 @@ export default function CustomTripPage() {
const activeTab = activeTabParam && TABS.some((tab) => tab.id === activeTabParam) ? activeTabParam : 'orders'
const [isOrdersLoading, setIsOrdersLoading] = useState(true)
const [isOrdersRefreshing, setIsOrdersRefreshing] = useState(false)
const [isOriginsLoading, setIsOriginsLoading] = useState(true)
const [isDestinationsLoading, setIsDestinationsLoading] = useState(true)
const [orders, setOrders] = useState<CustomTripOrderItem[]>([])
@ -68,6 +69,56 @@ export default function CustomTripPage() {
const [relations, setRelations] = useState<CustomTripTransportRelationItem[]>([])
const hotels = useHotelsCatalogStore((s) => s.hotels)
const setHotels = useHotelsCatalogStore((s) => s.setHotels)
const isMountedRef = useRef(true)
useEffect(() => {
isMountedRef.current = true
return () => {
isMountedRef.current = false
}
}, [])
const handleRefreshOrders = useCallback(async () => {
setIsOrdersRefreshing(true)
try {
const data = await fetchCustomTripOrders()
if (isMountedRef.current) {
setOrders(data)
}
} catch {
} finally {
if (isMountedRef.current) {
setIsOrdersRefreshing(false)
}
}
}, [])
useEffect(() => {
if (activeTab !== 'orders') return
const onFocus = () => {
void handleRefreshOrders()
}
const onVisibilityChange = () => {
if (document.visibilityState === 'visible') {
void handleRefreshOrders()
}
}
window.addEventListener('focus', onFocus)
document.addEventListener('visibilitychange', onVisibilityChange)
const intervalId = window.setInterval(() => {
if (document.visibilityState === 'visible') {
void handleRefreshOrders()
}
}, 15000)
return () => {
window.removeEventListener('focus', onFocus)
document.removeEventListener('visibilitychange', onVisibilityChange)
window.clearInterval(intervalId)
}
}, [activeTab, handleRefreshOrders])
useEffect(() => {
let isMounted = true
@ -303,6 +354,8 @@ export default function CustomTripPage() {
<CustomTripOrdersTab
orders={orders}
onOrderUpdated={handleOrderUpdated}
onRefresh={() => void handleRefreshOrders()}
isRefreshing={isOrdersRefreshing}
origins={origins}
destinations={destinations}
hotels={hotels}

51
src/features/custom-trip/components/CustomTripOrdersTab.tsx

@ -15,7 +15,13 @@ import {
import { Ic } from '@/icons'
import { toFa } from '@/lib/utils'
import { useTranslation } from '@/i18n'
import { formatDateByLanguage, formatDateRangeByLanguage, parseTravelDateRange } from '@/lib/date-utils'
import {
formatDateByLanguage,
formatDateTimeByLanguage,
formatDateRangeByLanguage,
parseTravelDateRange,
} from '@/lib/date-utils'
import { sortOrdersByCreatedDesc } from '../services/custom-trip-api'
import type {
CustomTripOrderItem,
CustomTripOrderStatus,
@ -27,6 +33,8 @@ import type {
interface CustomTripOrdersTabProps {
orders: CustomTripOrderItem[]
onOrderUpdated: (updated: CustomTripOrderItem) => void
onRefresh?: () => void
isRefreshing?: boolean
origins?: CustomTripOriginItem[]
destinations?: CustomTripDestinationItem[]
hotels?: CustomTripHotelItem[]
@ -35,6 +43,8 @@ interface CustomTripOrdersTabProps {
export function CustomTripOrdersTab({
orders,
onOrderUpdated,
onRefresh,
isRefreshing = false,
origins = [],
destinations = [],
hotels = [],
@ -102,17 +112,19 @@ export function CustomTripOrdersTab({
}
}
const filteredOrders = orders.filter((order) => {
const matchesStatus = statusFilter === 'all' || order.status === statusFilter
const term = search.trim().toLowerCase()
const matchesSearch =
!term ||
order.id.toString().includes(term) ||
(order.user.fullName && order.user.fullName.toLowerCase().includes(term)) ||
(order.originCity && order.originCity.toLowerCase().includes(term)) ||
order.destinations.some((d) => d.toLowerCase().includes(term))
return matchesStatus && matchesSearch
})
const filteredOrders = sortOrdersByCreatedDesc(
orders.filter((order) => {
const matchesStatus = statusFilter === 'all' || order.status === statusFilter
const term = search.trim().toLowerCase()
const matchesSearch =
!term ||
order.id.toString().includes(term) ||
(order.user.fullName && order.user.fullName.toLowerCase().includes(term)) ||
(order.originCity && order.originCity.toLowerCase().includes(term)) ||
order.destinations.some((d) => d.toLowerCase().includes(term))
return matchesStatus && matchesSearch
})
)
return (
<div className="space-y-4">
@ -211,6 +223,19 @@ export function CustomTripOrdersTab({
className="ps-9 h-10 rounded-xl bg-background border-border/60 text-xs sm:text-sm"
/>
</div>
{onRefresh && (
<Button
type="button"
variant="outline"
size="sm"
onClick={onRefresh}
disabled={isRefreshing}
className="h-10 px-3.5 rounded-xl gap-2 text-xs font-semibold border-border/60 shrink-0 cursor-pointer"
>
<Ic name="refresh" className={`size-4 ${isRefreshing ? 'animate-spin' : ''}`} />
<span>{t(isRefreshing ? 'dashboard.refreshing' : 'common.refresh')}</span>
</Button>
)}
</div>
{/* Status filter chips */}
@ -467,7 +492,7 @@ export function CustomTripOrdersTab({
</div>
</TableCell>
<TableCell className="px-4 py-3.5 text-center font-mono text-xs text-muted-foreground">
{formatDateByLanguage(order.created, language)}
{formatDateTimeByLanguage(order.created, language)}
</TableCell>
<TableCell className="px-4 py-3.5 text-center" onClick={(e) => e.stopPropagation()}>
<Button

39
src/features/custom-trip/services/__tests__/custom-trip-api.test.ts

@ -0,0 +1,39 @@
import { describe, expect, it } from 'vitest'
import { sortOrdersByCreatedDesc } from '../custom-trip-api'
describe('sortOrdersByCreatedDesc', () => {
it('sorts orders by creation date and time from newest to oldest', () => {
const input = [
{ id: 150, created: '2026-10-24T16:08:51.649117' },
{ id: 153, created: '2026-10-26T15:37:35.936085' },
{ id: 156, created: '2026-11-01T15:54:15.359013' },
{ id: 155, created: '2026-10-26T18:45:37.290538' },
{ id: 154, created: '2026-10-26T16:52:11.347603' },
]
const sorted = sortOrdersByCreatedDesc(input)
expect(sorted.map((o) => o.id)).toEqual([156, 155, 154, 153, 150])
})
it('uses id descending as deterministic tie-breaker when timestamps match', () => {
const input = [
{ id: 10, created: '2026-10-26T12:00:00' },
{ id: 12, created: '2026-10-26T12:00:00' },
{ id: 11, created: '2026-10-26T12:00:00' },
]
const sorted = sortOrdersByCreatedDesc(input)
expect(sorted.map((o) => o.id)).toEqual([12, 11, 10])
})
it('handles missing or invalid created values without throwing', () => {
const input = [
{ id: 1, created: '' },
{ id: 2, created: 'invalid-date' },
{ id: 3, created: '2026-11-01T10:00:00' },
]
const sorted = sortOrdersByCreatedDesc(input)
expect(sorted.map((o) => o.id)).toEqual([3, 2, 1])
})
})

33
src/features/custom-trip/services/custom-trip-api.ts

@ -234,11 +234,38 @@ function mapBackendOrderToPanel(raw: any): CustomTripOrderItem {
}
}
export function sortOrdersByCreatedDesc<T extends { created?: string | null; id: number }>(
orders: T[]
): T[] {
return [...orders].sort((a, b) => {
const timeA = a.created ? Date.parse(a.created) : 0
const timeB = b.created ? Date.parse(b.created) : 0
const safeA = Number.isNaN(timeA) ? 0 : timeA
const safeB = Number.isNaN(timeB) ? 0 : timeB
if (safeB !== safeA) return safeB - safeA
return Number(b.id) - Number(a.id)
})
}
export async function fetchCustomTripOrders(): Promise<CustomTripOrderItem[]> {
try {
const res = await apiFetch<any>('trip/custom/v2/admin/orders/?page_size=100')
const list = Array.isArray(res) ? res : Array.isArray(res?.results) ? res.results : []
return list.map(mapBackendOrderToPanel)
const allRaw: any[] = []
let page = 1
const maxPages = 20
while (page <= maxPages) {
const res = await apiFetch<any>(`trip/custom/v2/admin/orders/?page=${page}&page_size=200`)
if (Array.isArray(res)) {
allRaw.push(...res)
break
}
const results = Array.isArray(res?.results) ? res.results : []
allRaw.push(...results)
if (!res?.next || results.length === 0) break
page += 1
}
return sortOrdersByCreatedDesc(allRaw.map(mapBackendOrderToPanel))
} catch (err) {
console.warn('[CustomTrip API] Could not fetch admin orders from v2 endpoint:', err)
return []

Loading…
Cancel
Save