From 17916b3a7ae78b601ec4a1cab6c5ee4c11b06a2b Mon Sep 17 00:00:00 2001 From: Dennis Hadzialic <25294013+D3nnis38@users.noreply.github.com> Date: Fri, 2 Feb 2024 09:22:18 +0100 Subject: [PATCH 1/2] Fix regex pattern for orgNumber validation --- .../hooks/useCreateAccountForm/createAccount.validation.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/Auth/CreateAccount/hooks/useCreateAccountForm/createAccount.validation.ts b/src/modules/Auth/CreateAccount/hooks/useCreateAccountForm/createAccount.validation.ts index 9063a9d..e4d73ec 100644 --- a/src/modules/Auth/CreateAccount/hooks/useCreateAccountForm/createAccount.validation.ts +++ b/src/modules/Auth/CreateAccount/hooks/useCreateAccountForm/createAccount.validation.ts @@ -9,7 +9,7 @@ const passwordRegex = /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[^\da-zA-Z]).{10,}$/; export const CreateAccountValidation = z.object({ orgNumber: z .string() - .regex(/\d{10}/, { message: 'Fel format på organisationsnummer - ett organisationsnummer består av 10 siffror.' }), + .regex(/^[0-9]{10}$/, { message: 'Fel format på organisationsnummer - ett organisationsnummer består av 10 siffror.' }), name: z.string().min(1, { message: 'Ange företagsnamn som hör till organisationsnumret' }), email: z .string() From 95456a2aca1e9045bc69831176710168670f96d3 Mon Sep 17 00:00:00 2001 From: Dennis Hadzialic <25294013+D3nnis38@users.noreply.github.com> Date: Fri, 2 Feb 2024 09:24:13 +0100 Subject: [PATCH 2/2] Add name, address, and area attributes to CreateZonesForm --- .../components/CreateZonesForm/CreateZonesForm.tsx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/modules/Account/CreateZones/components/CreateZonesForm/CreateZonesForm.tsx b/src/modules/Account/CreateZones/components/CreateZonesForm/CreateZonesForm.tsx index a40070c..05f67cc 100644 --- a/src/modules/Account/CreateZones/components/CreateZonesForm/CreateZonesForm.tsx +++ b/src/modules/Account/CreateZones/components/CreateZonesForm/CreateZonesForm.tsx @@ -71,6 +71,7 @@ export const CreateZonesForm = () => { type="text" value={zone.properties.name} onChange={setFieldValue(index, 'name')} + name="name" placeholder="Namn på zon" error={errors[index]?.name} /> @@ -87,6 +88,7 @@ export const CreateZonesForm = () => { value={zone.properties.address} onChange={setFieldValue(index, 'address')} placeholder="Adress till zon" + name="address" error={errors[index]?.address} disabled={!ready} /> @@ -98,10 +100,11 @@ export const CreateZonesForm = () => { type="text" value={zone.properties.area} onChange={setFieldValue(index, 'area')} + name="area" placeholder="Område" error={errors[index]?.area} /> -