hamedandClaude Opus 5
04d3222559
Four pages on the existing design system: a resources list whose branch/type/skill/
status filters live in the URL and go straight to the server, and three supporting
pages for types, skills and pools. Filtering client-side over a list the server had
already filtered would have been a second source of truth, so the page does neither.
The pool members dialog only offers resources from the pool's own branch and type —
the same rule the server enforces with 422, applied early so the user never reaches
the error. Skill assignment and pool membership are both full replacements, and both
say so in the dialog, because a partial-looking save that silently drops rows is
worse than an explicit one.
Wiring that was missing: deactivating a staff member through
PATCH /api/v1/staff/{uuid}/toggle now closes their resource too. Without it an
inactive operator would still have shown up in availability search. It is an explicit
call rather than a Doctrine lifecycle callback, since callbacks do not fire for
getArrayResult() — which is how every admin list is built — and that asymmetry is
its own bug. The reverse does not hold: closing a resource does not deactivate the
person, who may be purely administrative.
docs/api/resource.md documents all sixteen endpoints with responses captured from
real curl runs against ddev, including the 422 bodies for person-capacity and
non-scalar attributes. staff.md gains a "relationship to resources" section stating
that job_title is not a skill. tenancy.md contrasts these aggregate children —
whose roots do carry a tenant pair — with the branch_working_hours case from task 01,
where the root was global and the classification was wrong.
Also fixed a pre-existing flaky test: NumericFieldNormalizerTest guarded its random
mobile against collision on the never-reset db_test but not its random national code,
so a full-suite run could fail with 422 and close the EntityManager, taking an
unrelated test down with it. Both are now guarded, and the assertion prints the
server's response instead of a bare "422 is not 201".
Verified: phpunit 1119 tests / 3113 assertions green; slot-mode frozen contract green;
phpstan 14 errors before and after, none in touched files; tsc clean; vitest 88 files
/ 617 tests green.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
86 lines
5.7 KiB
TypeScript
86 lines
5.7 KiB
TypeScript
import React from 'react';
|
|
import {
|
|
CreditCardIcon, UserIcon, CalendarDaysIcon, BuildingOffice2Icon,
|
|
BanknotesIcon, UsersIcon, ShieldCheckIcon,
|
|
TagIcon, ChatBubbleLeftRightIcon, UserCircleIcon, UserPlusIcon, ReceiptPercentIcon, MapPinIcon, CubeIcon,
|
|
} from '@heroicons/react/24/outline';
|
|
import PurchaseSubscriptionSidebar from './PurchaseSubscriptionSidebar';
|
|
|
|
// ── Settings menu configuration ─────────────────────────────────────────────
|
|
// Source of truth for the *mobile* settings list (SettingsMenuPage). The desktop
|
|
// shell renders the shared PurchaseSubscriptionSidebar instead, so there is a
|
|
// single settings sidebar across all settings pages (no duplicate menu).
|
|
export type SettingsMenuItem = {
|
|
key: string;
|
|
label: string;
|
|
icon: React.ElementType;
|
|
to?: string;
|
|
/** when set, the item is only shown to these roles (omit = every role) */
|
|
roles?: string[];
|
|
/** [resource, action] — منشی فقط با داشتن این مجوز آیتم را میبیند. */
|
|
perm?: [string, string];
|
|
/** برای منشی همیشه نمایش داده میشود (حساب کاربری). */
|
|
alwaysOpen?: boolean;
|
|
};
|
|
|
|
export const SETTINGS_MENU: SettingsMenuItem[] = [
|
|
{ key: 'subscription', label: 'خرید اشتراک', icon: CreditCardIcon, to: '/admin/subscription', perm: ['subscription', 'view'] },
|
|
{ key: 'doctor', label: 'مدیریت پزشک', icon: UserIcon, to: '/admin/profile', roles: ['doctor'] },
|
|
{ key: 'appointment', label: 'مدیریت نوبت دهی', icon: CalendarDaysIcon, to: '/admin/appointment-settings', roles: ['doctor'], perm: ['appointment_settings', 'view'] },
|
|
{ key: 'appointment', label: 'مدیریت نوبت دهی', icon: CalendarDaysIcon, to: '/admin/settings/appointment-settings', roles: ['clinic'], perm: ['appointment_settings', 'view'] },
|
|
{ key: 'clinic-doctors', label: 'پزشکان کلینیک', icon: BuildingOffice2Icon, to: '/admin/settings/clinic-doctors', roles: ['clinic'], perm: ['clinic_doctors', 'view'] },
|
|
{ key: 'branches', label: 'شعبهها و اتاقها', icon: MapPinIcon, to: '/admin/branches', roles: ['doctor', 'clinic'], perm: ['appointment_settings', 'view'] },
|
|
{ key: 'resources', label: 'منابع', icon: CubeIcon, to: '/admin/resources', roles: ['doctor', 'clinic'], perm: ['appointment_settings', 'view'] },
|
|
{ key: 'payment', label: 'مدیریت پرداخت', icon: BanknotesIcon, to: '/admin/my-financial', perm: ['payments', 'view'] },
|
|
{ key: 'secretary', label: 'مدیریت منشی', icon: UsersIcon, to: '/admin/my-secretaries' },
|
|
{ key: 'staff', label: 'پرسنل', icon: UserPlusIcon, to: '/admin/staff', perm: ['staff', 'view'] },
|
|
{ key: 'insurance', label: 'مدیریت بیمه', icon: ShieldCheckIcon, to: '/admin/insurance-pricing', perm: ['insurances', 'view'] },
|
|
{ key: 'discounts', label: 'مدیریت تخفیفها', icon: ReceiptPercentIcon, to: '/admin/discounts', roles: ['doctor', 'clinic'], perm: ['discounts', 'view'] },
|
|
{ key: 'tags', label: 'برچسبها', icon: TagIcon, to: '/admin/tags-settings', perm: ['tags', 'view'] },
|
|
{ key: 'sms', label: 'پیامکها', icon: ChatBubbleLeftRightIcon, to: '/admin/sms-wallet', perm: ['sms', 'view'] },
|
|
{ key: 'account', label: 'حساب کاربری', icon: UserCircleIcon, to: '/admin/account-settings', alwaysOpen: true },
|
|
];
|
|
|
|
/**
|
|
* Menu items visible to the given role. برای منشی بر اساس مجوز فیلتر میشود
|
|
* (آیتمِ بدونِ perm/alwaysOpen پنهان است)؛ سایر نقشها با roles.
|
|
*/
|
|
export function menuForRole(
|
|
role: string | null | undefined,
|
|
can?: (resource: string, action: string) => boolean,
|
|
scope?: string | null,
|
|
): SettingsMenuItem[] {
|
|
// منشی و پزشکِ عضوِ کلینیک (scope=clinic) محدود-به-مجوزند؛ بقیه با فیلترِ نقشی.
|
|
const permissionRestricted = role === 'secretary' || (role === 'doctor' && scope === 'clinic');
|
|
return SETTINGS_MENU.filter((i) => {
|
|
if (permissionRestricted) {
|
|
if (i.alwaysOpen) return true;
|
|
if (!i.perm || !can || !can(i.perm[0], i.perm[1])) return false;
|
|
// واریانتِ نقشی (نوبتدهی/پزشکان کلینیک) را با scope تطبیق بده.
|
|
if (i.roles) return i.roles.includes(scope === 'clinic' ? 'clinic' : 'doctor');
|
|
return true;
|
|
}
|
|
return !i.roles || (role != null && i.roles.includes(role));
|
|
});
|
|
}
|
|
|
|
/**
|
|
* SettingsLayout — presentational shell for the doctor/clinic settings area.
|
|
* Renders the shared settings sidebar (PurchaseSubscriptionSidebar) beside the
|
|
* page content, so every settings page shows the exact same menu as the
|
|
* subscription page. Full-width so the sidebar sits flush against the main nav.
|
|
*
|
|
* @param active key of the currently-open settings section (highlighted)
|
|
* @param children the section content (e.g. subscription plans)
|
|
*/
|
|
export default function SettingsLayout({ active, children }: { active: string; children: React.ReactNode }) {
|
|
return (
|
|
<div className="fade-in settings-shell" dir="rtl" style={{ width: '100%' }}>
|
|
<div className="grid grid-cols-1 lg:grid-cols-[248px_minmax(0,1fr)] gap-5">
|
|
<PurchaseSubscriptionSidebar active={active} />
|
|
<div style={{ minWidth: 0 }}>{children}</div>
|
|
</div>
|
|
</div>
|
|
);
|
|
}
|