From 9fb1d53abd9bf0738d8c7c19af35f8f51d806968 Mon Sep 17 00:00:00 2001 From: Muhammad Amin Ghorbani Date: Wed, 18 Nov 2026 18:03:44 +0330 Subject: [PATCH] feat: add automatic and manual refresh for custom trip orders with descending date sorting --- .../custom-trip/CustomTripOrderDetailPage.tsx | 4 +- src/features/custom-trip/CustomTripPage.tsx | 55 ++++++++++++++++++- .../components/CustomTripOrdersTab.tsx | 51 ++++++++++++----- .../__tests__/custom-trip-api.test.ts | 39 +++++++++++++ .../custom-trip/services/custom-trip-api.ts | 33 ++++++++++- 5 files changed, 163 insertions(+), 19 deletions(-) create mode 100644 src/features/custom-trip/services/__tests__/custom-trip-api.test.ts diff --git a/src/features/custom-trip/CustomTripOrderDetailPage.tsx b/src/features/custom-trip/CustomTripOrderDetailPage.tsx index f607de8..2f66296 100644 --- a/src/features/custom-trip/CustomTripOrderDetailPage.tsx +++ b/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() {
{t('customTrip.createdDate')}: - {formatDualDate(order.created, language)} + {formatDateTimeByLanguage(order.created, language)}
diff --git a/src/features/custom-trip/CustomTripPage.tsx b/src/features/custom-trip/CustomTripPage.tsx index 362f50c..9fdc40b 100644 --- a/src/features/custom-trip/CustomTripPage.tsx +++ b/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([]) @@ -68,6 +69,56 @@ export default function CustomTripPage() { const [relations, setRelations] = useState([]) 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() { void handleRefreshOrders()} + isRefreshing={isOrdersRefreshing} origins={origins} destinations={destinations} hotels={hotels} diff --git a/src/features/custom-trip/components/CustomTripOrdersTab.tsx b/src/features/custom-trip/components/CustomTripOrdersTab.tsx index fa0d5a4..91ff0a1 100644 --- a/src/features/custom-trip/components/CustomTripOrdersTab.tsx +++ b/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 (
@@ -211,6 +223,19 @@ export function CustomTripOrdersTab({ className="ps-9 h-10 rounded-xl bg-background border-border/60 text-xs sm:text-sm" />
+ {onRefresh && ( + + )} {/* Status filter chips */} @@ -467,7 +492,7 @@ export function CustomTripOrdersTab({ - {formatDateByLanguage(order.created, language)} + {formatDateTimeByLanguage(order.created, language)} e.stopPropagation()}>