update

backend/app/database.py

@@ -163,7 +163,8 @@ class CrmDeal(Base):
     tenant_id = Column(Integer, ForeignKey("tenants.id"), nullable=True, index=True)
     name = Column(String, index=True)
     stage = Column(String, default="new")  # new|discovery|proposal|negotiation|won|lost
-    owner_initials = Column(String, default="")
+    owner_user_id = Column(Integer, ForeignKey("users.id"), nullable=True, index=True)
+    owner_initials = Column(String, default="")  # display cache; derived from User when owner_user_id set
     deal_value = Column(Integer, nullable=True)  # whole USD (nullable)
     contact_display = Column(String, default="")  # primary person label
     account_name = Column(String, default="")
@@ -252,6 +253,12 @@ def run_migrations(connection_engine):
             if "google_refresh_token" not in ucols:
                 conn.execute(text("ALTER TABLE users ADD COLUMN google_refresh_token TEXT"))
 
+        insp = inspect(connection_engine)
+        if insp.has_table("crm_deals"):
+            dcols = [c["name"] for c in insp.get_columns("crm_deals")]
+            if "owner_user_id" not in dcols:
+                conn.execute(text("ALTER TABLE crm_deals ADD COLUMN owner_user_id INTEGER"))
+
 
 # Create tables then migrate legacy SQLite schemas
 Base.metadata.create_all(bind=engine)

backend/app/main.py

