@hed-hog/core 0.0.302 → 0.0.303

package/hedhog/frontend/app/roles/menus.tsx.ejs

@@ -1,5 +1,6 @@
 'use client';
 
+import { EmptyState } from '@/components/entity-list';
 import {
   Accordion,
   AccordionContent,
@@ -27,7 +28,7 @@ import {
   Menu as MenuIcon,
 } from 'lucide-react';
 import { useTranslations } from 'next-intl';
-import { JSX, useEffect, useState } from 'react';
+import { JSX, useEffect, useMemo, useState, type ComponentType } from 'react';
 import { toast } from 'sonner';
 
 type Menu = {
@@ -51,6 +52,8 @@ type RoleMenusSectionProps = {
   onMenuChange?: () => void;
 };
 
+const EMPTY_MENUS: Menu[] = [];
+
 export function RoleMenusSection({
   roleId,
   onMenuChange,
@@ -104,7 +107,7 @@ export function RoleMenusSection({
     enabled: !!roleId,
   });
 
-  const menus = menusData?.data || [];
+  const menus = menusData?.data ?? EMPTY_MENUS;
   const totalPages = menusData?.lastPage || 1;
   const totalMenus = menusData?.total || 0;
 
@@ -189,7 +192,7 @@ export function RoleMenusSection({
       await refetchAssignedMenus();
       await refetchMenus();
       onMenuChange?.();
-    } catch (error) {
+    } catch {
       toast.error(
         isAssigned ? t('errorRemovingMenu') : t('errorAssigningMenu')
       );
@@ -219,19 +222,25 @@ export function RoleMenusSection({
         match.replace('-', '').toUpperCase()
       );
 
+    const tablerIcons = TablerIcons as Record<
+      string,
+      ComponentType<{ className?: string }>
+    >;
     const pascalName = toPascalCase(String(iconName));
-    let IconComponent = (TablerIcons as any)[`Icon${pascalName}`];
-    if (!IconComponent) {
-      IconComponent = (TablerIcons as any)[`Icon${pascalName}Filled`];
-    }
-    if (!IconComponent) {
-      IconComponent = (TablerIcons as any)[`Icon${pascalName}Circle`];
-    }
-    if (IconComponent) {
-      return <IconComponent className="h-5 w-5" />;
-    }
-
-    return <MenuIcon className="h-5 w-5" />;
+    const iconCandidates = [
+      `Icon${pascalName}`,
+      `Icon${pascalName}Filled`,
+      `Icon${pascalName}Circle`,
+    ];
+    const IconComponent = iconCandidates
+      .map((candidate) => tablerIcons[candidate])
+      .find(Boolean);
+
+    return IconComponent ? (
+      <IconComponent className="h-5 w-5" />
+    ) : (
+      <MenuIcon className="h-5 w-5" />
+    );
   };
 
   const organizeMenuHierarchy = (menusList: Menu[]): Menu[] => {
@@ -255,15 +264,23 @@ export function RoleMenusSection({
     return rootMenus;
   };
 
-  const hierarchicalMenus = organizeMenuHierarchy(menus);
+  const hierarchicalMenus = useMemo(
+    () => organizeMenuHierarchy(menus),
+    [menus]
+  );
+  const defaultExpandedMenus = useMemo(
+    () =>
+      hierarchicalMenus
+        .filter((menu) => menu.children && menu.children.length > 0)
+        .map((menu) => `menu-${menu.id}`),
+    [hierarchicalMenus]
+  );
+
   useEffect(() => {
-    if (expandedMenus.length === 0 && hierarchicalMenus.length > 0) {
-      const allParentIds = hierarchicalMenus
-        .filter((m) => m.children && m.children.length > 0)
-        .map((m) => `menu-${m.id}`);
-      setExpandedMenus(allParentIds);
+    if (expandedMenus.length === 0 && defaultExpandedMenus.length > 0) {
+      setExpandedMenus(defaultExpandedMenus);
     }
-  }, [hierarchicalMenus.length]);
+  }, [defaultExpandedMenus, expandedMenus.length]);
 
   const renderChildMenu = (menu: Menu): JSX.Element => {
     const isAssigned = isMenuAssigned(menu);
@@ -326,12 +343,12 @@ export function RoleMenusSection({
 
   if (!menus || menus.length === 0) {
     return (
-      <div className="border border-dashed rounded-lg p-8 flex flex-col items-center justify-center">
-        <MenuIcon className="h-12 w-12 text-muted-foreground mb-3" />
-        <p className="text-sm font-medium text-center">
-          {t('noMenusAvailable')}
-        </p>
-      </div>
+      <EmptyState
+        className="min-h-60 py-10"
+        icon={<MenuIcon className="h-12 w-12" />}
+        title={t('noMenusAvailable')}
+        description={t('menusDescription')}
+      />
     );
   }
 

package/hedhog/frontend/app/roles/routes.tsx.ejs

@@ -1,5 +1,6 @@
 'use client';
 
+import { EmptyState } from '@/components/entity-list';
 import { Button } from '@/components/ui/button';
 import { Card, CardContent } from '@/components/ui/card';
 import { Input } from '@/components/ui/input';
@@ -43,6 +44,8 @@ type RoleRoutesSectionProps = {
   onRouteChange?: () => void;
 };
 
+type SearchType = 'contains' | 'startsWith' | 'endsWith';
+
 export function RoleRoutesSection({
   roleId,
   onRouteChange,
@@ -53,12 +56,20 @@ export function RoleRoutesSection({
   const [page, setPage] = useState(1);
   const [pageSize, setPageSize] = useState(10);
   const [searchTerm, setSearchTerm] = useState('');
-  const [searchType, setSearchType] = useState<
-    'contains' | 'startsWith' | 'endsWith'
-  >('contains');
+  const [searchType, setSearchType] = useState<SearchType>('contains');
   const [methodFilter, setMethodFilter] = useState<string>('all');
   const debouncedSearch = useDebounce(searchTerm);
 
+  const handleSearchTypeChange = (value: string) => {
+    if (
+      value === 'contains' ||
+      value === 'startsWith' ||
+      value === 'endsWith'
+    ) {
+      setSearchType(value);
+    }
+  };
+
   const {
     data: assignedRoutesData,
     isLoading: isLoadingAssigned,
@@ -143,7 +154,7 @@ export function RoleRoutesSection({
       await refetchAssignedRoutes();
       await refetchRoutes();
       onRouteChange?.();
-    } catch (error) {
+    } catch {
       toast.error(
         isAssigned ? t('errorRemovingRoute') : t('errorAssigningRoute')
       );
@@ -203,10 +214,7 @@ export function RoleRoutesSection({
           />
         </div>
         <div className="w-full flex gap-2">
-          <Select
-            value={searchType}
-            onValueChange={(value: any) => setSearchType(value)}
-          >
+          <Select value={searchType} onValueChange={handleSearchTypeChange}>
             <SelectTrigger className="w-full">
               <SelectValue placeholder={t('selectSearchType')} />
             </SelectTrigger>
@@ -299,14 +307,11 @@ export function RoleRoutesSection({
             );
           })
         ) : (
-          <Card className="border-dashed">
-            <CardContent className="flex flex-col items-center justify-center py-8">
-              <RouteIcon className="h-12 w-12 text-muted-foreground mb-3" />
-              <p className="text-sm font-medium text-center">
-                {t('noRoutesAvailable')}
-              </p>
-            </CardContent>
-          </Card>
+          <EmptyState
+            className="min-h-60 py-10"
+            icon={<RouteIcon className="h-12 w-12" />}
+            title={t('noRoutesAvailable')}
+          />
         )}
       </div>
 

package/hedhog/frontend/app/roles/users.tsx.ejs

@@ -1,5 +1,7 @@
 'use client';
 
+import { EmptyState } from '@/components/entity-list';
+import { Avatar, AvatarFallback, AvatarImage } from '@/components/ui/avatar';
 import { Button } from '@/components/ui/button';
 import { Card, CardContent } from '@/components/ui/card';
 import { Input } from '@/components/ui/input';
@@ -120,7 +122,7 @@ export function RoleUsersSection({
       await refetchAssignedUsers();
       await refetchAllUsers();
       onUserChange?.();
-    } catch (error) {
+    } catch {
       toast.error(
         isAssigned ? t('errorRemovingUser') : t('errorAssigningUser')
       );
@@ -184,11 +186,20 @@ export function RoleUsersSection({
               >
                 <CardContent className="flex items-center justify-between">
                   <div className="flex items-center gap-3 flex-1">
-                    <img
-                      src={getPhotoUrl(user.photo_id)}
-                      alt={user.name}
-                      className="h-10 w-10 rounded-full object-cover"
-                    />
+                    <Avatar className="h-10 w-10">
+                      <AvatarImage
+                        src={getPhotoUrl(user.photo_id)}
+                        alt={user.name}
+                      />
+                      <AvatarFallback>
+                        {user.name
+                          ?.split(' ')
+                          .filter(Boolean)
+                          .slice(0, 2)
+                          .map((part) => part[0]?.toUpperCase() ?? '')
+                          .join('') || 'U'}
+                      </AvatarFallback>
+                    </Avatar>
                     <div className="flex-1">
                       <Label
                         htmlFor={`user-${user.id}`}
@@ -215,14 +226,11 @@ export function RoleUsersSection({
             );
           })
         ) : (
-          <Card className="border-dashed">
-            <CardContent className="flex flex-col items-center justify-center py-8">
-              <UserCircle className="h-12 w-12 text-muted-foreground mb-3" />
-              <p className="text-sm font-medium text-center">
-                {t('noUsersAvailable')}
-              </p>
-            </CardContent>
-          </Card>
+          <EmptyState
+            className="min-h-60 py-10"
+            icon={<UserCircle className="h-12 w-12" />}
+            title={t('noUsersAvailable')}
+          />
         )}
       </div>
 

package/hedhog/frontend/app/users/permissions.tsx.ejs

@@ -1,5 +1,6 @@
 'use client';
 
+import { EmptyState } from '@/components/entity-list';
 import { Card, CardContent } from '@/components/ui/card';
 import { Label } from '@/components/ui/label';
 import { Switch } from '@/components/ui/switch';
@@ -61,7 +62,7 @@ export function PermissionsSection({
       }
       await refetchUserRoles();
       onRoleChange?.();
-    } catch (error) {
+    } catch {
       toast.error(
         isAssigned ? t('errorRemovingRole') : t('errorAssigningRole')
       );
@@ -83,14 +84,11 @@ export function PermissionsSection({
 
   if (!userRoles || userRoles.length === 0) {
     return (
-      <Card className="border-dashed">
-        <CardContent className="flex flex-col items-center justify-center py-8">
-          <ShieldCheck className="h-12 w-12 text-muted-foreground mb-3" />
-          <p className="text-sm font-medium text-center">
-            {t('noRolesAvailable')}
-          </p>
-        </CardContent>
-      </Card>
+      <EmptyState
+        className="min-h-60 py-10"
+        icon={<ShieldCheck className="h-12 w-12" />}
+        title={t('noRolesAvailable')}
+      />
     );
   }
 

package/hedhog/frontend/messages/en.json

@@ -1484,6 +1484,33 @@
     "treeOrderSaved": "Menu order saved successfully.",
     "treeOrderError": "Error saving menu order.",
     "treeChild": "child",
-    "treeChildren": "children"
+    "treeChildren": "children",
+    "refresh": "Refresh",
+    "treeWorkspaceTitle": "Structure and permissions",
+    "treeWorkspaceDescription": "Click to select, drag to reorganize, and use the context menu for quick actions.",
+    "treeEmptySearch": "No menu matches the current search.",
+    "selectedMenuTitle": "Selected menu",
+    "selectedMenuDescription": "Edit the item, organize its hierarchy, and define which roles unlock access.",
+    "noMenuSelectedTitle": "Select a menu to get started",
+    "noMenuSelectedDescription": "Choose an item in the tree to edit its data and manage permissions without leaving the page.",
+    "duplicateMenu": "Duplicate menu",
+    "duplicateSuccess": "Menu duplicated successfully.",
+    "duplicateError": "Unable to duplicate the menu.",
+    "moveToRoot": "Move to root",
+    "moveToRootSuccess": "Menu moved to the root.",
+    "addSubmenu": "Add submenu",
+    "rootMenuLabel": "Root",
+    "childrenCount": "Children",
+    "parentMenuSummary": "Parent menu",
+    "selectedLocaleLabel": "Language",
+    "openTreeOnMobile": "Open tree",
+    "totalSubmenus": "Submenus",
+    "searchResults": "Results",
+    "usersWithAccessTitle": "Users with access",
+    "usersWithAccessDescription": "Preview of who can open this menu through the assigned roles.",
+    "noAssignedRolesPreview": "Assign at least one role to preview who will gain access.",
+    "noUsersWithAccess": "No users are currently linked to the assigned roles.",
+    "grantedByRole": "Granted by",
+    "moreUsers": "+{count} more users"
   }
 }

package/hedhog/frontend/messages/pt.json

@@ -1539,6 +1539,33 @@
     "treeOrderSaved": "Ordem dos menus salva com sucesso.",
     "treeOrderError": "Erro ao salvar a ordem dos menus.",
     "treeChild": "filho",
-    "treeChildren": "filhos"
+    "treeChildren": "filhos",
+    "refresh": "Atualizar",
+    "treeWorkspaceTitle": "Estrutura e permissões",
+    "treeWorkspaceDescription": "Clique para selecionar, arraste para reorganizar e use o menu de contexto para ações rápidas.",
+    "treeEmptySearch": "Nenhum menu corresponde à busca atual.",
+    "selectedMenuTitle": "Menu selecionado",
+    "selectedMenuDescription": "Edite o item, organize sua hierarquia e defina quais cargos liberam o acesso.",
+    "noMenuSelectedTitle": "Selecione um menu para começar",
+    "noMenuSelectedDescription": "Escolha um item na árvore para editar seus dados e controlar suas permissões sem sair da tela.",
+    "duplicateMenu": "Duplicar menu",
+    "duplicateSuccess": "Menu duplicado com sucesso.",
+    "duplicateError": "Não foi possível duplicar o menu.",
+    "moveToRoot": "Mover para raiz",
+    "moveToRootSuccess": "Menu movido para a raiz.",
+    "addSubmenu": "Adicionar submenu",
+    "rootMenuLabel": "Raiz",
+    "childrenCount": "Filhos",
+    "parentMenuSummary": "Menu pai",
+    "selectedLocaleLabel": "Idioma",
+    "openTreeOnMobile": "Abrir árvore",
+    "totalSubmenus": "Submenus",
+    "searchResults": "Resultados",
+    "usersWithAccessTitle": "Usuários com acesso",
+    "usersWithAccessDescription": "Prévia de quem poderá abrir este menu por causa dos cargos atribuídos.",
+    "noAssignedRolesPreview": "Associe pelo menos um cargo para visualizar quem ganhará acesso.",
+    "noUsersWithAccess": "Nenhum usuário está vinculado aos cargos atribuídos no momento.",
+    "grantedByRole": "Liberado por",
+    "moreUsers": "+{count} usuários"
   }
 }

package/hedhog/table/role_menu.yaml

@@ -2,14 +2,12 @@ columns:
   - type: pk
   - name: role_id
     type: fk
-    isUnique: true
     references:
       table: role
       column: id
       onDelete: CASCADE
   - name: menu_id
     type: fk
-    isUnique: true
     references:
       table: menu
       column: id

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hed-hog/core",
-  "version": "0.0.302",
+  "version": "0.0.303",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "dependencies": {
@@ -31,10 +31,10 @@
     "speakeasy": "^2.0.0",
     "uuid": "^11.1.0",
     "@hed-hog/api": "0.0.6",
+    "@hed-hog/api-locale": "0.0.14",
     "@hed-hog/api-mail": "0.0.9",
-    "@hed-hog/api-types": "0.0.1",
     "@hed-hog/api-prisma": "0.0.6",
-    "@hed-hog/api-locale": "0.0.14",
+    "@hed-hog/api-types": "0.0.1",
     "@hed-hog/api-pagination": "0.0.7"
   },
   "exports": {

package/src/menu/menu.service.ts

@@ -3,11 +3,11 @@ import { getLocaleText } from '@hed-hog/api-locale';
 import { PaginationDTO, PaginationService } from '@hed-hog/api-pagination';
 import { PrismaService } from '@hed-hog/api-prisma';
 import {
-  BadRequestException,
-  Inject,
-  Injectable,
-  NotFoundException,
-  forwardRef,
+    BadRequestException,
+    Inject,
+    Injectable,
+    NotFoundException,
+    forwardRef,
 } from '@nestjs/common';
 import { DeleteDTO } from '../dto/delete.dto';
 import { UpdateIdsDTO } from '../dto/update-ids.dto';
@@ -24,6 +24,67 @@ export class MenuService {
     private readonly paginationService: PaginationService,
   ) {}
 
+  private async ensureValidParent(
+    locale: string,
+    currentMenuId: number | null,
+    parentId?: number | null,
+  ): Promise<void> {
+    if (parentId == null) {
+      return;
+    }
+
+    const parent = await this.prismaService.menu.findUnique({
+      where: { id: parentId },
+      select: { id: true, menu_id: true },
+    });
+
+    if (!parent) {
+      throw new BadRequestException(
+        getLocaleText('menuNotFound', locale, 'Menu not found.'),
+      );
+    }
+
+    if (currentMenuId != null && parentId === currentMenuId) {
+      throw new BadRequestException(
+        getLocaleText(
+          'menuInvalidParent',
+          locale,
+          'A menu cannot be its own parent.',
+        ),
+      );
+    }
+
+    if (currentMenuId == null) {
+      return;
+    }
+
+    const visited = new Set<number>([currentMenuId]);
+    let cursor: { id: number; menu_id: number | null } | null = parent;
+
+    while (cursor) {
+      if (visited.has(cursor.id)) {
+        throw new BadRequestException(
+          getLocaleText(
+            'menuInvalidParent',
+            locale,
+            'You cannot move a menu inside itself or one of its descendants.',
+          ),
+        );
+      }
+
+      visited.add(cursor.id);
+
+      if (cursor.menu_id == null) {
+        break;
+      }
+
+      cursor = await this.prismaService.menu.findUnique({
+        where: { id: cursor.menu_id },
+        select: { id: true, menu_id: true },
+      });
+    }
+  }
+
   async updateScreens(locale:string,menuId: number, data: UpdateIdsDTO): Promise<{count:number}> {
 
     const menuExists = await this.prismaService.menu.count({
@@ -170,6 +231,26 @@ export class MenuService {
               menu_id: true,
             },
           },
+          role_user: {
+            select: {
+              user_id: true,
+              user: {
+                select: {
+                  id: true,
+                  name: true,
+                  user_identifier: {
+                    where: {
+                      type: 'email',
+                    },
+                    select: {
+                      value: true,
+                    },
+                    take: 1,
+                  },
+                },
+              },
+            },
+          },
         },
       },
       'role_locale',
@@ -252,6 +333,11 @@ export class MenuService {
           where: { locale: { code: locale } },
           select: { name: true },
         },
+        _count: {
+          select: {
+            role_menu: true,
+          },
+        },
       },
     });
     return menus.map((m: any) => itemTranslations('menu_locale', m));
@@ -293,6 +379,11 @@ export class MenuService {
               name: true,
             },
           },
+          _count: {
+            select: {
+              role_menu: true,
+            },
+          },
         },
       },
       'menu_locale',
@@ -323,6 +414,8 @@ export class MenuService {
   }
 
   async create(_locale: string, { slug, url, icon, order, menu_id, locale }: CreateDTO) {
+    await this.ensureValidParent(_locale, null, menu_id);
+
     const created = await this.prismaService.menu.create({
       data: { slug, url, icon, order, menu_id },
     });
@@ -355,6 +448,8 @@ export class MenuService {
       },
     });
 
+    await this.ensureValidParent(locale, id, data.menu_id);
+
     if (!menuExists) {
       throw new BadRequestException(
         getLocaleText('menuNotFound', locale, 'Menu not found.'),