From d4e4df7ad38494575e3f41951d3d477984ca5060 Mon Sep 17 00:00:00 2001
From: Ruan Bueno <rbcr4z1@gmail.com>
Date: Wed, 3 Sep 2025 17:13:54 -0300
Subject: [PATCH 1/3] =?UTF-8?q?fix:=20pequenas=20altera=C3=A7=C3=B5es=20no?=
 =?UTF-8?q?=20gerenciamento=20de=20usu=C3=A1rios?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/(authenticated)/admin/users/page.tsx | 239 +++++++++++++------
 1 file changed, 165 insertions(+), 74 deletions(-)

diff --git a/src/app/(authenticated)/admin/users/page.tsx b/src/app/(authenticated)/admin/users/page.tsx
index 79208e44..f120bc4b 100644
--- a/src/app/(authenticated)/admin/users/page.tsx
+++ b/src/app/(authenticated)/admin/users/page.tsx
@@ -260,6 +260,47 @@ function UserManagementCard({ user, allForms, onUserUpdate }: UserManagementCard
     })
   }
 
+  // Função auxiliar para encontrar rota relacionada a uma permissão
+  const getRouteForPermission = (permission: string): string | null => {
+    for (const [routeId, permissions] of Object.entries(ROUTE_PERMISSIONS_MAP)) {
+      if (permissions.includes(permission)) {
+        return routeId;
+      }
+    }
+    return null;
+  }
+
+  // Função para gerenciar permissão individual e sua rota relacionada
+  const handlePermissionToggle = (permission: string, checked: boolean, updateFn: () => void) => {
+    // Executar a atualização da permissão
+    updateFn();
+
+    // Se a permissão foi desmarcada, verificar se deve desmarcar a rota relacionada
+    if (!checked) {
+      const relatedRoute = getRouteForPermission(permission);
+      if (relatedRoute) {
+        // Usar setTimeout para aguardar a atualização do estado
+        setTimeout(() => {
+          setPermissionsData(prev => {
+            const currentRoutes = prev.accessible_routes ?? [];
+            const newRoutes = currentRoutes.filter(route => route !== relatedRoute);
+            
+            return {
+              ...prev,
+              accessible_routes: newRoutes,
+            };
+          });
+
+          // Mostrar notificação
+          toast({
+            title: "Rota relacionada desativada",
+            description: `A rota ${AVAILABLE_ROUTES.find(r => r.id === relatedRoute)?.name} foi desativada automaticamente.`,
+          });
+        }, 0);
+      }
+    }
+  }
+
   const handleRouteToggle = (routeId: string, checked: boolean) => {
     const currentRoutes = permissionsData.accessible_routes ?? []
     const newRoutes = checked
@@ -271,9 +312,11 @@ function UserManagementCard({ user, allForms, onUserUpdate }: UserManagementCard
       accessible_routes: newRoutes,
     })
 
-    // Auto-selecionar permissões relacionadas se a rota for ativada
-    if (checked && ROUTE_PERMISSIONS_MAP[routeId]) {
+    // Auto-gerenciar permissões relacionadas quando rota for ativada/desativada
+    if (ROUTE_PERMISSIONS_MAP[routeId]) {
       const relatedPermissions = ROUTE_PERMISSIONS_MAP[routeId]
+      
+      // Atualizar permissões de conteúdo (events, flyers, rooms, cars)
       const newContent = { 
         can_create_event: false,
         can_create_flyer: false,
@@ -282,9 +325,19 @@ function UserManagementCard({ user, allForms, onUserUpdate }: UserManagementCard
         ...permissionsData.content 
       }
       
+      // Atualizar permissões de formulários
+      let newForms = permissionsData.forms;
+      
       relatedPermissions.forEach((permission: string) => {
         if (permission in newContent) {
-          (newContent as Record<string, boolean>)[permission] = true
+          (newContent as Record<string, boolean>)[permission] = checked
+        } else if (permission === 'can_create_form') {
+          newForms = {
+            ...permissionsData.forms,
+            can_create_form: checked,
+            unlocked_forms: permissionsData.forms?.unlocked_forms ?? [],
+            hidden_forms: permissionsData.forms?.hidden_forms ?? [],
+          }
         }
       })
 
@@ -292,12 +345,14 @@ function UserManagementCard({ user, allForms, onUserUpdate }: UserManagementCard
         ...permissionsData,
         accessible_routes: newRoutes,
         content: newContent,
+        forms: newForms,
       })
 
       // Mostrar notificação
+      const action = checked ? "ativadas" : "desativadas"
       toast({
-        title: "Permissões relacionadas ativadas",
-        description: `As permissões de ação relacionadas à rota ${AVAILABLE_ROUTES.find(r => r.id === routeId)?.name} foram ativadas automaticamente.`,
+        title: `Permissões relacionadas ${action}`,
+        description: `As permissões de ação relacionadas à rota ${AVAILABLE_ROUTES.find(r => r.id === routeId)?.name} foram ${action} automaticamente.`,
       })
     }
   }
