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>
111 lines
4.7 KiB
TypeScript
111 lines
4.7 KiB
TypeScript
import { describe, it, expect, beforeEach, vi } from 'vitest';
|
||
import { screen, fireEvent, waitFor } from '@testing-library/react';
|
||
import { renderWithProviders } from '../test/utils';
|
||
|
||
vi.mock('../lib/api', () => ({
|
||
api: { get: vi.fn(), post: vi.fn(), patch: vi.fn(), put: vi.fn(), delete: vi.fn() },
|
||
ApiError: class extends Error {},
|
||
}));
|
||
|
||
vi.mock('sonner', () => ({ toast: { success: vi.fn(), error: vi.fn() } }));
|
||
|
||
vi.mock('../hooks/usePermissions', () => ({
|
||
usePermissions: () => ({ can: () => true }),
|
||
}));
|
||
|
||
import { api } from '../lib/api';
|
||
import ResourcesPage from './ResourcesPage';
|
||
|
||
const get = api.get as ReturnType<typeof vi.fn>;
|
||
const post = api.post as ReturnType<typeof vi.fn>;
|
||
|
||
const branch = {
|
||
id: '1', uuid: 'b1', type: 'clinic', clinic_id: 3, clinic_name: 'کلینیک',
|
||
name: 'شعبهٔ مرکزی', map: { latitude: null, longitude: null }, address: null,
|
||
telephone: null, active: true, timezone: 'Asia/Tehran', city: null, province: null,
|
||
};
|
||
|
||
const laserType = { uuid: 't1', code: 'laser', name: 'دستگاه لیزر', is_system: false, active: true, resources_count: 1, created_at: 0, updated_at: 0 };
|
||
const skill = { uuid: 's1', name: 'آلکساندرایت', active: true, resources_count: 1, created_at: 0, updated_at: 0 };
|
||
|
||
const resource = {
|
||
uuid: 'r1', name: 'لیزر ۱', address_uuid: 'b1', address_name: 'شعبهٔ مرکزی',
|
||
type_uuid: 't1', type_code: 'laser', type_name: 'دستگاه لیزر',
|
||
capacity: 3, setup_minutes: 5, cleanup_minutes: 10, attributes: {},
|
||
subject_kind: null, subject_uuid: null,
|
||
skills: [{ skill_uuid: 's1', skill_name: 'آلکساندرایت', level: 4 }],
|
||
active: true, created_at: 0, updated_at: 0,
|
||
};
|
||
|
||
function mockApi() {
|
||
get.mockImplementation((path: string) => {
|
||
if (path.startsWith('/api/v1/branches')) return Promise.resolve({ success: true, data: [branch] });
|
||
if (path.startsWith('/api/v1/resource-types')) return Promise.resolve({ success: true, data: [laserType] });
|
||
if (path.startsWith('/api/v1/skills')) return Promise.resolve({ success: true, data: [skill] });
|
||
if (path.startsWith('/api/v1/resources')) return Promise.resolve({ success: true, data: [resource] });
|
||
return Promise.resolve({ success: true, data: [] });
|
||
});
|
||
post.mockResolvedValue({ success: true, data: resource });
|
||
}
|
||
|
||
describe('ResourcesPage', () => {
|
||
beforeEach(() => vi.clearAllMocks());
|
||
|
||
it('shows capacity as concurrency and both buffer minutes', async () => {
|
||
mockApi();
|
||
renderWithProviders(<ResourcesPage />, { route: '/admin/resources' });
|
||
|
||
await waitFor(() => expect(screen.getByText('لیزر ۱')).toBeInTheDocument());
|
||
expect(screen.getByText('3 نفر')).toBeInTheDocument();
|
||
expect(screen.getByText('5 / 10 دقیقه')).toBeInTheDocument();
|
||
});
|
||
|
||
it('labels a resource with no bridge as equipment', async () => {
|
||
mockApi();
|
||
renderWithProviders(<ResourcesPage />, { route: '/admin/resources' });
|
||
|
||
await waitFor(() => expect(screen.getByText(/تجهیزات/)).toBeInTheDocument());
|
||
});
|
||
|
||
it('renders each skill with its level', async () => {
|
||
mockApi();
|
||
renderWithProviders(<ResourcesPage />, { route: '/admin/resources' });
|
||
|
||
await waitFor(() => expect(screen.getByText('آلکساندرایت · 4')).toBeInTheDocument());
|
||
});
|
||
|
||
/**
|
||
* فیلترها از URL خوانده میشوند و مستقیم به سرور میروند — فیلتر دوبارهٔ سمت
|
||
* کلاینت روی فهرستی که خودش فیلترشده آمده، منبع اختلاف است.
|
||
*/
|
||
it('passes the URL filters straight to the server', async () => {
|
||
mockApi();
|
||
renderWithProviders(<ResourcesPage />, {
|
||
route: '/admin/resources?address=b1&type=t1&skill=s1&status=1',
|
||
});
|
||
|
||
await waitFor(() => expect(get).toHaveBeenCalled());
|
||
|
||
const called = get.mock.calls.map((c) => String(c[0]));
|
||
const listCall = called.find((p) => p.startsWith('/api/v1/resources'));
|
||
|
||
expect(listCall).toContain('address_uuid=b1');
|
||
expect(listCall).toContain('type_uuid=t1');
|
||
expect(listCall).toContain('skill_uuid=s1');
|
||
expect(listCall).toContain('active=1');
|
||
});
|
||
|
||
it('sends address and type only when creating, never when editing', async () => {
|
||
mockApi();
|
||
renderWithProviders(<ResourcesPage />, { route: '/admin/resources' });
|
||
|
||
await waitFor(() => expect(screen.getByText('لیزر ۱')).toBeInTheDocument());
|
||
|
||
fireEvent.click(screen.getByText('افزودن منبع'));
|
||
fireEvent.change(screen.getByPlaceholderText('لیزر آلکساندرایت ۱'), { target: { value: 'لیزر تازه' } });
|
||
|
||
// شعبه و نوع هنوز انتخاب نشدهاند → ذخیره غیرفعال است.
|
||
expect(screen.getByText('ذخیره').closest('button')).toBeDisabled();
|
||
});
|
||
});
|