ZCode
ae62a0391b
v2.7 dropped materials.category_id and the API started returning category: null for
every material, but the frontend still read material.category as the material's label.
Effect: the edit page's material field rendered blank for every row, the dashboard
category filter listed nothing (and matched nothing), the wizard's category suggestions
were empty, and the conversion lookups keyed by category (refConverted →
categoryUnits/unitConversions) silently returned null, dropping the per-reference-unit
price. Saving an edited quote matched materials on an always-true category term, so two
materials sharing brand+specs were interchangeable.
Auditing the dropped column also turned up four places still dereferencing it, one
request away from a 500 and hidden only because the inventory is empty:
GET /inventory (serializer), GET /inventory?category_id=…, GET /inventory/materials/options
and DELETE /material-categories/{id}.
Backend:
- expand_service: category_by_material() resolves a material's display category from its
FIRST linked supplier (oldest supplier_materials row — the v2.5 trigger's rule), used by
the material and line-item payloads; category_id is populated again when not expanded.
- inventory: list filter, row serializer and material-options filter match through
supplier_materials ⋈ suppliers, mirroring GET /materials?category_id=…
- material_categories: the delete guard blocks on suppliers (the RESTRICT FK) and says so.
Frontend:
- Material.category → Material.supplier_category (supplier-derived, documented); the
rename pushed every read site through tsc.
- Labels use the material's own name; the edit modal field is «متریال» and prefills by
name; formatMaterialTitle no longer falls back to a category.
- Identity matching (edit modal, wizard, material memory) is name + brand + specs via a
shared matchMaterial(), so same-brand same-spec materials are not conflated; legacy
composed names are still found through materialBaseName().
- Filters read the supplier's category (dashboard options + quote filter, consistent with
the backend's quote filtering); supplier categories now come from the supplier FK
instead of the removed JSONB column. Conversion keys use supplier_category.
- Removed dead code carrying the old logic: two uncalled topicCategories copies and
materialOptions' unused "cat" branch.
Verified: both images build clean (tsc -b && vite build); the API was exercised in-process
against a restore of the current production dump with an inventory row added — material
and line-item payloads carry the supplier category, the inventory endpoints that used to
raise return 200, and the category delete guard returns 409 instead of 500.
82 lines
2.9 KiB
TypeScript
82 lines
2.9 KiB
TypeScript
import { Link } from "react-router-dom";
|
||
import { MapPin, Phone, User, Plus, Timer } from "lucide-react";
|
||
import type { Supplier } from "../../lib/types";
|
||
import { normalize } from "../../lib/normalize";
|
||
import { fmtNum } from "../../lib/formatters";
|
||
|
||
export function suppliersOfCategory(topic: string, cat: string, suppliers: Supplier[]): Supplier[] {
|
||
return suppliers.filter(
|
||
(s) => normalize(s.topic) === normalize(topic) && (s.categories || []).some((c) => normalize(c) === normalize(cat)),
|
||
);
|
||
}
|
||
|
||
// کارت تأمینکننده همراه با برچسب میانگین زمان تحویل
|
||
export function SupplierCard({
|
||
s,
|
||
topic,
|
||
deletable,
|
||
onDelete,
|
||
materials = [],
|
||
avgLeadTime,
|
||
}: {
|
||
s: Supplier;
|
||
topic: string;
|
||
deletable?: boolean;
|
||
onDelete?: (id: string) => void;
|
||
materials?: string[];
|
||
avgLeadTime?: number | null;
|
||
}) {
|
||
return (
|
||
<div className="sup-card">
|
||
<div className="sc-head flex items-start justify-between gap-2">
|
||
<Link to={`/suppliers/${s.id}`} className="sc-name-link min-w-0 flex-1 leading-snug">
|
||
{s.name}
|
||
</Link>
|
||
<div className="flex items-center gap-1.5 shrink-0">
|
||
{avgLeadTime != null && (
|
||
<span
|
||
className="inline-flex items-center gap-1 whitespace-nowrap rounded-md bg-emerald-100 border border-emerald-300/80 px-2 py-0.5 text-xs font-bold text-emerald-900 shadow-2xs dark:bg-emerald-950 dark:border-emerald-800 dark:text-emerald-200 tabular-nums"
|
||
title="میانگین زمان تحویل سفارشها"
|
||
>
|
||
<Timer className="h-3.5 w-3.5 text-emerald-700 dark:text-emerald-400" />
|
||
<span>{fmtNum(avgLeadTime)} روز</span>
|
||
</span>
|
||
)}
|
||
{deletable && onDelete && (
|
||
<button type="button" className="sup-del" title="حذف تأمینکننده" onClick={() => onDelete(s.id)}>
|
||
×
|
||
</button>
|
||
)}
|
||
</div>
|
||
</div>
|
||
<div className="sc-meta">
|
||
<span>
|
||
<MapPin className="me-1 inline h-3 w-3" /> {s.location || "—"}
|
||
</span>
|
||
<span>
|
||
<Phone className="me-1 inline h-3 w-3" /> {s.phone || "—"}
|
||
</span>
|
||
<span>
|
||
<User className="me-1 inline h-3 w-3" /> {s.contact || "—"}
|
||
</span>
|
||
</div>
|
||
{materials.length > 0 && (
|
||
<div className="mt-2 border-t border-line pt-1.5">
|
||
<div className="mb-1 flex flex-wrap gap-1">
|
||
{materials.map((m, i) => (
|
||
<span key={i} className="spec-chip">
|
||
{m}
|
||
</span>
|
||
))}
|
||
</div>
|
||
</div>
|
||
)}
|
||
<div className="sc-actions">
|
||
<Link to={`/wizard?topic=${encodeURIComponent(topic)}&supplier=${encodeURIComponent(s.id)}`} className="btn-line-file no-underline">
|
||
<Plus className="h-3 w-3" />
|
||
پیشنهاد جدید
|
||
</Link>
|
||
</div>
|
||
</div>
|
||
);
|
||
} |