From 34ffc7f97a37795660ab0122a2aaae496423149b Mon Sep 17 00:00:00 2001
From: "Kalana B. Thilakarathna" <kalana2100@gmail.com>
Date: Mon, 21 Sep 2026 09:30:57 +0530
Subject: [PATCH 1/2] Fix ride selection logic to handle empty values in
 LoadingSheetsClient

---
 .../operations/loading/_components/loading-sheets-client.tsx    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/distribution_fe/app/(dashboard)/operations/loading/_components/loading-sheets-client.tsx b/distribution_fe/app/(dashboard)/operations/loading/_components/loading-sheets-client.tsx
index b033786..75ed717 100644
--- a/distribution_fe/app/(dashboard)/operations/loading/_components/loading-sheets-client.tsx
+++ b/distribution_fe/app/(dashboard)/operations/loading/_components/loading-sheets-client.tsx
@@ -195,7 +195,7 @@ export function LoadingSheetsClient() {
           <label className="text-xs text-muted-foreground">Ride</label>
           <Select
             value={rideId || ALL}
-            onValueChange={(v) => { setRideId(v === ALL ? '' : v); setPage(1) }}
+            onValueChange={(v) => { setRideId(!v || v === ALL ? '' : v); setPage(1) }}
           >
             <SelectTrigger className="w-52">
               <SelectValue placeholder="All rides" />

From 3c17047550dc13c8d203b222eef9dff42a22a5ed Mon Sep 17 00:00:00 2001
From: "Kalana B. Thilakarathna" <kalana2100@gmail.com>
Date: Mon, 21 Sep 2026 09:35:05 +0530
Subject: [PATCH 2/2] Improve filter handling in SalesClient to reset values
 for empty selections

---
 .../app/(dashboard)/sales/_components/sales-client.tsx      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/distribution_fe/app/(dashboard)/sales/_components/sales-client.tsx b/distribution_fe/app/(dashboard)/sales/_components/sales-client.tsx
index d5cc631..c248a5c 100644
--- a/distribution_fe/app/(dashboard)/sales/_components/sales-client.tsx
+++ b/distribution_fe/app/(dashboard)/sales/_components/sales-client.tsx
@@ -232,7 +232,7 @@ export function SalesClient() {
           <label className="text-xs text-muted-foreground">Agent</label>
           <Select
             value={agentId || ALL}
-            onValueChange={(v) => { setAgentId(v === ALL ? '' : v); setPage(1) }}
+            onValueChange={(v) => { setAgentId(!v || v === ALL ? '' : v); setPage(1) }}
           >
             <SelectTrigger className="w-44">
               <SelectValue placeholder="All agents" />
@@ -250,7 +250,7 @@ export function SalesClient() {
           <label className="text-xs text-muted-foreground">Route</label>
           <Select
             value={routeId || ALL}
-            onValueChange={(v) => { setRouteId(v === ALL ? '' : v); setPage(1) }}
+            onValueChange={(v) => { setRouteId(!v || v === ALL ? '' : v); setPage(1) }}
           >
             <SelectTrigger className="w-44">
               <SelectValue placeholder="All routes" />
@@ -268,7 +268,7 @@ export function SalesClient() {
           <label className="text-xs text-muted-foreground">Store</label>
           <Select
             value={shopId || ALL}
-            onValueChange={(v) => { setShopId(v === ALL ? '' : v); setPage(1) }}
+            onValueChange={(v) => { setShopId(!v || v === ALL ? '' : v); setPage(1) }}
           >
             <SelectTrigger className="w-44">
               <SelectValue placeholder="All stores" />