@carlonicora/nextjs-jsonapi 1.29.1 → 1.29.3

package/src/features/notification/contexts/NotificationContext.tsx

@@ -141,7 +141,7 @@ export const NotificationContextProvider = ({ children }: NotificationContextPro
     const response: BreadcrumbItemData[] = [];
 
     response.push({
-      name: t(`types.notifications`, { count: 2 }),
+      name: t(`entities.notifications`, { count: 2 }),
     });
 
     return response;
@@ -149,7 +149,7 @@ export const NotificationContextProvider = ({ children }: NotificationContextPro
 
   const title = () => {
     const response: any = {
-      type: t(`types.notifications`, { count: 2 }),
+      type: t(`entities.notifications`, { count: 2 }),
     };
 
     return response;

package/src/features/role/components/details/RoleDetails.tsx

@@ -14,7 +14,7 @@ export function RoleDetails() {
   return (
     <Card className="w-full">
       <CardContent className="p-4">
-        <AttributeElement title={t(`foundations.role.fields.description.label`)} value={role.description} />
+        <AttributeElement title={t(`role.fields.description.label`)} value={role.description} />
       </CardContent>
     </Card>
   );

package/src/features/role/components/forms/FormRoles.tsx

@@ -53,11 +53,11 @@ export function FormRoles({ form, id, name, roles }: FormRolesProps) {
                     <Tooltip>
                       <TooltipTrigger>
                         <FieldLabel className="ml-3 font-normal">
-                          {t(`foundations.role.roles`, { role: role.id.replaceAll(`-`, ``) })}
+                          {t(`role.roles`, { role: role.id.replaceAll(`-`, ``) })}
                         </FieldLabel>
                       </TooltipTrigger>
                       <TooltipContent>
-                        {t(`foundations.role.roles_descriptions`, { role: role.id.replaceAll(`-`, ``) })}
+                        {t(`role.roles_descriptions`, { role: role.id.replaceAll(`-`, ``) })}
                       </TooltipContent>
                     </Tooltip>
                   </div>

package/src/features/role/components/forms/RemoveUserFromRole.tsx

@@ -56,11 +56,11 @@ export function RemoveUserFromRole({ role, user, refresh }: RemoveUserFromRolePr
       setOpen(false);
       refresh();
     } catch (error) {
-      errorToast({ title: t(`generic.errors.error`), error: error });
+      errorToast({ title: t(`common.errors.error`), error: error });
     }
   };
 
-  const roleName = t(`foundations.role.roles`, { role: role.id.replaceAll(`-`, ``) });
+  const roleName = t(`role.roles`, { role: role.id.replaceAll(`-`, ``) });
 
   return (
     <Dialog open={open} onOpenChange={setOpen}>
@@ -71,23 +71,21 @@ export function RemoveUserFromRole({ role, user, refresh }: RemoveUserFromRolePr
           setOpen(true);
         }}
       >
-        <span className="hover:text-destructive cursor-pointer">{t(`foundations.role.remove_user.title`)}</span>
+        <span className="hover:text-destructive cursor-pointer">{t(`role.remove_user.title`)}</span>
       </DialogTrigger>
       <DialogContent className={`flex max-h-[70vh] max-w-3xl flex-col overflow-y-auto`}>
         <DialogHeader>
-          <DialogTitle>{t(`foundations.role.remove_user.title`)}</DialogTitle>
+          <DialogTitle>{t(`role.remove_user.title`)}</DialogTitle>
           <DialogDescription>
-            {canRemove
-              ? t(`foundations.role.remove_user.subtitle_allowed`)
-              : t(`foundations.role.remove_user.subtitle_not_allowed`)}
+            {canRemove ? t(`role.remove_user.subtitle_allowed`) : t(`role.remove_user.subtitle_not_allowed`)}
           </DialogDescription>
         </DialogHeader>
         {canRemove ? (
           <>
-            {t(`foundations.role.remove_user.description_allowed`, { role: roleName, user: user.name })}
+            {t(`role.remove_user.description_allowed`, { role: roleName, user: user.name })}
             <div className="flex justify-end">
               <Button className="mr-2" variant={"outline"} type={`button`} onClick={() => setOpen(false)}>
-                {t(`generic.buttons.cancel`)}
+                {t(`ui.buttons.cancel`)}
               </Button>
               <Button
                 type="submit"
@@ -97,12 +95,12 @@ export function RemoveUserFromRole({ role, user, refresh }: RemoveUserFromRolePr
                 }}
                 variant={"destructive"}
               >
-                {t(`generic.buttons.confirm_delete`)}
+                {t(`ui.buttons.confirm_delete`)}
               </Button>
             </div>
           </>
         ) : (
-          <>{t(`foundations.role.remove_user.description_not_allowed`, { role: roleName, user: user.name })}</>
+          <>{t(`role.remove_user.description_not_allowed`, { role: roleName, user: user.name })}</>
         )}
       </DialogContent>
     </Dialog>

package/src/features/role/components/forms/UserRoleAdd.tsx

@@ -40,14 +40,14 @@ export function UserRoleAdd({ user, refresh }: UserRoleAddProps) {
     setRoles(roles.filter((u) => u.id !== role.id));
 
     toast.message(
-      t(`generic.association.label`, {
-        source: t(`types.roles`, { count: 1 }),
-        destination: t(`types.users`, { count: 1 }),
+      t(`common.association.label`, {
+        source: t(`entities.roles`, { count: 1 }),
+        destination: t(`entities.users`, { count: 1 }),
       }),
       {
-        description: t(`generic.association.success`, {
-          source: t(`types.roles`, { count: 1 }),
-          destination: t(`types.users`, { count: 1 }),
+        description: t(`common.association.success`, {
+          source: t(`entities.roles`, { count: 1 }),
+          destination: t(`entities.users`, { count: 1 }),
           source_name: role.name,
           destination_name: user.name,
         }),
@@ -83,34 +83,34 @@ export function UserRoleAdd({ user, refresh }: UserRoleAddProps) {
     <>
       <Button size="sm" onClick={() => setOpen(true)}>
         <PlusCircle className="mr-3 h-3.5 w-3.5" />
-        {t(`generic.association.label`, {
-          source: t(`types.roles`, { count: 1 }),
-          destination: t(`types.users`, { count: 1 }),
+        {t(`common.association.label`, {
+          source: t(`entities.roles`, { count: 1 }),
+          destination: t(`entities.users`, { count: 1 }),
         })}
       </Button>
       <CommandDialog open={open} onOpenChange={setOpen}>
         <DialogTitle>
-          {t(`generic.association.label`, {
-            source: t(`types.roles`, { count: 1 }),
-            destination: t(`types.users`, { count: 1 }),
+          {t(`common.association.label`, {
+            source: t(`entities.roles`, { count: 1 }),
+            destination: t(`entities.users`, { count: 1 }),
           })}
         </DialogTitle>
         <DialogDescription>
-          {t(`generic.association.description`, {
-            source: t(`types.roles`, { count: 1 }),
-            destination: t(`types.users`, { count: 1 }),
+          {t(`common.association.description`, {
+            source: t(`entities.roles`, { count: 1 }),
+            destination: t(`entities.users`, { count: 1 }),
             destination_name: user.name,
           })}
         </DialogDescription>
         <Command shouldFilter={false}>
           <CommandInput
-            placeholder={t(`generic.search.placeholder`, { type: t(`types.roles`, { count: 1 }) })}
+            placeholder={t(`ui.search.placeholder`, { type: t(`entities.roles`, { count: 1 }) })}
             value={searchTerm}
             onValueChange={setSearchTerm}
             ref={inputRef}
           />
           <CommandList className="mt-3 h-auto max-h-96 min-h-96 max-w-full overflow-x-hidden overflow-y-auto">
-            <CommandEmpty>{t(`generic.search.no_results`, { type: t(`types.roles`, { count: 1 }) })}</CommandEmpty>
+            <CommandEmpty>{t(`ui.search.no_results`, { type: t(`entities.roles`, { count: 1 }) })}</CommandEmpty>
             {roles.map((role: RoleInterface) => (
               <CommandItem
                 className="cursor-pointer hover:bg-muted data-selected:hover:bg-muted bg-transparent data-selected:bg-transparent"
@@ -118,7 +118,7 @@ export function UserRoleAdd({ user, refresh }: UserRoleAddProps) {
                 onSelect={() => addUserToRole(role)}
                 onClick={() => addUserToRole(role)}
               >
-                {t(`foundations.role.roles`, { role: role.id.replaceAll(`-`, ``) })}
+                {t(`role.roles`, { role: role.id.replaceAll(`-`, ``) })}
               </CommandItem>
             ))}
           </CommandList>

package/src/features/role/components/lists/RolesList.tsx

@@ -22,7 +22,7 @@ export function RolesList() {
       data={data}
       fields={[RoleFields.name, RoleFields.description]}
       tableGeneratorType={Modules.Role}
-      title={t(`types.roles`, { count: 2 })}
+      title={t(`entities.roles`, { count: 2 })}
     />
   );
 }

package/src/features/role/components/lists/UserRolesList.tsx

@@ -26,7 +26,7 @@ export function UserRolesList({ user }: UserRolesListProps) {
       data={data}
       fields={[RoleFields.name, RoleFields.description]}
       tableGeneratorType={Modules.Role}
-      title={t(`types.roles`, { count: 2 })}
+      title={t(`entities.roles`, { count: 2 })}
     />
   );
 }

package/src/features/role/contexts/RoleContext.tsx

@@ -32,7 +32,7 @@ export const RoleProvider = ({ children, dehydratedRole }: RoleProviderProps) =>
     const response: BreadcrumbItemData[] = [];
 
     response.push({
-      name: t(`types.roles`, { count: 2 }),
+      name: t(`entities.roles`, { count: 2 }),
       href: generateUrl({ page: Modules.Role }),
     });
 
@@ -47,7 +47,7 @@ export const RoleProvider = ({ children, dehydratedRole }: RoleProviderProps) =>
 
   const title = () => {
     const response: any = {
-      type: t(`types.roles`, { count: role ? 1 : 2 }),
+      type: t(`entities.roles`, { count: role ? 1 : 2 }),
     };
 
     const functions: ReactNode[] = [];

package/src/features/role/hooks/useRoleTableStructure.tsx

@@ -37,7 +37,7 @@ export const useRoleTableStructure: UseTableStructureHook<RoleInterface, RoleFie
     [RoleFields.name]: () => ({
       id: "name",
       accessorKey: "name",
-      header: t(`foundations.role.fields.name.label`),
+      header: t(`role.fields.name.label`),
       cell: ({ row }: { row: Row<TableContent<RoleInterface>> }) => {
         const role = row.original.jsonApiData as RoleInterface;
         return <Link href={generateUrl({ page: Modules.Role, id: role.id })}>{row.getValue("name")}</Link>;
@@ -48,7 +48,7 @@ export const useRoleTableStructure: UseTableStructureHook<RoleInterface, RoleFie
     [RoleFields.description]: () => ({
       id: "description",
       accessorKey: "description",
-      header: t(`foundations.role.fields.description.label`),
+      header: t(`role.fields.description.label`),
       cell: ({ row }: { row: Row<TableContent<RoleInterface>> }) => <>{row.getValue("description")}</>,
       enableSorting: false,
       enableHiding: false,
@@ -56,7 +56,7 @@ export const useRoleTableStructure: UseTableStructureHook<RoleInterface, RoleFie
     [RoleFields.createdAt]: () =>
       cellDate({
         name: "createdAt",
-        title: t(`generic.date.create`),
+        title: t(`common.date.create`),
       }),
   };
 

package/src/features/user/components/containers/UsersListContainer.tsx

@@ -15,13 +15,13 @@ function UsersListContainerInternal() {
 
   const tabs: Tab[] = [
     {
-      label: t(`types.users`, { count: 2 }),
+      label: t(`entities.users`, { count: 2 }),
       content: <CompanyUsersList />,
       modules: [Modules.Company],
       action: Action.Read,
     },
     {
-      label: t(`foundations.user.deleted`),
+      label: t(`user.deleted`),
       content: <CompanyUsersList isDeleted={true} />,
       modules: [Modules.Company],
       action: Action.Update,

package/src/features/user/components/details/UserDetails.tsx

@@ -29,7 +29,7 @@ export function UserDetails({ user }: UserDetailsProps) {
           {user.roles.map((role: RoleInterface, index: number) => (
             <Link key={role.id} href={generateUrl({ page: Modules.Role, id: role.id })}>
               <Badge className="mr-2" variant={`default`}>
-                {t(`foundations.role.roles`, { role: role.id.replaceAll(`-`, ``) })}
+                {t(`role.roles`, { role: role.id.replaceAll(`-`, ``) })}
               </Badge>
             </Link>
           ))}
@@ -54,21 +54,21 @@ export function UserDetails({ user }: UserDetailsProps) {
       <ContentTitle module={Modules.User} type={title.type} element={title.element} functions={title.functions} />
       {user.isDeleted ? (
         <div>
-          <Badge variant="destructive">{t(`foundations.user.errors.deleted`)}</Badge>
+          <Badge variant="destructive">{t(`user.errors.deleted`)}</Badge>
         </div>
       ) : (
         <>
           {!user.isActivated && (
             <div>
-              <Badge variant="destructive">{t(`foundations.user.errors.inactive`)}</Badge>
+              <Badge variant="destructive">{t(`user.errors.inactive`)}</Badge>
             </div>
           )}
         </>
       )}
       {roles}
-      <AttributeElement inline={true} title={t(`foundations.user.fields.title.label`)} value={user.title} />
-      <AttributeElement inline={true} title={t(`generic.fields.email.label`)} value={user.email} />
-      <AttributeElement inline={false} title={t(`foundations.user.fields.bio.label`)} value={user.bio} />
+      <AttributeElement inline={true} title={t(`user.fields.title.label`)} value={user.title} />
+      <AttributeElement inline={true} title={t(`common.fields.email.label`)} value={user.email} />
+      <AttributeElement inline={false} title={t(`user.fields.bio.label`)} value={user.bio} />
     </div>
   );
 }

package/src/features/user/components/forms/RoleUserAdd.tsx

@@ -47,10 +47,10 @@ function AddUserToRoleInternal({ role, refresh }: AddUserToRoleProps) {
 
     triggerAssociationToast({
       t: t,
-      source: t(`types.users`, { count: 1 }),
-      destination: t(`types.roles`, { count: 1 }),
+      source: t(`entities.users`, { count: 1 }),
+      destination: t(`entities.roles`, { count: 1 }),
       source_name: user.name,
-      destination_name: t(`foundations.role.roles`, { role: role.id.replaceAll(`-`, ``) }),
+      destination_name: t(`role.roles`, { role: role.id.replaceAll(`-`, ``) }),
     });
 
     refresh();
@@ -72,17 +72,17 @@ function AddUserToRoleInternal({ role, refresh }: AddUserToRoleProps) {
   return (
     <>
       <CommonAssociationTrigger
-        sourceType={t(`types.users`, { count: 1 })}
-        destinationType={t(`types.roles`, { count: 1 })}
+        sourceType={t(`entities.users`, { count: 1 })}
+        destinationType={t(`entities.roles`, { count: 1 })}
         onTrigger={() => setShow(true)}
       />
       <CommonAssociationCommandDialog
         show={show}
         setShow={setShow}
         data={data}
-        source={t(`types.users`, { count: 1 })}
-        destination={t(`types.roles`, { count: 1 })}
-        destinationName={t(`foundations.role.roles`, { role: role.id.replaceAll(`-`, ``) })}
+        source={t(`entities.users`, { count: 1 })}
+        destination={t(`entities.roles`, { count: 1 })}
+        destinationName={t(`role.roles`, { role: role.id.replaceAll(`-`, ``) })}
       >
         <UserListInAdd data={data} existingUsers={existingUsers} setSelectedUser={addUserToRole} />
       </CommonAssociationCommandDialog>

package/src/features/user/components/forms/UserAvatarEditor.tsx

@@ -49,7 +49,7 @@ export function UserAvatarEditor({ user, file, setFile, resetImage, setResetImag
           {!resetImage && (file || user?.avatar) ? (
             <Image
               src={file ? URL.createObjectURL(file) : user?.avatar || ""}
-              alt={t(`generic.avatar`)}
+              alt={t(`common.avatar`)}
               width={200}
               height={200}
             />
@@ -70,7 +70,7 @@ export function UserAvatarEditor({ user, file, setFile, resetImage, setResetImag
             setResetImage(true);
           }}
         >
-          {t(`generic.buttons.remove`)}
+          {t(`ui.buttons.remove`)}
         </Button>
       )}
     </div>

package/src/features/user/components/forms/UserEditor.tsx

@@ -67,8 +67,8 @@ function UserEditorInternal({ user, propagateChanges, adminCreated, trigger, onR
 
   const formSchema = z.object({
     id: z.uuidv4(),
-    name: z.string().min(1, { message: t(`foundations.user.fields.name.error`) }),
-    email: z.string().min(1, { message: t(`generic.fields.email.error`) }),
+    name: z.string().min(1, { message: t(`user.fields.name.error`) }),
+    email: z.string().min(1, { message: t(`common.fields.email.error`) }),
     password: z.string().optional(),
     title: z.string().optional(),
     bio: z.string().optional(),
@@ -101,9 +101,9 @@ function UserEditorInternal({ user, propagateChanges, adminCreated, trigger, onR
         if (existingUser) {
           form.setError("email", {
             type: "manual",
-            message: t(`foundations.user.errors.email_exists`),
+            message: t(`user.errors.email_exists`),
           });
-          errorToast({ title: t(`foundations.user.errors.email_exists`), error: "" });
+          errorToast({ title: t(`user.errors.email_exists`), error: "" });
           return;
         }
       } catch (error) {
@@ -157,7 +157,7 @@ function UserEditorInternal({ user, propagateChanges, adminCreated, trigger, onR
         router.push(generateUrl({ page: Modules.User, id: updatedUser.id }));
       }
     } catch (error) {
-      errorToast({ title: user ? t(`generic.errors.update`) : t(`generic.errors.create`), error });
+      errorToast({ title: user ? t(`common.errors.update`) : t(`common.errors.create`), error });
     }
   };
 
@@ -216,7 +216,7 @@ function UserEditorInternal({ user, propagateChanges, adminCreated, trigger, onR
       <DialogContent
         className={`flex max-h-[70vh] ${canChangeRoles ? `max-w-[90vw]` : `max-w-3xl`} min-h-3xl max-h-[90vh] flex-col overflow-y-auto`}
       >
-        <CommonEditorHeader type={t(`types.users`, { count: 1 })} name={user?.name} />
+        <CommonEditorHeader type={t(`entities.users`, { count: 1 })} name={user?.name} />
         <Form {...form}>
           <form onSubmit={form.handleSubmit(onSubmit)} className={`flex w-full flex-col gap-y-4`}>
             <div className={`flex flex-row gap-x-4`}>
@@ -233,54 +233,50 @@ function UserEditorInternal({ user, propagateChanges, adminCreated, trigger, onR
                 <FormInput
                   form={form}
                   id="name"
-                  name={t(`foundations.user.fields.name.label`)}
-                  placeholder={t(`foundations.user.fields.name.placeholder`)}
+                  name={t(`user.fields.name.label`)}
+                  placeholder={t(`user.fields.name.placeholder`)}
                 />
                 <FormInput
                   form={form}
                   id="email"
-                  name={t(`generic.fields.email.label`)}
-                  placeholder={t(`generic.fields.email.placeholder`)}
+                  name={t(`common.fields.email.label`)}
+                  placeholder={t(`common.fields.email.placeholder`)}
                 />
                 <FormInput
                   form={form}
                   id="phone"
-                  name={t(`foundations.user.fields.phone.label`)}
-                  placeholder={t(`foundations.user.fields.phone.placeholder`)}
+                  name={t(`user.fields.phone.label`)}
+                  placeholder={t(`user.fields.phone.placeholder`)}
                 />
                 <FormPassword
                   form={form}
                   id="password"
-                  name={t(`foundations.user.fields.password.label`)}
-                  placeholder={t(`foundations.user.fields.password.placeholder`)}
+                  name={t(`user.fields.password.label`)}
+                  placeholder={t(`user.fields.password.placeholder`)}
                 />
                 <FormInput
                   form={form}
                   id="title"
-                  name={t(`foundations.user.fields.title.label`)}
-                  placeholder={t(`foundations.user.fields.title.placeholder`)}
+                  name={t(`user.fields.title.label`)}
+                  placeholder={t(`user.fields.title.placeholder`)}
                 />
                 <FormTextarea
                   form={form}
                   id="bio"
-                  name={t(`foundations.user.fields.bio.label`)}
-                  placeholder={t(`foundations.user.fields.bio.placeholder`)}
+                  name={t(`user.fields.bio.label`)}
+                  placeholder={t(`user.fields.bio.placeholder`)}
                   className="min-h-40"
                 />
               </div>
               {canChangeRoles && (
                 <div className="flex w-1/3 flex-col">
                   {canChangeRoles && (
-                    <FormRoles form={form} id="roleIds" name={t(`types.roles`, { count: 2 })} roles={roles} />
+                    <FormRoles form={form} id="roleIds" name={t(`entities.roles`, { count: 2 })} roles={roles} />
                   )}
                   {!user && (
                     <div className="flex flex-col gap-y-4">
-                      <div className="text-sm font-semibold">{t(`foundations.user.send_activation_email`)}</div>
-                      <FormCheckbox
-                        form={form}
-                        id="sendInvitationEmail"
-                        name={t(`foundations.user.send_activation_email`)}
-                      />
+                      <div className="text-sm font-semibold">{t(`user.send_activation_email`)}</div>
+                      <FormCheckbox form={form} id="sendInvitationEmail" name={t(`user.send_activation_email`)} />
                     </div>
                   )}
                 </div>

package/src/features/user/components/forms/UserReactivator.tsx

@@ -35,7 +35,7 @@ function UserReactivatorInterface({ user, propagateChanges }: UserReactivatorPro
       setOpen(false);
       propagateChanges(updatedUser);
     } catch (error) {
-      errorToast({ title: t(`generic.errors.error`), error: error });
+      errorToast({ title: t(`common.errors.error`), error: error });
     }
   };
 
@@ -44,18 +44,18 @@ function UserReactivatorInterface({ user, propagateChanges }: UserReactivatorPro
       <DialogTrigger>
         <Button size="sm">
           <UserCheckIcon className="mr-3 h-3.5 w-3.5" />
-          {t(`foundations.user.buttons.reactivate`)}
+          {t(`user.buttons.reactivate`)}
         </Button>
       </DialogTrigger>
       <DialogContent className={`flex max-h-[70vh] max-w-3xl flex-col overflow-y-auto`}>
         <DialogHeader>
-          <DialogTitle>{t(`foundations.user.reactivate.title`)}</DialogTitle>
-          <DialogDescription>{t(`foundations.user.reactivate.subtitle`)}</DialogDescription>
+          <DialogTitle>{t(`user.reactivate.title`)}</DialogTitle>
+          <DialogDescription>{t(`user.reactivate.subtitle`)}</DialogDescription>
         </DialogHeader>
-        {t(`foundations.user.reactivate.description`, { name: user.name })}
+        {t(`user.reactivate.description`, { name: user.name })}
         <div className="flex justify-end">
           <Button className="mr-2" variant={"outline"} type={`button`} onClick={() => setOpen(false)}>
-            {t(`generic.buttons.cancel`)}
+            {t(`ui.buttons.cancel`)}
           </Button>
           <Button
             type="submit"
@@ -64,7 +64,7 @@ function UserReactivatorInterface({ user, propagateChanges }: UserReactivatorPro
               reactivateUser();
             }}
           >
-            {t(`foundations.user.buttons.reactivate`)}
+            {t(`user.buttons.reactivate`)}
           </Button>
         </div>
       </DialogContent>

package/src/features/user/components/forms/UserResentInvitationEmail.tsx

@@ -36,11 +36,11 @@ function UserResentInvitationEmailInternal({ user }: UserResentInvitationEmailPr
       await UserService.sendInvitation({ userId: user.id, companyId: user.company!.id });
 
       setOpen(false);
-      toast.message(t(`foundations.user.resend_activation.email_sent`), {
-        description: t(`foundations.user.resend_activation.email_sent_description`, { email: user.email }),
+      toast.message(t(`user.resend_activation.email_sent`), {
+        description: t(`user.resend_activation.email_sent_description`, { email: user.email }),
       });
     } catch (error) {
-      errorToast({ title: t(`generic.errors.error`), error: error });
+      errorToast({ title: t(`common.errors.error`), error: error });
     }
   };
 
@@ -54,17 +54,17 @@ function UserResentInvitationEmailInternal({ user }: UserResentInvitationEmailPr
             </Button>
           </DialogTrigger>
         </TooltipTrigger>
-        <TooltipContent>{t(`foundations.user.buttons.resend_activation`)}</TooltipContent>
+        <TooltipContent>{t(`user.buttons.resend_activation`)}</TooltipContent>
       </Tooltip>
       <DialogContent className={`flex max-h-[70vh] max-w-3xl flex-col overflow-y-auto`}>
         <DialogHeader>
-          <DialogTitle>{t(`foundations.user.resend_activation.title`)}</DialogTitle>
-          <DialogDescription>{t(`foundations.user.resend_activation.subtitle`)}</DialogDescription>
+          <DialogTitle>{t(`user.resend_activation.title`)}</DialogTitle>
+          <DialogDescription>{t(`user.resend_activation.subtitle`)}</DialogDescription>
         </DialogHeader>
-        {t(`foundations.user.resend_activation.description`, { email: user.email })}
+        {t(`user.resend_activation.description`, { email: user.email })}
         <div className="flex justify-end">
           <Button className="mr-2" variant={"outline"} type={`button`} onClick={() => setOpen(false)}>
-            {t(`generic.buttons.cancel`)}
+            {t(`ui.buttons.cancel`)}
           </Button>
           <Button
             type="submit"
@@ -73,7 +73,7 @@ function UserResentInvitationEmailInternal({ user }: UserResentInvitationEmailPr
               sendInvitationEmail();
             }}
           >
-            {t(`foundations.user.buttons.resend_activation`)}
+            {t(`user.buttons.resend_activation`)}
           </Button>
         </div>
       </DialogContent>

package/src/features/user/components/forms/UserSelector.tsx

@@ -3,9 +3,9 @@
 import { CircleX, RefreshCwIcon, SearchIcon, XIcon } from "lucide-react";
 import { useTranslations } from "next-intl";
 import { useCallback, useEffect, useRef, useState } from "react";
+import { FormFieldWrapper } from "../../../../components/forms";
 import { Modules } from "../../../../core";
 import { DataListRetriever, useDataListRetriever, useDebounce } from "../../../../hooks";
-import { FormFieldWrapper } from "../../../../components/forms";
 import {
   Avatar,
   AvatarFallback,
@@ -88,12 +88,7 @@ export function UserSelector({ id, form, label, placeholder, onChange, isRequire
 
   return (
     <div className="flex w-full flex-col">
-      <FormFieldWrapper
-        form={form}
-        name={id}
-        label={label}
-        isRequired={isRequired}
-      >
+      <FormFieldWrapper form={form} name={id} label={label} isRequired={isRequired}>
         {(field) => (
           <Popover open={open} onOpenChange={setOpen} modal={true}>
             <div className="flex w-full flex-row items-center justify-between">
@@ -117,7 +112,7 @@ export function UserSelector({ id, form, label, placeholder, onChange, isRequire
                     </>
                   ) : (
                     <div className="text-muted-foreground mr-7 flex h-10 w-full flex-row items-center justify-start rounded-md border p-2 text-sm">
-                      {placeholder ?? t(`generic.search.placeholder`, { type: t(`types.users`, { count: 1 }) })}
+                      {placeholder ?? t(`ui.search.placeholder`, { type: t(`entities.users`, { count: 1 }) })}
                     </div>
                   )}
                 </div>
@@ -134,7 +129,7 @@ export function UserSelector({ id, form, label, placeholder, onChange, isRequire
                 <div className="relative mb-2 w-full">
                   <SearchIcon className="text-muted-foreground absolute top-2.5 left-2.5 h-4 w-4" />
                   <Input
-                    placeholder={t(`generic.search.placeholder`, { type: t(`types.users`, { count: 1 }) })}
+                    placeholder={t(`ui.search.placeholder`, { type: t(`entities.users`, { count: 1 }) })}
                     type="text"
                     className="w-full pr-8 pl-8"
                     onChange={(e) => setSearchTerm(e.target.value)}

package/src/features/user/components/lists/AdminUsersList.tsx

@@ -25,7 +25,7 @@ function AdminUsersListInternal({ company }: AdminUsersListProps) {
 
   return (
     <ContentListTable
-      title={t(`types.users`, { count: 2 })}
+      title={t(`entities.users`, { count: 2 })}
       data={data}
       fields={[UserFields.name, UserFields.email, UserFields.createdAt]}
       tableGeneratorType={Modules.User}

package/src/features/user/components/lists/CompanyUsersList.tsx

@@ -39,7 +39,7 @@ export function CompanyUsersList({ isDeleted }: CompanyUsersListProps) {
       fields={[UserFields.name, UserFields.email]}
       tableGeneratorType={Modules.User}
       functions={functions}
-      title={t(`types.users`, { count: 2 })}
+      title={t(`entities.users`, { count: 2 })}
     />
   );
 }

package/src/features/user/components/lists/RelevantUsersList.tsx

@@ -25,7 +25,7 @@ export function RelevantUsersList({ id }: RelevantUsersListProps) {
       data={data}
       fields={[UserFields.name, UserFields.email, UserFields.relevance]}
       tableGeneratorType={Modules.User}
-      title={t(`generic.relevant_users`)}
+      title={t(`common.relevant_users`)}
     />
   );
 }

package/src/features/user/components/lists/RoleUsersList.tsx

@@ -26,7 +26,7 @@ export function RoleUsersList({ role }: RoleUsersListProps) {
       data={data}
       fields={[UserFields.name, UserFields.email]}
       tableGeneratorType={Modules.User}
-      title={t(`types.users`, { count: 2 })}
+      title={t(`entities.users`, { count: 2 })}
     />
   );
 }