dev to sb (#3420)

* BAL-3932: Create directors with entity.variant of director (#3399)

* feat: added variant to end user & updated entity creation & updated endpoints

* feat: updated context schema & dto fix

* chore: lock fix

* chore: bump

* Bal 4297 documents tracker mapping (#3402)

* feat: added variant to end user & updated entity creation & updated endpoints

* feat: reworked documents mapping & fixed state computation

* fix: post merge fix

* fix: added assert valid project ids

* chore: bump kyb & ui (#3415)

* fix: fixed edit buttons (#3417)

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

* fix: added handling for pattern errors & schema fixes

* feat: added flags support to pattern validator

* chore: bump

* fix: fixed schema

* chore: cleaned logs

* feat: reorganized schemas

Author: chesterkmr

apps/backoffice-v2/CHANGELOG.md

@@ -1,5 +1,32 @@
 # @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
+
+- Updated dependencies
+  - @ballerine/ui@0.7.168
+  - @ballerine/react-pdf-toolkit@1.2.129
+
+## 0.7.167
+
+### Patch Changes
+
+- Updated dependencies
+  - @ballerine/common@0.9.117
+  - @ballerine/ui@0.7.167
+  - @ballerine/workflow-browser-sdk@0.6.141
+  - @ballerine/react-pdf-toolkit@1.2.128
+  - @ballerine/workflow-node-sdk@0.6.141
+
 ## 0.7.166
 
 ### Patch Changes

apps/backoffice-v2/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ballerine/backoffice-v2",
-  "version": "0.7.166",
+  "version": "0.7.169",
   "description": "Ballerine - Backoffice",
   "homepage": "https://github.com/ballerine-io/ballerine",
   "type": "module",
@@ -52,12 +52,12 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@ballerine/react-pdf-toolkit": "^1.2.127",
-    "@ballerine/ui": "0.7.164",
+    "@ballerine/react-pdf-toolkit": "^1.2.130",
+    "@ballerine/ui": "0.7.169",
     "@ballerine/blocks": "0.2.47",
-    "@ballerine/common": "0.9.116",
-    "@ballerine/workflow-browser-sdk": "0.6.140",
-    "@ballerine/workflow-node-sdk": "0.6.140",
+    "@ballerine/common": "0.9.117",
+    "@ballerine/workflow-browser-sdk": "0.6.141",
+    "@ballerine/workflow-node-sdk": "0.6.141",
     "@fontsource/inter": "^4.5.15",
     "@formkit/auto-animate": "0.8.2",
     "@hookform/resolvers": "^3.1.0",

apps/backoffice-v2/src/common/components/molecules/DocumentTracker/hooks/useDocumentTracker.tsx

@@ -46,7 +46,7 @@ export const useDocumentTracker = ({ workflowId }: { workflowId: string }) => {
           templateId: identifier.document.type,
           entity: {
             id: identifier.entity.id,
-            type: identifier.entity.entityType,
+            type: identifier.entity.variant,
           },
         })),
       }),

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']),
@@ -25,16 +21,16 @@ export const DocumentTrackerItemSchema = z.object({
       issuingVersion: z.string(),
       version: z.string(),
     }),
-    entity: z.discriminatedUnion('entityType', [
+    entity: z.discriminatedUnion('variant', [
       ObjectWithIdSchema.extend({
-        entityType: z.literal(EntityType.BUSINESS),
+        variant: z.literal(EntityType.BUSINESS),
         companyName: z.string(),
       }),
       EndUserSchema.extend({
-        entityType: z.literal(EntityType.UBO),
+        variant: z.literal(EntityType.UBO),
       }),
       EndUserSchema.extend({
-        entityType: z.literal(EntityType.DIRECTOR),
+        variant: z.literal(EntityType.DIRECTOR),
       }),
     ]),
   }),

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,6 +46,7 @@ export const EndUserSchema = z.object({
       }),
     })
     .optional(),
+  variant: z.enum(['director', 'ubo']).optional().nullable(),
   createdFrom: z.enum(['user', 'analyst', 'registry']).nullable().optional(),
 });
 

apps/backoffice-v2/src/lib/blocks/hooks/useDirectorsDocuments/helpers/get-directors-ids-from-workflow.ts

@@ -1,7 +1,5 @@
 import { TWorkflowById } from '@/domains/workflows/fetchers';
