Skip to content

Commit 37b77c4

Browse files
authored
fix: use custom error message handler (#1685)
1 parent 609665d commit 37b77c4

File tree

5 files changed

+10
-5
lines changed

5 files changed

+10
-5
lines changed

apps/studio/src/features/editing-experience/components/form-builder/renderers/controls/BaseLinkControl.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import { trpc } from "~/utils/trpc"
2626
import { LINK_TYPES } from "../../../LinkEditor/constants"
2727
import { getLinkHrefType } from "../../../LinkEditor/utils"
2828
import { LinkErrorBoundary } from "../../components/LinkErrorBoundary"
29+
import { getCustomErrorMessage } from "./utils"
2930
import { parseHref } from "./utils/parseHref"
3031

3132
interface SuspendableLabelProps {
@@ -132,7 +133,7 @@ export function BaseLinkControl({
132133
</Flex>
133134
{required && (
134135
<FormErrorMessage>
135-
{label} {errors}
136+
{label} {getCustomErrorMessage(errors)}
136137
</FormErrorMessage>
137138
)}
138139
</LinkErrorBoundary>

apps/studio/src/features/editing-experience/components/form-builder/renderers/controls/JsonFormsBooleanControl.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import {
99
} from "@opengovsg/design-system-react"
1010

1111
import { JSON_FORMS_RANKING } from "~/constants/formBuilder"
12+
import { getCustomErrorMessage } from "./utils"
1213

1314
export const jsonFormsBooleanControlTester: RankedTester = rankWith(
1415
JSON_FORMS_RANKING.BooleanControl,
@@ -50,7 +51,7 @@ export function JsonFormsBooleanControl({
5051
isChecked={!!data}
5152
onChange={(e) => handleChange(path, e.target.checked)}
5253
/>
53-
<FormErrorMessage>{errors}</FormErrorMessage>
54+
<FormErrorMessage>{getCustomErrorMessage(errors)}</FormErrorMessage>
5455
</Flex>
5556
</FormControl>
5657
</Box>

apps/studio/src/features/editing-experience/components/form-builder/renderers/controls/JsonFormsDateControl.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import {
99
} from "@opengovsg/design-system-react"
1010

1111
import { JSON_FORMS_RANKING } from "~/constants/formBuilder"
12+
import { getCustomErrorMessage } from "./utils"
1213

1314
export const jsonFormsDateControlTester: RankedTester = rankWith(
1415
JSON_FORMS_RANKING.TextControl,
@@ -37,7 +38,7 @@ export function JsonFormsDateControl({
3738
onInputValueChange={(date) => handleChange(path, date.toString())}
3839
/>
3940
<FormErrorMessage>
40-
{label} {errors}
41+
{label} {getCustomErrorMessage(errors)}
4142
</FormErrorMessage>
4243
</FormControl>
4344
</Box>

apps/studio/src/features/editing-experience/components/form-builder/renderers/controls/JsonFormsEmbedControl.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ import {
4141
getEmbedNameFromUrl,
4242
getIframeSrc,
4343
} from "../../../utils"
44+
import { getCustomErrorMessage } from "./utils"
4445

4546
const SUPPORTED_FORMS = Object.keys(FORMSG_EMBED_URL_REGEXES).map(
4647
(key) => EMBED_NAME_MAPPING[key as keyof typeof FORMSG_EMBED_URL_REGEXES],
@@ -237,7 +238,7 @@ export function JsonFormsEmbedControl({
237238
</HStack>
238239

239240
<FormErrorMessage>
240-
{label} {errors}
241+
{label} {getCustomErrorMessage(errors)}
241242
</FormErrorMessage>
242243
</FormControl>
243244
</Box>

apps/studio/src/features/editing-experience/components/form-builder/renderers/controls/JsonFormsIntegerControl.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import {
2323
} from "@opengovsg/design-system-react"
2424

2525
import { JSON_FORMS_RANKING } from "~/constants/formBuilder"
26+
import { getCustomErrorMessage } from "./utils"
2627

2728
export const jsonFormsIntegerControlTester: RankedTester = rankWith(
2829
JSON_FORMS_RANKING.IntegerControl,
@@ -85,7 +86,7 @@ export function JsonFormsIntegerControl({
8586
</NumberInputStepper>
8687
</NumberInput>
8788
<FormErrorMessage>
88-
{label} {errors}
89+
{label} {getCustomErrorMessage(errors)}
8990
</FormErrorMessage>
9091
</FormControl>
9192
</Box>

0 commit comments

Comments
 (0)