Nearle_express/dailygrubs_console
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updates on the active page section

Browse Source
This commit is contained in:
dharaneesh-r
2026-06-26 13:11:24 +05:30
parent 0ce99b3f69
commit 76c8e5062d
2 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/pages/nearle/dispatch/ActiveSection.js
View File

@@ -30,8 +30,8 @@ const ActiveSection = ({
.filter(Boolean)
.filter((o) => String(o.orderstatus || '').toLowerCase() === 'active')
.sort((a, b) => {
const mA = calculateEstMeters(a.rider_id, a) ?? Infinity;
const mB = calculateEstMeters(b.rider_id, b) ?? Infinity;
const mA = calculateEstMeters(a.rider_id || a.userid, a) ?? Infinity;
const mB = calculateEstMeters(b.rider_id || b.userid, b) ?? Infinity;
return mA - mB;
});
@@ -96,7 +96,7 @@ const ActiveSection = ({
}
const renderActiveDeliveryCard = (o, i) => {
const rid = o.rider_id;
const rid = o.rider_id || o.userid;
const rider = riders.find((r) => String(r.id) === String(rid));
const color = getRiderColor(rid);
const statusStyle = getStatusStyle(o.orderstatus);

28
src/pages/nearle/dispatch/Dispatch.js
View File

@@ -1702,7 +1702,7 @@ const Dispatch = ({
// is already gated to active-order riders) so the tiles can't disagree with
// the list/map below.
if (isAllActiveView) {
const activeOrders = allViewOrders.filter(isActiveDelivery);
const activeOrders = allViewOrders.filter((o) => String(o?.orderstatus || '').toLowerCase() === 'active');
return {
orders: activeOrders.length,
riders: visibleRiders.length,
@@ -1725,7 +1725,7 @@ const Dispatch = ({
// the header (RIDER DISPATCH title + Active Fleet badge + order/rider tiles)
// is hidden so the "No active deliveries" empty state stands on its own.
const activeDeliveryCount = useMemo(
() => (isAllActiveView ? allViewOrders.filter(isActiveDelivery).length : 0),
() => (isAllActiveView ? allViewOrders.filter((o) => String(o?.orderstatus || '').toLowerCase() === 'active').length : 0),
[isAllActiveView, allViewOrders]
);
@@ -2462,7 +2462,7 @@ const Dispatch = ({
html: `<div class="kitchen-mark${focused ? ' is-focused' : ''}">${(name || 'K').charAt(0).toUpperCase()}</div>`
});
const getRiderColor = (rid) => riders.find(r => r.id === rid)?.color || '#475569';
const getRiderColor = (rid) => riders.find(r => String(r.id) === String(rid))?.color || '#475569';
const calculateEstMeters = (riderId, order) => {
if (!riderId || !order || !hasValidDrop(order)) return null;
@@ -3872,16 +3872,18 @@ const Dispatch = ({
so the empty state isn't topped by a "0 orders / 0 riders" header. */}
{!focusedRider && !(isAllActiveView && activeDeliveryCount === 0) && (
<div className="sb-header">
<div className="sb-header-top">
<div className="sb-header-title">
<span className="sb-title-bar" aria-hidden="true" />
<span className="sb-title-text">RIDER DISPATCH</span>
{!isAllActiveView && (
<div className="sb-header-top">
<div className="sb-header-title">
<span className="sb-title-bar" aria-hidden="true" />
<span className="sb-title-text">RIDER DISPATCH</span>
</div>
<span className="sb-header-scope" title={activeStats.label}>
<span className="sb-scope-dot" />
{activeStats.label}
</span>
</div>
<span className="sb-header-scope" title={activeStats.label}>
<span className="sb-scope-dot" />
{activeStats.label}
</span>
</div>
)}
<div className="sb-header-tiles">
<div className="sb-tile sb-tile-orders">
@@ -4449,7 +4451,7 @@ const Dispatch = ({
{/* Hide the panel title in the Active view when there are no
in-progress deliveries, so the empty state isn't topped by
an "Active rider dispatch" heading. */}
{!(isAllActiveView && activeDeliveryCount === 0) && (
{!isAllActiveView && (
<div className="ph">{
viewMode === 'zones' ? 'Zone dispatch' :
viewMode === 'kitchens' ? 'Kitchen dispatch' :