-import { selectDirectors } from '@/pages/Entity/selectors/selectDirectors';
 
 export const getDirectorsIdsFromWorkflow = (workflow: TWorkflowById) =>
-  selectDirectors(workflow)
-    .map(director => director.ballerineEntityId)
-    .filter(Boolean);
+  workflow.endUsers?.filter(endUser => endUser.variant === 'director').map(endUser => endUser.id) ||
+  [];

apps/backoffice-v2/src/lib/blocks/hooks/useDirectorsDocuments/useDirectorsDocuments.ts

@@ -9,6 +9,7 @@ export const useDirectorsDocuments = (workflow: TWorkflowById) => {
 
   const { documents, documentsSchemas, isLoading } = useWorkflowDocumentsAdapter({
     entityIds,
+    // TODO: Remove once documents v1 are deprecated
     documents: (workflow?.context?.entity?.data?.additionalInfo?.directors?.flatMap(
       director => director.documents ?? [],
     ) ?? []) as TDocument[],

apps/backoffice-v2/src/lib/blocks/hooks/useEntityInfoBlock/useEntityInfoBlock.tsx

@@ -117,5 +117,5 @@ export const useEntityInfoBlock = ({
           .buildFlat(),
       })
       .build();
-  }, [entity, workflow]);
+  }, [entity, workflow, onEdit, isEditDisabled]);
 };

apps/backoffice-v2/src/lib/blocks/hooks/useKYCBusinessInformationBlock/useKYCBusinessInformationBlock.ts

@@ -4,6 +4,7 @@ import { useEntityInfoBlock } from '@/lib/blocks/hooks/useEntityInfoBlock/useEnt
 import { useCaseState } from '@/pages/Entity/components/Case/hooks/useCaseState/useCaseState';
 import { useCurrentCaseQuery } from '@/pages/Entity/hooks/useCurrentCaseQuery/useCurrentCaseQuery';
 import { StateTag } from '@ballerine/common';
+import { EDIT_TEMPLATES } from '@/pages/Entity/components/Case/components/CaseOptions/hooks/useEditCollectionFlow';
 
 export const useKYCBusinessInformationBlock = () => {
   const { data: workflow } = useCurrentCaseQuery();
@@ -19,7 +20,7 @@ export const useKYCBusinessInformationBlock = () => {
     ...entityDataAdditionalInfo
   } = workflow?.context?.entity?.data?.additionalInfo ?? {};
 
-  const { onEditCollectionFlow } = useEditCollectionFlow();
+  const { onEditCollectionFlow } = useEditCollectionFlow(EDIT_TEMPLATES.COMPANY_DETAILS);
   const { data: session } = useAuthenticatedUserQuery();
   const caseState = useCaseState(session?.user ?? null, workflow);
 
@@ -31,7 +32,7 @@ export const useKYCBusinessInformationBlock = () => {
       !workflow?.tags?.includes(StateTag.MANUAL_REVIEW),
       !workflow?.workflowDefinition?.config?.editableContext?.entityInfo,
     ].some(Boolean),
-    onEdit: onEditCollectionFlow({ steps: ['company_details'] }),
+    onEdit: onEditCollectionFlow,
   });
 
   return blocks;

apps/backoffice-v2/src/lib/blocks/hooks/useUbosDocuments/helpers/get-ubos-entity-ids-from-workflow.ts

@@ -1,19 +1,7 @@
 import { TWorkflowById } from '@/domains/workflows/fetchers';
 
 export const getUbosEntityIdsFromWorkflow = (workflow: TWorkflowById) => {
-  const directorsIds =
-    workflow?.context?.entity?.data?.additionalInfo?.directors
-      ?.map(director => director.ballerineEntityId)
-      .filter(Boolean) ?? [];
-
   return (
-    workflow?.childWorkflows
-      ?.filter(
-        childWorkflow =>
-          childWorkflow.context?.entity?.variant === 'ubo' &&
-          !directorsIds.includes(childWorkflow.context?.entity?.ballerineEntityId),
-      )
-      ?.map(childWorkflow => childWorkflow.context?.entity?.ballerineEntityId)
-      .filter(Boolean) ?? []
+    workflow.endUsers?.filter(endUser => endUser.variant === 'ubo').map(endUser => endUser.id) || []
   );
 };