Merge pull request #41 from LerianStudio/feat/add-validation-into-cod…

…e-field ✨ feat: add validation into field code
LerianStudio · Nov 21, 2024 · 519e352 · 519e352
2 parents 6e978ac + 093e593
commit 519e352
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 3 deletions.
diff --git a/locales/extracted/en.json b/locales/extracted/en.json
@@ -108,6 +108,7 @@
   "errors.custom.one_uppercase_letter": "Field must contain at least 1 uppercase letter",
   "errors.custom.only_numbers": "Field must contain only numbers",
   "errors.custom.special_characters": "Field must not contain special characters",
+  "errors.custom.uppercase_required": "Field must be in uppercase and consist of letters only",
   "errors.invalid_type": "",
   "errors.invalid_type_received_undefined": "Required field",
   "errors.too_big.date.exact": "Date must be exactly {maximum}",

diff --git a/locales/extracted/pt.json b/locales/extracted/pt.json
@@ -260,5 +260,6 @@
   "account.sheet.type.loans": "Empréstimos",
   "account.sheet.type.marketplace": "Mercado",
   "account.sheet.type.savings": "Poupança",
-  "ledgers.account.field.type.tooltip": "O tipo de conta"
+  "ledgers.account.field.type.tooltip": "O tipo de conta",
+  "errors.custom.uppercase_required": "O campo deve estar em maiúsculas e conter apenas letras"
 }
diff --git a/src/app/(routes)/ledgers/[id]/assets/assets-sheet.tsx b/src/app/(routes)/ledgers/[id]/assets/assets-sheet.tsx
@@ -335,7 +335,6 @@ export const AssetsSheet = ({
               <LoadingButton
                 size="lg"
                 type="submit"
-                disabled={!(form.formState.isDirty && form.formState.isValid)}
                 fullWidth
                 loading={createPending || updatePending}
               >

diff --git a/src/lib/zod/messages.ts b/src/lib/zod/messages.ts
@@ -92,6 +92,10 @@ const messages = defineMessages({
   custom_date_invalid: {
     id: 'errors.custom.date.invalid',
     defaultMessage: 'Invalid date'
+  },
+  custom_uppercase_required: {
+    id: 'errors.custom.uppercase_required',
+    defaultMessage: 'Field must be in uppercase and consist of letters only'
   }
 })
 

diff --git a/src/schema/assets.ts b/src/schema/assets.ts
@@ -1,8 +1,15 @@
 import { z } from 'zod'
 import { metadata } from './metadata'
+import { uppercaseLettersOnly, regex } from './regex'
 
 const type = z.string().min(1).max(255)
 const name = z.string().min(1).max(255)
-const code = z.string().min(1).max(255)
+const code = z
+  .string()
+  .min(1)
+  .max(255)
+  .refine(regex(uppercaseLettersOnly), {
+    params: { id: 'custom_uppercase_required' }
+  })
 
 export const assets = { type, name, code, metadata }
diff --git a/src/schema/regex.ts b/src/schema/regex.ts
@@ -10,3 +10,5 @@ export const oneLowerCaseLetter = /[a-z]/
 export const oneNumber = /[0-9]/
 
 export const onlyNumbers = /^[0-9]*$/
+
+export const uppercaseLettersOnly = /^[A-Z]+$/
Original file line number	Diff line number	Diff line change
Expand Up		@@ -10,3 +10,5 @@ export const oneLowerCaseLetter = /[a-z]/
		export const oneNumber = /[0-9]/

		export const onlyNumbers = /^[0-9]*$/

		export const uppercaseLettersOnly = /^[A-Z]+$/