format: user resource

Author: ahaodev

api/controller/resource_controller.go

@@ -42,9 +42,25 @@ func (rc *ResourceController) GetResources(c *gin.Context) {
 	// 管理员直接返回所有菜单和权限
 	if isAdmin {
 		allPermissions := rc.collectAllPermissions(menuTree)
+
+		// Resolve role names for admin (same format as non-admin path)
+		adminUser, err := rc.UserRepository.GetByID(c, userID)
+		if err != nil {
+			pkg.Log.WithField("userID", userID).WithError(err).Error("Failed to get admin user information")
+			c.JSON(http.StatusInternalServerError, domain.RespError("Failed to get user: "+err.Error()))
+			return
+		}
+		adminRoleObjects, _ := rc.getUserRoles(c, adminUser.Roles)
+		adminRoleNames := make([]string, 0, len(adminRoleObjects))
+		for _, r := range adminRoleObjects {
+			adminRoleNames = append(adminRoleNames, r.Name)
+		}
+
 		responseData := gin.H{
 			"menus":       menuTree,
 			"permissions": allPermissions,
+			"roles":       adminRoleNames,
+			"is_admin":    true,
 		}
 		c.JSON(http.StatusOK, domain.RespSuccess(responseData))
 		return
@@ -71,10 +87,18 @@ func (rc *ResourceController) GetResources(c *gin.Context) {
 	// 过滤菜单树
 	filteredMenuTree := rc.filterMenuTree(menuTree, userMenuIDs)
 
+	// 提取角色名称列表
+	roleNames := make([]string, 0, len(roles))
+	for _, r := range roles {
+		roleNames = append(roleNames, r.Name)
+	}
+
 	// 构建响应数据
 	responseData := gin.H{
 		"menus":       filteredMenuTree,
 		"permissions": userPermissions,
+		"roles":       roleNames,
+		"is_admin":    false,
 	}
 	c.JSON(http.StatusOK, domain.RespSuccess(responseData))
 }

domain/profile.go

@@ -10,7 +10,6 @@ type Profile struct {
 	Username  string    `json:"username"`
 	Email     string    `json:"email"`
 	Phone     string    `json:"phone"`
-	IsAdmin   bool      `json:"is_admin"`
 	Status    string    `json:"status"`
 	CreatedAt time.Time `json:"created_at"`
 	UpdatedAt time.Time `json:"updated_at"`

repository/profile_repository.go

@@ -33,7 +33,6 @@ func (pr *entProfileRepository) GetByID(c context.Context, id string) (*domain.P
 		Username:  u.Username,
 		Email:     u.Email,
 		Phone:     u.Phone,
-		IsAdmin:   u.IsAdmin,
 		Status:    string(u.Status),
 		CreatedAt: u.CreatedAt,
 		UpdatedAt: u.UpdatedAt,

web/src/components/layout/data/dynamic-sidebar-data.ts

@@ -28,12 +28,6 @@ export async function getDynamicSidebarData(): Promise<SidebarData> {
     const sidebarData = await sidebarService.getSidebarData()
 
     if (sidebarData.navGroups && sidebarData.navGroups.length > 0) {
-      console.log(
-        'Dynamic sidebar data: Loaded',
-        sidebarData.navGroups.length,
-        'dynamic nav groups'
-      )
-
       return {
         user: sidebarData.user,
         teams: sidebarData.teams,

web/src/hooks/use-sidebar-data.ts

@@ -30,15 +30,10 @@ export function useSidebarData() {
         setIsLoading(true)
         setError(null)
 
-        console.log('Loading sidebar data for user:', userKey)
         const dynamicData = await getDynamicSidebarData()
 
         if (mounted) {
           setSidebarData(dynamicData)
-          console.log(
-            'Sidebar data updated, nav groups count:',
-            dynamicData.navGroups?.length || 0
-          )
         }
       } catch (err) {
         if (mounted) {

web/src/lib/backend-menu-adapter.ts

@@ -1,5 +1,5 @@
-import { type MenuTreeNode } from '@/types/menu'
-import { type NavGroup, type NavItem } from '@/components/layout/types'
+import {type MenuTreeNode} from '@/types/menu'
+import {type NavGroup, type NavItem} from '@/components/layout/types'
 
 /**
  * Convert a single MenuTreeNode to NavItem
@@ -13,11 +13,6 @@ function convertMenuNodeToNavItem(menu: MenuTreeNode): NavItem | null {
 
   // Filter out button types - buttons should not be rendered in navigation menu
   if (menu.type === 'button') {
-    console.log(
-      'Skipping button type:',
-      menu.name,
-      'buttons are handled via permissions on pages'
-    )
     return null
   }
 
@@ -30,10 +25,6 @@ function convertMenuNodeToNavItem(menu: MenuTreeNode): NavItem | null {
     // If this menu item has a path and no visible children (all children are buttons),
     // render it as a single menu item instead of a group
     if (visibleChildren.length === 0 && menu.path) {
-      console.log(
-        'Rendering menu item with no visible children as single item:',
-        menu.name
-      )
       return {
         title: menu.name,
         icon: menu.icon,
@@ -78,23 +69,9 @@ export class BackendMenuAdapter {
       console.log('BackendMenuAdapter: No menu nodes to transform')
       return []
     }
-
-    console.log(
-      'BackendMenuAdapter: Transforming',
-      menuNodes.length,
-      'menu nodes'
-    )
-
-    const result = menuNodes
-      .map(this.convertToNavGroup)
-      .filter((group): group is NavGroup => group !== null)
-    console.log(
-      'BackendMenuAdapter: Transformed to',
-      result.length,
-      'nav groups'
-    )
-
-    return result
+    return menuNodes
+        .map(this.convertToNavGroup)
+        .filter((group): group is NavGroup => group !== null)
   }
 
   /**

web/src/services/menu-service.ts

@@ -53,11 +53,10 @@ export class MenuService {
         const { setPermissions } = useAuthStore.getState().auth
         setPermissions({
           permissions: resourcesData.permissions.map((p) => [p]), // Convert string[] to string[][]
-          roles: [], // TODO: get roles from API if available
+          roles: resourcesData.roles ?? [],
           menus: resourcesData.menus.map((m) => m.id), // Extract menu IDs
-          is_admin: false, // TODO: determine admin status from API
+          is_admin: resourcesData.is_admin ?? false,
         })
-        console.log('Permissions set to auth store:', resourcesData.permissions)
       }
 
       // Transform the backend data using the backend adapter

web/src/services/resourceApi.ts

@@ -1,5 +1,5 @@
-import { type MenuTreeNode, type ResourcesResponse } from '@/types/menu'
-import { apiClient } from './config'
+import {type MenuTreeNode, type ResourcesResponse} from '@/types/menu'
+import {apiClient} from './config'
 
 /**
  * Resource API service for fetching menu resources from backend
@@ -36,12 +36,9 @@ export const getResourcesWithPermissions =
       const response = await apiClient.get(`/api/v1/resources`)
 
       if (response.data && response.data.data) {
-        const resourcesData: ResourcesResponse = response.data.data
-        console.log('API Response - Complete resources:', resourcesData)
-        return resourcesData
+        return response.data.data
       } else {
-        console.warn('No resources data returned from API')
-        return { menus: [], permissions: null }
+        return { menus: [], permissions: null, roles: [], is_admin: false }
       }
     } catch (error) {
       console.error('Failed to fetch resources:', error)

web/src/types/menu.ts

@@ -92,6 +92,8 @@ export interface MenuQueryParams {
 export interface ResourcesResponse {
   menus: MenuTreeNode[]
   permissions: string[] | null
+  roles: string[]
+  is_admin: boolean
 }
 
 // Type definitions