@@ -453,9 +508,25 @@ function UserManagementCard({ user, allForms, onUserUpdate }: UserManagementCard
                       <Checkbox
                         id="sudo"
                         checked={permissionsData.sudo}
-                        onCheckedChange={(checked) => 
-                          setPermissionsData({ ...permissionsData, sudo: checked === true })
-                        }
+                        onCheckedChange={(checked) => {
+                          if (checked === true) {
+                            // Quando sudo é marcado, limpar todas as outras permissões
+                            setPermissionsData({ 
+                              ...permissionsData, 
+                              sudo: true,
+                              admin_pages: undefined,
+                              accessible_routes: undefined,
+                              content: undefined,
+                              forms: undefined
+                            });
+                          } else {
+                            // Quando sudo é desmarcado, manter as permissões existentes
+                            setPermissionsData({ 
+                              ...permissionsData, 
+                              sudo: false 
+                            });
+                          }
+                        }}
                       />
                       <Label htmlFor="sudo" className="font-medium text-red-700">
                         Super Admin (Acesso Total)
@@ -510,18 +581,22 @@ function UserManagementCard({ user, allForms, onUserUpdate }: UserManagementCard
                           <Checkbox
                             id="create_event"
                             checked={permissionsData.content?.can_create_event ?? false}
-                            onCheckedChange={(checked) =>
-                              setPermissionsData({
-                                ...permissionsData,
-                                content: {
-                                  ...permissionsData.content,
-                                  can_create_event: checked === true,
-                                  can_create_flyer: permissionsData.content?.can_create_flyer ?? false,
-                                  can_create_booking: permissionsData.content?.can_create_booking ?? false,
-                                  can_locate_cars: permissionsData.content?.can_locate_cars ?? false,
-                                },
-                              })
-                            }
+                            onCheckedChange={(checked) => {
+                              handlePermissionToggle(
+                                'can_create_event', 
+                                checked === true,
+                                () => setPermissionsData({
+                                  ...permissionsData,
+                                  content: {
+                                    ...permissionsData.content,
+                                    can_create_event: checked === true,
+                                    can_create_flyer: permissionsData.content?.can_create_flyer ?? false,
+                                    can_create_booking: permissionsData.content?.can_create_booking ?? false,
+                                    can_locate_cars: permissionsData.content?.can_locate_cars ?? false,
+                                  },
+                                })
+                              );
+                            }}
                           />
                           <Label htmlFor="create_event">Criar Eventos</Label>
                         </div>
@@ -529,18 +604,22 @@ function UserManagementCard({ user, allForms, onUserUpdate }: UserManagementCard
                           <Checkbox
                             id="create_flyer"
                             checked={permissionsData.content?.can_create_flyer ?? false}
-                            onCheckedChange={(checked) =>
-                              setPermissionsData({
-                                ...permissionsData,
-                                content: {
-                                  ...permissionsData.content,
-                                  can_create_event: permissionsData.content?.can_create_event ?? false,
-                                  can_create_flyer: checked === true,
-                                  can_create_booking: permissionsData.content?.can_create_booking ?? false,
-                                  can_locate_cars: permissionsData.content?.can_locate_cars ?? false,
-                                },
-                              })
-                            }
+                            onCheckedChange={(checked) => {
+                              handlePermissionToggle(
+                                'can_create_flyer', 
+                                checked === true,
+                                () => setPermissionsData({
+                                  ...permissionsData,
+                                  content: {
+                                    ...permissionsData.content,
+                                    can_create_event: permissionsData.content?.can_create_event ?? false,
+                                    can_create_flyer: checked === true,
+                                    can_create_booking: permissionsData.content?.can_create_booking ?? false,
+                                    can_locate_cars: permissionsData.content?.can_locate_cars ?? false,
+                                  },
+                                })
+                              );
+                            }}
                           />
                           <Label htmlFor="create_flyer">Criar Encartes</Label>
                         </div>
@@ -548,18 +627,22 @@ function UserManagementCard({ user, allForms, onUserUpdate }: UserManagementCard
                           <Checkbox
                             id="create_booking"
                             checked={permissionsData.content?.can_create_booking ?? false}
-                            onCheckedChange={(checked) =>
-                              setPermissionsData({
-                                ...permissionsData,
-                                content: {
-                                  ...permissionsData.content,
-                                  can_create_event: permissionsData.content?.can_create_event ?? false,
-                                  can_create_flyer: permissionsData.content?.can_create_flyer ?? false,
-                                  can_create_booking: checked === true,
-                                  can_locate_cars: permissionsData.content?.can_locate_cars ?? false,
-                                },
-                              })
-                            }
+                            onCheckedChange={(checked) => {
+                              handlePermissionToggle(
+                                'can_create_booking', 
+                                checked === true,
+                                () => setPermissionsData({
+                                  ...permissionsData,
+                                  content: {
+                                    ...permissionsData.content,
+                                    can_create_event: permissionsData.content?.can_create_event ?? false,
+                                    can_create_flyer: permissionsData.content?.can_create_flyer ?? false,
+                                    can_create_booking: checked === true,
+                                    can_locate_cars: permissionsData.content?.can_locate_cars ?? false,
+                                  },
+                                })
+                              );
+                            }}
                           />
                           <Label htmlFor="create_booking">Agendar Salas</Label>
                         </div>
@@ -567,18 +650,22 @@ function UserManagementCard({ user, allForms, onUserUpdate }: UserManagementCard
                           <Checkbox
                             id="locate_cars"
                             checked={permissionsData.content?.can_locate_cars ?? false}
-                            onCheckedChange={(checked) =>
-                              setPermissionsData({
-                                ...permissionsData,
-                                content: {
-                                  ...permissionsData.content,
-                                  can_create_event: permissionsData.content?.can_create_event ?? false,
-                                  can_create_flyer: permissionsData.content?.can_create_flyer ?? false,
-                                  can_create_booking: permissionsData.content?.can_create_booking ?? false,
-                                  can_locate_cars: checked === true,
-                                },
-                              })
-                            }
+                            onCheckedChange={(checked) => {
+                              handlePermissionToggle(
+                                'can_locate_cars', 
+                                checked === true,
+                                () => setPermissionsData({
+                                  ...permissionsData,
+                                  content: {
+                                    ...permissionsData.content,
+                                    can_create_event: permissionsData.content?.can_create_event ?? false,
+                                    can_create_flyer: permissionsData.content?.can_create_flyer ?? false,
+                                    can_create_booking: permissionsData.content?.can_create_booking ?? false,
+                                    can_locate_cars: checked === true,
+                                  },
+                                })
+                              );
+                            }}
                           />
                           <Label htmlFor="locate_cars">Agendar Carros</Label>
                         </div>
@@ -592,17 +679,21 @@ function UserManagementCard({ user, allForms, onUserUpdate }: UserManagementCard
                           <Checkbox
                             id="create_form"
                             checked={permissionsData.forms?.can_create_form ?? false}
-                            onCheckedChange={(checked) =>
-                              setPermissionsData({
-                                ...permissionsData,
-                                forms: {
-                                  ...permissionsData.forms,
-                                  can_create_form: checked === true,
-                                  unlocked_forms: permissionsData.forms?.unlocked_forms ?? [],
-                                  hidden_forms: permissionsData.forms?.hidden_forms ?? [],
-                                },
-                              })
-                            }
+                            onCheckedChange={(checked) => {
+                              handlePermissionToggle(
+                                'can_create_form', 
+                                checked === true,
+                                () => setPermissionsData({
+                                  ...permissionsData,
+                                  forms: {
+                                    ...permissionsData.forms,
+                                    can_create_form: checked === true,
+                                    unlocked_forms: permissionsData.forms?.unlocked_forms ?? [],
+                                    hidden_forms: permissionsData.forms?.hidden_forms ?? [],
+                                  },
+                                })
+                              );
+                            }}
                           />
                           <Label htmlFor="create_form">Criar Formulários</Label>
                         </div>
@@ -617,23 +708,23 @@ function UserManagementCard({ user, allForms, onUserUpdate }: UserManagementCard
                 <div>
                   <div className="flex items-center gap-2 mb-3">
                     <FileText className="h-4 w-4" />
-                    <Label className="text-base font-semibold">Formulários Ocultos</Label>
+                    <Label className="text-base font-semibold">Formulários Visíveis</Label>
                   </div>
                   <p className="text-sm text-muted-foreground mb-4">
-                    Por padrão, todos os formulários são visíveis. Selecione os formulários que devem ficar ocultos para este usuário.
+                    Por padrão, todos os formulários estão marcados como visíveis. Desmarque os formulários que devem ficar ocultos para este usuário.
                   </p>
                   
                   <div className="space-y-2 max-h-48 overflow-y-auto border rounded p-3">
                     {allForms.map((form) => (
                       <div key={form.id} className="flex items-center space-x-2">
                         <Checkbox
-                          id={`hidden_${form.id}`}
-                          checked={permissionsData.forms?.hidden_forms?.includes(form.id) ?? false}
+                          id={`visible_${form.id}`}
+                          checked={!(permissionsData.forms?.hidden_forms?.includes(form.id) ?? false)}
                           onCheckedChange={(checked) => {
                             const currentHidden = permissionsData.forms?.hidden_forms ?? [];
                             const newHidden = checked
-                              ? [...currentHidden, form.id]
-                              : currentHidden.filter(id => id !== form.id);
+                              ? currentHidden.filter(id => id !== form.id) // Remove da lista de ocultos
+                              : [...currentHidden, form.id]; // Adiciona à lista de ocultos
 
                             setPermissionsData({
                               ...permissionsData,
@@ -646,7 +737,7 @@ function UserManagementCard({ user, allForms, onUserUpdate }: UserManagementCard
                             });
                           }}
                         />
-                        <Label htmlFor={`hidden_${form.id}`} className="text-sm">
+                        <Label htmlFor={`visible_${form.id}`} className="text-sm">
                           {form.title}
                         </Label>
                       </div>

From 6163d319a8c73a63e0f85cd3832b413ddd866ec9 Mon Sep 17 00:00:00 2001
From: Ruan Bueno <rbcr4z1@gmail.com>
Date: Wed, 3 Sep 2025 17:39:52 -0300
Subject: [PATCH 2/3] =?UTF-8?q?fix:=20adicionando=20algumas=20permiss?=
 =?UTF-8?q?=C3=B5es=20quebradas?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/(authenticated)/admin/users/page.tsx | 469 ++++++++++++++++---
 src/components/complete-profile-modal.tsx    |   9 +-
 src/hooks/use-access-control.tsx             | 102 +++-
 src/lib/access-control.ts                    | 110 +++--
 src/types/role-config.ts                     |   9 +-
 5 files changed, 592 insertions(+), 107 deletions(-)

diff --git a/src/app/(authenticated)/admin/users/page.tsx b/src/app/(authenticated)/admin/users/page.tsx
index f120bc4b..58433885 100644
--- a/src/app/(authenticated)/admin/users/page.tsx
+++ b/src/app/(authenticated)/admin/users/page.tsx
@@ -10,6 +10,7 @@ import { Badge } from "@/components/ui/badge"
 import { Checkbox } from "@/components/ui/checkbox"
 import { Collapsible, CollapsibleContent, CollapsibleTrigger } from "@/components/ui/collapsible"
 import { Separator } from "@/components/ui/separator"
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select"
 import { useToast } from "@/hooks/use-toast"
 import { api } from "@/trpc/react"
 import { useAccessControl } from "@/hooks/use-access-control"
@@ -46,11 +47,36 @@ const AVAILABLE_ROUTES = [
 
 // Mapear rotas para suas permissões relacionadas
 const ROUTE_PERMISSIONS_MAP: Record<string, string[]> = {
-  "events": ["can_create_event"],
-  "flyers": ["can_create_flyer"],
-  "rooms": ["can_create_booking"],
-  "cars": ["can_locate_cars"],
-  "forms": ["can_create_form"],
+  "events": ["can_view_events"],
+  "flyers": ["can_view_flyers"],
+  "rooms": ["can_view_rooms"],
+  "cars": ["can_view_cars"],
+  "forms": ["can_view_forms"],
+}
+
+// Lista de setores disponíveis
+const AVAILABLE_SETORES = [
+  { value: "", label: "Nenhum setor" },
+  { value: "ADMINISTRATIVO", label: "Administrativo" },
+  { value: "COMERCIAL", label: "Comercial" },
+  { value: "FINANCEIRO", label: "Financeiro" },
+  { value: "RECURSOS_HUMANOS", label: "Recursos Humanos" },
+  { value: "TI", label: "Tecnologia da Informação" },
+  { value: "MARKETING", label: "Marketing" },
+  { value: "VENDAS", label: "Vendas" },
+  { value: "PRODUCAO", label: "Produção" },
+  { value: "COMPRAS", label: "Compras" },
+  { value: "QUALIDADE", label: "Qualidade" },
+  { value: "LOGISTICA", label: "Logística" },
+  { value: "JURIDICO", label: "Jurídico" },
+]
+
+// Função auxiliar para obter o nome amigável do setor
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+const getSetorLabel = (setorValue: string | null | undefined): string => {
+  if (!setorValue) return "Não informado"
+  const setor = AVAILABLE_SETORES.find(s => s.value === setorValue)
+  return setor ? setor.label : setorValue
 }
 
 export default function UsersManagementPage() {
@@ -192,6 +218,13 @@ interface UserManagementCardProps {
 function UserManagementCard({ user, allForms, onUserUpdate }: UserManagementCardProps) {
   const [isEditingBasic, setIsEditingBasic] = useState(false)
   const [isEditingPermissions, setIsEditingPermissions] = useState(false)
+  
+  // Função auxiliar para obter o nome do setor
+  const getSetorLabel = (setorValue: string | null | undefined): string => {
+    if (!setorValue) return "Não informado"
+    const setor = AVAILABLE_SETORES.find(s => s.value === setorValue)
+    return setor ? setor.label : setorValue
+  }
   const [basicData, setBasicData] = useState({
     firstName: user.firstName ?? "",
     lastName: user.lastName ?? "",
@@ -203,8 +236,22 @@ function UserManagementCard({ user, allForms, onUserUpdate }: UserManagementCard
       sudo: false,
       admin_pages: undefined,
       accessible_routes: undefined,
-      forms: undefined,
-      content: undefined,
+      forms: {
+        can_view_forms: false,
+        can_create_form: false,
+        unlocked_forms: [],
+        hidden_forms: [],
+      },
+      content: {
+        can_view_events: false,
+        can_create_event: false,
+        can_view_flyers: false,
+        can_create_flyer: false,
+        can_view_rooms: false,
+        can_create_booking: false,
+        can_view_cars: false,
+        can_locate_cars: false,
+      },
     }
   )
 
@@ -317,12 +364,16 @@ function UserManagementCard({ user, allForms, onUserUpdate }: UserManagementCard
       const relatedPermissions = ROUTE_PERMISSIONS_MAP[routeId]
       
       // Atualizar permissões de conteúdo (events, flyers, rooms, cars)
-      const newContent = { 
+      const newContent = {
+        can_view_events: false,
         can_create_event: false,
+        can_view_flyers: false,
         can_create_flyer: false,
+        can_view_rooms: false,
         can_create_booking: false,
+        can_view_cars: false,
         can_locate_cars: false,
-        ...permissionsData.content 
+        ...permissionsData.content
       }
       
       // Atualizar permissões de formulários
@@ -331,10 +382,11 @@ function UserManagementCard({ user, allForms, onUserUpdate }: UserManagementCard
       relatedPermissions.forEach((permission: string) => {
         if (permission in newContent) {
           (newContent as Record<string, boolean>)[permission] = checked
-        } else if (permission === 'can_create_form') {
+        } else if (permission === 'can_view_forms') {
           newForms = {
             ...permissionsData.forms,
-            can_create_form: checked,
+            can_view_forms: checked,
+            can_create_form: permissionsData.forms?.can_create_form ?? false,
             unlocked_forms: permissionsData.forms?.unlocked_forms ?? [],
             hidden_forms: permissionsData.forms?.hidden_forms ?? [],
           }
@@ -377,7 +429,7 @@ function UserManagementCard({ user, allForms, onUserUpdate }: UserManagementCard
             </CardTitle>
             <CardDescription>
               {user.email}
-              {user.setor && <span className="ml-2">• {user.setor}</span>}
+              {user.setor && <span className="ml-2">• {getSetorLabel(user.setor)}</span>}
             </CardDescription>
           </div>
           <div className="flex items-center gap-2">
@@ -433,11 +485,21 @@ function UserManagementCard({ user, allForms, onUserUpdate }: UserManagementCard
                   </div>
                   <div>
                     <Label htmlFor="setor">Setor</Label>
-                    <Input
-                      id="setor"
+                    <Select
                       value={basicData.setor}
-                      onChange={(e) => setBasicData({ ...basicData, setor: e.target.value })}
-                    />
+                      onValueChange={(value) => setBasicData({ ...basicData, setor: value })}
+                    >
+                      <SelectTrigger>
+                        <SelectValue placeholder="Selecione um setor" />
+                      </SelectTrigger>
+                      <SelectContent>
+                        {AVAILABLE_SETORES.map((setor) => (
+                          <SelectItem key={setor.value} value={setor.value}>
+                            {setor.label}
+                          </SelectItem>
+                        ))}
+                      </SelectContent>
+                    </Select>
                   </div>
                 </div>
                 <div className="flex justify-end gap-2">
@@ -464,7 +526,7 @@ function UserManagementCard({ user, allForms, onUserUpdate }: UserManagementCard
                   </div>
                   <div>
                     <Label className="text-sm font-medium">Setor</Label>
-                    <p className="text-sm text-muted-foreground">{user.setor ?? "Não informado"}</p>
+                    <p className="text-sm text-muted-foreground">{getSetorLabel(user.setor)}</p>
                   </div>
                 </div>
                 <Button onClick={() => setIsEditingBasic(true)} size="sm">
@@ -575,127 +637,323 @@ function UserManagementCard({ user, allForms, onUserUpdate }: UserManagementCard
 
                   <div className="grid grid-cols-2 gap-4">
                     <div className="space-y-2">
-                      <Label className="font-medium">Conteúdo</Label>
+                      <Label className="font-medium">Eventos</Label>
                       <div className="space-y-2">
                         <div className="flex items-center space-x-2">
                           <Checkbox
-                            id="create_event"
-                            checked={permissionsData.content?.can_create_event ?? false}
+                            id="view_events"
+                            checked={Boolean(permissionsData.content?.can_view_events)}
                             onCheckedChange={(checked) => {
+                              const isChecked = checked === true;
                               handlePermissionToggle(
-                                'can_create_event', 
-                                checked === true,
+                                'can_view_events',
+                                isChecked,
                                 () => setPermissionsData({
                                   ...permissionsData,
                                   content: {
                                     ...permissionsData.content,
-                                    can_create_event: checked === true,
+                                    can_view_events: isChecked,
+                                    can_create_event: permissionsData.content?.can_create_event ?? false,
+                                    can_view_flyers: permissionsData.content?.can_view_flyers ?? false,
                                     can_create_flyer: permissionsData.content?.can_create_flyer ?? false,
+                                    can_view_rooms: permissionsData.content?.can_view_rooms ?? false,
                                     can_create_booking: permissionsData.content?.can_create_booking ?? false,
+                                    can_view_cars: permissionsData.content?.can_view_cars ?? false,
                                     can_locate_cars: permissionsData.content?.can_locate_cars ?? false,
                                   },
                                 })
                               );
                             }}
                           />
+                          <Label htmlFor="view_events">Visualizar Eventos</Label>
+                        </div>
+                        <div className="flex items-center space-x-2">
+                          <Checkbox
+                            id="create_event"
+                            checked={Boolean(permissionsData.content?.can_create_event)}
+                            onCheckedChange={(checked) => {
+                              const isChecked = checked === true;
+                              // Se está marcando "criar", automaticamente marcar "visualizar"
+                              if (isChecked) {
+                                setPermissionsData({
+                                  ...permissionsData,
+                                  content: {
+                                    ...permissionsData.content,
+                                    can_view_events: true,
+                                    can_create_event: true,
+                                    can_view_flyers: permissionsData.content?.can_view_flyers ?? false,
+                                    can_create_flyer: permissionsData.content?.can_create_flyer ?? false,
+                                    can_view_rooms: permissionsData.content?.can_view_rooms ?? false,
+                                    can_create_booking: permissionsData.content?.can_create_booking ?? false,
+                                    can_view_cars: permissionsData.content?.can_view_cars ?? false,
+                                    can_locate_cars: permissionsData.content?.can_locate_cars ?? false,
+                                  },
+                                });
+                              } else {
+                                handlePermissionToggle(
+                                  'can_create_event',
+                                  false,
+                                  () => setPermissionsData({
+                                    ...permissionsData,
+                                    content: {
+                                      ...permissionsData.content,
+                                      can_view_events: permissionsData.content?.can_view_events ?? false,
+                                      can_create_event: false,
+                                      can_view_flyers: permissionsData.content?.can_view_flyers ?? false,
+                                      can_create_flyer: permissionsData.content?.can_create_flyer ?? false,
+                                      can_view_rooms: permissionsData.content?.can_view_rooms ?? false,
+                                      can_create_booking: permissionsData.content?.can_create_booking ?? false,
+                                      can_view_cars: permissionsData.content?.can_view_cars ?? false,
+                                      can_locate_cars: permissionsData.content?.can_locate_cars ?? false,
+                                    },
+                                  })
+                                );
+                              }
+                            }}
+                          />
                           <Label htmlFor="create_event">Criar Eventos</Label>
                         </div>
+                      </div>
+                    </div>
+
+                    <div className="space-y-2">
+                      <Label className="font-medium">Encartes</Label>
+                      <div className="space-y-2">
                         <div className="flex items-center space-x-2">
                           <Checkbox
-                            id="create_flyer"
-                            checked={permissionsData.content?.can_create_flyer ?? false}
+                            id="view_flyers"
+                            checked={Boolean(permissionsData.content?.can_view_flyers)}
                             onCheckedChange={(checked) => {
+                              const isChecked = checked === true;
                               handlePermissionToggle(
-                                'can_create_flyer', 
-                                checked === true,
+                                'can_view_flyers',
+                                isChecked,
                                 () => setPermissionsData({
                                   ...permissionsData,
                                   content: {
                                     ...permissionsData.content,
+                                    can_view_events: permissionsData.content?.can_view_events ?? false,
                                     can_create_event: permissionsData.content?.can_create_event ?? false,
-                                    can_create_flyer: checked === true,
+                                    can_view_flyers: isChecked,
+                                    can_create_flyer: permissionsData.content?.can_create_flyer ?? false,
+                                    can_view_rooms: permissionsData.content?.can_view_rooms ?? false,
                                     can_create_booking: permissionsData.content?.can_create_booking ?? false,
+                                    can_view_cars: permissionsData.content?.can_view_cars ?? false,
                                     can_locate_cars: permissionsData.content?.can_locate_cars ?? false,
                                   },
                                 })
                               );
                             }}
                           />
+                          <Label htmlFor="view_flyers">Visualizar Encartes</Label>
+                        </div>
+                        <div className="flex items-center space-x-2">
+                          <Checkbox
+                            id="create_flyer"
+                            checked={Boolean(permissionsData.content?.can_create_flyer)}
+                            onCheckedChange={(checked) => {
+                              const isChecked = checked === true;
+                              // Se está marcando "criar", automaticamente marcar "visualizar"
+                              if (isChecked) {
+                                setPermissionsData({
+                                  ...permissionsData,
+                                  content: {
+                                    ...permissionsData.content,
+                                    can_view_events: permissionsData.content?.can_view_events ?? false,
+                                    can_create_event: permissionsData.content?.can_create_event ?? false,
+                                    can_view_flyers: true,
+                                    can_create_flyer: true,
+                                    can_view_rooms: permissionsData.content?.can_view_rooms ?? false,
+                                    can_create_booking: permissionsData.content?.can_create_booking ?? false,
+                                    can_view_cars: permissionsData.content?.can_view_cars ?? false,
+                                    can_locate_cars: permissionsData.content?.can_locate_cars ?? false,
+                                  },
+                                });
+                              } else {
+                                handlePermissionToggle(
+                                  'can_create_flyer',
+                                  false,
+                                  () => setPermissionsData({
+                                    ...permissionsData,
+                                    content: {
+                                      ...permissionsData.content,
+                                      can_view_events: permissionsData.content?.can_view_events ?? false,
+                                      can_create_event: permissionsData.content?.can_create_event ?? false,
+                                      can_view_flyers: permissionsData.content?.can_view_flyers ?? false,
+                                      can_create_flyer: false,
+                                      can_view_rooms: permissionsData.content?.can_view_rooms ?? false,
+                                      can_create_booking: permissionsData.content?.can_create_booking ?? false,
+                                      can_view_cars: permissionsData.content?.can_view_cars ?? false,
+                                      can_locate_cars: permissionsData.content?.can_locate_cars ?? false,
+                                    },
+                                  })
+                                );
+                              }
+                            }}
+                          />
                           <Label htmlFor="create_flyer">Criar Encartes</Label>
                         </div>
+                      </div>
+                    </div>
+                  </div>
+
+                  <div className="grid grid-cols-2 gap-4 mt-6">
+                    <div className="space-y-2">
+                      <Label className="font-medium">Salas</Label>
+                      <div className="space-y-2">
                         <div className="flex items-center space-x-2">
                           <Checkbox
-                            id="create_booking"
-                            checked={permissionsData.content?.can_create_booking ?? false}
+                            id="view_rooms"
+                            checked={Boolean(permissionsData.content?.can_view_rooms)}
                             onCheckedChange={(checked) => {
+                              const isChecked = checked === true;
                               handlePermissionToggle(
-                                'can_create_booking', 
-                                checked === true,
+                                'can_view_rooms',
+                                isChecked,
                                 () => setPermissionsData({
                                   ...permissionsData,
                                   content: {
                                     ...permissionsData.content,
+                                    can_view_events: permissionsData.content?.can_view_events ?? false,
                                     can_create_event: permissionsData.content?.can_create_event ?? false,
+                                    can_view_flyers: permissionsData.content?.can_view_flyers ?? false,
                                     can_create_flyer: permissionsData.content?.can_create_flyer ?? false,
-                                    can_create_booking: checked === true,
+                                    can_view_rooms: isChecked,
+                                    can_create_booking: permissionsData.content?.can_create_booking ?? false,
+                                    can_view_cars: permissionsData.content?.can_view_cars ?? false,
                                     can_locate_cars: permissionsData.content?.can_locate_cars ?? false,
                                   },
                                 })
                               );
                             }}
                           />
-                          <Label htmlFor="create_booking">Agendar Salas</Label>
+                          <Label htmlFor="view_rooms">Visualizar Salas</Label>
                         </div>
                         <div className="flex items-center space-x-2">
                           <Checkbox
-                            id="locate_cars"
-                            checked={permissionsData.content?.can_locate_cars ?? false}
+                            id="create_booking"
+                            checked={Boolean(permissionsData.content?.can_create_booking)}
                             onCheckedChange={(checked) => {
-                              handlePermissionToggle(
-                                'can_locate_cars', 
-                                checked === true,
-                                () => setPermissionsData({
+                              const isChecked = checked === true;
+                              // Se está marcando "criar", automaticamente marcar "visualizar"
+                              if (isChecked) {
+                                setPermissionsData({
                                   ...permissionsData,
                                   content: {
                                     ...permissionsData.content,
+                                    can_view_events: permissionsData.content?.can_view_events ?? false,
                                     can_create_event: permissionsData.content?.can_create_event ?? false,
+                                    can_view_flyers: permissionsData.content?.can_view_flyers ?? false,
                                     can_create_flyer: permissionsData.content?.can_create_flyer ?? false,
-                                    can_create_booking: permissionsData.content?.can_create_booking ?? false,
-                                    can_locate_cars: checked === true,
+                                    can_view_rooms: true,
+                                    can_create_booking: true,
+                                    can_view_cars: permissionsData.content?.can_view_cars ?? false,
+                                    can_locate_cars: permissionsData.content?.can_locate_cars ?? false,
                                   },
-                                })
-                              );
+                                });
+                              } else {
+                                handlePermissionToggle(
+                                  'can_create_booking',
+                                  false,
+                                  () => setPermissionsData({
+                                    ...permissionsData,
+                                    content: {
+                                      ...permissionsData.content,
+                                      can_view_events: permissionsData.content?.can_view_events ?? false,
+                                      can_create_event: permissionsData.content?.can_create_event ?? false,
+                                      can_view_flyers: permissionsData.content?.can_view_flyers ?? false,
+                                      can_create_flyer: permissionsData.content?.can_create_flyer ?? false,
+                                      can_view_rooms: permissionsData.content?.can_view_rooms ?? false,
+                                      can_create_booking: false,
+                                      can_view_cars: permissionsData.content?.can_view_cars ?? false,
+                                      can_locate_cars: permissionsData.content?.can_locate_cars ?? false,
+                                    },
+                                  })
+                                );
+                              }
                             }}
                           />
-                          <Label htmlFor="locate_cars">Agendar Carros</Label>
+                          <Label htmlFor="create_booking">Agendar Salas</Label>
                         </div>
                       </div>
                     </div>
 
                     <div className="space-y-2">
-                      <Label className="font-medium">Formulários</Label>
+                      <Label className="font-medium">Carros</Label>
                       <div className="space-y-2">
                         <div className="flex items-center space-x-2">
                           <Checkbox
-                            id="create_form"
-                            checked={permissionsData.forms?.can_create_form ?? false}
+                            id="view_cars"
+                            checked={Boolean(permissionsData.content?.can_view_cars)}
                             onCheckedChange={(checked) => {
+                              const isChecked = checked === true;
                               handlePermissionToggle(
-                                'can_create_form', 
-                                checked === true,
+                                'can_view_cars',
+                                isChecked,
                                 () => setPermissionsData({
                                   ...permissionsData,
-                                  forms: {
-                                    ...permissionsData.forms,
-                                    can_create_form: checked === true,
-                                    unlocked_forms: permissionsData.forms?.unlocked_forms ?? [],
-                                    hidden_forms: permissionsData.forms?.hidden_forms ?? [],
+                                  content: {
+                                    ...permissionsData.content,
+                                    can_view_events: permissionsData.content?.can_view_events ?? false,
+                                    can_create_event: permissionsData.content?.can_create_event ?? false,
+                                    can_view_flyers: permissionsData.content?.can_view_flyers ?? false,
+                                    can_create_flyer: permissionsData.content?.can_create_flyer ?? false,
+                                    can_view_rooms: permissionsData.content?.can_view_rooms ?? false,
+                                    can_create_booking: permissionsData.content?.can_create_booking ?? false,
+                                    can_view_cars: isChecked,
+                                    can_locate_cars: permissionsData.content?.can_locate_cars ?? false,
                                   },
                                 })
                               );
                             }}
                           />
-                          <Label htmlFor="create_form">Criar Formulários</Label>
+                          <Label htmlFor="view_cars">Visualizar Carros</Label>
+                        </div>
+                        <div className="flex items-center space-x-2">
+                          <Checkbox
+                            id="locate_cars"
+                            checked={Boolean(permissionsData.content?.can_locate_cars)}
+                            onCheckedChange={(checked) => {
+                              const isChecked = checked === true;
+                              // Se está marcando "criar", automaticamente marcar "visualizar"
+                              if (isChecked) {
+                                setPermissionsData({
+                                  ...permissionsData,
+                                  content: {
+                                    ...permissionsData.content,
+                                    can_view_events: permissionsData.content?.can_view_events ?? false,
+                                    can_create_event: permissionsData.content?.can_create_event ?? false,
+                                    can_view_flyers: permissionsData.content?.can_view_flyers ?? false,
+                                    can_create_flyer: permissionsData.content?.can_create_flyer ?? false,
+                                    can_view_rooms: permissionsData.content?.can_view_rooms ?? false,
+                                    can_create_booking: permissionsData.content?.can_create_booking ?? false,
+                                    can_view_cars: true,
+                                    can_locate_cars: true,
+                                  },
+                                });
+                              } else {
+                                handlePermissionToggle(
+                                  'can_locate_cars',
+                                  false,
+                                  () => setPermissionsData({
+                                    ...permissionsData,
+                                    content: {
+                                      ...permissionsData.content,
+                                      can_view_events: permissionsData.content?.can_view_events ?? false,
+                                      can_create_event: permissionsData.content?.can_create_event ?? false,
+                                      can_view_flyers: permissionsData.content?.can_view_flyers ?? false,
+                                      can_create_flyer: permissionsData.content?.can_create_flyer ?? false,
+                                      can_view_rooms: permissionsData.content?.can_view_rooms ?? false,
+                                      can_create_booking: permissionsData.content?.can_create_booking ?? false,
+                                      can_view_cars: permissionsData.content?.can_view_cars ?? false,
+                                      can_locate_cars: false,
+                                    },
+                                  })
+                                );
+                              }
+                            }}
+                          />
+                          <Label htmlFor="locate_cars">Agendar Carros</Label>
                         </div>
                       </div>
                     </div>
@@ -704,6 +962,84 @@ function UserManagementCard({ user, allForms, onUserUpdate }: UserManagementCard
 
                 <Separator />
 
+                {/* Seção de Formulários */}
+                <div>
+                  <div className="flex items-center gap-2 mb-3">
+                    <FileText className="h-4 w-4" />
+                    <Label className="text-base font-semibold">Formulários</Label>
+                  </div>
+                  <p className="text-sm text-muted-foreground mb-4">
+                    Configure as permissões para visualizar e criar formulários.
+                  </p>
+
+                  <div className="space-y-2">
+                    <div className="flex items-center space-x-2">
+                      <Checkbox
+                        id="view_forms"
+                        checked={Boolean(permissionsData.forms?.can_view_forms)}
+                        onCheckedChange={(checked) => {
+                          const isChecked = checked === true;
+                          handlePermissionToggle(
+                            'can_view_forms', 
+                            isChecked,
+                            () => setPermissionsData({
+                              ...permissionsData,
+                              forms: {
+                                ...permissionsData.forms,
+                                can_view_forms: isChecked,
+                                can_create_form: permissionsData.forms?.can_create_form ?? false,
+                                unlocked_forms: permissionsData.forms?.unlocked_forms ?? [],
+                                hidden_forms: permissionsData.forms?.hidden_forms ?? [],
+                              },
+                            })
+                          );
+                        }}
+                      />
+                      <Label htmlFor="view_forms">Visualizar Formulários</Label>
+                    </div>
+                    <div className="flex items-center space-x-2">
+                      <Checkbox
+                        id="create_form"
+                        checked={permissionsData.forms?.can_create_form ?? false}
+                        onCheckedChange={(checked) => {
+                          const isChecked = checked === true;
+                          // Se está marcando "criar", automaticamente marcar "visualizar"
+                          if (isChecked) {
+                            setPermissionsData({
+                              ...permissionsData,
+                              forms: {
+                                ...permissionsData.forms,
+                                can_view_forms: true,
+                                can_create_form: true,
+                                unlocked_forms: permissionsData.forms?.unlocked_forms ?? [],
+                                hidden_forms: permissionsData.forms?.hidden_forms ?? [],
+                              },
+                            });
+                          } else {
+                            handlePermissionToggle(
+                              'can_create_form', 
+                              false,
+                              () => setPermissionsData({
+                                ...permissionsData,
+                                forms: {
+                                  ...permissionsData.forms,
+                                  can_view_forms: Boolean(permissionsData.forms?.can_view_forms),
+                                  can_create_form: false,
+                                  unlocked_forms: permissionsData.forms?.unlocked_forms ?? [],
+                                  hidden_forms: permissionsData.forms?.hidden_forms ?? [],
+                                },
+                              })
+                            );
+                          }
+                        }}
+                      />
+                      <Label htmlFor="create_form">Criar Formulários</Label>
+                    </div>
+                  </div>
+                </div>
+
+                <Separator />
+
                 {/* Seção de Visibilidade de Formulários */}
                 <div>
                   <div className="flex items-center gap-2 mb-3">
@@ -721,8 +1057,9 @@ function UserManagementCard({ user, allForms, onUserUpdate }: UserManagementCard
                           id={`visible_${form.id}`}
                           checked={!(permissionsData.forms?.hidden_forms?.includes(form.id) ?? false)}
                           onCheckedChange={(checked) => {
+                            const isChecked = checked === true;
                             const currentHidden = permissionsData.forms?.hidden_forms ?? [];
-                            const newHidden = checked
+                            const newHidden = isChecked
                               ? currentHidden.filter(id => id !== form.id) // Remove da lista de ocultos
                               : [...currentHidden, form.id]; // Adiciona à lista de ocultos
 
@@ -730,7 +1067,8 @@ function UserManagementCard({ user, allForms, onUserUpdate }: UserManagementCard
                               ...permissionsData,
                               forms: {
                                 ...permissionsData.forms,
-                                can_create_form: permissionsData.forms?.can_create_form ?? false,
+                                can_view_forms: Boolean(permissionsData.forms?.can_view_forms),
+                                can_create_form: Boolean(permissionsData.forms?.can_create_form),
                                 unlocked_forms: permissionsData.forms?.unlocked_forms ?? [],
                                 hidden_forms: newHidden,
                               },
@@ -769,18 +1107,33 @@ function UserManagementCard({ user, allForms, onUserUpdate }: UserManagementCard
                 <div>
                   <Label className="text-sm font-medium">Permissões de Ação</Label>
                   <div className="flex flex-wrap gap-2 mt-1">
+                    {permissionsData.content?.can_view_events && (
+                      <Badge variant="secondary">Visualizar Eventos</Badge>
+                    )}
                     {permissionsData.content?.can_create_event && (
                       <Badge variant="secondary">Criar Eventos</Badge>
                     )}
+                    {permissionsData.content?.can_view_flyers && (
+                      <Badge variant="secondary">Visualizar Encartes</Badge>
+                    )}
                     {permissionsData.content?.can_create_flyer && (
                       <Badge variant="secondary">Criar Encartes</Badge>
                     )}
+                    {permissionsData.content?.can_view_rooms && (
+                      <Badge variant="secondary">Visualizar Salas</Badge>
+                    )}
                     {permissionsData.content?.can_create_booking && (
                       <Badge variant="secondary">Agendar Salas</Badge>
                     )}
+                    {permissionsData.content?.can_view_cars && (
+                      <Badge variant="secondary">Visualizar Carros</Badge>
+                    )}
                     {permissionsData.content?.can_locate_cars && (
                       <Badge variant="secondary">Agendar Carros</Badge>
                     )}
+                    {permissionsData.forms?.can_view_forms && (
+                      <Badge variant="secondary">Visualizar Formulários</Badge>
+                    )}
                     {permissionsData.forms?.can_create_form && (
                       <Badge variant="secondary">Criar Formulários</Badge>
                     )}
diff --git a/src/components/complete-profile-modal.tsx b/src/components/complete-profile-modal.tsx
index 8d823066..6984bbec 100644
--- a/src/components/complete-profile-modal.tsx
+++ b/src/components/complete-profile-modal.tsx
@@ -31,11 +31,12 @@ const setores = [
   { value: "ADMINISTRATIVO", label: "Administrativo" },
   { value: "COMERCIAL", label: "Comercial" },
   { value: "FINANCEIRO", label: "Financeiro" },
-  { value: "INOVACAO", label: "Inovação" },
-  { value: "LOGISTICA", label: "Logística" },
+  { value: "RECURSOS_HUMANOS", label: "Recursos Humanos" },
+  { value: "TI", label: "Tecnologia da Informação" },
   { value: "MARKETING", label: "Marketing" },
-  { value: "PROMOTORES", label: "Promotores" },
-  { value: "RECURSOS HUMANOS", label: "Recursos Humanos" },
+  { value: "VENDAS", label: "Vendas" },
+  { value: "LOGISTICA", label: "Logística" },
+  { value: "INOVACAO", label: "Inovação" },
 ]
 
 export function CompleteProfileModal({ isOpen, user, onSuccess, onClose }: CompleteProfileModalProps) {
diff --git a/src/hooks/use-access-control.tsx b/src/hooks/use-access-control.tsx
index 0cbeaa34..c06af52e 100644
--- a/src/hooks/use-access-control.tsx
+++ b/src/hooks/use-access-control.tsx
@@ -17,34 +17,90 @@ export function useAccessControl() {
     return Array.isArray(db_user.role_config.admin_pages) && db_user.role_config.admin_pages.includes(route);
   };
 
+  const canViewForms = (): boolean => {
+    if (!db_user?.role_config) return false;
+
+    // Se é sudo, pode visualizar
+    if (db_user.role_config.sudo) return true;
+
+    // Verifica se pode visualizar formulários
+    return Boolean(db_user.role_config.forms?.can_view_forms);
+  };
+
   const canCreateForm = (): boolean => {
     if (!db_user?.role_config) return false;
-    
+
     // Se é sudo, pode criar formulários
     if (db_user.role_config.sudo) return true;
-    
+
     // Verifica se pode criar formulários
     return db_user.role_config.forms?.can_create_form ?? false;
   };
 
+  const canViewEvents = (): boolean => {
+    if (!db_user?.role_config) return false;
+
+    // Se é sudo, pode visualizar
+    if (db_user.role_config.sudo) return true;
+
+    // Verifica se pode visualizar eventos
+    return Boolean(db_user.role_config.content?.can_view_events);
+  };
+
+  const canViewFlyers = (): boolean => {
+    if (!db_user?.role_config) return false;
+
+    // Se é sudo, pode visualizar
+    if (db_user.role_config.sudo) return true;
+
+    // Verifica se pode visualizar encartes
+    return Boolean(db_user.role_config.content?.can_view_flyers);
+  };
+
+  const canViewRooms = (): boolean => {
+    if (!db_user?.role_config) return false;
+
+    // Se é sudo, pode visualizar
+    if (db_user.role_config.sudo) return true;
+
+    // Verifica se pode visualizar salas
+    return Boolean(db_user.role_config.content?.can_view_rooms);
+  };
+
+  const canViewCars = (): boolean => {
+    if (!db_user?.role_config) return false;
+
+    // Se é sudo, pode visualizar
+    if (db_user.role_config.sudo) return true;
+
+    // Verifica se pode visualizar carros
+    return Boolean(db_user.role_config.content?.can_view_cars);
+  };
+
   const canAccessForm = (formId: string): boolean => {
-    if (!db_user?.role_config) return true; // Se não tem config, pode acessar
+    if (!db_user?.role_config) return false; // Se não tem config, não pode acessar
     
     // Se é sudo, pode acessar qualquer formulário
     if (db_user.role_config.sudo) return true;
     
-    // NOVA REGRA: Pode acessar qualquer formulário, exceto os hidden_forms
+    // Primeiro verifica se tem permissão para visualizar formulários
+    if (!db_user.role_config.forms?.can_view_forms) return false;
+    
+    // Se tem permissão para ver, verifica se não está na lista de ocultos
     const isHidden = db_user.role_config.forms?.hidden_forms?.includes(formId) ?? false;
     return !isHidden;
   };
 
   const getAccessibleForms = <T extends { id: string }>(forms: T[]): T[] => {
-    if (!db_user?.role_config) return forms; // Se não tem config, mostra todos
+    if (!db_user?.role_config) return []; // Se não tem config, não mostra nenhum
     
     // Se é sudo, retorna todos os formulários
     if (db_user.role_config.sudo) return forms;
     
-    // NOVA REGRA: Todos podem ver todos os formulários, exceto os hidden_forms
+    // Se não tem permissão para ver formulários, retorna lista vazia
+    if (!db_user.role_config.forms?.can_view_forms) return [];
+    
+    // Se tem permissão, filtra apenas os não ocultos
     return forms.filter(form => {
       const isHidden = db_user.role_config.forms?.hidden_forms?.includes(form.id) ?? false;
       return !isHidden;
@@ -57,7 +113,10 @@ export function useAccessControl() {
     // Se é sudo, pode criar eventos
     if (db_user.role_config.sudo) return true;
 
-    // Verifica se pode criar eventos
+    // Primeiro verifica se pode visualizar eventos
+    if (!db_user.role_config.content?.can_view_events) return false;
+
+    // Se pode visualizar, verifica se pode criar
     return db_user.role_config.content?.can_create_event ?? false;
   };
 
@@ -67,7 +126,10 @@ export function useAccessControl() {
     // Se é sudo, pode criar encartes
     if (db_user.role_config.sudo) return true;
 
-    // Verifica se pode criar encartes
+    // Primeiro verifica se pode visualizar encartes
+    if (!db_user.role_config.content?.can_view_flyers) return false;
+
+    // Se pode visualizar, verifica se pode criar
     return db_user.role_config.content?.can_create_flyer ?? false;
   };
 
@@ -77,19 +139,41 @@ export function useAccessControl() {
     // Se é sudo, pode fazer agendamentos
     if (db_user.role_config.sudo) return true;
 
-    // Verifica se pode fazer agendamentos
+    // Primeiro verifica se pode visualizar salas
+    if (!db_user.role_config.content?.can_view_rooms) return false;
+
+    // Se pode visualizar, verifica se pode agendar
     return db_user.role_config.content?.can_create_booking ?? false;
   };
 
+  const canLocateCars = (): boolean => {
+    if (!db_user?.role_config) return false;
+
+    // Se é sudo, pode fazer agendamentos de carros
+    if (db_user.role_config.sudo) return true;
+
+    // Primeiro verifica se pode visualizar carros
+    if (!db_user.role_config.content?.can_view_cars) return false;
+
+    // Se pode visualizar, verifica se pode agendar
+    return db_user.role_config.content?.can_locate_cars ?? false;
+  };
+
   return {
     db_user,
     hasAdminAccess,
+    canViewForms,
     canCreateForm,
     canAccessForm,
     getAccessibleForms,
+    canViewEvents,
     canCreateEvent,
+    canViewFlyers,
     canCreateFlyer,
+    canViewRooms,
     canCreateBooking,
+    canViewCars,
+    canLocateCars,
     isLoading: !db_user,
     isSudo: db_user?.role_config?.sudo ?? false,
   };
diff --git a/src/lib/access-control.ts b/src/lib/access-control.ts
index 0d7a15e6..42994664 100644
--- a/src/lib/access-control.ts
+++ b/src/lib/access-control.ts
@@ -79,83 +79,122 @@ export function canCreateForm(roleConfig: RolesConfig | null): boolean {
 
 export function canCreateEvent(roleConfig: RolesConfig | null): boolean {
   if (!roleConfig) return false;
-  
+
   // Se é sudo, pode criar eventos
   if (roleConfig.sudo) return true;
-  
-  // Verifica se pode criar eventos
+
+  // Primeiro verifica se pode visualizar eventos
+  if (!roleConfig.content?.can_view_events) return false;
+
+  // Se pode visualizar, verifica se pode criar
   return roleConfig.content?.can_create_event ?? false;
 }
 
 export function canCreateFlyer(roleConfig: RolesConfig | null): boolean {
   if (!roleConfig) return false;
-  
+
   // Se é sudo, pode criar encartes
   if (roleConfig.sudo) return true;
-  
-  // Verifica se pode criar encartes
+
+  // Primeiro verifica se pode visualizar encartes
+  if (!roleConfig.content?.can_view_flyers) return false;
+
+  // Se pode visualizar, verifica se pode criar
   return roleConfig.content?.can_create_flyer ?? false;
 }
 
 export function canCreateBooking(roleConfig: RolesConfig | null): boolean {
   if (!roleConfig) return false;
-  
+
   // Se é sudo, pode fazer agendamentos
   if (roleConfig.sudo) return true;
-  
-  // Verifica se pode fazer agendamentos
+
+  // Primeiro verifica se pode visualizar salas
+  if (!roleConfig.content?.can_view_rooms) return false;
+
+  // Se pode visualizar, verifica se pode agendar
   return roleConfig.content?.can_create_booking ?? false;
 }
 
 export function canLocateCars(roleConfig: RolesConfig | null): boolean {
   if (!roleConfig) return false;
-  
+
   // Se é sudo, pode fazer agendamentos de carros
   if (roleConfig.sudo) return true;
-  
-  // Verifica se pode fazer agendamentos de carros
+
+  // Primeiro verifica se pode visualizar carros
+  if (!roleConfig.content?.can_view_cars) return false;
+
+  // Se pode visualizar, verifica se pode agendar
   return roleConfig.content?.can_locate_cars ?? false;
 }
 
-// Funções de visualização (acesso à página)
-export function canViewCars(): boolean {
-  // Todos podem visualizar a página de carros
+// Funções de visualização (acesso às páginas)
+export function canViewShop(): boolean {
+  // Todos podem visualizar a página de shop
   return true;
 }
 
-export function canViewEvents(): boolean {
-  // Todos podem visualizar a página de eventos
-  return true;
+export function canViewForms(roleConfig: RolesConfig | null): boolean {
+  if (!roleConfig) return false;
+
+  // Se é sudo, pode visualizar
+  if (roleConfig.sudo) return true;
+
+  // Precisa ter a permissão específica para visualizar formulários
+  return roleConfig.forms?.can_view_forms ?? false;
 }
 
-export function canViewFlyers(): boolean {
-  // Todos podem visualizar a página de encartes
-  return true;
+export function canViewEvents(roleConfig: RolesConfig | null): boolean {
+  if (!roleConfig) return false;
+
+  // Se é sudo, pode visualizar
+  if (roleConfig.sudo) return true;
+
+  // Precisa ter a permissão específica para visualizar eventos
+  return roleConfig.content?.can_view_events ?? false;
 }
 
-export function canViewShop(): boolean {
-  // Todos podem visualizar a página de shop
-  return true;
+export function canViewFlyers(roleConfig: RolesConfig | null): boolean {
+  if (!roleConfig) return false;
+
+  // Se é sudo, pode visualizar
+  if (roleConfig.sudo) return true;
+
+  // Precisa ter a permissão específica para visualizar encartes
+  return roleConfig.content?.can_view_flyers ?? false;
 }
 
-export function canViewForms(roleConfig: RolesConfig | null): boolean {
+export function canViewRooms(roleConfig: RolesConfig | null): boolean {
   if (!roleConfig) return false;
-  
+
   // Se é sudo, pode visualizar
   if (roleConfig.sudo) return true;
-  
-  // TODOS podem visualizar a página de formulários
-  // A filtragem dos formulários específicos é feita no componente FormsList
-  return true;
+
+  // Precisa ter a permissão específica para visualizar salas
+  return roleConfig.content?.can_view_rooms ?? false;
+}
+
+export function canViewCars(roleConfig: RolesConfig | null): boolean {
+  if (!roleConfig) return false;
+
+  // Se é sudo, pode visualizar
+  if (roleConfig.sudo) return true;
+
+  // Precisa ter a permissão específica para visualizar carros
+  return roleConfig.content?.can_view_cars ?? false;
 }
 
 export function canAccessForm(roleConfig: RolesConfig | null, formId: string): boolean {
-  if (!roleConfig) return true; // Se não tem config, pode acessar
+  if (!roleConfig) return false; // Se não tem config, não pode acessar
   
   // Se é sudo, pode acessar qualquer formulário
   if (roleConfig.sudo) return true;
   
-  // NOVA REGRA: Pode acessar qualquer formulário, exceto os hidden_forms
+  // Primeiro verifica se tem permissão para visualizar formulários
+  if (!roleConfig.forms?.can_view_forms) return false;
+  
+  // Se tem permissão para ver, verifica se não está na lista de ocultos
   const isHidden = roleConfig.forms?.hidden_forms?.includes(formId) ?? false;
   return !isHidden;
 }
@@ -164,12 +203,15 @@ export function getAccessibleForms<T extends { id: string }>(
   roleConfig: RolesConfig | null,
   forms: T[]
 ): T[] {
-  if (!roleConfig) return forms; // Se não tem config, mostra todos
+  if (!roleConfig) return [];
 
   // Se é sudo, retorna todos os formulários
   if (roleConfig.sudo) return forms;
 
-  // NOVA REGRA: Todos podem ver todos os formulários, exceto os hidden_forms
+  // Se não tem permissão para ver formulários, retorna lista vazia
+  if (!roleConfig.forms?.can_view_forms) return [];
+
+  // Se tem permissão, filtra apenas os não ocultos
   return forms.filter(form => {
     const isHidden = roleConfig.forms?.hidden_forms?.includes(form.id) ?? false;
     return !isHidden;
diff --git a/src/types/role-config.ts b/src/types/role-config.ts
index 1b1a6607..371c4259 100644
--- a/src/types/role-config.ts
+++ b/src/types/role-config.ts
@@ -3,14 +3,19 @@ export type RolesConfig = {
   admin_pages: string[] | undefined; // Páginas admin permitidas
   accessible_routes?: string[]; // Rotas/páginas que o usuário pode acessar
   forms: {
-    can_create_form: boolean;  // Pode criar formulários
-    unlocked_forms: string[];   // Formulários que devem ficar visíveis para o usuário
+    can_view_forms: boolean;     // Pode visualizar formulários
+    can_create_form: boolean;    // Pode criar formulários
+    unlocked_forms: string[];    // Formulários que devem ficar visíveis para o usuário
     hidden_forms?: string[];     // Formulários que devem ficar invisíveis
   } | undefined;
   content?: {
+    can_view_events: boolean;     // Pode visualizar eventos
     can_create_event: boolean;    // Pode criar eventos
+    can_view_flyers: boolean;     // Pode visualizar encartes
     can_create_flyer: boolean;    // Pode criar encartes
+    can_view_rooms: boolean;      // Pode visualizar salas
     can_create_booking: boolean;  // Pode fazer agendamentos de salas
+    can_view_cars: boolean;       // Pode visualizar carros
     can_locate_cars: boolean;     // Pode fazer agendamentos de carros
   } | undefined;
   isTotem?: boolean; // Para usuários TOTEM (acesso limitado)

From f4a52a1b21959c8ee22385cc2d1def74eaccf5f6 Mon Sep 17 00:00:00 2001
From: Ruan Bueno <rbcr4z1@gmail.com>
Date: Wed, 3 Sep 2025 18:01:39 -0300
Subject: [PATCH 3/3] fix: update access control checks to utilize user role
 configuration

---
 src/app/(authenticated)/cars/page.tsx   | 2 +-
 src/app/(authenticated)/events/page.tsx | 2 +-
 src/app/(authenticated)/flyers/page.tsx | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/(authenticated)/cars/page.tsx b/src/app/(authenticated)/cars/page.tsx
index 6480b24d..19332692 100644
--- a/src/app/(authenticated)/cars/page.tsx
+++ b/src/app/(authenticated)/cars/page.tsx
@@ -32,7 +32,7 @@ export default async function DashboardPage() {
   const userData = await api.user.me()
 
   // Verificar se o usuário tem permissão para visualizar a página de carros
-  if (!canViewCars()) {
+  if (!canViewCars(userData.role_config)) {
     redirect("/dashboard")
   }
 
diff --git a/src/app/(authenticated)/events/page.tsx b/src/app/(authenticated)/events/page.tsx
index 22a58d69..24e5d7b9 100644
--- a/src/app/(authenticated)/events/page.tsx
+++ b/src/app/(authenticated)/events/page.tsx
@@ -24,7 +24,7 @@ export default async function EventsPage() {
   const userData = await api.user.me()
 
   // Verificar se o usuário tem permissão para visualizar a página de eventos
-  if (!canViewEvents()) {
+  if (!canViewEvents(userData.role_config)) {
     redirect("/dashboard")
   }
 
diff --git a/src/app/(authenticated)/flyers/page.tsx b/src/app/(authenticated)/flyers/page.tsx
index b181a074..26e2eccf 100644
--- a/src/app/(authenticated)/flyers/page.tsx
+++ b/src/app/(authenticated)/flyers/page.tsx
@@ -23,7 +23,7 @@ export default async function FlyersPage() {
   const userData = await api.user.me()
 
   // Verificar se o usuário tem permissão para visualizar a página de encartes
-  if (!canViewFlyers()) {
+  if (!canViewFlyers(userData.role_config)) {
     redirect("/dashboard")
   }