update client address add primary address and update client address , fixed profile page and update user layer
This commit is contained in:
@@ -40,12 +40,14 @@ function labelIcon(label: string): string {
|
||||
// ─── AddressCard ───────────────────────────────────────────────────────────
|
||||
|
||||
interface AddressCardProps {
|
||||
address: ClientAddress;
|
||||
onEdit: () => void;
|
||||
onDelete: () => void;
|
||||
address: ClientAddress;
|
||||
onEdit: () => void;
|
||||
onDelete: () => void;
|
||||
onSetPrimary: () => void;
|
||||
settingPrimary: boolean; // true only while THIS card's request is in flight
|
||||
}
|
||||
|
||||
function AddressCard({ address, onEdit, onDelete }: AddressCardProps) {
|
||||
function AddressCard({ address, onEdit, onDelete, onSetPrimary, settingPrimary }: AddressCardProps) {
|
||||
const { details, contactPerson } = address;
|
||||
const {
|
||||
street,
|
||||
@@ -195,6 +197,19 @@ function AddressCard({ address, onEdit, onDelete }: AddressCardProps) {
|
||||
<ActionBtn onClick={onEdit} color="#1D4ED8" bg="#EFF6FF" border="#BFDBFE">
|
||||
تعديل
|
||||
</ActionBtn>
|
||||
|
||||
{!address.isPrimary && (
|
||||
<ActionBtn
|
||||
onClick={onSetPrimary}
|
||||
disabled={settingPrimary}
|
||||
color="#B45309"
|
||||
bg="#FFFBEB"
|
||||
border="#FDE68A"
|
||||
>
|
||||
{settingPrimary ? "جارٍ التعيين…" : "تعيين كأساسي"}
|
||||
</ActionBtn>
|
||||
)}
|
||||
|
||||
<ActionBtn
|
||||
onClick={onDelete}
|
||||
color="#DC2626"
|
||||
@@ -346,6 +361,8 @@ export default function ClientAddressesPage() {
|
||||
createAddress,
|
||||
updateAddress,
|
||||
deleteAddress,
|
||||
setPrimaryAddress,
|
||||
settingPrimaryId,
|
||||
} = useClientAddresses(clientId ?? "");
|
||||
|
||||
// ── Modal state ──────────────────────────────────────────────────────────
|
||||
@@ -374,6 +391,11 @@ export default function ClientAddressesPage() {
|
||||
if (ok) setDeleteTarget(null);
|
||||
};
|
||||
|
||||
// ── Set primary handler ──────────────────────────────────────────────────
|
||||
const handleSetPrimary = async (address: ClientAddress) => {
|
||||
await setPrimaryAddress(address.id);
|
||||
};
|
||||
|
||||
// ── Client edit handler ──────────────────────────────────────────────────
|
||||
const handleClientEditSubmit = async (
|
||||
data: ClientFormData,
|
||||
@@ -661,6 +683,8 @@ export default function ClientAddressesPage() {
|
||||
address={addr}
|
||||
onEdit={() => setAddrFormTarget(addr)}
|
||||
onDelete={() => setDeleteTarget(addr)}
|
||||
onSetPrimary={() => handleSetPrimary(addr)}
|
||||
settingPrimary={settingPrimaryId === addr.id}
|
||||
/>
|
||||
))}
|
||||
</div>
|
||||
|
||||
@@ -32,19 +32,32 @@ export default function ProfilePage() {
|
||||
{ label: "آخر تحديث", value: new Date(user.updatedAt).toLocaleDateString("ar-SA") },
|
||||
];
|
||||
|
||||
// تجميع الصلاحيات حسب الموديول عشان تبقى منظمة وسهلة القراءة
|
||||
const permissionsByModule = (user.role?.permissions ?? []).reduce<Record<string, string[]>>(
|
||||
(acc, entry) => {
|
||||
const mod = entry.permission.module || "أخرى";
|
||||
if (!acc[mod]) acc[mod] = [];
|
||||
acc[mod].push(entry.permission.name);
|
||||
return acc;
|
||||
},
|
||||
{},
|
||||
);
|
||||
const modules = Object.keys(permissionsByModule);
|
||||
|
||||
return (
|
||||
<div className="mx-auto max-w-lg px-4 py-10" dir="rtl">
|
||||
<div className="mx-auto max-w-2xl space-y-6 px-4 py-10" dir="rtl">
|
||||
{/* بطاقة البيانات الأساسية */}
|
||||
<div className="rounded-2xl bg-white p-6 shadow-md">
|
||||
<div className="mb-6 flex flex-col items-center gap-3">
|
||||
<img
|
||||
src={user.photo ?? "/images/avatar-placeholder.png"}
|
||||
alt={user.name}
|
||||
className="h-20 w-20 rounded-full object-cover ring-2 ring-blue-100"
|
||||
onError={(e) => {
|
||||
(e.target as HTMLImageElement).src = "/images/avatar-placeholder.png";
|
||||
}}
|
||||
/>
|
||||
<div className="flex h-20 w-20 items-center justify-center rounded-full bg-blue-50 text-2xl font-semibold text-blue-600 ring-2 ring-blue-100">
|
||||
{user.name?.trim().charAt(0) ?? "?"}
|
||||
</div>
|
||||
<h1 className="text-base font-semibold text-slate-900">{user.name}</h1>
|
||||
{user.role?.name && (
|
||||
<span className="rounded-full bg-blue-50 px-3 py-1 text-xs font-medium text-blue-700">
|
||||
{user.role.name}
|
||||
</span>
|
||||
)}
|
||||
</div>
|
||||
|
||||
{/* عرض البيانات بشكل read-only بدون أي فورم أو زرار تعديل */}
|
||||
@@ -57,6 +70,54 @@ export default function ProfilePage() {
|
||||
))}
|
||||
</dl>
|
||||
</div>
|
||||
|
||||
{/* بطاقة الدور والصلاحيات */}
|
||||
{user.role && (
|
||||
<div className="rounded-2xl bg-white p-6 shadow-md">
|
||||
<div className="mb-4">
|
||||
<h2 className="text-sm font-semibold text-slate-900">الدور والصلاحيات</h2>
|
||||
{user.role.description && (
|
||||
<p className="mt-1 text-[13px] text-slate-500">{user.role.description}</p>
|
||||
)}
|
||||
</div>
|
||||
|
||||
{modules.length === 0 ? (
|
||||
<p className="text-[13px] text-slate-400">لا توجد صلاحيات مسجّلة لهذا الدور.</p>
|
||||
) : (
|
||||
<div className="space-y-2">
|
||||
{modules.map((mod) => (
|
||||
<details
|
||||
key={mod}
|
||||
className="group rounded-lg border border-slate-100 open:bg-slate-50"
|
||||
open
|
||||
>
|
||||
<summary className="flex cursor-pointer list-none items-center justify-between px-3 py-2.5 text-[13px] font-medium text-slate-700">
|
||||
<span className="flex items-center gap-2">
|
||||
{mod}
|
||||
<span className="rounded-full bg-slate-100 px-2 py-0.5 text-[11px] font-normal text-slate-500">
|
||||
{permissionsByModule[mod].length}
|
||||
</span>
|
||||
</span>
|
||||
<span className="text-slate-400 transition-transform group-open:rotate-180">
|
||||
▾
|
||||
</span>
|
||||
</summary>
|
||||
<div className="flex flex-wrap gap-2 px-3 pb-3 pt-1">
|
||||
{permissionsByModule[mod].map((name) => (
|
||||
<span
|
||||
key={name}
|
||||
className="rounded-md bg-blue-50 px-2.5 py-1 text-[12px] font-medium text-blue-700"
|
||||
>
|
||||
{name}
|
||||
</span>
|
||||
))}
|
||||
</div>
|
||||
</details>
|
||||
))}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
Reference in New Issue
Block a user