Skip to content

fix: trim whitespace-only input in settings definition forms #16413

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Valyrian-Code wants to merge 8 commits into
base: develop
Choose a base branch
from
Open

fix: trim whitespace-only input in settings definition forms #16413

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0db6845
fix: trim whitespace-only input in settings definition forms
Valyrian-Code Jun 2, 2026
0ce2b92
Merge branch 'develop' into issues/trim-settings-definition-forms
Valyrian-Code Jun 2, 2026
e9de3fc
test: cover description/usage whitespace + extract shared helper
Valyrian-Code Jun 2, 2026
1529f0e
test: assert required-error text in whitespace helper; fix field loca…
Valyrian-Code Jun 2, 2026
c135271
Merge branch 'develop' into issues/trim-settings-definition-forms
Valyrian-Code Jun 3, 2026
7ea5430
fix: trim slug/uri schemas; assert error visibility in whitespace helper
Valyrian-Code Jun 3, 2026
9ae4315
Merge branch 'develop' into issues/trim-settings-definition-forms
Valyrian-Code Jun 3, 2026
4bd22a3
revert: drop derived_from_uri trim (out of scope for required-text fix)
Valyrian-Code Jun 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/pages/Facility/settings/activityDefinition/ActivityDefinitionForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,13 +129,13 @@ function ActivityDefinitionFormContent({
const { t } = useTranslation();

const formSchema = z.object({
title: z.string().min(1, t("field_required")),
title: z.string().trim().min(1, t("field_required")),
Comment thread
Valyrian-Code marked this conversation as resolved.
slug_value: z
.string()
.min(5, t("character_count_validation", { min: 5, max: 25 }))
.max(25, t("character_count_validation", { min: 5, max: 25 })),
description: z.string().min(1, t("field_required")),
usage: z.string().min(1, t("field_required")),
description: z.string().trim().min(1, t("field_required")),
usage: z.string().trim().min(1, t("field_required")),
Comment thread
Valyrian-Code marked this conversation as resolved.
Comment thread
Valyrian-Code marked this conversation as resolved.
derived_from_uri: z.string().nullable(),
status: z.nativeEnum(Status),
classification: z.nativeEnum(Classification),
Expand Down
4 changes: 2 additions & 2 deletions src/pages/Facility/settings/observationDefinition/ObservationDefinitionForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,12 +140,12 @@ function ObservationDefinitionFormContent({

const formSchema = z
.object({
title: z.string().min(1, t("field_required")),
title: z.string().trim().min(1, t("field_required")),
Comment thread
Valyrian-Code marked this conversation as resolved.
slug_value: z
.string()
.min(5, t("character_count_validation", { min: 5, max: 25 }))
.max(25, t("character_count_validation", { min: 5, max: 25 })),
description: z.string().min(1, t("field_required")),
description: z.string().trim().min(1, t("field_required")),
Comment thread
Valyrian-Code marked this conversation as resolved.
Comment thread
Valyrian-Code marked this conversation as resolved.
status: z.nativeEnum(ObservationDefinitionStatus),
category: z.enum(
OBSERVATION_DEFINITION_CATEGORY as [string, ...string[]],
Expand Down
4 changes: 2 additions & 2 deletions src/pages/Facility/settings/specimen-definitions/SpecimenDefinitionForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,13 +179,13 @@ function SpecimenDefinitionFormContent({
const isEditMode = Boolean(specimenSlug);

const formSchema = z.object({
title: z.string().min(1, t("field_required")),
title: z.string().trim().min(1, t("field_required")),
Comment thread
Valyrian-Code marked this conversation as resolved.
slug_value: z
.string()
.min(5, t("character_count_validation", { min: 5, max: 25 }))
.max(25, t("character_count_validation", { min: 5, max: 25 })),
status: z.nativeEnum(SpecimenDefinitionStatus),
description: z.string().min(1, t("field_required")),
description: z.string().trim().min(1, t("field_required")),
Comment thread
Valyrian-Code marked this conversation as resolved.
derived_from_uri: z
.string()
.url({ message: t("field_required") })
Comment thread
Valyrian-Code marked this conversation as resolved.
Expand Down
13 changes: 13 additions & 0 deletions tests/facility/settings/activityDefinition/activityDefinitionCreate.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,19 @@ test.describe("activity definition form", () => {
);
});

test("should reject a whitespace-only title", async ({ page }) => {
await page.goto(
`/facility/${facilityId}/settings/activity_definitions/categories/f-${facilityId}-${RESOURCE_CATEGORY_SLUG}/new`,
);

const titleInput = page.getByRole("textbox", { name: "Title *" });
await titleInput.fill(" ");
await page.getByRole("button", { name: "Create" }).click();

// Whitespace-only title must be treated as empty.
await expect(getFieldErrorMessage(titleInput)).toBeVisible();
});
Comment thread
Valyrian-Code marked this conversation as resolved.
Outdated
Comment thread
Valyrian-Code marked this conversation as resolved.
Outdated

test("should create activity definition with required fields", async ({
page,
}) => {
Expand Down
10 changes: 10 additions & 0 deletions tests/facility/settings/observationDefinition/observationDefinition.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { faker } from "@faker-js/faker";

import { expect, test } from "@playwright/test";
import { getFieldErrorMessage } from "tests/helper/error";
import { getFacilityId } from "tests/support/facilityId";

const UNITS = [
Expand Down Expand Up @@ -201,6 +202,15 @@ test.describe("Observation Definition Form with Interpretation", () => {
await page.goto(targetUrl);
});

test("should reject a whitespace-only title", async ({ page }) => {
const titleInput = page.getByRole("textbox", { name: "Title" });
await titleInput.fill(" ");
await page.getByRole("button", { name: "Create" }).click();

// Whitespace-only title must be treated as empty.
await expect(getFieldErrorMessage(titleInput)).toBeVisible();
});

test("should create observation definition with root-level interpretation", async ({
page,
}) => {
Expand Down
11 changes: 11 additions & 0 deletions tests/facility/settings/specimenDefinitions/specimenDefinitionCreate.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,17 @@ test.describe("Specimen Definitions Create", () => {
await page.goto(targetUrl);
});

test("should reject a whitespace-only title", async ({ page }) => {
await page.getByRole("button", { name: "Add Definition" }).click();

const titleInput = page.getByRole("textbox", { name: "Title *" });
await titleInput.fill(" ");
await page.getByRole("button", { name: /save/i }).click();

// Whitespace-only title must be treated as empty.
await expect(getFieldErrorMessage(titleInput)).toBeVisible();
});

test("should create specimen definition with all fields", async ({
page,
}) => {
Expand Down
Loading