` so screen readers can announce it.
+ - Render the `general-endBeforeStart` block whenever `endBeforeStart` is present (drop the `touched` gate so the user sees the error the moment they leave End ≤ Start). Keep `general-eventEnd-error` rendering only for `invalidDatetime` cases.
+ - Symmetrically, for Event start, render the `general-eventStart-error` whenever `invalidDatetime` is on the control (today it is correctly shown when the input becomes dirty AND invalid).
+
+3. **Save gating remains:** `[disabled]="submitting() || form.invalid"` keeps Save disabled while any of (a) the inline per-field validators, (b) the cross-field `endBeforeStart`, or (c) the page-title required/blank validator are in error. No change needed.
+
+### Open Question (please confirm before implementation)
+
+The current docs intentionally allow empty Start/End so the event window can be cleared (`general.pure.ts:69-72`, `docs/api/admin.md:48-53`). The Job description says empty strings should be rejected (negative case 1). I am interpreting the Job as the source of truth and proposing we **reject empty strings** in both backend and client. If instead the intent is to keep `''` valid but reject "malformed-but-not-empty" strings, the backend fix becomes a no-op (it already does that) and only the UI changes are needed. Please confirm before implementation begins.
+
+## 4. Test Strategy
+
+- **Target backend test file:** new `tests/backend/admin-general-event-window.spec.ts`. Reuses `tests/backend/csrf-client.ts`, follows the exact pattern from `tests/backend/admin-validation.spec.ts:16-46` (boots `AppModule`, registers first admin, primes CSRF, then exercises `PUT /api/v1/admin/general/settings` via `request.agent`).
+- **Target frontend test file:** `tests/frontend/admin-general-pure.spec.ts`. Add only the helper-level assertions (e.g., `isoDatetimeValidator({ value: '' })` returns `{ invalidDatetime: true }`) — no DOM rendering tests. The existing pattern uses plain `describe` / `it` with assertions on function returns.
+- **Mocking strategy:** No new mocks. The backend spec uses the real `AppModule` against `:memory:` SQLite (set via `process.env.DATABASE_PATH = ':memory:'` at the top of the file, mirroring `admin-validation.spec.ts:1-3`). Auth uses `register-first-admin` + login + CSRF — already idempotent because the database is in-memory and the test creates exactly one admin in `beforeAll`.
+- **Cases to cover (minimal & focused):**
+ 1. **Backend negative — empty Event End** ⇒ `PUT /settings` with `eventEndUtc: ''` returns HTTP 400 and the per-field message, and a follow-up `GET /settings` shows `eventEndUtc` unchanged.
+ 2. **Backend negative — empty Event Start** ⇒ symmetric to (1).
+ 3. **Backend negative — malformed datetime** ⇒ `PUT /settings` with `eventEndUtc: 'not-a-date'` returns HTTP 400 and `'eventEndUtc must be a valid ISO-8601 datetime'`.
+ 4. **Backend negative — end ≤ start** ⇒ valid Start + `End === Start` returns HTTP 400 with `'eventEndUtc must be strictly after eventStartUtc'`.
+ 5. **Backend positive — valid window** ⇒ well-formed `2026-08-15T10:30:00.000Z` / `2026-08-20T18:45:00.000Z` persists and is round-tripped unchanged.
+ 6. **Frontend pure** — assert `isoDatetimeValidator('')` returns the invalid sentinel (if we choose to flip empty to invalid client-side).
+ 7. **Frontend pure** — assert the new `endBeforeStartMessage` helper returns the canonical string.
+- **Single command:** `npm test` from `/repo` runs the full suite. Frontend and backend can also be run separately via `npm run test:backend` / `npm run test:frontend` (already in `package.json`).
+
+## 5. Persistent Project Data (/data)
+
+Not applicable to this Job. No mock data, seed files, or shared assets are produced or consumed by the bug fix. Tests boot against `:memory:` SQLite, which is sufficient.
diff --git a/backend/src/modules/admin/dto/general.dto.ts b/backend/src/modules/admin/dto/general.dto.ts
index 22e1bf0..52496bf 100644
--- a/backend/src/modules/admin/dto/general.dto.ts
+++ b/backend/src/modules/admin/dto/general.dto.ts
@@ -7,8 +7,8 @@ export const GeneralSettingsSchema = z
logo: z.string().max(2048),
welcomeMarkdown: z.string().max(64_000),
themeKey: z.enum(THEME_IDS as unknown as [string, ...string[]]),
- eventStartUtc: z.union([z.literal(''), z.string().datetime({ message: 'eventStartUtc must be a valid ISO-8601 datetime' })]),
- eventEndUtc: z.union([z.literal(''), z.string().datetime({ message: 'eventEndUtc must be a valid ISO-8601 datetime' })]),
+ eventStartUtc: z.string().datetime({ message: 'eventStartUtc must be a valid ISO-8601 datetime' }),
+ eventEndUtc: z.string().datetime({ message: 'eventEndUtc must be a valid ISO-8601 datetime' }),
defaultChallengeIp: z.string().min(1).max(255),
registrationsEnabled: z.boolean(),
})
diff --git a/frontend/src/app/features/admin/general.component.ts b/frontend/src/app/features/admin/general.component.ts
index aba8f26..048d617 100644
--- a/frontend/src/app/features/admin/general.component.ts
+++ b/frontend/src/app/features/admin/general.component.ts
@@ -10,6 +10,7 @@ import {
datetimeMessage,
deriveEventState,
endAfterStartValidator,
+ endBeforeStartMessage,
isoDatetimeValidator,
normalizePageTitle,
pageTitleMessage,
@@ -113,14 +114,17 @@ import {
type="datetime-local"
formControlName="eventEndUtc"
data-testid="general-eventEnd"
- [attr.aria-invalid]="showEventEndError() || (form.controls.eventEndUtc.touched && !!form.error?.['endBeforeStart']) ? 'true' : null"
- [attr.aria-describedby]="(showEventEndError() || (form.controls.eventEndUtc.touched && !!form.error?.['endBeforeStart'])) ? 'general-eventEnd-error general-endBeforeStart' : null"
+ [attr.aria-invalid]="showEventEndError() || eventEndCrossFieldError() ? 'true' : null"
+ [attr.aria-describedby]="(showEventEndError() || eventEndCrossFieldError())
+ ? 'general-eventEnd-error general-endBeforeStart'
+ : null"
+ [attr.title]="(showEventEndError() ? eventEndMessage() : eventEndCrossFieldError() ? endBeforeStartMessage : null)"
/>
@if (showEventEndError()) {
{{ eventEndMessage() }}
}
- @if (form.controls.eventEndUtc.touched && form.error?.['endBeforeStart']) {
- Event end must be after event start.
+ @if (eventEndCrossFieldError()) {
+ {{ endBeforeStartMessage }}
}
@@ -256,6 +260,10 @@ export class AdminGeneralComponent implements OnInit {
datetimeMessage('Event end', this.eventEndValue(), this.form.controls.eventEndUtc.errors),
);
+ readonly eventEndCrossFieldError = computed(
+ () => !!this.form.errors?.['endBeforeStart'],
+ );
+
constructor() {
this.form.controls.welcomeMarkdown.valueChanges
.pipe(takeUntilDestroyed(this.destroyRef))
diff --git a/frontend/src/app/features/admin/general.pure.ts b/frontend/src/app/features/admin/general.pure.ts
index 0db8f5d..781bb32 100644
--- a/frontend/src/app/features/admin/general.pure.ts
+++ b/frontend/src/app/features/admin/general.pure.ts
@@ -67,7 +67,6 @@ export function toIsoUtc(local: string): string {
export function isoDatetimeValidator(ctrl: { value: string | null | undefined }): { invalidDatetime: true } | null {
const v = ctrl?.value ?? '';
- if (v === '') return null;
const t = Date.parse(v);
return Number.isFinite(t) ? null : { invalidDatetime: true };
}
@@ -81,8 +80,10 @@ export function datetimeMessage(
return `${fieldLabel} must be a valid ISO-8601 datetime.`;
}
const v = value ?? '';
- if (v !== '' && !Number.isFinite(Date.parse(v))) {
+ if (!Number.isFinite(Date.parse(v))) {
return `${fieldLabel} must be a valid ISO-8601 datetime.`;
}
return null;
}
+
+export const endBeforeStartMessage = 'Event end must be after event start.';
diff --git a/tests/backend/admin-general-event-window.spec.ts b/tests/backend/admin-general-event-window.spec.ts
new file mode 100644
index 0000000..5c5fe02
--- /dev/null
+++ b/tests/backend/admin-general-event-window.spec.ts
@@ -0,0 +1,68 @@
+process.env.NODE_ENV = 'test';
+
+import { GeneralSettingsSchema } from '../../backend/src/modules/admin/dto/general.dto';
+
+const baseValid = {
+ pageTitle: 'OpenVelo',
+ logo: '',
+ welcomeMarkdown: '',
+ themeKey: 'classic',
+ defaultChallengeIp: '127.0.0.1',
+ registrationsEnabled: false,
+};
+
+function withEvent(start: string, end: string) {
+ return { ...baseValid, eventStartUtc: start, eventEndUtc: end };
+}
+
+describe('Admin general settings - event window validation (Job 888)', () => {
+ it('accepts a valid event window', () => {
+ const r = GeneralSettingsSchema.safeParse(
+ withEvent('2026-08-15T10:30:00.000Z', '2026-08-20T18:45:00.000Z'),
+ );
+ expect(r.success).toBe(true);
+ });
+
+ it('rejects an empty eventEndUtc with a per-field message', () => {
+ const r = GeneralSettingsSchema.safeParse(withEvent('2026-08-15T10:30:00.000Z', ''));
+ expect(r.success).toBe(false);
+ if (r.success) return;
+ const endIssue = r.error.issues.find((i) => i.path.join('.') === 'eventEndUtc');
+ expect(endIssue?.message).toBe('eventEndUtc must be a valid ISO-8601 datetime');
+ });
+
+ it('rejects an empty eventStartUtc with a per-field message', () => {
+ const r = GeneralSettingsSchema.safeParse(withEvent('', '2026-08-20T18:45:00.000Z'));
+ expect(r.success).toBe(false);
+ if (r.success) return;
+ const startIssue = r.error.issues.find((i) => i.path.join('.') === 'eventStartUtc');
+ expect(startIssue?.message).toBe('eventStartUtc must be a valid ISO-8601 datetime');
+ });
+
+ it('rejects a non-empty malformed eventEndUtc', () => {
+ const r = GeneralSettingsSchema.safeParse(withEvent('2026-08-15T10:30:00.000Z', 'not-a-date'));
+ expect(r.success).toBe(false);
+ if (r.success) return;
+ const endIssue = r.error.issues.find((i) => i.path.join('.') === 'eventEndUtc');
+ expect(endIssue?.message).toBe('eventEndUtc must be a valid ISO-8601 datetime');
+ });
+
+ it('rejects end equal to start', () => {
+ const ts = '2026-08-15T10:30:00.000Z';
+ const r = GeneralSettingsSchema.safeParse(withEvent(ts, ts));
+ expect(r.success).toBe(false);
+ if (r.success) return;
+ const endIssue = r.error.issues.find((i) => i.path.join('.') === 'eventEndUtc');
+ expect(endIssue?.message).toBe('eventEndUtc must be strictly after eventStartUtc');
+ });
+
+ it('rejects end before start', () => {
+ const r = GeneralSettingsSchema.safeParse(
+ withEvent('2026-08-20T18:45:00.000Z', '2026-08-15T10:30:00.000Z'),
+ );
+ expect(r.success).toBe(false);
+ if (r.success) return;
+ const endIssue = r.error.issues.find((i) => i.path.join('.') === 'eventEndUtc');
+ expect(endIssue?.message).toBe('eventEndUtc must be strictly after eventStartUtc');
+ });
+});
diff --git a/tests/backend/admin-general-service.spec.ts b/tests/backend/admin-general-service.spec.ts
index a54b40c..f7c3416 100644
--- a/tests/backend/admin-general-service.spec.ts
+++ b/tests/backend/admin-general-service.spec.ts
@@ -141,7 +141,7 @@ describe('GeneralSettingsSchema - validation rules', () => {
expect(r.success).toBe(false);
});
- it('accepts empty strings (unconfigured event window) for both datetime fields', () => {
+ it('rejects empty strings for event datetime fields with per-field messages (Job 888)', () => {
const r = GeneralSettingsSchema.safeParse({
pageTitle: 'T',
logo: '',
@@ -152,7 +152,12 @@ describe('GeneralSettingsSchema - validation rules', () => {
defaultChallengeIp: '127.0.0.1',
registrationsEnabled: false,
});
- expect(r.success).toBe(true);
+ expect(r.success).toBe(false);
+ if (r.success) return;
+ const startIssue = r.error.issues.find((i) => i.path.join('.') === 'eventStartUtc');
+ const endIssue = r.error.issues.find((i) => i.path.join('.') === 'eventEndUtc');
+ expect(startIssue?.message).toBe('eventStartUtc must be a valid ISO-8601 datetime');
+ expect(endIssue?.message).toBe('eventEndUtc must be a valid ISO-8601 datetime');
});
});
diff --git a/tests/frontend/admin-general-pure.spec.ts b/tests/frontend/admin-general-pure.spec.ts
index 60b9c27..3d6018d 100644
--- a/tests/frontend/admin-general-pure.spec.ts
+++ b/tests/frontend/admin-general-pure.spec.ts
@@ -165,10 +165,10 @@ describe('pageTitleMessage', () => {
});
describe('isoDatetimeValidator', () => {
- it('returns null for an empty value (unconfigured is allowed)', () => {
- expect(isoDatetimeValidator({ value: '' })).toBeNull();
- expect(isoDatetimeValidator({ value: null })).toBeNull();
- expect(isoDatetimeValidator({ value: undefined })).toBeNull();
+ it('returns { invalidDatetime: true } for an empty value (empty string no longer accepted)', () => {
+ expect(isoDatetimeValidator({ value: '' })).toEqual({ invalidDatetime: true });
+ expect(isoDatetimeValidator({ value: null })).toEqual({ invalidDatetime: true });
+ expect(isoDatetimeValidator({ value: undefined })).toEqual({ invalidDatetime: true });
});
it('returns null for a valid ISO-8601 datetime', () => {
@@ -194,9 +194,9 @@ describe('datetimeMessage', () => {
.toBe('Event start must be a valid ISO-8601 datetime.');
});
- it('returns null for an empty value', () => {
- expect(datetimeMessage('Event start', '', null)).toBeNull();
- expect(datetimeMessage('Event start', '', { invalidDatetime: false as any })).toBeNull();
+ it('returns the per-field error for an empty value (empty is now invalid)', () => {
+ expect(datetimeMessage('Event start', '', null)).toBe('Event start must be a valid ISO-8601 datetime.');
+ expect(datetimeMessage('Event end', '', { invalidDatetime: true })).toBe('Event end must be a valid ISO-8601 datetime.');
});
it('returns null for a valid ISO-8601 datetime', () => {