Skip to content

[FIX] Enable auto-refresh with polling and manual refresh for admin orders page #288

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Siddh2024 wants to merge 1 commit into
base: gssoc_develop
Choose a base branch
from
Open

[FIX] Enable auto-refresh with polling and manual refresh for admin orders page #288

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 29 additions & 10 deletions RestroHub-FrontEnd/src/components/admin/orders/orderComponents/OrdersGrid.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useState, useEffect } from 'react';
import { RefreshCw, AlertCircle, ClipboardList } from 'lucide-react';
import { RefreshCw, AlertCircle, ClipboardList, Clock } from 'lucide-react';
import OrderCard from './OrderCard';
import api from "@services/common/api";
import AdminSkeleton from '../../AdminSkeleton';
Expand All @@ -12,6 +12,7 @@ const OrdersGrid = ({ activeFilter, searchQuery, onOrdersChange }) => {
const [loading, setLoading] = useState(true);
const [error, setError] = useState(null);
const [refreshing, setRefreshing] = useState(false);
const [lastRefreshed, setLastRefreshed] = useState(null);

// Sync orders up to parent so OrderFilters gets real counts
const syncOrders = (updated) => {
Expand Down Expand Up @@ -77,9 +78,8 @@ const OrdersGrid = ({ activeFilter, searchQuery, onOrdersChange }) => {
useEffect(() => {
fetchOrders();

// 🔌 UNCOMMENT: Auto-refresh every 30 seconds
// const interval = setInterval(fetchOrders, 30000);
// return () => clearInterval(interval);
const interval = setInterval(fetchOrders, 30000);
return () => clearInterval(interval);
}, []);
Comment on lines 78 to 83

const fetchOrders = async () => {
Expand All @@ -101,6 +101,7 @@ const OrdersGrid = ({ activeFilter, searchQuery, onOrdersChange }) => {
} finally {
setLoading(false);
setRefreshing(false);
setLastRefreshed(new Date());
}
};

Expand Down Expand Up @@ -178,13 +179,31 @@ const OrdersGrid = ({ activeFilter, searchQuery, onOrdersChange }) => {

return (
<div>
{/* Refresh indicator */}
{refreshing && (
<div className="flex items-center gap-2 mb-4 text-sm text-blue-600">
<RefreshCw className="w-4 h-4 animate-spin" />
<span>Refreshing orders...</span>
{/* Refresh indicator & last refreshed */}
<div className="flex items-center justify-between mb-4">
<div className="flex items-center gap-2">
{refreshing && (
<>
<RefreshCw className="w-4 h-4 animate-spin text-blue-600" />
<span className="text-sm text-blue-600">Refreshing orders...</span>
</>
)}
{!refreshing && lastRefreshed && (
<div className="flex items-center gap-1.5 text-xs text-gray-400">
<Clock className="w-3.5 h-3.5" />
<span>Last updated: {lastRefreshed.toLocaleTimeString()}</span>
</div>
)}
</div>
)}
<button
onClick={fetchOrders}
disabled={refreshing}
className="flex items-center gap-1.5 px-3 py-1.5 text-xs font-medium text-blue-700 bg-blue-50 hover:bg-blue-100 rounded-lg transition-colors disabled:opacity-50"
>
<RefreshCw className={`w-3.5 h-3.5 ${refreshing ? 'animate-spin' : ''}`} />
Refresh
</button>
</div>

{/* Orders Grid */}
<div className="grid grid-cols-1 md:grid-cols-2 xl:grid-cols-3 gap-4">
Expand Down