@@ -23,6 +23,8 @@ from .database import (
     get_db,
     SessionLocal,
     Tenant,
+    TenantMembership,
+    User,
     UploadedFile,
     Prompt,
     GeneratedSequence,
@@ -498,11 +500,41 @@ def _deal_name_from_lead(lead: CrmLead) -> str:
     return (lead.email or "").strip() or "Untitled deal"
 
 
-def _owner_initials_from_lead(lead: CrmLead) -> str:
-    a = (lead.first_name or "").strip()[:1].upper()
-    b = (lead.last_name or "").strip()[:1].upper()
-    s = a + b
-    return s if s else "?"
+def _user_initials_from_user(u: User | None) -> str:
+    if not u:
+        return ""
+    name = (u.name or "").strip()
+    em = (u.email or "").strip()
+    if name:
+        parts = name.split()
+        if len(parts) >= 2:
+            return (parts[0][:1] + parts[-1][:1]).upper()[:2]
+        return (parts[0][:2] or "?").upper()[:2]
+    if em:
+        return em[:2].upper()
+    return "?"
+
+
+def _tenant_member_ids(db: Session, tenant_id: int) -> set[int]:
+    rows = (
+        db.query(TenantMembership.user_id)
+        .filter(TenantMembership.tenant_id == int(tenant_id))
+        .all()
+    )
+    return {int(r[0]) for r in rows}
+
+
+def _deal_member_can_see(row: CrmDeal, user_id: int) -> bool:
+    if row.owner_user_id is None:
+        return True
+    return int(row.owner_user_id) == int(user_id)
+
+
+def _deal_access_or_403(row: CrmDeal, t: TenantContext) -> None:
+    if t.role == "admin":
+        return
+    if not _deal_member_can_see(row, t.user_id):
+        raise HTTPException(status_code=403, detail="You do not have access to this deal")
 
 
 def _deal_to_dict(d: CrmDeal) -> dict:
@@ -519,6 +551,7 @@ def _deal_to_dict(d: CrmDeal) -> dict:
         "id": d.id,
         "name": d.name or "",
         "stage": d.stage or "new",
+        "owner_user_id": d.owner_user_id,
         "owner_initials": d.owner_initials or "",
         "deal_value": d.deal_value,
         "contact_display": d.contact_display or "",
@@ -1172,6 +1205,14 @@ def _format_contact_display(contact: Contact) -> str:
 
 def _enrich_deal_response(db: Session, row: CrmDeal) -> dict:
     out = _deal_to_dict(row)
+    if row.owner_user_id:
+        ou = db.query(User).filter(User.id == row.owner_user_id).first()
+        if ou:
+            out["owner_display_name"] = (ou.name or ou.email or "").strip() or None
+            if not (out.get("owner_initials") or "").strip():
+                out["owner_initials"] = _user_initials_from_user(ou)
+    else:
+        out["owner_display_name"] = None
     out["linked_contact"] = None
     if row.contact_id:
         c = (
@@ -2478,11 +2519,13 @@ async def deals_from_leads(body: BulkLeadIdsRequest, t: TenantContext = Depends(
             errors.append({"lead_id": lid, "error": "not found"})
             continue
         person = " ".join(filter(None, [lead.first_name or "", lead.last_name or ""])).strip()
+        inviter = db.query(User).filter(User.id == t.user_id).first()
         deal = CrmDeal(
             tenant_id=lead.tenant_id,
             name=_deal_name_from_lead(lead),
             stage="new",
-            owner_initials=_owner_initials_from_lead(lead),
+            owner_user_id=t.user_id,
+            owner_initials=_user_initials_from_user(inviter),
             deal_value=None,
             contact_display=person or (lead.email or ""),
             account_name=lead.company_name or "",
@@ -2496,7 +2539,12 @@ async def deals_from_leads(body: BulkLeadIdsRequest, t: TenantContext = Depends(
         )
         db.add(deal)
         db.flush()
-        created.append(_deal_to_dict(deal))
+        dd = _deal_to_dict(deal)
+        if inviter:
+            dd["owner_display_name"] = (inviter.name or inviter.email or "").strip() or None
+        else:
+            dd["owner_display_name"] = None
+        created.append(dd)
         db.delete(lead)
     db.commit()
     return {"created": created, "errors": errors}
@@ -2513,6 +2561,10 @@ async def list_deals(
 ):
     db = t.db
     q = db.query(CrmDeal).filter(CrmDeal.tenant_id == t.tenant_id)
+    if t.role != "admin":
+        q = q.filter(
+            or_(CrmDeal.owner_user_id == t.user_id, CrmDeal.owner_user_id.is_(None))
+        )
     if search.strip():
         term = f"%{search.strip().lower()}%"
         q = q.filter(
@@ -2536,7 +2588,23 @@ async def list_deals(
     else:
         q = q.order_by(col.desc())
     rows = q.offset(offset).limit(limit).all()
-    return {"total": total, "deals": [_deal_to_dict(r) for r in rows]}
+    oid_set = {r.owner_user_id for r in rows if r.owner_user_id}
+    user_map: Dict[int, User] = {}
+    if oid_set:
+        for u in db.query(User).filter(User.id.in_(oid_set)).all():
+            user_map[u.id] = u
+    deals_out = []
+    for r in rows:
+        dd = _deal_to_dict(r)
+        if r.owner_user_id and r.owner_user_id in user_map:
+            u = user_map[r.owner_user_id]
+            dd["owner_display_name"] = (u.name or u.email or "").strip() or None
+            if not (dd.get("owner_initials") or "").strip():
+                dd["owner_initials"] = _user_initials_from_user(u)
+        else:
+            dd["owner_display_name"] = None
+        deals_out.append(dd)
+    return {"total": total, "deals": deals_out}
 
 
 @app.post("/api/deals")
@@ -2550,11 +2618,13 @@ async def create_deal(body: CrmDealCreateRequest, t: TenantContext = Depends(get
     db = t.db
     raw_name = _safe_str(body.name) if body.name is not None else ""
     name = raw_name or "Untitled deal"
+    creator = db.query(User).filter(User.id == t.user_id).first()
     row = CrmDeal(
         tenant_id=t.tenant_id,
         name=name,
         stage=stage,
-        owner_initials="",
+        owner_user_id=t.user_id,
+        owner_initials=_user_initials_from_user(creator),
         deal_value=None,
         contact_display="",
         account_name="",
@@ -2569,7 +2639,7 @@ async def create_deal(body: CrmDealCreateRequest, t: TenantContext = Depends(get
     db.add(row)
     db.commit()
     db.refresh(row)
-    return _deal_to_dict(row)
+    return _enrich_deal_response(db, row)
 
 
 @app.get("/api/deals/{deal_id}")
@@ -2582,6 +2652,7 @@ async def get_deal(deal_id: int, t: TenantContext = Depends(get_tenant_context))
     )
     if not row:
         raise HTTPException(status_code=404, detail="Deal not found")
+    _deal_access_or_403(row, t)
     return _enrich_deal_response(db, row)
 
 
@@ -2595,9 +2666,49 @@ async def patch_deal(deal_id: int, body: CrmDealPatchRequest, t: TenantContext =
     )
     if not row:
         raise HTTPException(status_code=404, detail="Deal not found")
+    _deal_access_or_403(row, t)
     data = body.model_dump(exclude_unset=True)
     if not data:
         raise HTTPException(status_code=400, detail="No fields to update")
+    if "owner_initials" in data:
+        del data["owner_initials"]
+    if "owner_user_id" in data:
+        val = data.pop("owner_user_id")
+        mids = _tenant_member_ids(db, t.tenant_id)
+        if t.role == "admin":
+            if val is None:
+                row.owner_user_id = None
+                row.owner_initials = ""
+            else:
+                vid = int(val)
+                if vid not in mids:
+                    raise HTTPException(
+                        status_code=400,
+                        detail="Owner must be a member of this workspace",
+                    )
+                ou = db.query(User).filter(User.id == vid).first()
+                if not ou:
+                    raise HTTPException(status_code=404, detail="User not found")
+                row.owner_user_id = vid
+                row.owner_initials = _user_initials_from_user(ou)
+        else:
+            if val is None:
+                raise HTTPException(
+                    status_code=403, detail="Only admins can set a deal to unassigned"
+                )
+            if int(val) != int(t.user_id):
+                raise HTTPException(
+                    status_code=403,
+                    detail="Only admins can assign deals to other users",
+                )
+            if row.owner_user_id is not None and int(row.owner_user_id) != int(t.user_id):
+                raise HTTPException(
+                    status_code=403,
+                    detail="You can only take ownership of unassigned deals",
+                )
+            claimer = db.query(User).filter(User.id == t.user_id).first()
+            row.owner_user_id = t.user_id
+            row.owner_initials = _user_initials_from_user(claimer)
     if "contact_id" in data:
         cid = data["contact_id"]
         if cid is None:
@@ -2619,8 +2730,6 @@ async def patch_deal(deal_id: int, body: CrmDealPatchRequest, t: TenantContext =
                 row.account_name = _safe_str(contact.company)
     if "name" in data:
         row.name = _safe_str(data["name"])
-    if "owner_initials" in data:
-        row.owner_initials = _safe_str(data["owner_initials"])[:8]
     if "contact_display" in data:
         row.contact_display = _safe_str(data["contact_display"])
     if "account_name" in data:
@@ -2688,7 +2797,7 @@ async def seed_demo_deals(t: TenantContext = Depends(get_tenant_context)):
         {
             "name": "DEMO: Ramco — Aus",
             "stage": "discovery",
-            "owner_initials": "KW",
+            "owner_initials": "",
             "deal_value": 10000,
             "contact_display": "KENNETH WON",
             "account_name": "Quanticsit",
@@ -2699,7 +2808,7 @@ async def seed_demo_deals(t: TenantContext = Depends(get_tenant_context)):
         {
             "name": "DEMO: HT Pilot",
             "stage": "proposal",
-            "owner_initials": "SL",
+            "owner_initials": "",
             "deal_value": 1600,
             "contact_display": "SARAH LEE",
             "account_name": "HT Logistics",
@@ -2710,7 +2819,7 @@ async def seed_demo_deals(t: TenantContext = Depends(get_tenant_context)):
         {
             "name": "DEMO: Northwind rollout",
             "stage": "negotiation",
-            "owner_initials": "JD",
+            "owner_initials": "",
             "deal_value": 45000,
             "contact_display": "JAMES DIAZ",
             "account_name": "Northwind Trading",
@@ -2721,7 +2830,7 @@ async def seed_demo_deals(t: TenantContext = Depends(get_tenant_context)):
         {
             "name": "DEMO: Maple cold chain",
             "stage": "new",
-            "owner_initials": "AR",
+            "owner_initials": "",
             "deal_value": None,
             "contact_display": "ALEX RUIZ",
             "account_name": "Maple Cold",
@@ -2736,6 +2845,7 @@ async def seed_demo_deals(t: TenantContext = Depends(get_tenant_context)):
                 tenant_id=tid,
                 name=s["name"],
                 stage=s["stage"],
+                owner_user_id=None,
                 owner_initials=s["owner_initials"],
                 deal_value=s["deal_value"],
                 contact_display=s["contact_display"],

backend/app/models.py

@@ -99,6 +99,8 @@ class CrmDealPatchRequest(BaseModel):
     name: Optional[str] = None
     stage: Optional[str] = None
     owner_initials: Optional[str] = None
+    # Admin: set to a workspace member's user id, or null for unassigned. Member: may set to own id only to claim an unassigned deal.
+    owner_user_id: Optional[int] = None
     deal_value: Optional[int] = None
     close_probability: Optional[int] = None
     expected_close_date: Optional[str] = None  # ISO date or datetime

frontend/src/pages/Deals.jsx

@@ -143,6 +143,9 @@ function GroupedDealTbody({
     openDeal,
     createBusy,
     onAddDeal,
+    isAdmin,
+    currentUserId,
+    tenantMembers,
 }) {
     const sumDeal = sumNumeric(deals, 'deal_value');
     const sumForecast = sumNumeric(deals, 'forecast_value');
@@ -162,6 +165,9 @@ function GroupedDealTbody({
                     patchDeal={patchDeal}
                     updateStage={updateStage}
                     openDeal={openDeal}
+                    isAdmin={isAdmin}
+                    currentUserId={currentUserId}
+                    tenantMembers={tenantMembers}
                 />
             ))}
             <tr className="bg-slate-50/90 text-slate-700 border-b border-slate-100">
@@ -350,7 +356,17 @@ function PipelineBoard({ columns, openDeal, patchDeal, createDeal, createBusy })
     );
 }
 
-function DealRow({ deal, tableEditRowId, setTableEditRowId, patchDeal, updateStage, openDeal }) {
+function DealRow({
+    deal,
+    tableEditRowId,
+    setTableEditRowId,
+    patchDeal,
+    updateStage,
+    openDeal,
+    isAdmin,
+    currentUserId,
+    tenantMembers,
+}) {
     const meta = stageMeta(deal.stage);
     const safeStage = STAGES.some((s) => s.value === deal.stage) ? deal.stage : 'new';
     const closeSel = closeProbabilitySelectValue(deal.close_probability);
@@ -441,20 +457,64 @@ function DealRow({ deal, tableEditRowId, setTableEditRowId, patchDeal, updateSta
                     </SelectContent>
                 </Select>
             </td>
-            <td className="px-3 py-2 align-top">
-                {tableEditRowId === deal.id ? (
-                    <EditableCell
-                        value={deal.owner_initials || ''}
-                        onCommit={(v) =>
-                            patchDeal(deal.id, {
-                                owner_initials: (v || '').slice(0, 8).toUpperCase(),
-                            })
+            <td className="px-3 py-2 align-top" onClick={(e) => e.stopPropagation()}>
+                {isAdmin && tableEditRowId === deal.id ? (
+                    <Select
+                        value={
+                            deal.owner_user_id != null && deal.owner_user_id !== ''
+                                ? String(deal.owner_user_id)
+                                : EMPTY_OWNER_KEY
                         }
-                        inputClassName="text-center uppercase tracking-wide max-w-[4.5rem] font-semibold"
-                    />
+                        onValueChange={(v) => {
+                            if (v === EMPTY_OWNER_KEY) {
+                                patchDeal(deal.id, { owner_user_id: null });
+                            } else {
+                                patchDeal(deal.id, { owner_user_id: Number(v) });
+                            }
+                        }}
+                    >
+                        <SelectTrigger className="h-8 min-w-[10rem] border-slate-200 shadow-none text-xs">
+                            <span className="truncate">
+                                {deal.owner_user_id == null
+                                    ? 'Unassigned'
+                                    : deal.owner_display_name ||
+                                      deal.owner_initials ||
+                                      `User ${deal.owner_user_id}`}
+                            </span>
+                        </SelectTrigger>
+                        <SelectContent className="min-w-[12rem]">
+                            <SelectItem value={EMPTY_OWNER_KEY}>Unassigned</SelectItem>
+                            {(tenantMembers || []).map((m) => (
+                                <SelectItem key={m.user_id} value={String(m.user_id)}>
+                                    {(m.name || m.email || `User ${m.user_id}`).trim()}
+                                </SelectItem>
+                            ))}
+                        </SelectContent>
+                    </Select>
                 ) : (
-                    <div className="h-8 w-8 rounded-full bg-violet-100 text-violet-700 text-xs font-semibold flex items-center justify-center border border-violet-200">
-                        {deal.owner_initials || '?'}
+                    <div className="flex flex-wrap items-center gap-2">
+                        <div
+                            className="h-8 w-8 shrink-0 rounded-full bg-violet-100 text-violet-700 text-xs font-semibold flex items-center justify-center border border-violet-200"
+                            title={deal.owner_display_name || deal.owner_initials || 'Unassigned'}
+                        >
+                            {(deal.owner_initials || '?').toString().slice(0, 2).toUpperCase()}
+                        </div>
+                        {!isAdmin &&
+                        currentUserId != null &&
+                        (deal.owner_user_id == null || deal.owner_user_id === '') ? (
+                            <Button
+                                type="button"
+                                variant="outline"
+                                size="sm"
+                                className="h-7 text-xs shrink-0"
+                                onClick={(e) => {
+                                    e.stopPropagation();
+                                    patchDeal(deal.id, { owner_user_id: currentUserId });
+                                }}
+                            >
+                                Take ownership
+                            </Button>
+                        ) : null}
                     </div>
                 )}
             </td>
@@ -602,6 +662,29 @@ export default function Deals() {
     const [companyFetchError, setCompanyFetchError] = useState('');
     const [dealPanelForm, setDealPanelForm] = useState(null);
     const [dealPanelSaving, setDealPanelSaving] = useState(false);
+    const [me, setMe] = useState(null);
+    const [tenantMembers, setTenantMembers] = useState([]);
+
+    const isAdmin = me?.current_role === 'admin';
+    const currentUserId = me?.user_id ?? null;
+
+    useEffect(() => {
+        apiFetch('/api/auth/me')
+            .then((r) => (r.ok ? r.json() : null))
+            .then(setMe)
+            .catch(() => setMe(null));
+    }, []);
+
+    useEffect(() => {
+        if (!me || me.current_role !== 'admin') {
+            setTenantMembers([]);
+            return;
+        }
+        apiFetch('/api/tenants/members')
+            .then((r) => (r.ok ? r.json() : null))
+            .then((d) => setTenantMembers(d?.members || []))
+            .catch(() => setTenantMembers([]));
+    }, [me]);
 
     const fetchDeals = useCallback(async () => {
         setLoading(true);
@@ -666,11 +749,17 @@ export default function Deals() {
     const dealsByOwner = useMemo(() => {
         const map = new Map();
         for (const d of deals) {
-            const raw = (d.owner_initials || '').trim();
-            const sortKey = raw ? raw.toUpperCase() : EMPTY_OWNER_KEY;
+            const unassigned = d.owner_user_id == null;
+            const sortKey = unassigned ? EMPTY_OWNER_KEY : `u:${d.owner_user_id}`;
+            const displayLabel = unassigned
+                ? 'Unassigned'
+                : (
+                      d.owner_display_name ||
+                      d.owner_initials ||
+                      `User ${d.owner_user_id}`
+                  ).trim();
             if (!map.has(sortKey)) {
-                const label = raw ? raw.toUpperCase() : 'Unassigned';
-                map.set(sortKey, { sortKey, displayLabel: label, deals: [] });
+                map.set(sortKey, { sortKey, displayLabel, deals: [] });
             }
             map.get(sortKey).deals.push(d);
         }
@@ -888,7 +977,7 @@ export default function Deals() {
     return (
         <AppShell
             title="Deals"
-            subtitle="Pipeline from converted leads — stage, value, and forecast."
+            subtitle="Pipeline by stage and owner. Members see their deals and unassigned deals; admins see all and can assign owners (edit row → Owner)."
         >
             <MainTableWorkspace
                 tabs={[
@@ -1007,6 +1096,9 @@ export default function Deals() {
                                             patchDeal={patchDeal}
                                             updateStage={updateStage}
                                             openDeal={openDeal}
+                                            isAdmin={isAdmin}
+                                            currentUserId={currentUserId}
+                                            tenantMembers={tenantMembers}
                                         />
                                     ))}
                                 </tbody>
@@ -1042,6 +1134,9 @@ export default function Deals() {
                                         openDeal={openDeal}
                                         createBusy={createBusy}
                                         onAddDeal={() => createDeal(group.value)}
+                                        isAdmin={isAdmin}
+                                        currentUserId={currentUserId}
+                                        tenantMembers={tenantMembers}
                                     />
                                 ))
                             ) : dealsView === 'byCountry' ? (
@@ -1065,6 +1160,9 @@ export default function Deals() {
                                         openDeal={openDeal}
                                         createBusy={createBusy}
                                         onAddDeal={() => createDeal('new')}
+                                        isAdmin={isAdmin}
+                                        currentUserId={currentUserId}
+                                        tenantMembers={tenantMembers}
                                     />
                                 ))
                             ) : dealsView === 'byOwner' ? (
@@ -1079,7 +1177,7 @@ export default function Deals() {
                                                 <div className="flex h-8 w-8 shrink-0 items-center justify-center rounded-full bg-violet-100 text-xs font-semibold text-violet-800 border border-violet-200">
                                                     {group.sortKey === EMPTY_OWNER_KEY
                                                         ? '?'
-                                                        : group.displayLabel.slice(0, 2)}
+                                                        : group.displayLabel.slice(0, 2).toUpperCase()}
                                                 </div>
                                                 <span className="rounded-full bg-slate-100 px-2.5 py-0.5 text-xs font-semibold text-slate-800">
                                                     {group.displayLabel}
@@ -1098,6 +1196,9 @@ export default function Deals() {
                                         openDeal={openDeal}
                                         createBusy={createBusy}
                                         onAddDeal={() => createDeal('new')}
+                                        isAdmin={isAdmin}
+                                        currentUserId={currentUserId}
+                                        tenantMembers={tenantMembers}
                                     />
                                 ))
                             ) : null}