feat(resource): ad-hoc blocking, 409 recovery, and the rest of the flake
Ad-hoc resource blocking - "The laser is being serviced this afternoon" is a specific range, not a change to the resource's working pattern. It stays separate from calendar exceptions and the modal says which is which — merging them means either an afternoon's closure lives in the calendar forever, or a change to working hours vanishes with one click - Blocking a range that already holds an appointment is refused with 409 rather than silently taking capacity back; the appointment is still there and someone has to decide about it first - Deleting an occupancy that belongs to an appointment is refused too, otherwise a patient's booking would quietly lose its resource with no record 409 on hold now recovers Saying "someone just took it" is not enough — the operator would have to search again by hand. The page drops the stale selection and refetches, so alternatives are on screen immediately. Flake, second half The earlier fix only covered createUser's retry path. Any test that trips a unique constraint closes the EntityManager, and the next test inherits the same closed instance from the container. setUp now resets the registry when it finds a closed manager, so a test's starting state no longer depends on how the previous one failed. Three consecutive full runs green: 1340 tests. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
This commit is contained in:
hamed
@@ -0,0 +1,197 @@
|
||||
import React, { useState } from 'react';
|
||||
import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
|
||||
import { toast } from 'sonner';
|
||||
import { TrashIcon } from '@heroicons/react/24/outline';
|
||||
import Modal from './ui/Modal';
|
||||
import PersianDateInput from './ui/PersianDateInput';
|
||||
import { api, ApiError, type ApiResponse } from '../lib/api';
|
||||
import { formatDate, isoToUnix, unixToIso } from '../lib/utils';
|
||||
|
||||
interface Block {
|
||||
uuid: string;
|
||||
starts_at: number;
|
||||
ends_at: number;
|
||||
segment_name: string | null;
|
||||
}
|
||||
|
||||
interface Props {
|
||||
resourceUuid: string | null;
|
||||
resourceName: string;
|
||||
onClose: () => void;
|
||||
}
|
||||
|
||||
const HOUR = 3600;
|
||||
|
||||
/**
|
||||
* مسدودسازی موردی یک منبع.
|
||||
*
|
||||
* عمداً از «استثنای تقویم» جداست و همینجا هم گفته میشود: آن الگوی کاری منبع را عوض
|
||||
* میکند و ماندگار است، این فقط یک بازهٔ مشخص را میبندد. اپراتوری که این تفاوت را
|
||||
* نداند، تعطیلی یک بعدازظهر را برای همیشه در تقویم ثبت میکند.
|
||||
*/
|
||||
export default function ResourceBlocksModal({ resourceUuid, resourceName, onClose }: Props) {
|
||||
const qc = useQueryClient();
|
||||
const key = ['resource-blocks', resourceUuid];
|
||||
|
||||
const [day, setDay] = useState(() => unixToIso(Math.floor(Date.now() / 1000) + 86400));
|
||||
const [fromHour, setFromHour] = useState(9);
|
||||
const [toHour, setToHour] = useState(13);
|
||||
const [reason, setReason] = useState('');
|
||||
|
||||
const { data, isLoading } = useQuery({
|
||||
queryKey: key,
|
||||
queryFn: () => api.get<ApiResponse<Block[]>>(`/api/v1/resource/${resourceUuid}/blocks`),
|
||||
enabled: !!resourceUuid,
|
||||
});
|
||||
|
||||
const blocks = data?.data ?? [];
|
||||
|
||||
const create = useMutation({
|
||||
mutationFn: (body: { starts_at: number; ends_at: number; reason: string }) =>
|
||||
api.post<ApiResponse<Block>>(`/api/v1/resource/${resourceUuid}/blocks`, body),
|
||||
onSuccess: () => {
|
||||
toast.success('بازه مسدود شد');
|
||||
qc.invalidateQueries({ queryKey: key });
|
||||
setReason('');
|
||||
},
|
||||
// ۴۰۹ یعنی آن بازه نوبت دارد؛ پیام سرور دقیقاً میگوید اول چه باید کرد.
|
||||
onError: (e) => toast.error(e instanceof ApiError ? e.message : 'مسدودسازی ناموفق بود'),
|
||||
});
|
||||
|
||||
const remove = useMutation({
|
||||
mutationFn: (uuid: string) => api.delete<ApiResponse<null>>(`/api/v1/resource-block/${uuid}`),
|
||||
onSuccess: () => {
|
||||
toast.success('مسدودسازی برداشته شد');
|
||||
qc.invalidateQueries({ queryKey: key });
|
||||
},
|
||||
onError: (e) => toast.error(e instanceof ApiError ? e.message : 'حذف ناموفق بود'),
|
||||
});
|
||||
|
||||
const dayStart = isoToUnix(day) ?? 0;
|
||||
const rangeInvalid = toHour <= fromHour;
|
||||
|
||||
return (
|
||||
<Modal
|
||||
open={resourceUuid !== null}
|
||||
title={`مسدودسازی موردی — ${resourceName}`}
|
||||
onClose={onClose}
|
||||
footer={
|
||||
<button type="button" className="btn secondary" onClick={onClose}>
|
||||
بستن
|
||||
</button>
|
||||
}
|
||||
>
|
||||
<div style={{ display: 'flex', flexDirection: 'column', gap: 14 }}>
|
||||
<p style={{ fontSize: 12, color: 'var(--text-3)', margin: 0, lineHeight: 1.7 }}>
|
||||
این یک بازهٔ مشخص را میبندد و تا وقتی حذفش نکنید میماند. برای تغییر
|
||||
<strong> الگوی کاری </strong>
|
||||
منبع (مثلاً «پنجشنبهها تعطیل») از استثنای تقویم استفاده کنید، نه از اینجا.
|
||||
</p>
|
||||
|
||||
<div style={{ display: 'flex', gap: 10, flexWrap: 'wrap', alignItems: 'flex-end' }}>
|
||||
<div className="field" style={{ minWidth: 170, margin: 0 }}>
|
||||
<label>روز</label>
|
||||
<PersianDateInput value={day} onChange={setDay} />
|
||||
</div>
|
||||
|
||||
<label style={{ fontSize: 12, display: 'flex', alignItems: 'center', gap: 4 }}>
|
||||
از ساعت
|
||||
<input
|
||||
className="input"
|
||||
style={{ width: 70 }}
|
||||
type="number"
|
||||
min={0}
|
||||
max={23}
|
||||
value={fromHour}
|
||||
onChange={(e) => setFromHour(Number(e.target.value))}
|
||||
/>
|
||||
</label>
|
||||
|
||||
<label style={{ fontSize: 12, display: 'flex', alignItems: 'center', gap: 4 }}>
|
||||
تا ساعت
|
||||
<input
|
||||
className="input"
|
||||
style={{ width: 70 }}
|
||||
type="number"
|
||||
min={1}
|
||||
max={24}
|
||||
value={toHour}
|
||||
onChange={(e) => setToHour(Number(e.target.value))}
|
||||
/>
|
||||
</label>
|
||||
</div>
|
||||
|
||||
<div className="field" style={{ margin: 0 }}>
|
||||
<label htmlFor="block-reason">دلیل</label>
|
||||
<input
|
||||
id="block-reason"
|
||||
className="input"
|
||||
value={reason}
|
||||
onChange={(e) => setReason(e.target.value)}
|
||||
placeholder="مثلاً: سرویس دورهای دستگاه"
|
||||
/>
|
||||
</div>
|
||||
|
||||
{rangeInvalid && (
|
||||
<span style={{ fontSize: 12, color: 'var(--danger)' }}>
|
||||
ساعت پایان باید بعد از ساعت شروع باشد.
|
||||
</span>
|
||||
)}
|
||||
|
||||
<div>
|
||||
<button
|
||||
type="button"
|
||||
className="btn primary sm"
|
||||
disabled={rangeInvalid || dayStart === 0 || create.isPending}
|
||||
onClick={() =>
|
||||
create.mutate({
|
||||
starts_at: dayStart + fromHour * HOUR,
|
||||
ends_at: dayStart + toHour * HOUR,
|
||||
reason,
|
||||
})
|
||||
}
|
||||
>
|
||||
مسدود کن
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<div style={{ borderTop: '1px solid var(--border)', paddingTop: 12 }}>
|
||||
<h3 style={{ fontSize: 14, margin: '0 0 10px' }}>مسدودسازیهای فعلی</h3>
|
||||
|
||||
{isLoading ? (
|
||||
<span style={{ fontSize: 13, color: 'var(--text-3)' }}>در حال بارگذاری…</span>
|
||||
) : blocks.length === 0 ? (
|
||||
<span style={{ fontSize: 13, color: 'var(--text-3)' }}>
|
||||
این منبع مسدودسازی موردی ندارد.
|
||||
</span>
|
||||
) : (
|
||||
blocks.map((block) => (
|
||||
<div
|
||||
key={block.uuid}
|
||||
style={{ display: 'flex', alignItems: 'center', gap: 10, fontSize: 13, marginBottom: 6 }}
|
||||
>
|
||||
<span>{formatDate(block.starts_at)}</span>
|
||||
<span dir="ltr" style={{ color: 'var(--text-2)' }}>
|
||||
{new Date(block.starts_at * 1000).toLocaleTimeString('fa-IR', { hour: '2-digit', minute: '2-digit' })}
|
||||
{' – '}
|
||||
{new Date(block.ends_at * 1000).toLocaleTimeString('fa-IR', { hour: '2-digit', minute: '2-digit' })}
|
||||
</span>
|
||||
<span style={{ color: 'var(--text-3)', fontSize: 12 }}>{block.segment_name ?? '—'}</span>
|
||||
<button
|
||||
type="button"
|
||||
className="btn secondary sm"
|
||||
style={{ marginRight: 'auto' }}
|
||||
disabled={remove.isPending}
|
||||
onClick={() => remove.mutate(block.uuid)}
|
||||
aria-label="برداشتن مسدودسازی"
|
||||
>
|
||||
<TrashIcon style={{ width: 15 }} />
|
||||
</button>
|
||||
</div>
|
||||
))
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
</Modal>
|
||||
);
|
||||
}
|
||||
Reference in New Issue
Block a user