fix: persist team changes only after versioned server confirmation
This commit is contained in:
@@ -5,7 +5,7 @@ import { firmStats, companyStats } from '../services/analytics';
|
||||
import { Briefcase, FileText, Calendar, History, Trophy, Eye, Kanban, Radar, ArrowRight, Users, Plus, Trash2 } from 'lucide-react';
|
||||
|
||||
export const RightSidebar = () => {
|
||||
const { setActiveTab, setQuickFilter, tenders, teamMembers, addTeamMember, removeTeamMember } = useApp();
|
||||
const { setActiveTab, setQuickFilter, tenders, teamMembers, teamSaving, teamError, addTeamMember, removeTeamMember } = useApp();
|
||||
const [tmName, setTmName] = useState('');
|
||||
const [tmEmail, setTmEmail] = useState('');
|
||||
const [tmRole, setTmRole] = useState('Uzman');
|
||||
@@ -13,11 +13,11 @@ export const RightSidebar = () => {
|
||||
const cs = companyStats(tenders);
|
||||
const topFirms = firmStats(tenders).firms.slice(0, 3);
|
||||
|
||||
const handleAddMember = (e) => {
|
||||
const handleAddMember = async (e) => {
|
||||
e.preventDefault();
|
||||
if (!tmName.trim()) return;
|
||||
addTeamMember({ name: tmName.trim(), email: tmEmail.trim(), role: tmRole });
|
||||
setTmName(''); setTmEmail('');
|
||||
const saved=await addTeamMember({ name: tmName.trim(), email: tmEmail.trim(), role: tmRole });
|
||||
if(saved){setTmName('');setTmEmail('');}
|
||||
};
|
||||
|
||||
const records = [
|
||||
@@ -125,7 +125,7 @@ export const RightSidebar = () => {
|
||||
</button>
|
||||
</div>
|
||||
|
||||
{/* Ekip Yönetimi — gerçek (localStorage) */}
|
||||
{/* Ekip Yönetimi — sunucu kaydı */}
|
||||
<div className="bg-white rounded-2xl border border-slate-200 shadow-xs p-4 space-y-3">
|
||||
<h3 className="font-extrabold text-xs uppercase tracking-wider text-slate-800 flex items-center gap-2">
|
||||
<Users className="w-4 h-4 text-indigo-600" /> Ekip Yönetimi ({teamMembers.length})
|
||||
@@ -137,28 +137,32 @@ export const RightSidebar = () => {
|
||||
<div className="text-xs font-bold text-slate-800 truncate">{m.name}</div>
|
||||
<div className="text-[10px] text-slate-500 truncate">{m.role}{m.email ? ` · ${m.email}` : ''}</div>
|
||||
</div>
|
||||
{teamMembers.length > 1 && (
|
||||
<button onClick={() => removeTeamMember(m.id)} className="text-slate-400 hover:text-red-500 shrink-0" title="Çıkar">
|
||||
{(
|
||||
<button disabled={teamSaving} aria-label={`${m.name} ekip kaydını çıkar`} onClick={() => removeTeamMember(m.id)} className="text-slate-400 hover:text-red-500 shrink-0" title="Çıkar">
|
||||
<Trash2 className="w-3.5 h-3.5" />
|
||||
</button>
|
||||
)}
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
{teamError&&<p role="alert" className="text-xs text-red-700">{teamError}</p>}
|
||||
{teamSaving&&<p role="status" className="text-xs">Ekip kaydediliyor…</p>}
|
||||
<form onSubmit={handleAddMember} className="space-y-1.5 pt-1 border-t border-slate-100">
|
||||
<input value={tmName} onChange={(e) => setTmName(e.target.value)} placeholder="Ad Soyad"
|
||||
<fieldset disabled={teamSaving} className="space-y-1.5">
|
||||
<input aria-label="Ekip üyesi adı" maxLength={200} value={tmName} onChange={(e) => setTmName(e.target.value)} placeholder="Ad Soyad"
|
||||
className="w-full bg-slate-50 border border-slate-200 rounded-lg px-2.5 py-1.5 text-xs" />
|
||||
<div className="flex gap-1.5">
|
||||
<input value={tmEmail} onChange={(e) => setTmEmail(e.target.value)} placeholder="E-posta (ops.)"
|
||||
<input aria-label="Ekip üyesi e-postası" type="email" maxLength={254} value={tmEmail} onChange={(e) => setTmEmail(e.target.value)} placeholder="E-posta (ops.)"
|
||||
className="flex-1 bg-slate-50 border border-slate-200 rounded-lg px-2.5 py-1.5 text-xs" />
|
||||
<select value={tmRole} onChange={(e) => setTmRole(e.target.value)}
|
||||
<select aria-label="Ekip üyesi görevi" value={tmRole} onChange={(e) => setTmRole(e.target.value)}
|
||||
className="bg-slate-50 border border-slate-200 rounded-lg px-2 py-1.5 text-xs">
|
||||
<option>Uzman</option><option>Yönetici</option><option>Saha</option><option>Muhasebe</option>
|
||||
</select>
|
||||
</div>
|
||||
<button type="submit" className="w-full bg-indigo-600 hover:bg-indigo-500 text-white font-bold text-xs py-2 rounded-lg flex items-center justify-center gap-1">
|
||||
<button type="submit" disabled={teamSaving || !tmName.trim()} className="w-full bg-indigo-600 hover:bg-indigo-500 text-white font-bold text-xs py-2 rounded-lg flex items-center justify-center gap-1">
|
||||
<Plus className="w-3.5 h-3.5" /> Ekip Üyesi Ekle
|
||||
</button>
|
||||
</fieldset>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
import {validateTeam} from '../services/teamData';
|
||||
import {savedFilterCriteria} from '../services/savedFilterCriteria';
|
||||
import {mergeServerNotifications,acknowledgeNotifications} from '../services/notifications';
|
||||
import { searchTender } from '../services/searchTender';
|
||||
@@ -165,7 +166,7 @@ export const AppProvider = ({ children }) => {
|
||||
useEffect(() => {
|
||||
notificationVersion.current++;notificationMutation.current=null;seenServerNotifications.current.clear();setNotificationError(null);setNotificationBusy(false);
|
||||
aiRunRef.current=null;setAiAnalyzing(false);setAiJobStatus('');
|
||||
dataRevisions.current={};
|
||||
dataRevisions.current={};setTeamError(null);
|
||||
setVeriSenkron(false); setPlan(null); setSaveError(null);
|
||||
setFavoriteKurumlar([]); setTeamMembers([]); setSavedFilters([]); setCompetitorWatchlist([]);
|
||||
setReminderSettings(defaultReminder()); setUserProfile(defaultProfile(authUser));
|
||||
@@ -367,11 +368,23 @@ export const AppProvider = ({ children }) => {
|
||||
|
||||
// --- Ekip yönetimi (sunucu kaydı) ---
|
||||
const [teamMembers, setTeamMembers] = useState([]);
|
||||
useEffect(() => {
|
||||
if (veriSenkron) ilkYazmaDegil('ekip', teamMembers);
|
||||
}, [teamMembers, veriSenkron]);
|
||||
const addTeamMember = (m) => setTeamMembers((prev) => [...prev, { id: 'tm-' + Date.now(), ...m }]);
|
||||
const removeTeamMember = (id) => setTeamMembers((prev) => prev.filter((m) => m.id !== id));
|
||||
const teamSaveLock=useRef(false);
|
||||
const [teamSaving,setTeamSaving]=useState(false);
|
||||
const [teamError,setTeamError]=useState(null);
|
||||
const persistTeam=async next=>{
|
||||
if(!authUser||!veriSenkron){setTeamError('Hesap verileri yüklenmeden ekip kaydedilemez.');return false;}
|
||||
if(teamSaveLock.current)return false;
|
||||
const session=getToken();teamSaveLock.current=true;setTeamSaving(true);setTeamError(null);
|
||||
try {
|
||||
validateTeam(next);
|
||||
const saved=await setUserData('ekip',next,dataRevisions.current.ekip ?? null);
|
||||
if(getToken()!==session)return false;
|
||||
dataRevisions.current.ekip=saved.revision;setTeamMembers(next);return true;
|
||||
} catch(error){if(getToken()===session)setTeamError(error.message);return false;}
|
||||
finally{teamSaveLock.current=false;setTeamSaving(false);}
|
||||
};
|
||||
const addTeamMember = member => persistTeam([...teamMembers,{...member,id:'tm-'+crypto.randomUUID()}]);
|
||||
const removeTeamMember = id => persistTeam(teamMembers.filter(member=>member.id!==id));
|
||||
|
||||
// Belge kasası — kullanıcı kendi belgelerini ekler (hesaba özel sunucu kaydı)
|
||||
const [vaultDocuments, setVaultDocuments] = useState([]);
|
||||
@@ -813,7 +826,7 @@ export const AppProvider = ({ children }) => {
|
||||
isQuietNow,
|
||||
favoriteKurumlar,
|
||||
toggleFavoriteKurum,
|
||||
teamMembers,
|
||||
teamMembers,teamSaving,teamError,
|
||||
addTeamMember,
|
||||
removeTeamMember,
|
||||
toggleTrackTender,
|
||||
|
||||
@@ -0,0 +1,12 @@
|
||||
export function validateTeam(members) {
|
||||
if(!Array.isArray(members))throw new Error('Ekip listesi geçersiz.');
|
||||
const ids=new Set();
|
||||
for(const member of members){
|
||||
if(!member || typeof member.id!=='string' || !member.id.trim() || member.id.length>100 || ids.has(member.id))throw new Error('Ekip üyesi kimliği eksik veya yineleniyor.');
|
||||
ids.add(member.id);
|
||||
if(typeof member.name!=='string' || !member.name.trim() || member.name.length>200)throw new Error('Ekip üyesinin adını girin (en fazla 200 karakter).');
|
||||
if(member.email && (typeof member.email!=='string' || member.email.length>254 || !/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(member.email)))throw new Error('Ekip üyesinin e-posta adresini kontrol edin.');
|
||||
if(typeof member.role!=='string' || !member.role.trim() || member.role.length>100)throw new Error('Ekip üyesinin görevini kontrol edin.');
|
||||
}
|
||||
return members;
|
||||
}
|
||||
Reference in New Issue
Block a user