B2B-30: adds personal code to account, company admins invites members

packages/features/admin/src/components/admin-account-page.tsx

@@ -28,6 +28,12 @@ import { AdminMembersTable } from './admin-members-table';
 import { AdminMembershipsTable } from './admin-memberships-table';
 import { AdminReactivateUserDialog } from './admin-reactivate-user-dialog';
 
+import {
+  AccountInvitationsTable,
+  AccountMembersTable,
+  InviteMembersDialogContainer,
+} from '@kit/team-accounts/components';
+
 type Account = Tables<'accounts'>;
 type Membership = Tables<'accounts_memberships'>;
 
@@ -146,8 +152,6 @@ async function PersonalAccountPage(props: { account: Account }) {
         </div>
 
         <div className={'flex flex-col gap-y-8'}>
-          <SubscriptionsTable accountId={props.account.id} />
-
           <div className={'divider-divider-x flex flex-col gap-y-2.5'}>
             <Heading level={6}>Companies</Heading>
 
@@ -213,7 +217,7 @@ async function TeamAccountPage(props: {
           <div className={'flex flex-col gap-y-8'}>
 
             <div className={'flex flex-col gap-y-2.5'}>
-              <Heading level={6}>Company Employees</Heading>
+              <Heading level={6}>Company Members</Heading>
 
               <AdminMembersTable members={members} />
             </div>

packages/features/admin/src/components/admin-accounts-table.tsx

@@ -179,6 +179,14 @@ function getColumns(): ColumnDef<Account>[] {
       header: 'Email',
       accessorKey: 'email',
     },
+    {
+      id: 'personalCode',
+      header: 'Personal Code',
+      accessorKey: 'personalCode',
+      cell: ({ row }) => {
+        return row.original.personal_code ?? '-';
+      },
+    },
     {
       id: 'type',
       header: 'Type',

packages/features/admin/src/components/admin-create-user-dialog.tsx

@@ -48,8 +48,9 @@ export function AdminCreateUserDialog(props: React.PropsWithChildren) {
       email: '',
       password: '',
       emailConfirm: false,
+      personalCode: ''
     },
-    mode: 'onChange',
+    mode: 'onBlur',
   });
 
   const onSubmit = (data: CreateUserSchemaType) => {
@@ -98,6 +99,25 @@ export function AdminCreateUserDialog(props: React.PropsWithChildren) {
               </Alert>
             </If>
 
+            <FormField
+              name={'personalCode'}
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>Personal code</FormLabel>
+
+                  <FormControl>
+                    <Input
+                      required
+                      type="text"
+                      placeholder={'48506040199'}
+                      {...field}
+                    />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+
             <FormField
               name={'email'}
               render={({ field }) => (

packages/features/admin/src/components/admin-members-table.tsx

@@ -52,7 +52,7 @@ function getColumns(): ColumnDef<Memberships>[] {
     {
       header: 'Role',
       cell: ({ row }) => {
-        return row.original.role === 'owner' ? 'HR' : 'Employee';
+        return row.original.role === 'owner' ? 'Admin' : 'Member';
       },
     },
     {

packages/features/admin/src/lib/server/admin-server-actions.ts

@@ -160,7 +160,7 @@ export const deleteAccountAction = adminAction(
  */
 export const createUserAction = adminAction(
   enhanceAction(
-    async ({ email, password, emailConfirm }) => {
+    async ({ email, password, emailConfirm, personalCode }) => {
       const adminClient = getSupabaseServerAdminClient();
       const logger = await getLogger();
 
@@ -182,6 +182,16 @@ export const createUserAction = adminAction(
         `Super Admin has successfully created a new user`,
       );
 
+      const { error: accountError } = await adminClient
+        .from('accounts')
+        .update({ personal_code: personalCode })
+        .eq('id', data.user.id);
+
+      if (accountError) {
+        logger.error({ accountError }, 'Error inserting personal code to accounts');
+        throw new Error(`Error saving personal code: ${accountError.message}`);
+      }
+
       revalidateAdmin();
 
       return {

packages/features/admin/src/lib/server/schema/create-user-profile.schema.ts

@@ -0,0 +1,10 @@
+import { z } from 'zod';
+
+export const CreateUserProfileSchema = z.object({
+  personalCode: z.string().regex(/^[1-6]\d{2}(0[1-9]|1[0-2])(0[1-9]|[12]\d|3[01])\d{3}\d$/, {
+    message: 'Invalid Estonian personal code format',
+  }),
+});
+
+export type CreateUserProfileSchemaType = z.infer<typeof CreateUserProfileSchema>;
+

packages/features/admin/src/lib/server/schema/create-user.schema.ts

@@ -1,6 +1,9 @@
 import { z } from 'zod';
 
 export const CreateUserSchema = z.object({
+  personalCode: z.string().regex(/^[1-6]\d{2}(0[1-9]|1[0-2])(0[1-9]|[12]\d|3[01])\d{3}\d$/, {
+    message: 'Invalid Estonian personal code format',
+  }),
   email: z.string().email({ message: 'Please enter a valid email address' }),
   password: z
     .string()