From b48cc040e1166c75535575d183f1679c25f885f5 Mon Sep 17 00:00:00 2001
From: "diana.dolgolyova" <diana.dolgolyova@gmail.com>
Date: Tue, 24 Mar 2026 17:23:16 +0300
Subject: [PATCH] fix: search and status filter work together consistently
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Status filter chips stay visible during text search
- Search results filtered by selected status (search + filter = AND)
- Shows "Нет записей по фильтру" when search has results but filter excludes all
---
 src/app/admin/bookings/SearchBar.tsx |  4 +---
 src/app/admin/bookings/page.tsx      | 13 +++++++++----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/app/admin/bookings/SearchBar.tsx b/src/app/admin/bookings/SearchBar.tsx
index 8c061c4..8730536 100644
--- a/src/app/admin/bookings/SearchBar.tsx
+++ b/src/app/admin/bookings/SearchBar.tsx
@@ -39,8 +39,6 @@ export function SearchBar({
     onClear();
   }
 
-  const isSearching = query.trim().length >= 2;
-
   return (
     <div className="space-y-2">
       <div className="relative">
@@ -58,7 +56,7 @@ export function SearchBar({
           </button>
         )}
       </div>
-      {!isSearching && (
+      {(
         <div className="flex items-center gap-1.5">
           <Filter size={12} className="text-neutral-600 shrink-0" />
           <button
diff --git a/src/app/admin/bookings/page.tsx b/src/app/admin/bookings/page.tsx
index a3aea30..26cb3d9 100644
--- a/src/app/admin/bookings/page.tsx
+++ b/src/app/admin/bookings/page.tsx
@@ -792,12 +792,15 @@ function BookingsPageInner() {
       </div>
 
       {searchResults ? (
-        /* #5: Actionable search results */
+        /* #5: Actionable search results — filtered by status */
+        (() => {
+          const filtered = statusFilter === "all" ? searchResults : searchResults.filter((r) => r.status === statusFilter);
+          return (
         <div className="mt-4 space-y-2">
-          {searchResults.length === 0 ? (
-            <p className="text-sm text-neutral-500 py-8 text-center">Ничего не найдено</p>
+          {filtered.length === 0 ? (
+            <p className="text-sm text-neutral-500 py-8 text-center">{searchResults.length === 0 ? "Ничего не найдено" : "Нет записей по фильтру"}</p>
           ) : (
-            searchResults.map((r) => (
+            filtered.map((r) => (
               <BookingCard key={`${r.type}-${r.id}`} status={r.status as BookingStatus}>
                 <div className="flex items-start justify-between gap-3">
                   <div className="flex items-center gap-2 flex-wrap text-sm min-w-0">
@@ -820,6 +823,8 @@ function BookingsPageInner() {
             ))
           )}
         </div>
+          );
+        })()
       ) : (
         <>
           {/* Dashboard — what needs attention */}