@carlonicora/nextjs-jsonapi 1.29.2 → 1.29.3

package/src/features/company/components/forms/CompanyDeleter.tsx

@@ -41,7 +41,7 @@ function CompanyDeleterInternal({ company }: CompanyDeleterProps) {
       await CompanyService.delete({ companyId: company.id });
       router.push("/");
     } catch (error) {
-      errorToast({ title: t(`generic.errors.delete`), error: error });
+      errorToast({ title: t(`common.errors.delete`), error: error });
     }
     setIsDeleting(false);
   };
@@ -51,29 +51,31 @@ function CompanyDeleterInternal({ company }: CompanyDeleterProps) {
       <AlertDialogTrigger>
         <Button size="sm" variant={"destructive"}>
           <Trash2Icon className="mr-3 h-3.5 w-3.5" />
-          {t(`generic.buttons.delete`)}
+          {t(`ui.buttons.delete`)}
         </Button>
       </AlertDialogTrigger>
       <AlertDialogContent className={`flex max-h-[70vh] max-w-3xl flex-col overflow-y-auto`}>
         <AlertDialogHeader>
-          <AlertDialogTitle>{t(`generic.delete.title`, { type: t(`types.companies`, { count: 1 }) })}</AlertDialogTitle>
+          <AlertDialogTitle>
+            {t(`common.delete.title`, { type: t(`entities.companies`, { count: 1 }) })}
+          </AlertDialogTitle>
           <AlertDialogDescription>
-            {t(`generic.delete.subtitle`, { type: t(`types.companies`, { count: 1 }) })}
+            {t(`common.delete.subtitle`, { type: t(`entities.companies`, { count: 1 }) })}
           </AlertDialogDescription>
         </AlertDialogHeader>
         <div className="text-destructive p-4 text-sm">
-          {t(`generic.delete.description`, { type: t(`types.companies`, { count: 1 }) })}
+          {t(`common.delete.description`, { type: t(`entities.companies`, { count: 1 }) })}
         </div>
         <div className="flex w-full flex-col gap-y-2">
-          <div>{t(`generic.delete.confirmation`, { type: t(`types.companies`, { count: 1 }) })}</div>
+          <div>{t(`common.delete.confirmation`, { type: t(`entities.companies`, { count: 1 }) })}</div>
           <div className="flex w-full flex-col">
             <Label className="flex items-center">
-              {t(`foundations.company.fields.name.label`)}
+              {t(`company.fields.name.label`)}
               <span className="text-destructive ml-2 font-semibold">*</span>
             </Label>
             <Input
               className={`w-full`}
-              placeholder={t(`foundations.company.fields.name.placeholder`)}
+              placeholder={t(`company.fields.name.placeholder`)}
               onChange={(e) => setCompanyName(e.target.value)}
             />
           </div>
@@ -86,7 +88,7 @@ function CompanyDeleterInternal({ company }: CompanyDeleterProps) {
             onClick={() => setOpen(false)}
             disabled={isDeleting}
           >
-            {t(`generic.buttons.cancel`)}
+            {t(`ui.buttons.cancel`)}
           </Button>
           <Button
             type="submit"
@@ -99,11 +101,11 @@ function CompanyDeleterInternal({ company }: CompanyDeleterProps) {
           >
             {isDeleting ? (
               <>
-                {t(`generic.buttons.is_deleting`)}
+                {t(`ui.buttons.is_deleting`)}
                 <LoaderCircleIcon className="animate-spin-slow h-5 w-5" />
               </>
             ) : (
-              t(`generic.buttons.delete`)
+              t(`ui.buttons.delete`)
             )}
           </Button>
         </div>

package/src/features/company/components/forms/CompanyEditor.tsx

@@ -54,7 +54,7 @@ function CompanyEditorInternal({ company, propagateChanges, onRevalidate }: Comp
   const formSchema = z.object({
     id: z.uuidv4(),
     name: z.string().min(1, {
-      message: t(`foundations.company.fields.name.error`),
+      message: t(`company.fields.name.error`),
     }),
     featureIds: z.array(z.string()).optional(),
     moduleIds: z.array(z.string()).optional(),
@@ -110,7 +110,7 @@ function CompanyEditorInternal({ company, propagateChanges, onRevalidate }: Comp
       }
     } catch (error) {
       errorToast({
-        title: company ? t(`generic.errors.update`) : t(`generic.errors.create`),
+        title: company ? t(`common.errors.update`) : t(`common.errors.create`),
         error,
       });
     }
@@ -186,7 +186,7 @@ function CompanyEditorInternal({ company, propagateChanges, onRevalidate }: Comp
       <DialogContent
         className={`flex max-h-[70vh] w-full ${isAdministrator || canAccessFeatures ? `max-w-5xl` : `max-w-4xl`} flex-col overflow-y-auto`}
       >
-        <CommonEditorHeader type={t(`types.companies`, { count: 1 })} name={company?.name} />
+        <CommonEditorHeader type={t(`entities.companies`, { count: 1 })} name={company?.name} />
         <Form {...form}>
           <form onSubmit={form.handleSubmit(onSubmit)} className={`flex w-full flex-col gap-y-4`}>
             <div className="flex w-full items-start justify-between gap-x-4">
@@ -205,9 +205,7 @@ function CompanyEditorInternal({ company, propagateChanges, onRevalidate }: Comp
                         ) : (
                           <>
                             <UploadIcon className="my-4 h-8 w-8" />
-                            <p className="mb-1 flex w-full text-center text-sm">
-                              {t(`foundations.company.click_drag_logo`)}
-                            </p>
+                            <p className="mb-1 flex w-full text-center text-sm">{t(`company.click_drag_logo`)}</p>
                           </>
                         )}
                       </div>
@@ -219,18 +217,14 @@ function CompanyEditorInternal({ company, propagateChanges, onRevalidate }: Comp
                 <FormInput
                   form={form}
                   id="name"
-                  name={t(`foundations.company.fields.name.label`)}
-                  placeholder={t(`foundations.company.fields.name.placeholder`)}
+                  name={t(`company.fields.name.label`)}
+                  placeholder={t(`company.fields.name.placeholder`)}
                 />
               </div>
               {canAccessFeatures && (
                 <div className={`flex w-96 flex-col justify-start gap-y-4`}>
                   <ScrollArea className="h-max">
-                    <FormFeatures
-                      form={form}
-                      name={t(`foundations.company.features_and_modules`)}
-                      features={features}
-                    />
+                    <FormFeatures form={form} name={t(`company.features_and_modules`)} features={features} />
                   </ScrollArea>
                 </div>
               )}

package/src/features/company/components/lists/CompaniesList.tsx

@@ -26,7 +26,7 @@ export function CompaniesList() {
       fields={[CompanyFields.name, CompanyFields.createdAt]}
       tableGeneratorType={Modules.Company}
       functions={functions}
-      title={t(`types.companies`, { count: 2 })}
+      title={t(`entities.companies`, { count: 2 })}
     />
   );
 }

package/src/features/company/contexts/CompanyContext.tsx

@@ -53,7 +53,7 @@ export const CompanyProvider = ({ children, dehydratedCompany }: CompanyProvider
 
   const title = () => {
     const response: any = {
-      type: t(`types.companies`, { count: company ? 1 : 2 }),
+      type: t(`entities.companies`, { count: company ? 1 : 2 }),
     };
 
     if (company) response.element = company.name;

package/src/features/company/hooks/useCompanyTableStructure.tsx

@@ -41,7 +41,7 @@ export const useCompanyTableStructure: UseTableStructureHook<CompanyInterface, C
     [CompanyFields.name]: () => ({
       id: "name",
       accessorKey: "name",
-      header: t(`foundations.user.fields.name.label`),
+      header: t(`user.fields.name.label`),
       cell: ({ row }: { row: Row<TableContent<CompanyInterface>> }) => {
         const company = row.original.jsonApiData as CompanyInterface;
         return (
@@ -66,7 +66,7 @@ export const useCompanyTableStructure: UseTableStructureHook<CompanyInterface, C
     [CompanyFields.createdAt]: () =>
       cellDate({
         name: "createdAt",
-        title: t(`generic.date.create`),
+        title: t(`common.date.create`),
       }),
   };
 

package/src/features/content/components/lists/ContentsList.tsx

@@ -17,7 +17,7 @@ export function ContentsList({ contentList }: ContentsListProps) {
 
   return (
     <div className="flex min-h-0 w-full flex-col overflow-y-auto">
-      <h2 className="text-xl font-semibold">{t(`foundations.content.news`)}</h2>
+      <h2 className="text-xl font-semibold">{t(`content.news`)}</h2>
       <div className="flex flex-col">
         {contentList.map((content) => (
           <ContentsListElement content={content} key={content.id} />

package/src/features/content/components/lists/ContentsListById.tsx

@@ -25,7 +25,7 @@ export function ContentsListById({ contentIds }: ContentsListByIdProps) {
       data={data}
       fields={[ContentFields.name, ContentFields.authors, ContentFields.updatedAt]}
       tableGeneratorType={Modules.Content}
-      title={t(`generic.relevant`)}
+      title={t(`common.relevant`)}
     />
   );
 }

package/src/features/content/components/lists/RelevantContentsList.tsx

@@ -25,7 +25,7 @@ export function RelevantContentsList({ id }: RelevantContentsListProps) {
       data={data}
       fields={[ContentFields.name, ContentFields.authors, ContentFields.relevance, ContentFields.updatedAt]}
       tableGeneratorType={Modules.Content}
-      title={t(`generic.relevant`)}
+      title={t(`common.relevant`)}
     />
   );
 }

package/src/features/content/hooks/useContentTableStructure.tsx

@@ -39,7 +39,7 @@ export const useContentTableStructure = <U extends string = ContentFields>(
     [ContentFields.name]: () => ({
       id: "name",
       accessorKey: "name",
-      header: t(`foundations.content.fields.name.label`),
+      header: t(`content.fields.name.label`),
       cell: ({ row }: { row: TableContent<ContentInterface> }) => {
         const content: ContentInterface = row.original.jsonApiData;
 
@@ -64,7 +64,7 @@ export const useContentTableStructure = <U extends string = ContentFields>(
     [ContentFields.relevance]: () => ({
       id: "relevance",
       accessorKey: "relevance",
-      header: t(`generic.relevance`),
+      header: t(`common.relevance`),
       cell: ({ row }: { row: TableContent<ContentInterface> }) => {
         const content: ContentInterface = row.original.jsonApiData;
 
@@ -92,7 +92,7 @@ export const useContentTableStructure = <U extends string = ContentFields>(
     [ContentFields.authors]: () => ({
       id: "authors",
       accessorKey: "authors",
-      header: t(`generic.relationships.author.label`),
+      header: t(`common.relationships.author.label`),
       cell: ({ row }: { row: TableContent<ContentInterface> }) => {
         const content: ContentInterface = row.original.jsonApiData;
         return <ContributorsList content={content} />;
@@ -103,12 +103,12 @@ export const useContentTableStructure = <U extends string = ContentFields>(
     [ContentFields.createdAt]: () =>
       cellDate({
         name: "createdAt",
-        title: t(`generic.date.create`),
+        title: t(`common.date.create`),
       }),
     [ContentFields.updatedAt]: () =>
       cellDate({
         name: "updatedAt",
-        title: t(`generic.date.update`),
+        title: t(`common.date.update`),
       }),
   };
 

package/src/features/notification/components/containers/NotificationsListContainer.tsx

@@ -23,11 +23,11 @@ function NotificationsListContainerContent() {
 
   const tabs: Tab[] = [
     {
-      label: t(`foundations.notification.inbox`),
+      label: t(`notification.inbox`),
       content: <NotificationsList archived={false} />,
     },
     {
-      label: t(`foundations.notification.archived`),
+      label: t(`notification.archived`),
       content: <NotificationsList archived={true} />,
     },
   ];

package/src/features/notification/components/lists/NotificationsList.tsx

@@ -78,7 +78,7 @@ export function NotificationsList({ archived }: NotificationsListProps) {
                   )}
                   <div className="flex w-full flex-col">
                     <p className="text-sm">
-                      {t.rich(`foundations.notification.${notification.notificationType}.description` as any, {
+                      {t.rich(`notification.${notification.notificationType}.description` as any, {
                         strong: (chunks: any) => <strong>{chunks}</strong>,
                         actor: notificationData.actor?.name ?? "",
                         title: notificationData.title,
@@ -92,7 +92,7 @@ export function NotificationsList({ archived }: NotificationsListProps) {
                     {notificationData.url ? (
                       <Link href={notificationData.url}>
                         <Button variant={`outline`} size={`sm`} onClick={(e) => e.stopPropagation()}>
-                          {t(`foundations.notification.${notification.notificationType}.buttons.action` as any)}
+                          {t(`notification.${notification.notificationType}.buttons.action` as any)}
                         </Button>
                       </Link>
                     ) : (
@@ -113,7 +113,7 @@ export function NotificationsList({ archived }: NotificationsListProps) {
                             <ArchiveIcon className="h-4 w-4 cursor-pointer" />
                           </Button>
                         </TooltipTrigger>
-                        <TooltipContent>{t(`foundations.notification.buttons.archive`)}</TooltipContent>
+                        <TooltipContent>{t(`notification.buttons.archive`)}</TooltipContent>
                       </Tooltip>
                     )}
                   </div>

package/src/features/notification/components/modals/NotificationModal.tsx

@@ -196,13 +196,13 @@ function NotificationModalContent({ isOpen, setIsOpen }: NotificationModalProps)
           <BellIcon
             className={`h-5 w-5 cursor-pointer ${unreadNotifications ? "text-destructive" : ""} ${isLoading ? "animate-pulse" : ""}`}
           />
-          {t(`types.notifications`, { count: 2 })}
+          {t(`entities.notifications`, { count: 2 })}
         </SidebarMenuButton>
       </PopoverTrigger>
       <PopoverContent className="relative left-10 w-80 border-0 p-0 shadow-none">
         <Card>
           <CardHeader className="p-4">
-            <CardTitle>{t(`types.notifications`, { count: 2 })}</CardTitle>
+            <CardTitle>{t(`entities.notifications`, { count: 2 })}</CardTitle>
             {isLoading && <div className="text-muted-foreground text-xs">Loading...</div>}
             {error && <div className="text-destructive text-xs">Error: {error}</div>}
           </CardHeader>
@@ -213,9 +213,7 @@ function NotificationModalContent({ isOpen, setIsOpen }: NotificationModalProps)
                 <Fragment key={notification.id}>{generateNotification(notification, () => setIsOpen(false))}</Fragment>
               ))
             ) : (
-              <div className="p-4 text-center text-sm text-gray-500">
-                {t(`foundations.notification.empty`, { count: 2 })}
-              </div>
+              <div className="p-4 text-center text-sm text-gray-500">{t(`notification.empty`)}</div>
             )}
           </ScrollArea>
         </Card>

package/src/features/notification/components/notifications/Notification.tsx

@@ -45,7 +45,7 @@ export function NotificationToast(
   const data = generateNotificationData({ notification: notification, generateUrl: generateUrl });
 
   return {
-    title: t(`foundations.notification.${notification.notificationType}.title`),
+    title: t(`notification.${notification.notificationType}.title`),
     description: (
       <div className={`flex w-full flex-row items-center p-2`}>
         {data.actor ? (
@@ -57,7 +57,7 @@ export function NotificationToast(
         )}
         <div className="flex w-full flex-col">
           <p className="text-sm">
-            {t.rich(`foundations.notification.${notification.notificationType}.description`, {
+            {t.rich(`notification.${notification.notificationType}.description`, {
               strong: (chunks: any) => <strong>{chunks}</strong>,
               actor: data.actor?.name ?? "",
               title: data.title,
@@ -72,7 +72,7 @@ export function NotificationToast(
     ),
     action: data.url
       ? {
-          label: t(`foundations.notification.${notification.notificationType}.buttons.action`),
+          label: t(`notification.${notification.notificationType}.buttons.action`),
           onClick: () => {
             reouter.push(data.url!);
           },
@@ -103,7 +103,7 @@ export function NotificationMenuItem({ notification, closePopover }: TaskComment
       )}
       <div className="flex w-full flex-col">
         <p className="text-sm">
-          {t.rich(`foundations.notification.${notification.notificationType}.description` as any, {
+          {t.rich(`notification.${notification.notificationType}.description` as any, {
             strong: (chunks: any) => <strong>{chunks}</strong>,
             actor: data.actor?.name ?? "",
             title: data.title,

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>
   );
 }