Apply saved filters to tender search with visible region criteria
This commit is contained in:
@@ -1,3 +1,4 @@
|
||||
import {matchesRegion,matchesProcurement} from '../services/savedFilterCriteria';
|
||||
import { matchesTenderSearch } from '../services/tenderSearch';
|
||||
import React, { useState, useMemo, useEffect, useRef, useCallback } from 'react';
|
||||
import { useApp } from '../context/AppContext';
|
||||
@@ -18,7 +19,7 @@ export const TenderList = () => {
|
||||
searchQuery,
|
||||
kalemEslesen, itemSearchState, retryItemSearch,
|
||||
uyumEsigi,
|
||||
selectedCity,
|
||||
selectedCity,selectedRegion,setSelectedRegion,
|
||||
selectedAlimTuru,
|
||||
selectedSektorler,
|
||||
selectedCpvler,
|
||||
@@ -56,7 +57,8 @@ export const TenderList = () => {
|
||||
|
||||
// Dropdown Filters
|
||||
if (selectedCity && normTr(tender.sehir) !== normTr(selectedCity)) return false;
|
||||
if (selectedAlimTuru && tender.alimTuru !== selectedAlimTuru) return false;
|
||||
if (!matchesProcurement(tender,selectedAlimTuru)) return false;
|
||||
if (!matchesRegion(tender,selectedRegion)) return false;
|
||||
if (selectedSektorler.length && !selectedSektorler.includes(tender.sektor)) return false;
|
||||
if (selectedCpvler.length && !(tender.cpvBolum || []).some(b => selectedCpvler.includes(b))) return false;
|
||||
if (selectedKurumTipi && tender.kurumTipi !== selectedKurumTipi) return false;
|
||||
@@ -69,7 +71,7 @@ export const TenderList = () => {
|
||||
if (sortBy === 'distant') return compareTenderDeadlines(a,b,-1);
|
||||
return 0;
|
||||
});
|
||||
}, [tenders, searchQuery, kalemEslesen, uyumEsigi, selectedCity, selectedAlimTuru, selectedSektorler, selectedCpvler, selectedKurumTipi, quickFilter, sortBy, onlyValidOnly, now, favoriteKurumlar, oncekiGiris]);
|
||||
}, [tenders, searchQuery, 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;
|
||||
@@ -78,7 +80,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, selectedAlimTuru, selectedSektorler,
|
||||
searchQuery, selectedCity, selectedRegion, selectedAlimTuru, selectedSektorler,
|
||||
selectedCpvler, selectedKurumTipi, quickFilter, sortBy, onlyValidOnly,
|
||||
]);
|
||||
|
||||
@@ -128,6 +130,7 @@ export const TenderList = () => {
|
||||
return (
|
||||
<div className="w-full min-w-0 flex-1 space-y-4">
|
||||
|
||||
{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 */}
|
||||
<div className="bg-white rounded-xl border border-slate-200 p-4 shadow-xs flex flex-col sm:flex-row items-center justify-between gap-3">
|
||||
<div className="flex items-center gap-2">
|
||||
|
||||
Reference in New Issue
Block a user