hikmettan/ihaleist
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Apply saved filters to tender search with visible region criteria

Browse Source
This commit is contained in:
hikmettan
2026-09-06 13:40:26 +03:00
parent 2a9281c9a5
commit 2f86c6d690
8 changed files with 90 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/LeftSidebar.jsx
+3 -3
View File
@@ -12,7 +12,7 @@ export const LeftSidebar = ({onOpenProductSearch} = {}) => {
quickFilter,
setQuickFilter,
setActiveTab,
savedFilters,
savedFilters, applySavedFilter, selectedRegion,
deleteSavedFilter,
savingCount,
selectedAlimTuru,
@@ -89,7 +89,7 @@ export const LeftSidebar = ({onOpenProductSearch} = {}) => {
<span className="font-bold text-xs uppercase tracking-wider text-slate-700 flex items-center gap-1.5">
<Compass className="w-4 h-4 text-blue-600" /> Hızlı Erişim
</span>
{(quickFilter !== 'all' || selectedSektorler.length || selectedCpvler.length || selectedCity || selectedAlimTuru || selectedKurumTipi) && (
{(selectedRegion || quickFilter !== 'all' || selectedSektorler.length || selectedCpvler.length || selectedCity || selectedAlimTuru || selectedKurumTipi) && (
<button
onClick={clearAllFilters}
className="text-[11px] font-medium text-blue-600 hover:underline"
@@ -156,7 +156,7 @@ export const LeftSidebar = ({onOpenProductSearch} = {}) => {
className="bg-slate-50 hover:bg-slate-100 p-2.5 rounded-lg border border-slate-200 flex items-center justify-between text-xs transition-colors group"
>
<div className="flex-1 min-w-0 pr-2">
<p className="font-bold text-slate-800 truncate">{filter.name}</p>
<button className="font-bold text-blue-800 underline text-left" onClick={()=>applySavedFilter(filter)} aria-label={`${filter.name} filtresini uygula`}>{filter.name}</button>
<p className="text-[10px] text-slate-500 truncate mt-0.5">
👤 {filter.user} {filter.sehir && `• 📍 ${filter.sehir}`}
</p>
src/components/SmartFilterBuilder.jsx
+3 -3
View File
@@ -4,7 +4,7 @@ import { INSTITUTION_TYPES_LIST, CITIES_LIST } from '../data/constants';
import { Bot, ArrowLeft, CheckCircle2, HelpCircle, Building2, MapPin, Tag } from 'lucide-react';
export const SmartFilterBuilder = () => {
const { savedFilters, addSavedFilter, deleteSavedFilter, setActiveTab, sektorListesi, savingCount, saveError } = useApp();
const { savedFilters, applySavedFilter, addSavedFilter, deleteSavedFilter, setActiveTab, sektorListesi, savingCount, saveError } = useApp();
const [filterName, setFilterName] = useState('');
const [selectedKurumTip, setSelectedKurumTip] = useState('');
@@ -57,7 +57,7 @@ export const SmartFilterBuilder = () => {
</div>
<div>
<h1 className="text-xl font-black text-slate-900">Kayıtlı Filtreler</h1>
<p className="text-xs text-slate-500">Arama ölçütlerinizi hesabınıza kaydedin. E-posta bildirimleri Yönetim → Mobil PWA bölümünden ayrıca kurulur.</p>
<p className="text-xs text-slate-500">Arama ölçütlerinizi kaydedin; soldaki filtre adına tıklayarak ihale listesine uygulayın. E-posta bildirimleri Yönetim → Mobil PWA bölümünden ayrıca kurulur.</p>
</div>
</div>
<button
@@ -96,7 +96,7 @@ export const SmartFilterBuilder = () => {
{savedFilters.map(f => (
<div key={f.id} className="p-3 bg-slate-50 border border-slate-200 rounded-lg text-xs hover:bg-slate-100 transition-colors">
<div className="flex items-center justify-between font-bold text-slate-900">
<span>🤖 {f.name}</span>
<button type="button" className="text-blue-800 underline" onClick={()=>applySavedFilter(f)} aria-label={`${f.name} filtresini uygula`}>{f.name}</button>
<button
disabled={savingCount > 0} aria-label={`${f.name} filtresini sil`} onClick={async()=>{setSuccessMessage('');await deleteSavedFilter(f.id);}}
className="text-slate-400 hover:text-red-600 text-xs"
src/components/TenderList.jsx
+7 -4
View File
@@ -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">
src/context/AppContext.jsx
+15 -1
View File
@@ -1,3 +1,4 @@
import {savedFilterCriteria} from '../services/savedFilterCriteria';
import {mergeServerNotifications,acknowledgeNotifications} from '../services/notifications';
import { searchTender } from '../services/searchTender';
import { normalizeTenderSearch, matchingItemResults } from '../services/tenderSearch';
@@ -80,6 +81,7 @@ export const AppProvider = ({ children }) => {
return () => { iptal = true; controller.abort(); clearTimeout(zaman); };
}, [searchQuery,kalemRetry]);
const [selectedCity, setSelectedCity] = useState('');
const [selectedRegion,setSelectedRegion]=useState('');
const [selectedAlimTuru, setSelectedAlimTuru] = useState('');
const [selectedKurumTipi, setSelectedKurumTipi] = useState('');
// Çoklu sektör seçimi. Tek seçimlik eski API (selectedSektor) uyumluluk
@@ -689,7 +691,19 @@ export const AppProvider = ({ children }) => {
const addSavedFilter = newFilter => persistSavedFilters([{...newFilter,id:'sf-'+crypto.randomUUID(),user:userProfile.username},...savedFilters]);
const deleteSavedFilter = id => persistSavedFilters(savedFilters.filter(filter=>filter.id!==id));
const applySavedFilter = filter => {
try {
const criteria=savedFilterCriteria(filter);
setSearchQuery('');setSelectedCpvler([]);setQuickFilter('all');
setSelectedCity(criteria.city);setSelectedRegion(criteria.region);
setSelectedAlimTuru(criteria.procedure);setSelectedKurumTipi(criteria.institution);
setSelectedSektorler(criteria.sector?[criteria.sector]:[]);setActiveTab('list');setSaveError(null);
return true;
}catch(error){setSaveError(error.message);return false;}
};
const clearAllFilters = () => {
setSelectedRegion('');
setSearchQuery('');
setSelectedCity('');
setSelectedAlimTuru('');
@@ -723,7 +737,7 @@ export const AppProvider = ({ children }) => {
searchQuery,
kalemEslesen, itemSearchState, retryItemSearch,
setSearchQuery,
selectedCity,
selectedCity, selectedRegion,setSelectedRegion,applySavedFilter,
setSelectedCity,
selectedAlimTuru,
setSelectedAlimTuru,
src/services/savedFilterCriteria.js
+19
View File
@@ -0,0 +1,19 @@
const norm=value=>String(value || '').normalize('NFC').trim().toLocaleUpperCase('tr-TR');
export const REGION_CITIES={
'MARMARA BÖLGESİ':'Balıkesir,Bilecik,Bursa,Çanakkale,Edirne,İstanbul,Kırklareli,Kocaeli,Sakarya,Tekirdağ,Yalova',
'EGE BÖLGESİ':'Afyonkarahisar,Aydın,Denizli,İzmir,Kütahya,Manisa,Muğla,Uşak',
'AKDENİZ BÖLGESİ':'Adana,Antalya,Burdur,Hatay,Isparta,Kahramanmaraş,Mersin,Osmaniye',
'İÇ ANADOLU BÖLGESİ':'Aksaray,Ankara,Çankırı,Eskişehir,Karaman,Kayseri,Kırıkkale,Kırşehir,Konya,Nevşehir,Niğde,Sivas,Yozgat',
'KARADENİZ BÖLGESİ':'Amasya,Artvin,Bartın,Bayburt,Bolu,Çorum,Düzce,Giresun,Gümüşhane,Karabük,Kastamonu,Ordu,Rize,Samsun,Sinop,Tokat,Trabzon,Zonguldak',
'DOĞU ANADOLU BÖLGESİ':'Ağrı,Ardahan,Bingöl,Bitlis,Elazığ,Erzincan,Erzurum,Hakkari,Iğdır,Kars,Malatya,Muş,Tunceli,Van',
'GÜNEYDOĞU ANADOLU BÖLGESİ':'Adıyaman,Batman,Diyarbakır,Gaziantep,Kilis,Mardin,Siirt,Şanlıurfa,Şırnak',
};
const cityRegions=new Map(Object.entries(REGION_CITIES).flatMap(([region,cities])=>cities.split(',').map(city=>[norm(city),region])));
export function matchesRegion(tender,region){return !region || cityRegions.get(norm(tender.sehir))===norm(region);}
export function matchesProcurement(tender,procedure){return !procedure || [tender.usul,tender.ihaleUsulu,tender.alimTuru].some(value=>norm(value)===norm(procedure));}
export function savedFilterCriteria(filter){
const read=key=>{if(filter[key]!=null&&typeof filter[key]!=='string')throw new Error('Kayıtlı filtre ölçütü geçersiz.');return (filter[key] || '').trim();};
const region=read('bolge');
if(region&&!Object.keys(REGION_CITIES).includes(norm(region)))throw new Error('Kayıtlı bölge tanınmadı; filtreyi yeniden düzenleyin.');
return {city:read('sehir'),region:region?norm(region):'',sector:read('sektor'),institution:read('kurumTipi'),procedure:read('usul')};
}