fix(appointments): a resource is a view inside its doctor, and never slot-based

Two reported bugs, one root cause: resource tabs were built as a rival selection
to the doctor rather than a narrower view within them.

Selecting a resource cleared the doctor. The auto-select effect then quietly put
the *first* doctor back, so anyone working under the second doctor was thrown to
the first and lost that doctor's own booking. Selecting a resource now leaves the
doctor alone; only picking a doctor clears the resource.

A resource tab also still rendered the doctor's slot timeline, just with no data.
Resources have no slotted weekly schedule — their calendar comes from service
duration and real occupancy — so showing a slot grid promises times the booking
engine does not recognise. The resource tab now renders its own panel: that day's
appointments on the resource plus a service booking entry point.

Both regressions are pinned by tests, and both were checked by reverting each fix
in turn. The first attempt at the doctor-retention test passed even with the bug
restored, because the auto-select effect masked it; it was rewritten to use the
second doctor, where the bounce is observable.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
This commit is contained in:
hamed
2026-08-03 12:58:13 +03:30
co-authored by Claude Opus 5
parent 202be9a328
commit 732fbd462f
3 changed files with 155 additions and 12 deletions
+22 -12
View File
@@ -24,10 +24,9 @@ import TurnsStatInfo from '../components/appointments/TurnsStatInfo';
import TurnsViewToggle from '../components/appointments/TurnsViewToggle';
import type { TurnsViewMode } from '../components/appointments/TurnsViewToggle';
import DoctorTabs from '../components/appointments/DoctorTabs';
/** هیچ تبی فعال نیست — وقتی تب منبع انتخاب شده، نوار پزشکان نباید هایلایت داشته باشد. */
const NO_ACTIVE_TAB = '\u0000';
import { useResources } from '../hooks/useResources';
import ResourceBookingModal from '../components/appointments/ResourceBookingModal';
import ResourceDayPanel from '../components/appointments/ResourceDayPanel';
import { useUrlState } from '../hooks/useUrlState';
import TurnsTimeline from '../components/appointments/TurnsTimeline';
import TurnsTable from '../components/appointments/TurnsTable';
@@ -533,20 +532,20 @@ export default function AppointmentsPage() {
* وقتی خودِ تب منبع فعال است `selectedDoctorUuid` خالی می‌شود، پس ناظرِ همان منبع
* مبنا قرار می‌گیرد — وگرنه نوار منابع زیر پای کاربر خالی می‌شد.
*/
const supervisorFilterUuid = selectedDoctorUuid
|| bookableResources.find((r) => r.uuid === selectedResourceUuid)?.supervisor?.uuid
|| '';
const supervisedResources = supervisorFilterUuid
? bookableResources.filter((r) => r.supervisor?.uuid === supervisorFilterUuid)
const supervisedResources = selectedDoctorUuid
? bookableResources.filter((r) => r.supervisor?.uuid === selectedDoctorUuid)
: [];
const [bookingResource, setBookingResource] = useState<ClinicResource | null>(null);
const activeResource = bookableResources.find((r) => r.uuid === selectedResourceUuid) ?? null;
const selectResource = (uuid: string) => {
setUrlState({ resource: uuid });
if (uuid) setSelectedDoctorUuid('');
};
/**
* منبع زیرمجموعهٔ پزشک است، نه رقیبش: انتخاب یک منبع فقط نما را داخل همان پزشک
* تنگ می‌کند. پاک کردن پزشک، نوبت‌دهی خودِ او را از دسترس خارج می‌کرد.
*/
const selectResource = (uuid: string) => setUrlState({ resource: uuid });
/** برگشت به خودِ پزشک: نمای منبع بسته می‌شود. */
const selectDoctor = (uuid: string) => {
setSelectedDoctorUuid(uuid);
if (selectedResourceUuid) setUrlState({ resource: '' });
@@ -879,7 +878,7 @@ export default function AppointmentsPage() {
{showDoctorTabs && (
<DoctorTabs
doctors={doctors}
selected={selectedResourceUuid ? NO_ACTIVE_TAB : selectedDoctorUuid}
selected={selectedDoctorUuid}
onSelect={selectDoctor}
showAll={isAdmin}
/>
@@ -915,6 +914,17 @@ export default function AppointmentsPage() {
</div>
)}
</>
) : activeResource ? (
/* منبع اسلات ندارد: تقویمش سرویسی است، پس تایم‌لاین اسلاتیِ پزشک اینجا
اصلاً رندر نمی‌شود — فهرست نوبت‌های همین منبع و یک ورودیِ سرویسی. */
<ResourceDayPanel
resource={activeResource}
appointments={filteredAppointments}
loading={apptQuery.isLoading}
canCreate={!isRepresentation && canCreateAppt}
onBook={() => setBookingResource(activeResource)}
onView={openDetail}
/>
) : (
<>
{!selectedDoctorUuid ? (