fix: added handling for pattern errors & schema fixes (#3416)

chesterkmr · web-flow · commit 5dfd72734963 · 2025-06-14T16:45:06.000+03:00
* fix: added handling for pattern errors &amp; schema fixes

* feat: added flags support to pattern validator

* chore: bump

* fix: fixed schema

* chore: cleaned logs

* feat: reorganized schemas
diff --git a/apps/backoffice-v2/CHANGELOG.md b/apps/backoffice-v2/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @ballerine/backoffice-v2
 
+## 0.7.169
+
+### Patch Changes
+
+- Updated dependencies
+  - @ballerine/ui@0.7.169
+  - @ballerine/react-pdf-toolkit@1.2.130
+
 ## 0.7.168
 
 ### Patch Changes
diff --git a/apps/backoffice-v2/package.json b/apps/backoffice-v2/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ballerine/backoffice-v2",
-  "version": "0.7.168",
+  "version": "0.7.169",
   "description": "Ballerine - Backoffice",
   "homepage": "https://github.com/ballerine-io/ballerine",
   "type": "module",
@@ -52,8 +52,8 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@ballerine/react-pdf-toolkit": "^1.2.129",
-    "@ballerine/ui": "0.7.168",
+    "@ballerine/react-pdf-toolkit": "^1.2.130",
+    "@ballerine/ui": "0.7.169",
     "@ballerine/blocks": "0.2.47",
     "@ballerine/common": "0.9.117",
     "@ballerine/workflow-browser-sdk": "0.6.141",
diff --git a/apps/backoffice-v2/src/domains/documents/schemas.ts b/apps/backoffice-v2/src/domains/documents/schemas.ts
@@ -1,17 +1,13 @@
 import { ObjectWithIdSchema } from '@/lib/zod/utils/object-with-id/object-with-id';
 import { z } from 'zod';
+import { EndUserVariantSchema, EntityType } from '../individuals/fetchers';
 
 export const EndUserSchema = ObjectWithIdSchema.extend({
   firstName: z.string(),
   lastName: z.string(),
+  variant: EndUserVariantSchema.optional().nullable(),
 });
 
-export const EntityType = {
-  BUSINESS: 'business',
-  UBO: 'ubo',
-  DIRECTOR: 'director',
-} as const;
-
 export const DocumentTrackerItemSchema = z.object({
   documentId: z.string().nullable(),
   status: z.enum(['provided', 'unprovided', 'requested']),
diff --git a/apps/backoffice-v2/src/domains/individuals/fetchers.ts b/apps/backoffice-v2/src/domains/individuals/fetchers.ts
@@ -8,6 +8,14 @@ import { HitSchema } from '@/lib/blocks/components/AmlBlock/utils/aml-adapter';
 
 import { apiClient } from '@/common/api-client/api-client';
 
+export const EntityType = {
+  BUSINESS: 'business',
+  UBO: 'ubo',
+  DIRECTOR: 'director',
+} as const;
+
+export const EndUserVariantSchema = z.enum([EntityType.UBO, EntityType.DIRECTOR]);
+
 export const EndUserSchema = z.object({
   id: z.string(),
   firstName: z.string(),
@@ -38,7 +46,7 @@ export const EndUserSchema = z.object({
       }),
     })
     .optional(),
-  variant: z.enum(['director', 'ubo']).optional(),
+  variant: z.enum(['director', 'ubo']).optional().nullable(),
   createdFrom: z.enum(['user', 'analyst', 'registry']).nullable().optional(),
 });
 
diff --git a/apps/backoffice-v2/src/lib/blocks/hooks/useDocumentBlocks/hooks/useDocuments/useDocuments.ts b/apps/backoffice-v2/src/lib/blocks/hooks/useDocumentBlocks/hooks/useDocuments/useDocuments.ts
@@ -36,8 +36,6 @@ export const useDocuments = (workflow: TWorkflowById) => {
     useUbosDocuments(workflow as TWorkflowById),
   ];
 
-  console.log('ubo documents', ubosDocuments);
-
   const businessDocumentsWithEntity = useMemo(
     () =>
       businessDocuments.map(document => ({
diff --git a/apps/backoffice-v2/src/pages/Entities/components/CaseCreation/components/CaseCreationForm/utils/transform-errors.ts b/apps/backoffice-v2/src/pages/Entities/components/CaseCreation/components/CaseCreationForm/utils/transform-errors.ts
@@ -48,8 +48,8 @@ export const transformErrors = (errors: RJSFValidationError[]): RJSFValidationEr
       }.`;
     }
 
-    if (errorCopy.params?.format === 'email') {
-      errorCopy.message = 'Please provide valid email address.';
+    if (errorCopy.params?.pattern) {
+      errorCopy.message = `Text must match the pattern ${errorCopy.params.pattern}`;
     }
 
     return errorCopy;
diff --git a/apps/kyb-app/CHANGELOG.md b/apps/kyb-app/CHANGELOG.md
@@ -1,5 +1,13 @@
 # kyb-app
 
+## 0.3.198
+
+### Patch Changes
+
+- Bump
+- Updated dependencies
+  - @ballerine/ui@0.7.169
+
 ## 0.3.197
 
 ### Patch Changes
diff --git a/apps/kyb-app/package.json b/apps/kyb-app/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@ballerine/kyb-app",
   "private": true,
-  "version": "0.3.197",
+  "version": "0.3.198",
   "type": "module",
   "scripts": {
     "dev": "vite",
@@ -18,7 +18,7 @@
   "dependencies": {
     "@ballerine/blocks": "0.2.47",
     "@ballerine/common": "^0.9.117",
-    "@ballerine/ui": "0.7.168",
+    "@ballerine/ui": "0.7.169",
     "@ballerine/workflow-browser-sdk": "0.6.141",
     "@lukemorales/query-key-factory": "^1.0.3",
     "@radix-ui/react-icons": "^1.3.0",
diff --git a/packages/react-pdf-toolkit/CHANGELOG.md b/packages/react-pdf-toolkit/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @ballerine/react-pdf-toolkit
 
+## 1.2.130
+
+### Patch Changes
+
+- Updated dependencies
+  - @ballerine/ui@0.7.169
+
 ## 1.2.129
 
 ### Patch Changes
diff --git a/packages/react-pdf-toolkit/package.json b/packages/react-pdf-toolkit/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@ballerine/react-pdf-toolkit",
   "private": false,
-  "version": "1.2.129",
+  "version": "1.2.130",
   "types": "./dist/build.d.ts",
   "main": "./dist/react-pdf-toolkit.js",
   "module": "./dist/react-pdf-toolkit.mjs",
@@ -27,7 +27,7 @@
   },
   "dependencies": {
     "@ballerine/config": "^1.1.44",
-    "@ballerine/ui": "0.7.168",
+    "@ballerine/ui": "0.7.169",
     "@react-pdf/renderer": "^3.1.14",
     "@sinclair/typebox": "^0.31.7",
     "ajv": "^8.12.0",
diff --git a/packages/ui/CHANGELOG.md b/packages/ui/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @ballerine/ui
 
+## 0.7.169
+
+### Patch Changes
+
+- Bump
+
 ## 0.7.168
 
 ### Patch Changes
diff --git a/packages/ui/package.json b/packages/ui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@ballerine/ui",
   "private": false,
-  "version": "0.7.168",
+  "version": "0.7.169",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
diff --git a/packages/ui/src/components/organisms/Form/Validator/validators/pattern/pattern-validator.ts b/packages/ui/src/components/organisms/Form/Validator/validators/pattern/pattern-validator.ts
@@ -10,7 +10,7 @@ export const patternValueValidator: TValidator<string, IPatternValidatorParams>
 
   if (typeof value !== 'string') return true;
 
-  if (!new RegExp(params.value.pattern).test(value as string)) {
+  if (!new RegExp(params.value.pattern, params.value.flags).test(value as string)) {
     throw new Error(formatErrorMessage(message, 'pattern', params.value.pattern));
   }
 };
diff --git a/packages/ui/src/components/organisms/Form/Validator/validators/pattern/types.ts b/packages/ui/src/components/organisms/Form/Validator/validators/pattern/types.ts
@@ -1,3 +1,4 @@
 export interface IPatternValidatorParams {
   pattern: string;
+  flags?: string;
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/services/workflows-service/prisma/data-migrations b/services/workflows-service/prisma/data-migrations
@@ -1 +1 @@
-Subproject commit 1d5a1b01b87cb8082f2dd7ba17f96129d8a2703e
+Subproject commit 3c5019318b61838284cf71499b75cc1f34ab0fab

Original file line number	Diff line number	Diff line change
`@@ -48,8 +48,8 @@ export const transformErrors = (errors: RJSFValidationError[]): RJSFValidationEr`
`48`	`48`	}.`;
`49`	`49`	`}`
`50`	`50`
`51`		`- if (errorCopy.params?.format === 'email') {`
`52`		`- errorCopy.message = 'Please provide valid email address.';`
	`51`	`+ if (errorCopy.params?.pattern) {`
	`52`	+ errorCopy.message = `Text must match the pattern ${errorCopy.params.pattern}`;
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`return errorCopy;`