Restructures frontend to a feature-based folder layout
Continuous Integration / config (pull_request) Successful in 11s
Continuous Integration / changes (pull_request) Successful in 21s
Continuous Integration / backend-build (pull_request) Skipped
Continuous Integration / backend-test (pull_request) Skipped
Continuous Integration / vulnerability-scan (pull_request) Skipped
Continuous Integration / frontend-prepare (pull_request) Successful in 1m37s
Continuous Integration / frontend-build (pull_request) Successful in 2m12s
Continuous Integration / frontend-test (pull_request) Successful in 4m42s
Continuous Integration / frontend-lint (pull_request) Successful in 2m2s
Continuous Integration / publish-production (pull_request) Skipped
Continuous Integration / deploy-production (pull_request) Skipped
Continuous Integration / publish-test (pull_request) Successful in 6m51s
Continuous Integration / deploy-test (pull_request) Skipped
Continuous Integration / config (pull_request) Successful in 11s
Continuous Integration / changes (pull_request) Successful in 21s
Continuous Integration / backend-build (pull_request) Skipped
Continuous Integration / backend-test (pull_request) Skipped
Continuous Integration / vulnerability-scan (pull_request) Skipped
Continuous Integration / frontend-prepare (pull_request) Successful in 1m37s
Continuous Integration / frontend-build (pull_request) Successful in 2m12s
Continuous Integration / frontend-test (pull_request) Successful in 4m42s
Continuous Integration / frontend-lint (pull_request) Successful in 2m2s
Continuous Integration / publish-production (pull_request) Skipped
Continuous Integration / deploy-production (pull_request) Skipped
Continuous Integration / publish-test (pull_request) Successful in 6m51s
Continuous Integration / deploy-test (pull_request) Skipped
Groups auth, setup, invitation, profile, users, cms, availability and system code (services/hooks, components, schemas, mocks, pages) under src/features/<name> instead of splitting by technical layer (api/, components/, lib/schemas/, mocks/, pages/). Renames the old connection-oriented `api` layer to `services` per feature, and splits the monolithic api/types.ts into per-feature types.ts files (with ProblemDetails/ApiResult merged into lib/api-client.ts as shared infra). Layout-agnostic code (ui primitives, app shell, i18n, test utils, lib) stays at the top level. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
@@ -1,34 +0,0 @@
|
||||
import type { AuthResponse, User } from '@/api/types';
|
||||
import { getAppConfig } from '@/lib/config';
|
||||
|
||||
/**
|
||||
* Base URL the ApiClient targets; mocks must match it exactly. Reads the same
|
||||
* getAppConfig().apiBaseUrl the real ApiClient is constructed with, rather than
|
||||
* re-deriving VITE_API_BASE_URL with its own fallback — a second, diverging default here
|
||||
* previously matched the real client's origin only when a local .env.local happened to set
|
||||
* VITE_API_BASE_URL, and silently mismatched (all mocks unmatched) whenever it was unset, as in CI.
|
||||
*/
|
||||
export const API_BASE = getAppConfig().apiBaseUrl;
|
||||
|
||||
export const TEST_CREDENTIALS = {
|
||||
email: 'owner@example.com',
|
||||
password: 'Password123!',
|
||||
};
|
||||
|
||||
export const mockUser: User = {
|
||||
id: '11111111-1111-1111-1111-111111111111',
|
||||
email: TEST_CREDENTIALS.email,
|
||||
name: 'Test Owner',
|
||||
role: 'Owner',
|
||||
isActive: true,
|
||||
};
|
||||
|
||||
export function makeAuthResponse(overrides: Partial<AuthResponse> = {}): AuthResponse {
|
||||
return {
|
||||
accessToken: 'mock-access-token',
|
||||
// Fixed timestamp keeps fixtures deterministic.
|
||||
expiresAt: '2099-01-01T00:00:00.000Z',
|
||||
user: mockUser,
|
||||
...overrides,
|
||||
};
|
||||
}
|
||||
@@ -1,48 +0,0 @@
|
||||
import { http, HttpResponse } from 'msw';
|
||||
import type { LoginRequest, ProblemDetails } from '@/api/types';
|
||||
import { API_BASE, makeAuthResponse, TEST_CREDENTIALS } from './fixtures';
|
||||
|
||||
function problem(status: number, title: string, detail?: string): ProblemDetails {
|
||||
return {
|
||||
type: 'about:blank',
|
||||
title,
|
||||
status,
|
||||
detail,
|
||||
traceId: '00-mock-trace-00',
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* Default auth mocks aligned with the real backend contract:
|
||||
* POST /api/v1/auth/login, /refresh, /revoke. Tests override these per case
|
||||
* via `server.use(...)` to simulate failures and 401 flows.
|
||||
*/
|
||||
export const authHandlers = [
|
||||
http.post(`${API_BASE}/api/v1/auth/login`, async ({ request }) => {
|
||||
const body = (await request.json()) as LoginRequest;
|
||||
if (body.email === TEST_CREDENTIALS.email && body.password === TEST_CREDENTIALS.password) {
|
||||
return HttpResponse.json(makeAuthResponse());
|
||||
}
|
||||
return HttpResponse.json(problem(401, 'Invalid email or password'), { status: 401 });
|
||||
}),
|
||||
|
||||
// By default refresh succeeds (simulates a valid httpOnly cookie present).
|
||||
http.post(`${API_BASE}/api/v1/auth/refresh`, () => {
|
||||
return HttpResponse.json(makeAuthResponse());
|
||||
}),
|
||||
|
||||
http.post(`${API_BASE}/api/v1/auth/revoke`, () => {
|
||||
return new HttpResponse(null, { status: 204 });
|
||||
}),
|
||||
|
||||
http.post(`${API_BASE}/api/v1/Auth/change-password`, async ({ request }) => {
|
||||
const body = (await request.json()) as { currentPassword: string; newPassword: string };
|
||||
if (body.currentPassword === TEST_CREDENTIALS.password) {
|
||||
return new HttpResponse(null, { status: 200 });
|
||||
}
|
||||
return HttpResponse.json(
|
||||
problem(400, 'Incorrect password', 'Current password is incorrect.'),
|
||||
{ status: 400 },
|
||||
);
|
||||
}),
|
||||
];
|
||||
@@ -1,14 +0,0 @@
|
||||
import { http, HttpResponse } from 'msw';
|
||||
|
||||
export const availabilityHandlers = [
|
||||
http.get('*/Availability/status', () =>
|
||||
HttpResponse.json({
|
||||
status: 'Available',
|
||||
checkedAt: new Date().toISOString(),
|
||||
message: '',
|
||||
isMasterControlled: false,
|
||||
}),
|
||||
),
|
||||
|
||||
http.post('*/Availability/admin/status', () => new HttpResponse(null, { status: 200 })),
|
||||
];
|
||||
@@ -1,66 +0,0 @@
|
||||
import { http, HttpResponse } from 'msw';
|
||||
import type { CmsInstance, UpdateStatusResult } from '@/api/types';
|
||||
import { API_BASE } from '../auth/fixtures';
|
||||
|
||||
const seed: CmsInstance[] = [
|
||||
{
|
||||
id: 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa',
|
||||
name: 'Main CMS',
|
||||
url: 'http://cms.example.com',
|
||||
status: 'Available',
|
||||
disableMessage: null,
|
||||
lastContactedAt: '2026-06-30T10:00:00.000Z',
|
||||
lastStatusPushedAt: '2026-06-30T10:00:00.000Z',
|
||||
lastIntegrityCheckFailedAt: null,
|
||||
},
|
||||
{
|
||||
id: 'bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb',
|
||||
name: 'Legacy CMS',
|
||||
url: 'http://legacy.example.com',
|
||||
status: 'Inactive',
|
||||
disableMessage: null,
|
||||
lastContactedAt: null,
|
||||
lastStatusPushedAt: null,
|
||||
lastIntegrityCheckFailedAt: null,
|
||||
},
|
||||
];
|
||||
|
||||
let mockCmsInstances: CmsInstance[] = [...seed];
|
||||
|
||||
export const resetMockCmsInstances = () => {
|
||||
mockCmsInstances = [...seed];
|
||||
};
|
||||
|
||||
export const getMockCmsInstances = () => mockCmsInstances;
|
||||
|
||||
export const cmsHandlers = [
|
||||
http.get(`${API_BASE}/api/v1/CmsInstances`, () => HttpResponse.json(mockCmsInstances)),
|
||||
|
||||
http.post(`${API_BASE}/api/v1/CmsInstances`, async ({ request }) => {
|
||||
const body = (await request.json()) as { name: string; url: string; apiKey: string };
|
||||
const newInstance: CmsInstance = {
|
||||
id: crypto.randomUUID(),
|
||||
name: body.name,
|
||||
url: body.url,
|
||||
status: 'Available',
|
||||
disableMessage: null,
|
||||
lastContactedAt: null,
|
||||
lastStatusPushedAt: null,
|
||||
lastIntegrityCheckFailedAt: null,
|
||||
};
|
||||
mockCmsInstances = [...mockCmsInstances, newInstance];
|
||||
return HttpResponse.json(newInstance, { status: 201 });
|
||||
}),
|
||||
|
||||
http.put(`${API_BASE}/api/v1/CmsInstances/:id/status`, async ({ params, request }) => {
|
||||
const { id } = params as { id: string };
|
||||
const body = (await request.json()) as { status: CmsInstance['status']; disableMessage: string | null };
|
||||
mockCmsInstances = mockCmsInstances.map((instance) =>
|
||||
instance.id === id
|
||||
? { ...instance, status: body.status, disableMessage: body.disableMessage }
|
||||
: instance,
|
||||
);
|
||||
const result: UpdateStatusResult = { success: true, slaveContactSuccess: true };
|
||||
return HttpResponse.json(result);
|
||||
}),
|
||||
];
|
||||
+15
-15
@@ -1,19 +1,19 @@
|
||||
import { authHandlers } from './auth/handlers';
|
||||
import { userHandlers } from './users/handlers';
|
||||
import { setupHandlers } from './setup/handlers';
|
||||
import { invitationHandlers } from './invitation/handlers';
|
||||
import { availabilityHandlers } from './availability/handlers';
|
||||
import { cmsHandlers } from './cms/handlers';
|
||||
import { systemHandlers } from './system/handlers';
|
||||
import { authHandlers } from '@/features/auth/mocks/handlers';
|
||||
import { userHandlers } from '@/features/users/mocks/handlers';
|
||||
import { setupHandlers } from '@/features/setup/mocks/handlers';
|
||||
import { invitationHandlers } from '@/features/invitation/mocks/handlers';
|
||||
import { availabilityHandlers } from '@/features/availability/mocks/handlers';
|
||||
import { cmsHandlers } from '@/features/cms/mocks/handlers';
|
||||
import { systemHandlers } from '@/features/system/mocks/handlers';
|
||||
|
||||
/** All default MSW handlers, composed from feature folders (Q3-B). */
|
||||
export const handlers = [...authHandlers, ...userHandlers, ...setupHandlers, ...invitationHandlers, ...availabilityHandlers, ...cmsHandlers, ...systemHandlers];
|
||||
|
||||
export { authHandlers } from './auth/handlers';
|
||||
export { userHandlers } from './users/handlers';
|
||||
export { setupHandlers, setupUninitializedHandlers, setupConflictHandlers, setupNetworkErrorHandlers } from './setup/handlers';
|
||||
export { invitationHandlers } from './invitation/handlers';
|
||||
export { availabilityHandlers } from './availability/handlers';
|
||||
export { cmsHandlers, resetMockCmsInstances, getMockCmsInstances } from './cms/handlers';
|
||||
export { systemHandlers } from './system/handlers';
|
||||
export * from './auth/fixtures';
|
||||
export { authHandlers } from '@/features/auth/mocks/handlers';
|
||||
export { userHandlers } from '@/features/users/mocks/handlers';
|
||||
export { setupHandlers, setupUninitializedHandlers, setupConflictHandlers, setupNetworkErrorHandlers } from '@/features/setup/mocks/handlers';
|
||||
export { invitationHandlers } from '@/features/invitation/mocks/handlers';
|
||||
export { availabilityHandlers } from '@/features/availability/mocks/handlers';
|
||||
export { cmsHandlers, resetMockCmsInstances, getMockCmsInstances } from '@/features/cms/mocks/handlers';
|
||||
export { systemHandlers } from '@/features/system/mocks/handlers';
|
||||
export * from '@/features/auth/mocks/fixtures';
|
||||
|
||||
@@ -1,44 +0,0 @@
|
||||
import { http, HttpResponse } from 'msw';
|
||||
import { API_BASE } from '../auth/fixtures';
|
||||
|
||||
export const invitationHandlers = [
|
||||
http.get(`${API_BASE}/api/v1/Invitation/validate`, ({ request }) => {
|
||||
const token = new URL(request.url).searchParams.get('token');
|
||||
|
||||
if (token === 'valid-token') {
|
||||
return HttpResponse.json(
|
||||
{ isValid: true, email: 'invited@example.com', name: null, errorCode: null },
|
||||
{ status: 200 },
|
||||
);
|
||||
}
|
||||
|
||||
return HttpResponse.json(
|
||||
{ isValid: false, email: '', name: null, errorCode: 'EXPIRED' },
|
||||
{ status: 200 },
|
||||
);
|
||||
}),
|
||||
|
||||
http.post(`${API_BASE}/api/v1/Invitation/complete`, async ({ request }) => {
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
const body = await request.json() as any;
|
||||
|
||||
if (!body.token || !body.name || !body.password) {
|
||||
return HttpResponse.json(
|
||||
{ type: 'about:blank', title: 'Bad Request', status: 400, detail: 'Missing required fields' },
|
||||
{ status: 400 },
|
||||
);
|
||||
}
|
||||
|
||||
if (body.token !== 'valid-token') {
|
||||
return HttpResponse.json(
|
||||
{ type: 'about:blank', title: 'Bad Request', status: 400, detail: 'Invalid or expired token' },
|
||||
{ status: 400 },
|
||||
);
|
||||
}
|
||||
|
||||
return HttpResponse.json(
|
||||
{ message: 'Account created', user: { id: '2', name: body.name, email: 'invited@example.com', role: 'User' } },
|
||||
{ status: 201 },
|
||||
);
|
||||
}),
|
||||
];
|
||||
@@ -1,61 +0,0 @@
|
||||
import { http, HttpResponse } from 'msw';
|
||||
import type { SetupStatus } from '@/api/types';
|
||||
import { API_BASE } from '../auth/fixtures';
|
||||
|
||||
/** Setup status mock (used by public bootstrap guards). */
|
||||
export const setupHandlers = [
|
||||
http.get(`${API_BASE}/api/v1/Setup/status`, () =>
|
||||
HttpResponse.json<SetupStatus>({ initialized: true }),
|
||||
),
|
||||
|
||||
http.post(`${API_BASE}/api/v1/Setup/owner`, async ({ request }) => {
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
const body = await request.json() as any;
|
||||
if (!body.email || !body.password || !body.name) {
|
||||
return HttpResponse.json(
|
||||
{
|
||||
type: 'about:blank',
|
||||
title: 'Bad Request',
|
||||
status: 400,
|
||||
detail: 'Missing required fields'
|
||||
},
|
||||
{ status: 400 }
|
||||
);
|
||||
}
|
||||
return HttpResponse.json(
|
||||
{
|
||||
message: 'System initialized',
|
||||
user: {
|
||||
id: '1',
|
||||
name: body.name,
|
||||
email: body.email,
|
||||
role: 'Owner'
|
||||
}
|
||||
},
|
||||
{ status: 201 }
|
||||
);
|
||||
}),
|
||||
];
|
||||
|
||||
/** Override: simulates network error on setup status — backend unreachable. */
|
||||
export const setupNetworkErrorHandlers = [
|
||||
http.get(`${API_BASE}/api/v1/Setup/status`, () => HttpResponse.error()),
|
||||
];
|
||||
|
||||
/** Override: returns not-initialized status — use in tests for InitGuard. */
|
||||
export const setupUninitializedHandlers = [
|
||||
http.get(`${API_BASE}/api/v1/Setup/status`, () =>
|
||||
HttpResponse.json<SetupStatus>({ initialized: false }),
|
||||
),
|
||||
];
|
||||
|
||||
/** Override: POST /Setup/owner returns 409 — system already initialized. */
|
||||
export const setupConflictHandlers = [
|
||||
...setupUninitializedHandlers,
|
||||
http.post(`${API_BASE}/api/v1/Setup/owner`, () =>
|
||||
HttpResponse.json(
|
||||
{ title: 'Conflict', detail: 'System has already been initialized.', status: 409 },
|
||||
{ status: 409 },
|
||||
),
|
||||
),
|
||||
];
|
||||
@@ -1,9 +0,0 @@
|
||||
import { http, HttpResponse } from 'msw';
|
||||
|
||||
export const systemHandlers = [
|
||||
http.get('*/System/capabilities', () =>
|
||||
HttpResponse.json({
|
||||
modules: ['Availability', 'Identity', 'Master'],
|
||||
}),
|
||||
),
|
||||
];
|
||||
@@ -1,118 +0,0 @@
|
||||
import { http, HttpResponse } from 'msw';
|
||||
import type { UserListItem } from '@/api/types';
|
||||
import { API_BASE, mockUser } from '../auth/fixtures';
|
||||
|
||||
let mockUsers: UserListItem[] = [
|
||||
{
|
||||
...mockUser,
|
||||
createdAt: '2026-01-01T00:00:00.000Z',
|
||||
invitationPending: false,
|
||||
inviteLink: null,
|
||||
},
|
||||
{
|
||||
id: '22222222-2222-2222-2222-222222222222',
|
||||
email: 'admin@example.com',
|
||||
name: 'Admin User',
|
||||
role: 'Administrator',
|
||||
isActive: true,
|
||||
createdAt: '2026-01-15T00:00:00.000Z',
|
||||
invitationPending: false,
|
||||
inviteLink: null,
|
||||
},
|
||||
{
|
||||
id: '33333333-3333-3333-3333-333333333333',
|
||||
email: 'pending@example.com',
|
||||
name: 'pending@example.com',
|
||||
role: 'User',
|
||||
isActive: true,
|
||||
createdAt: '2026-06-01T00:00:00.000Z',
|
||||
invitationPending: true,
|
||||
inviteLink: '/invite/complete?token=pending-mock-token',
|
||||
},
|
||||
];
|
||||
|
||||
export const resetMockUsers = () => {
|
||||
mockUsers = [
|
||||
{
|
||||
...mockUser,
|
||||
createdAt: '2026-01-01T00:00:00.000Z',
|
||||
invitationPending: false,
|
||||
inviteLink: null,
|
||||
},
|
||||
{
|
||||
id: '22222222-2222-2222-2222-222222222222',
|
||||
email: 'admin@example.com',
|
||||
name: 'Admin User',
|
||||
role: 'Administrator',
|
||||
isActive: true,
|
||||
createdAt: '2026-01-15T00:00:00.000Z',
|
||||
invitationPending: false,
|
||||
inviteLink: null,
|
||||
},
|
||||
{
|
||||
id: '33333333-3333-3333-3333-333333333333',
|
||||
email: 'pending@example.com',
|
||||
name: 'pending@example.com',
|
||||
role: 'User',
|
||||
isActive: true,
|
||||
createdAt: '2026-06-01T00:00:00.000Z',
|
||||
invitationPending: true,
|
||||
inviteLink: '/invite/complete?token=pending-mock-token',
|
||||
},
|
||||
];
|
||||
};
|
||||
|
||||
export const getMockUsers = () => mockUsers;
|
||||
|
||||
export const userHandlers = [
|
||||
http.get(`${API_BASE}/api/v1/Users`, () => HttpResponse.json(mockUsers)),
|
||||
|
||||
http.post(`${API_BASE}/api/v1/Users/invite`, async ({ request }) => {
|
||||
const body = (await request.json()) as { email: string; role: string };
|
||||
const token = `mock-token-${Date.now()}`;
|
||||
const inviteLink = `/invite/complete?token=${token}`;
|
||||
|
||||
const newUser: UserListItem = {
|
||||
id: crypto.randomUUID(),
|
||||
email: body.email,
|
||||
name: body.email,
|
||||
role: body.role as UserListItem['role'],
|
||||
isActive: true,
|
||||
createdAt: new Date().toISOString(),
|
||||
invitationPending: true,
|
||||
inviteLink,
|
||||
};
|
||||
mockUsers = [...mockUsers, newUser];
|
||||
|
||||
return HttpResponse.json({ inviteLink });
|
||||
}),
|
||||
|
||||
http.put(`${API_BASE}/api/v1/Users/:userId/role`, () => new HttpResponse(null, { status: 200 })),
|
||||
|
||||
http.put(`${API_BASE}/api/v1/Users/:userId/active`, () => new HttpResponse(null, { status: 200 })),
|
||||
|
||||
http.put(`${API_BASE}/api/v1/Users/me`, async ({ request }) => {
|
||||
const body = (await request.json()) as { name: string; email: string };
|
||||
const owner = mockUsers.find((u) => u.role === 'Owner') ?? mockUsers[0];
|
||||
const updated: UserListItem = {
|
||||
...owner,
|
||||
name: body.name,
|
||||
email: body.email,
|
||||
};
|
||||
mockUsers = mockUsers.map((u) => (u.id === owner.id ? updated : u));
|
||||
return HttpResponse.json(updated);
|
||||
}),
|
||||
|
||||
http.delete(`${API_BASE}/api/v1/Users/:userId`, ({ params }) => {
|
||||
const { userId } = params as { userId: string };
|
||||
const ownerUser = mockUsers.find((u) => u.role === 'Owner');
|
||||
if (userId === ownerUser?.id) {
|
||||
return HttpResponse.json(
|
||||
{ title: 'Bad Request', detail: 'At least one Owner must remain.', status: 400 },
|
||||
{ status: 400 },
|
||||
);
|
||||
}
|
||||
mockUsers = mockUsers.filter((u) => u.id !== userId);
|
||||
return new HttpResponse(null, { status: 204 });
|
||||
}),
|
||||
];
|
||||
Reference in New Issue
Block a user