fix: combine detailed tender search fields

This commit is contained in:
2026-09-06 15:59:01 +03:00
parent 9b751296ed
commit 3a5b06cee2
8 changed files with 78 additions and 35 deletions
+9 -3
View File
@@ -1,5 +1,5 @@
import {matchesRegion,matchesProcurement} from '../services/savedFilterCriteria';
import { matchesTenderSearch } from '../services/tenderSearch';
import { matchesTenderSearch, matchesDetailedSearch } from '../services/tenderSearch';
import React, { useState, useMemo, useEffect, useRef, useCallback } from 'react';
import { useApp } from '../context/AppContext';
import { TenderCard } from './TenderCard';
@@ -17,6 +17,7 @@ export const TenderList = () => {
const {
tenders,
searchQuery,
detailedQueries,setDetailedQueries,
kalemEslesen, itemSearchState, retryItemSearch,
uyumEsigi,
selectedCity,selectedRegion,setSelectedRegion,
@@ -46,6 +47,7 @@ export const TenderList = () => {
return tenders.filter(tender => {
// Search Query
if (!matchesTenderSearch(tender,searchQuery,kalemEslesen)) return false;
if (!matchesDetailedSearch(tender,detailedQueries)) return false;
// Geçmiş ihaleler: varsayılan olarak GİZLİ. Kullanıcı "geçmişi de göster"
// derse (onlyValidOnly=false) hepsi gelir. Tarihi okunamayan kayıt gizlenmez.
@@ -71,7 +73,7 @@ export const TenderList = () => {
if (sortBy === 'distant') return compareTenderDeadlines(a,b,-1);
return 0;
});
}, [tenders, searchQuery, kalemEslesen, uyumEsigi, selectedCity, selectedRegion, selectedAlimTuru, selectedSektorler, selectedCpvler, selectedKurumTipi, quickFilter, sortBy, onlyValidOnly, now, favoriteKurumlar, oncekiGiris]);
}, [tenders, searchQuery, detailedQueries, kalemEslesen, uyumEsigi, selectedCity, selectedRegion, selectedAlimTuru, selectedSektorler, selectedCpvler, selectedKurumTipi, quickFilter, sortBy, onlyValidOnly, now, favoriteKurumlar, oncekiGiris]);
const gorunenTenders = filteredTenders.slice(0, gosterilen);
const dahaVar = gosterilen < filteredTenders.length;
@@ -80,7 +82,7 @@ export const TenderList = () => {
// dizisine bağlansaydı havuz her yenilendiğinde (10 dk) kullanıcı listenin
// başına fırlardı.
useEffect(() => { setGosterilen(SAYFA_ADIM); }, [
searchQuery, selectedCity, selectedRegion, selectedAlimTuru, selectedSektorler,
searchQuery, detailedQueries, selectedCity, selectedRegion, selectedAlimTuru, selectedSektorler,
selectedCpvler, selectedKurumTipi, quickFilter, sortBy, onlyValidOnly,
]);
@@ -129,6 +131,10 @@ export const TenderList = () => {
return (
<div className="w-full min-w-0 flex-1 space-y-4">
{Object.entries(detailedQueries).filter(([,value])=>value).map(([key,value])=><div key={key} className="flex gap-3 items-center flex-wrap text-sm bg-blue-50 border rounded p-3">
<span>{key==='institution'?'Kurum adı':'İKN / DT no'}: {value}</span>
<button className="underline text-blue-800" onClick={()=>setDetailedQueries(old=>({...old,[key]:''}))}>{key==='institution'?'Kurum adı filtresini kaldır':'İKN filtresini kaldır'}</button>
</div>)}
{selectedRegion&&<div className="flex gap-3 items-center flex-wrap text-sm bg-blue-50 border rounded p-3"><span>İl bazında bölge filtresi: {selectedRegion}</span><button className="underline text-blue-800" onClick={()=>setSelectedRegion('')}>Bölge filtresini kaldır</button></div>}
{/* Header bar above list */}