From aff802a4c3c7997f058535283ab206ff7b8b502b Mon Sep 17 00:00:00 2001
From: Tomer Shvadron <tomers@ballerine.com>
Date: Tue, 3 Dec 2024 21:47:11 +0200
Subject: [PATCH 1/3] feat(signup): add job title and additional info to signup
 form

- Introduce optional job title field in signup form schema
- Modify user creation logic to include additional information
- Update UI to accommodate new form structure

(Your signup form is expanding faster than my collection of dad jokes)
---
 apps/kyb-app/src/common/types/settings.ts     |  1 +
 .../components/layouts/AppShell/AppShell.tsx  |  2 +-
 .../components/layouts/AppShell/Sidebar.tsx   |  2 +-
 .../collection-flow/collection-flow.api.ts    | 12 ++++++--
 .../pages/CollectionFlow/CollectionFlow.tsx   | 11 +++++---
 .../components/SignUpForm/SignUpForm.tsx      | 15 +++++++---
 .../SignUpForm/signup-form-schema.ts          | 28 +++++++++++++++++--
 .../collection-flow.no-user.controller.ts     | 12 ++++++--
 .../src/collection-flow/dto/signup.dto.ts     |  6 +++-
 9 files changed, 71 insertions(+), 18 deletions(-)

diff --git a/apps/kyb-app/src/common/types/settings.ts b/apps/kyb-app/src/common/types/settings.ts
index d5310f4fb8..b386bd9897 100644
--- a/apps/kyb-app/src/common/types/settings.ts
+++ b/apps/kyb-app/src/common/types/settings.ts
@@ -8,6 +8,7 @@ export interface ITheme {
     poweredBy?: boolean;
   };
   signup?: {
+    showJobTitle?: boolean;
     companyLogo: {
       imageSrc?: string;
       styles?: CSSProperties;
diff --git a/apps/kyb-app/src/components/layouts/AppShell/AppShell.tsx b/apps/kyb-app/src/components/layouts/AppShell/AppShell.tsx
index cf60de6b5b..bac48a36cf 100644
--- a/apps/kyb-app/src/components/layouts/AppShell/AppShell.tsx
+++ b/apps/kyb-app/src/components/layouts/AppShell/AppShell.tsx
@@ -10,7 +10,7 @@ interface Props {
 }
 
 export const AppShell = ({ children }: Props) => {
-  return <div className="w-ful flex h-screen flex-nowrap">{children}</div>;
+  return <div className="flex h-screen w-full flex-nowrap">{children}</div>;
 };
 
 AppShell.FormContainer = FormContainer;
diff --git a/apps/kyb-app/src/components/layouts/AppShell/Sidebar.tsx b/apps/kyb-app/src/components/layouts/AppShell/Sidebar.tsx
index 48baa1ea1c..182f66871b 100644
--- a/apps/kyb-app/src/components/layouts/AppShell/Sidebar.tsx
+++ b/apps/kyb-app/src/components/layouts/AppShell/Sidebar.tsx
@@ -7,7 +7,7 @@ interface Props {
 export const Sidebar = ({ children }: Props) => {
   return (
     <div
-      className="bg-primary text-primary-foreground col-span-2 flex h-screen w-[24%] max-w-[418px] flex-col px-14 pb-4 pt-14"
+      className="bg-primary text-primary-foreground flex h-screen w-[24rem] flex-col p-10"
       id="sidebar"
     >
       {children}
diff --git a/apps/kyb-app/src/domains/collection-flow/collection-flow.api.ts b/apps/kyb-app/src/domains/collection-flow/collection-flow.api.ts
index f5cf9ec690..d915566a79 100644
--- a/apps/kyb-app/src/domains/collection-flow/collection-flow.api.ts
+++ b/apps/kyb-app/src/domains/collection-flow/collection-flow.api.ts
@@ -108,8 +108,16 @@ export interface CreateEndUserDto {
   email: string;
   firstName: string;
   lastName: string;
+  additionalInfo?: Record<string, unknown>;
 }
 
-export const createEndUserRequest = async ({ email, firstName, lastName }: CreateEndUserDto) => {
-  await request.post('collection-flow/no-user', { json: { email, firstName, lastName } });
+export const createEndUserRequest = async ({
+  email,
+  firstName,
+  lastName,
+  additionalInfo,
+}: CreateEndUserDto) => {
+  await request.post('collection-flow/no-user', {
+    json: { email, firstName, lastName, additionalInfo },
+  });
 };
diff --git a/apps/kyb-app/src/pages/CollectionFlow/CollectionFlow.tsx b/apps/kyb-app/src/pages/CollectionFlow/CollectionFlow.tsx
index 829dd3161c..37bd012c26 100644
--- a/apps/kyb-app/src/pages/CollectionFlow/CollectionFlow.tsx
+++ b/apps/kyb-app/src/pages/CollectionFlow/CollectionFlow.tsx
@@ -200,11 +200,11 @@ export const CollectionFlow = withSessionProtected(() => {
                               <AppShell.Sidebar>
                                 <div className="flex h-full flex-col">
                                   <div className="flex h-full flex-1 flex-col">
-                                    <div className="flex flex-col gap-8 pb-10">
-                                      <div className="flex justify-start">
+                                    <div className="flex justify-between gap-8 pb-10">
+                                      <AppShell.Navigation />
+                                      <div className="flex w-full justify-end">
                                         <AppShell.LanguagePicker />
                                       </div>
-                                      <AppShell.Navigation />
                                     </div>
                                     <div className="pb-10">
                                       {customer?.logoImageUri && (
@@ -233,7 +233,10 @@ export const CollectionFlow = withSessionProtected(() => {
                                       {themeDefinition.ui?.poweredBy !== false && (
                                         <div className="flex flex-col">
                                           <div className="border-b pb-12" />
-                                          <PoweredByLogo className="mt-8" sidebarRootId="sidebar" />
+                                          <PoweredByLogo
+                                            className="mt-8 max-w-[10rem]"
+                                            sidebarRootId="sidebar"
+                                          />
                                         </div>
                                       )}
                                     </div>
diff --git a/apps/kyb-app/src/pages/SignUpPage/components/SignUpForm/SignUpForm.tsx b/apps/kyb-app/src/pages/SignUpPage/components/SignUpForm/SignUpForm.tsx
index 981fd57839..e3e3c3caa9 100644
--- a/apps/kyb-app/src/pages/SignUpPage/components/SignUpForm/SignUpForm.tsx
+++ b/apps/kyb-app/src/pages/SignUpPage/components/SignUpForm/SignUpForm.tsx
@@ -2,11 +2,12 @@ import { JsonSchemaRuleEngine } from '@/components/organisms/DynamicUI/rule-engi
 import { CreateEndUserDto } from '@/domains/collection-flow';
 import { transformRJSFErrors } from '@/helpers/transform-errors';
 import { baseLayouts, DynamicForm } from '@ballerine/ui';
-import { useCallback } from 'react';
+import { useCallback, useMemo } from 'react';
 import { toast } from 'sonner';
 import { Submit } from './components/Submit';
 import { useCreateEndUserMutation } from './hooks/useCreateEndUserMutation';
 import { signupFormSchema, signupFormUiSchema } from './signup-form-schema';
+import { useSignupLayout } from '@/common/components/layouts/Signup';
 
 const layouts = {
   ...baseLayouts,
@@ -18,6 +19,12 @@ const layouts = {
 
 export const SignUpForm = () => {
   const { createEndUserRequest, isLoading } = useCreateEndUserMutation();
+  const { themeParams } = useSignupLayout();
+
+  const signupSchema = useMemo(
+    () => signupFormSchema({ jobTitle: themeParams?.showJobTitle }),
+    [themeParams?.showJobTitle],
+  );
 
   const handleSubmit = useCallback(
     (values: Record<string, any>) => {
@@ -26,7 +33,7 @@ export const SignUpForm = () => {
       const isValid = (values: unknown): values is CreateEndUserDto => {
         return jsonValidator.test(values, {
           type: 'json-schema',
-          value: signupFormSchema,
+          value: signupSchema,
         });
       };
 
@@ -36,12 +43,12 @@ export const SignUpForm = () => {
         toast.error('Invalid form values. Something went wrong.');
       }
     },
-    [createEndUserRequest],
+    [createEndUserRequest, signupSchema],
   );
 
   return (
     <DynamicForm
-      schema={signupFormSchema}
+      schema={signupSchema}
       uiSchema={signupFormUiSchema}
       onSubmit={handleSubmit}
       transformErrors={transformRJSFErrors}
diff --git a/apps/kyb-app/src/pages/SignUpPage/components/SignUpForm/signup-form-schema.ts b/apps/kyb-app/src/pages/SignUpPage/components/SignUpForm/signup-form-schema.ts
index 06d923eb60..a47d61640d 100644
--- a/apps/kyb-app/src/pages/SignUpPage/components/SignUpForm/signup-form-schema.ts
+++ b/apps/kyb-app/src/pages/SignUpPage/components/SignUpForm/signup-form-schema.ts
@@ -1,6 +1,8 @@
 import { RJSFSchema, UiSchema } from '@rjsf/utils';
 
-export const signupFormSchema: RJSFSchema = {
+export const signupFormSchema: (props: { jobTitle?: boolean }) => RJSFSchema = ({
+  jobTitle,
+} = {}) => ({
   type: 'object',
   required: ['firstName', 'lastName', 'email'],
   properties: {
@@ -20,7 +22,27 @@ export const signupFormSchema: RJSFSchema = {
       format: 'email',
       maxLength: 254,
     },
+    additionalInfo: {
+      type: 'object',
+      default: {},
+      required: [...[jobTitle ? 'jobTitle' : null]].filter(Boolean),
+      properties: {
+        ...(jobTitle
+          ? {
+              jobTitle: {
+                type: 'string',
+                title: 'Job Title',
+                maxLength: 50,
+              },
+            }
+          : {}),
+      },
+    },
   },
-};
+});
 
-export const signupFormUiSchema: UiSchema = {};
+export const signupFormUiSchema: UiSchema = {
+  additionalInfo: {
+    'ui:label': false,
+  },
+};
diff --git a/services/workflows-service/src/collection-flow/controllers/collection-flow.no-user.controller.ts b/services/workflows-service/src/collection-flow/controllers/collection-flow.no-user.controller.ts
index 29ee389bd6..6a6b8770f0 100644
--- a/services/workflows-service/src/collection-flow/controllers/collection-flow.no-user.controller.ts
+++ b/services/workflows-service/src/collection-flow/controllers/collection-flow.no-user.controller.ts
@@ -50,7 +50,10 @@ export class CollectionFlowNoUserController {
   }
 
   @common.Post()
-  async signUp(@TokenScope() tokenScope: ITokenScope, @common.Body() payload: SignupDto) {
+  async signUp(
+    @TokenScope() tokenScope: ITokenScope,
+    @common.Body() { additionalInfo, ...payload }: SignupDto,
+  ) {
     try {
       const { workflowDefinitionId, context } =
         await this.workflowService.getWorkflowRuntimeDataById(
@@ -70,7 +73,12 @@ export class CollectionFlowNoUserController {
       await this.prismaService.$transaction(async transaction => {
         const endUser = await this.endUserService.create(
           {
-            data: { ...payload, projectId: tokenScope.projectId },
+            data: {
+              ...payload,
+              // @ts-ignore -- known issue with Prisma's JSON type
+              additionalInfo,
+              projectId: tokenScope.projectId,
+            },
           },
           transaction,
         );
diff --git a/services/workflows-service/src/collection-flow/dto/signup.dto.ts b/services/workflows-service/src/collection-flow/dto/signup.dto.ts
index 4fc4610899..fb03565127 100644
--- a/services/workflows-service/src/collection-flow/dto/signup.dto.ts
+++ b/services/workflows-service/src/collection-flow/dto/signup.dto.ts
@@ -1,5 +1,5 @@
 import { ApiProperty } from '@nestjs/swagger';
-import { IsEmail, IsNotEmpty, IsString, MaxLength } from 'class-validator';
+import { IsEmail, IsNotEmpty, IsOptional, IsString, MaxLength } from 'class-validator';
 
 export class SignupDto {
   @ApiProperty({ required: true, type: String })
@@ -19,4 +19,8 @@ export class SignupDto {
   @IsNotEmpty()
   @MaxLength(254)
   email!: string;
+
+  @ApiProperty({ required: false })
+  @IsOptional()
+  additionalInfo?: Record<string, unknown>;
 }

From cdd020259e62fc73f4eec4dbb30114d20fb6106c Mon Sep 17 00:00:00 2001
From: Tomer Shvadron <tomers@ballerine.com>
Date: Tue, 3 Dec 2024 23:58:43 +0200
Subject: [PATCH 2/3] feat(database): add DBA column to Business model and
 migration

- Introduce a new 'dba' column to the Business schema
- Create migration for adding the 'dba' column in the database

(Your database schema has more additions than my Netflix watchlist)
---
 services/workflows-service/prisma/data-migrations               | 2 +-
 .../20241203215328_dba_column_in_business_table/migration.sql   | 2 ++
 services/workflows-service/prisma/schema.prisma                 | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)
 create mode 100644 services/workflows-service/prisma/migrations/20241203215328_dba_column_in_business_table/migration.sql

diff --git a/services/workflows-service/prisma/data-migrations b/services/workflows-service/prisma/data-migrations
index 79ee883a56..ba511b855d 160000
--- a/services/workflows-service/prisma/data-migrations
+++ b/services/workflows-service/prisma/data-migrations
@@ -1 +1 @@
-Subproject commit 79ee883a5606b2dc562ac8530bb493e2e23faadd
+Subproject commit ba511b855dd18506ef8f042dabc114907f9c531d
diff --git a/services/workflows-service/prisma/migrations/20241203215328_dba_column_in_business_table/migration.sql b/services/workflows-service/prisma/migrations/20241203215328_dba_column_in_business_table/migration.sql
new file mode 100644
index 0000000000..ddc8d60ad9
--- /dev/null
+++ b/services/workflows-service/prisma/migrations/20241203215328_dba_column_in_business_table/migration.sql
@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "Business" ADD COLUMN     "dba" TEXT;
diff --git a/services/workflows-service/prisma/schema.prisma b/services/workflows-service/prisma/schema.prisma
index 66bfad1b06..826184334f 100644
--- a/services/workflows-service/prisma/schema.prisma
+++ b/services/workflows-service/prisma/schema.prisma
@@ -124,6 +124,7 @@ model Business {
   companyName             String // Official registered name of the business entity
   registrationNumber      String? // Unique registration number assigned by the relevant authorities
   legalForm               String? // Legal structure of the business entity, e.g., LLC, corporation, partnership
+  dba                     String? // Doing Business As (DBA) name of the business entity
   country                 String?
   countryOfIncorporation  String? // Country where the business entity is incorporated
   dateOfIncorporation     DateTime? // Date when the business entity was incorporated

From ca2506b07d5ad50a459db829ec9d8b309f5a36b0 Mon Sep 17 00:00:00 2001
From: Tomer Shvadron <tomers@ballerine.com>
Date: Thu, 5 Dec 2024 00:21:17 +0200
Subject: [PATCH 3/3] fix(ui-definition): correct URL formatting in collection
 flow event
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Update URLs to remove unnecessary closing curly braces
- Ensure consistent formatting across multiple files

(your code is like a URL with a typo—hard to reach the destination)
---
 services/workflows-service/prisma/data-migrations               | 2 +-
 .../kyb-parent-dynamic-example/pages/defintion-logic.ts         | 2 +-
 .../associated-company-ui-def/associated-ui-definition.ts       | 2 +-
 .../kyb-with-associated-company-ui-def/defintion-logic.ts       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/services/workflows-service/prisma/data-migrations b/services/workflows-service/prisma/data-migrations
index ba511b855d..32292b88a8 160000
--- a/services/workflows-service/prisma/data-migrations
+++ b/services/workflows-service/prisma/data-migrations
@@ -1 +1 @@
-Subproject commit ba511b855dd18506ef8f042dabc114907f9c531d
+Subproject commit 32292b88a8cde04e4f099c985ca41858e5045476
diff --git a/services/workflows-service/scripts/workflows/ui-definition/kyb-parent-dynamic-example/pages/defintion-logic.ts b/services/workflows-service/scripts/workflows/ui-definition/kyb-parent-dynamic-example/pages/defintion-logic.ts
index 1cfb482569..38791fdc42 100644
--- a/services/workflows-service/scripts/workflows/ui-definition/kyb-parent-dynamic-example/pages/defintion-logic.ts
+++ b/services/workflows-service/scripts/workflows/ui-definition/kyb-parent-dynamic-example/pages/defintion-logic.ts
@@ -117,7 +117,7 @@ export const definition = {
       {
         name: 'send_collection_flow_finished',
         pluginKind: 'api',
-        url: `{collectionFlow.config.apiUrl}/api/v1/collection-flow/send-event}`,
+        url: `{collectionFlow.config.apiUrl}/api/v1/collection-flow/send-event`,
         method: 'POST',
         stateNames: ['finish'],
         headers: { Authorization: 'Bearer {query.token}' },
diff --git a/services/workflows-service/scripts/workflows/ui-definition/kyb-with-associated-companies/ui-definition/associated-company-ui-def/associated-ui-definition.ts b/services/workflows-service/scripts/workflows/ui-definition/kyb-with-associated-companies/ui-definition/associated-company-ui-def/associated-ui-definition.ts
index 204f56b2ab..d9ad3a3425 100644
--- a/services/workflows-service/scripts/workflows/ui-definition/kyb-with-associated-companies/ui-definition/associated-company-ui-def/associated-ui-definition.ts
+++ b/services/workflows-service/scripts/workflows/ui-definition/kyb-with-associated-companies/ui-definition/associated-company-ui-def/associated-ui-definition.ts
@@ -145,7 +145,7 @@ export const definition = {
       {
         name: 'send_collection_flow_finished',
         pluginKind: 'api',
-        url: `{collectionFlow.config.apiUrl}/api/v1/collection-flow/send-event}`,
+        url: `{collectionFlow.config.apiUrl}/api/v1/collection-flow/send-event`,
         method: 'POST',
         stateNames: ['finish'],
         headers: { Authorization: 'Bearer {query.token}' },
diff --git a/services/workflows-service/scripts/workflows/ui-definition/kyb-with-associated-companies/ui-definition/kyb-with-associated-company-ui-def/defintion-logic.ts b/services/workflows-service/scripts/workflows/ui-definition/kyb-with-associated-companies/ui-definition/kyb-with-associated-company-ui-def/defintion-logic.ts
index c5fbf922f8..ce62318ce4 100644
--- a/services/workflows-service/scripts/workflows/ui-definition/kyb-with-associated-companies/ui-definition/kyb-with-associated-company-ui-def/defintion-logic.ts
+++ b/services/workflows-service/scripts/workflows/ui-definition/kyb-with-associated-companies/ui-definition/kyb-with-associated-company-ui-def/defintion-logic.ts
@@ -129,7 +129,7 @@ export const definition = {
       {
         name: 'send_collection_flow_finished',
         pluginKind: 'api',
-        url: `{collectionFlow.config.apiUrl}/api/v1/collection-flow/send-event}`,
+        url: `{collectionFlow.config.apiUrl}/api/v1/collection-flow/send-event`,
         method: 'POST',
         stateNames: ['finish'],
         headers: { Authorization: 'Bearer {query.token}' },