fix: remove dashboard widgets flow

TaskTrackingSystem.Database/AppDbContextModels/AppDbContext.cs

@@ -24,8 +24,6 @@ public partial class AppDbContext : DbContext
 
     public virtual DbSet<Menu> Menus { get; set; }
 
-    public virtual DbSet<DashboardWidget> DashboardWidgets { get; set; }
-
     public virtual DbSet<Notification> Notifications { get; set; }
 
     public virtual DbSet<Permission> Permissions { get; set; }
@@ -38,8 +36,6 @@ public partial class AppDbContext : DbContext
 
     public virtual DbSet<RoleMenu> RoleMenus { get; set; }
 
-    public virtual DbSet<RoleDashboardWidget> RoleDashboardWidgets { get; set; }
-
     public virtual DbSet<RolePermission> RolePermissions { get; set; }
 
     public virtual DbSet<Task> Tasks { get; set; }
@@ -48,8 +44,6 @@ public partial class AppDbContext : DbContext
 
     public virtual DbSet<TimeLog> TimeLogs { get; set; }
 
-    public virtual DbSet<UserDashboardLayout> UserDashboardLayouts { get; set; }
-
     public virtual DbSet<UserDevice> UserDevices { get; set; }
 
     public virtual DbSet<User> Users { get; set; }
@@ -142,29 +136,6 @@ public partial class AppDbContext : DbContext
                 .HasConstraintName("FK_Menus_ParentMenu");
         });
 
-        modelBuilder.Entity<DashboardWidget>(entity =>
-        {
-            entity.HasKey(e => e.WidgetId);
-
-            entity.HasIndex(e => e.WidgetCode, "UQ_DashboardWidgets_WidgetCode").IsUnique();
-
-            entity.Property(e => e.Category).HasMaxLength(50);
-            entity.Property(e => e.ComponentKey).HasMaxLength(100);
-            entity.Property(e => e.CreatedAt)
-                .HasPrecision(0)
-                .HasDefaultValueSql("(sysutcdatetime())");
-            entity.Property(e => e.DataSourceKey).HasMaxLength(100);
-            entity.Property(e => e.DefaultHeight).HasDefaultValue(3);
-            entity.Property(e => e.DefaultOrder).HasDefaultValue(0);
-            entity.Property(e => e.DefaultWidth).HasDefaultValue(4);
-            entity.Property(e => e.Description).HasMaxLength(500);
-            entity.Property(e => e.IsActive).HasDefaultValue(true);
-            entity.Property(e => e.IsDeleted).HasDefaultValue(false);
-            entity.Property(e => e.UpdatedAt).HasPrecision(0);
-            entity.Property(e => e.WidgetCode).HasMaxLength(50);
-            entity.Property(e => e.WidgetName).HasMaxLength(100);
-        });
-
         modelBuilder.Entity<Notification>(entity =>
         {
             entity.ToTable("notifications");
@@ -289,39 +260,6 @@ public partial class AppDbContext : DbContext
                 .HasConstraintName("FK_RoleMenus_Roles");
         });
 
-        modelBuilder.Entity<RoleDashboardWidget>(entity =>
-        {
-            entity.HasKey(e => e.RoleDashboardWidgetId);
-
-            entity.HasIndex(e => e.RoleId, "IX_RoleDashboardWidgets_RoleId");
-            entity.HasIndex(e => e.WidgetId, "IX_RoleDashboardWidgets_WidgetId");
-            entity.HasIndex(e => new { e.RoleId, e.WidgetId }, "UQ_RoleDashboardWidgets_Role_Widget").IsUnique();
-
-            entity.Property(e => e.CanConfigure).HasDefaultValue(false);
-            entity.Property(e => e.CanView).HasDefaultValue(true);
-            entity.Property(e => e.CreatedAt)
-                .HasPrecision(0)
-                .HasDefaultValueSql("(sysutcdatetime())");
-            entity.Property(e => e.DefaultGridX).HasDefaultValue(0);
-            entity.Property(e => e.DefaultGridY).HasDefaultValue(0);
-            entity.Property(e => e.DefaultHeight).HasDefaultValue(3);
-            entity.Property(e => e.DefaultSortOrder).HasDefaultValue(0);
-            entity.Property(e => e.DefaultWidth).HasDefaultValue(4);
-            entity.Property(e => e.IsDefaultVisible).HasDefaultValue(true);
-            entity.Property(e => e.IsDeleted).HasDefaultValue(false);
-            entity.Property(e => e.UpdatedAt).HasPrecision(0);
-
-            entity.HasOne(d => d.Role).WithMany(p => p.RoleDashboardWidgets)
-                .HasForeignKey(d => d.RoleId)
-                .OnDelete(DeleteBehavior.Cascade)
-                .HasConstraintName("FK_RoleDashboardWidgets_Roles");
-
-            entity.HasOne(d => d.Widget).WithMany(p => p.RoleDashboardWidgets)
-                .HasForeignKey(d => d.WidgetId)
-                .OnDelete(DeleteBehavior.Cascade)
-                .HasConstraintName("FK_RoleDashboardWidgets_DashboardWidgets");
-        });
-
         modelBuilder.Entity<RolePermission>(entity =>
         {
             entity.HasIndex(e => e.PermissionId, "IX_RolePermissions_PermissionId");
@@ -421,37 +359,6 @@ public partial class AppDbContext : DbContext
                 .HasConstraintName("FK_TimeLogs_Users");
         });
 
-        modelBuilder.Entity<UserDashboardLayout>(entity =>
-        {
-            entity.HasKey(e => e.UserDashboardLayoutId);
-
-            entity.HasIndex(e => e.UserId, "IX_UserDashboardLayouts_UserId");
-            entity.HasIndex(e => e.WidgetId, "IX_UserDashboardLayouts_WidgetId");
-            entity.HasIndex(e => new { e.UserId, e.WidgetId }, "UQ_UserDashboardLayouts_User_Widget").IsUnique();
-
-            entity.Property(e => e.ConfigJson).HasColumnType("nvarchar(max)");
-            entity.Property(e => e.CreatedAt)
-                .HasPrecision(0)
-                .HasDefaultValueSql("(sysutcdatetime())");
-            entity.Property(e => e.Height).HasDefaultValue(3);
-            entity.Property(e => e.IsDeleted).HasDefaultValue(false);
-            entity.Property(e => e.IsHidden).HasDefaultValue(false);
-            entity.Property(e => e.IsPinned).HasDefaultValue(false);
-            entity.Property(e => e.SortOrder).HasDefaultValue(0);
-            entity.Property(e => e.UpdatedAt).HasPrecision(0);
-            entity.Property(e => e.Width).HasDefaultValue(4);
-
-            entity.HasOne(d => d.User).WithMany(p => p.UserDashboardLayouts)
-                .HasForeignKey(d => d.UserId)
-                .OnDelete(DeleteBehavior.Cascade)
-                .HasConstraintName("FK_UserDashboardLayouts_Users");
-
-            entity.HasOne(d => d.Widget).WithMany(p => p.UserDashboardLayouts)
-                .HasForeignKey(d => d.WidgetId)
-                .OnDelete(DeleteBehavior.Cascade)
-                .HasConstraintName("FK_UserDashboardLayouts_DashboardWidgets");
-        });
-
         modelBuilder.Entity<User>(entity =>
         {
             entity.HasIndex(e => e.RoleId, "IX_Users_RoleId");

TaskTrackingSystem.Database/AppDbContextModels/DashboardWidget.cs

@@ -1,39 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace TaskTrackingSystem.Database.AppDbContextModels;
-
-public partial class DashboardWidget
-{
-    public long WidgetId { get; set; }
-
-    public string WidgetCode { get; set; } = null!;
-
-    public string WidgetName { get; set; } = null!;
-
-    public string? Description { get; set; }
-
-    public string? Category { get; set; }
-
-    public string? ComponentKey { get; set; }
-
-    public string? DataSourceKey { get; set; }
-
-    public int DefaultWidth { get; set; }
-
-    public int DefaultHeight { get; set; }
-
-    public int DefaultOrder { get; set; }
-
-    public bool IsActive { get; set; }
-
-    public bool IsDeleted { get; set; }
-
-    public DateTime CreatedAt { get; set; }
-
-    public DateTime? UpdatedAt { get; set; }
-
-    public virtual ICollection<RoleDashboardWidget> RoleDashboardWidgets { get; set; } = new List<RoleDashboardWidget>();
-
-    public virtual ICollection<UserDashboardLayout> UserDashboardLayouts { get; set; } = new List<UserDashboardLayout>();
-}

TaskTrackingSystem.Database/AppDbContextModels/Role.cs

@@ -25,7 +25,5 @@ public partial class Role
 
     public virtual ICollection<RolePermission> RolePermissions { get; set; } = new List<RolePermission>();
 
-    public virtual ICollection<RoleDashboardWidget> RoleDashboardWidgets { get; set; } = new List<RoleDashboardWidget>();
-
     public virtual ICollection<User> Users { get; set; } = new List<User>();
 }

TaskTrackingSystem.Database/AppDbContextModels/RoleDashboardWidget.cs

@@ -1,42 +0,0 @@
-using System;
-
-namespace TaskTrackingSystem.Database.AppDbContextModels;
-
-public partial class RoleDashboardWidget
-{
-    public long RoleDashboardWidgetId { get; set; }
-
-    public long RoleId { get; set; }
-
-    public long WidgetId { get; set; }
-
-    public bool CanView { get; set; }
-
-    public bool CanConfigure { get; set; }
-
-    public bool IsDefaultVisible { get; set; }
-
-    public int DefaultGridX { get; set; }
-
-    public int DefaultGridY { get; set; }
-
-    public int DefaultWidth { get; set; }
-
-    public int DefaultHeight { get; set; }
-
-    public int DefaultSortOrder { get; set; }
-
-    public bool IsDeleted { get; set; }
-
-    public long? CreatedById { get; set; }
-
-    public DateTime CreatedAt { get; set; }
-
-    public long? UpdatedById { get; set; }
-
-    public DateTime? UpdatedAt { get; set; }
-
-    public virtual DashboardWidget Widget { get; set; } = null!;
-
-    public virtual Role Role { get; set; } = null!;
-}

TaskTrackingSystem.Database/AppDbContextModels/User.cs

@@ -53,5 +53,4 @@ public partial class User
 
     public virtual ICollection<TimeLog> TimeLogs { get; set; } = new List<TimeLog>();
 
-    public virtual ICollection<UserDashboardLayout> UserDashboardLayouts { get; set; } = new List<UserDashboardLayout>();
 }

TaskTrackingSystem.Database/AppDbContextModels/UserDashboardLayout.cs

@@ -1,42 +0,0 @@
-using System;
-
-namespace TaskTrackingSystem.Database.AppDbContextModels;
-
-public partial class UserDashboardLayout
-{
-    public long UserDashboardLayoutId { get; set; }
-
-    public long UserId { get; set; }
-
-    public long WidgetId { get; set; }
-
-    public int GridX { get; set; }
-
-    public int GridY { get; set; }
-
-    public int Width { get; set; }
-
-    public int Height { get; set; }
-
-    public int SortOrder { get; set; }
-
-    public bool IsHidden { get; set; }
-
-    public bool IsPinned { get; set; }
-
-    public string? ConfigJson { get; set; }
-
-    public bool IsDeleted { get; set; }
-
-    public long? CreatedById { get; set; }
-
-    public DateTime CreatedAt { get; set; }
-
-    public long? UpdatedById { get; set; }
-
-    public DateTime? UpdatedAt { get; set; }
-
-    public virtual DashboardWidget Widget { get; set; } = null!;
-
-    public virtual User User { get; set; } = null!;
-}

TaskTrackingSystem.Shared/Models/Dashboard/DashboardWidgetAdminDto.cs

@@ -1,37 +0,0 @@
-using System;
-
-namespace TaskTrackingSystem.Shared.Models.Dashboard
-{
-    public class DashboardWidgetAdminDto
-    {
-        public long WidgetId { get; set; }
-
-        public string WidgetCode { get; set; } = string.Empty;
-
-        public string WidgetName { get; set; } = string.Empty;
-
-        public string? Description { get; set; }
-
-        public string? Category { get; set; }
-
-        public string? ComponentKey { get; set; }
-
-        public string? DataSourceKey { get; set; }
-
-        public int DefaultWidth { get; set; }
-
-        public int DefaultHeight { get; set; }
-
-        public int DefaultOrder { get; set; }
-
-        public bool IsActive { get; set; }
-
-        public bool IsDeleted { get; set; }
-
-        public DateTime CreatedAt { get; set; }
-
-        public DateTime? UpdatedAt { get; set; }
-
-        public int RoleCount { get; set; }
-    }
-}

TaskTrackingSystem.Shared/Models/Dashboard/DashboardWidgetDto.cs

@@ -1,49 +0,0 @@
-namespace TaskTrackingSystem.Shared.Models.Dashboard
-{
-    public class DashboardWidgetDto
-    {
-        public long WidgetId { get; set; }
-
-        public string WidgetCode { get; set; } = string.Empty;
-
-        public string WidgetName { get; set; } = string.Empty;
-
-        public string? Description { get; set; }
-
-        public string? Category { get; set; }
-
-        public string? ComponentKey { get; set; }
-
-        public string? DataSourceKey { get; set; }
-
-        public int DefaultWidth { get; set; }
-
-        public int DefaultHeight { get; set; }
-
-        public int DefaultOrder { get; set; }
-
-        public bool CanView { get; set; }
-
-        public bool CanConfigure { get; set; }
-
-        public bool IsDefaultVisible { get; set; }
-
-        public bool HasCustomLayout { get; set; }
-
-        public bool IsHidden { get; set; }
-
-        public bool IsPinned { get; set; }
-
-        public int GridX { get; set; }
-
-        public int GridY { get; set; }
-
-        public int Width { get; set; }
-
-        public int Height { get; set; }
-
-        public int SortOrder { get; set; }
-
-        public string? ConfigJson { get; set; }
-    }
-}

TaskTrackingSystem.Shared/Models/Dashboard/DashboardWidgetLayoutItemDto.cs

@@ -1,23 +0,0 @@
-namespace TaskTrackingSystem.Shared.Models.Dashboard
-{
-    public class DashboardWidgetLayoutItemDto
-    {
-        public long WidgetId { get; set; }
-
-        public int GridX { get; set; }
-
-        public int GridY { get; set; }
-
-        public int Width { get; set; }
-
-        public int Height { get; set; }
-
-        public int SortOrder { get; set; }
-
-        public bool IsHidden { get; set; }
-
-        public bool IsPinned { get; set; }
-
-        public string? ConfigJson { get; set; }
-    }
-}

TaskTrackingSystem.Shared/Models/Dashboard/DashboardWidgetLayoutSaveRequestDto.cs

@@ -1,9 +0,0 @@
-using System.Collections.Generic;
-
-namespace TaskTrackingSystem.Shared.Models.Dashboard
-{
-    public class DashboardWidgetLayoutSaveRequestDto
-    {
-        public List<DashboardWidgetLayoutItemDto> Widgets { get; set; } = new();
-    }
-}

TaskTrackingSystem.Shared/Models/Dashboard/DashboardWidgetRoleAccessDto.cs

@@ -1,25 +0,0 @@
-namespace TaskTrackingSystem.Shared.Models.Dashboard
-{
-    public class DashboardWidgetRoleAccessDto
-    {
-        public long RoleId { get; set; }
-
-        public string RoleName { get; set; } = string.Empty;
-
-        public bool CanView { get; set; }
-
-        public bool CanConfigure { get; set; }
-
-        public bool IsDefaultVisible { get; set; }
-
-        public int DefaultGridX { get; set; }
-
-        public int DefaultGridY { get; set; }
-
-        public int DefaultWidth { get; set; }
-
-        public int DefaultHeight { get; set; }
-
-        public int DefaultSortOrder { get; set; }
-    }
-}

TaskTrackingSystem.Shared/Models/Dashboard/DashboardWidgetRoleAccessSaveRequestDto.cs

@@ -1,9 +0,0 @@
-using System.Collections.Generic;
-
-namespace TaskTrackingSystem.Shared.Models.Dashboard
-{
-    public class DashboardWidgetRoleAccessSaveRequestDto
-    {
-        public List<DashboardWidgetRoleAccessDto> RoleAccess { get; set; } = new();
-    }
-}

TaskTrackingSystem.Shared/Models/Dashboard/DashboardWidgetUpsertDto.cs

@@ -1,35 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-
-namespace TaskTrackingSystem.Shared.Models.Dashboard
-{
-    public class DashboardWidgetUpsertDto
-    {
-        public long WidgetId { get; set; }
-
-        [Required, MaxLength(50)]
-        public string WidgetCode { get; set; } = string.Empty;
-
-        [Required, MaxLength(100)]
-        public string WidgetName { get; set; } = string.Empty;
-
-        [MaxLength(500)]
-        public string? Description { get; set; }
-
-        [MaxLength(50)]
-        public string? Category { get; set; }
-
-        [MaxLength(100)]
-        public string? ComponentKey { get; set; }
-
-        [MaxLength(100)]
-        public string? DataSourceKey { get; set; }
-
-        public int DefaultWidth { get; set; } = 4;
-
-        public int DefaultHeight { get; set; } = 3;
-
-        public int DefaultOrder { get; set; }
-
-        public bool IsActive { get; set; } = true;
-    }
-}

TaskTrackingSystem.WebApi/Features/Dashboard/DashboardController.cs

@@ -1,5 +1,5 @@
-using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using TaskTrackingSystem.Shared;
@@ -40,104 +40,5 @@ namespace TaskTrackingSystem.WebApi.Features.Dashboard
             var result = await _dashboardService.GetProjectProgressAsync(User.GetRoleName(), User.GetUserId());
             return StatusCode(result.StatusCode, result);
         }
-
-        [HttpGet("widgets")]
-        public async Task<ActionResult<Result<IEnumerable<DashboardWidgetDto>>>> GetWidgets()
-        {
-            var result = await _dashboardService.GetWidgetsAsync(User.GetRoleName(), User.GetUserId());
-            return StatusCode(result.StatusCode, result);
-        }
-
-        [HttpPut("widgets/layout")]
-        public async Task<ActionResult<Result>> SaveWidgetLayout([FromBody] DashboardWidgetLayoutSaveRequestDto request)
-        {
-            var result = await _dashboardService.SaveWidgetLayoutAsync(User.GetRoleName(), User.GetUserId(), request);
-            return StatusCode(result.StatusCode, result);
-        }
-
-        [HttpGet("admin/widgets")]
-        public async Task<ActionResult<Result<IEnumerable<DashboardWidgetAdminDto>>>> GetWidgetCatalog()
-        {
-            if (!User.IsInRole("Admin"))
-            {
-                return Forbid();
-            }
-
-            var result = await _dashboardService.GetWidgetCatalogAsync();
-            return StatusCode(result.StatusCode, result);
-        }
-
-        [HttpGet("admin/widgets/{widgetId:long}")]
-        public async Task<ActionResult<Result<DashboardWidgetAdminDto>>> GetWidget(long widgetId)
-        {
-            if (!User.IsInRole("Admin"))
-            {
-                return Forbid();
-            }
-
-            var result = await _dashboardService.GetWidgetByIdAsync(widgetId);
-            return StatusCode(result.StatusCode, result);
-        }
-
-        [HttpPost("admin/widgets")]
-        public async Task<ActionResult<Result<DashboardWidgetAdminDto>>> CreateWidget([FromBody] DashboardWidgetUpsertDto request)
-        {
-            if (!User.IsInRole("Admin"))
-            {
-                return Forbid();
-            }
-
-            var result = await _dashboardService.SaveWidgetAsync(request, User.GetUserId());
-            return StatusCode(result.StatusCode, result);
-        }
-
-        [HttpPut("admin/widgets/{widgetId:long}")]
-        public async Task<ActionResult<Result<DashboardWidgetAdminDto>>> UpdateWidget(long widgetId, [FromBody] DashboardWidgetUpsertDto request)
-        {
-            if (!User.IsInRole("Admin"))
-            {
-                return Forbid();
-            }
-
-            request.WidgetId = widgetId;
-            var result = await _dashboardService.SaveWidgetAsync(request, User.GetUserId());
-            return StatusCode(result.StatusCode, result);
-        }
-
-        [HttpDelete("admin/widgets/{widgetId:long}")]
-        public async Task<ActionResult<Result>> DeleteWidget(long widgetId)
-        {
-            if (!User.IsInRole("Admin"))
-            {
-                return Forbid();
-            }
-
-            var result = await _dashboardService.DeleteWidgetAsync(widgetId, User.GetUserId());
-            return StatusCode(result.StatusCode, result);
-        }
-
-        [HttpGet("admin/widgets/{widgetId:long}/access")]
-        public async Task<ActionResult<Result<IEnumerable<DashboardWidgetRoleAccessDto>>>> GetWidgetAccess(long widgetId)
-        {
-            if (!User.IsInRole("Admin"))
-            {
-                return Forbid();
-            }
-
-            var result = await _dashboardService.GetWidgetAccessAsync(widgetId);
-            return StatusCode(result.StatusCode, result);
-        }
-
-        [HttpPut("admin/widgets/{widgetId:long}/access")]
-        public async Task<ActionResult<Result>> SaveWidgetAccess(long widgetId, [FromBody] DashboardWidgetRoleAccessSaveRequestDto request)
-        {
-            if (!User.IsInRole("Admin"))
-            {
-                return Forbid();
-            }
-
-            var result = await _dashboardService.SaveWidgetAccessAsync(widgetId, request, User.GetUserId());
-            return StatusCode(result.StatusCode, result);
-        }
     }
 }

TaskTrackingSystem.WebApi/Features/Dashboard/DashboardService.cs

@@ -5,9 +5,8 @@ using System.Linq;
 using System.Threading.Tasks;
 using TaskTrackingSystem.Database.AppDbContextModels;
 using TaskTrackingSystem.Shared;
-using TaskTrackingSystem.Shared.Models.Dashboard;
 using TaskTrackingSystem.Shared.Enums;
-using RoleEntity = TaskTrackingSystem.Database.AppDbContextModels.Role;
+using TaskTrackingSystem.Shared.Models.Dashboard;
 
 namespace TaskTrackingSystem.WebApi.Features.Dashboard
 {
@@ -58,7 +57,6 @@ namespace TaskTrackingSystem.WebApi.Features.Dashboard
                 })
                 .ToListAsync();
 
-            // Status mappings (StatusId 1 = To Do, 2 = In Progress, 3 = Done etc.)
             var statusMap = new Dictionary<AppTaskStatus, string>
             {
                 { AppTaskStatus.Todo, "To Do" },
@@ -73,7 +71,6 @@ namespace TaskTrackingSystem.WebApi.Features.Dashboard
                 TaskCount = gt.Count
             }).ToList();
 
-            // Make sure standard statuses are represented even if count is 0
             foreach (var status in statusMap)
             {
                 if (!overview.Any(o => o.StatusId == status.Key))
@@ -92,9 +89,7 @@ namespace TaskTrackingSystem.WebApi.Features.Dashboard
 
         public async Task<Result<IEnumerable<ProjectProgressDto>>> GetProjectProgressAsync(string roleName, long currentUserId)
         {
-            var activeProjects = await BuildAccessibleProjectQuery(roleName, currentUserId)
-                .ToListAsync();
-
+            var activeProjects = await BuildAccessibleProjectQuery(roleName, currentUserId).ToListAsync();
             var progressList = new List<ProjectProgressDto>();
 
             foreach (var project in activeProjects)
@@ -104,8 +99,7 @@ namespace TaskTrackingSystem.WebApi.Features.Dashboard
                     .ToListAsync();
 
                 int totalTasks = tasks.Count;
-                int completedTasks = tasks.Count(t => t.StatusId == AppTaskStatus.Done); // StatusId 3 = Done
-
+                int completedTasks = tasks.Count(t => t.StatusId == AppTaskStatus.Done);
                 double percentage = totalTasks > 0 ? Math.Round(((double)completedTasks / totalTasks) * 100, 2) : 0;
 
                 progressList.Add(new ProjectProgressDto
@@ -121,515 +115,6 @@ namespace TaskTrackingSystem.WebApi.Features.Dashboard
             return Result<IEnumerable<ProjectProgressDto>>.Success(progressList);
         }
 
-        public async Task<Result<IEnumerable<DashboardWidgetDto>>> GetWidgetsAsync(string roleName, long currentUserId)
-        {
-            var role = await GetRoleAsync(roleName);
-            if (role == null)
-            {
-                return Result<IEnumerable<DashboardWidgetDto>>.Failure("Role not found.", 404);
-            }
-
-            var roleWidgets = await (
-                from access in _db.RoleDashboardWidgets
-                join widget in _db.DashboardWidgets on access.WidgetId equals widget.WidgetId
-                where access.RoleId == role.Id &&
-                      !access.IsDeleted &&
-                      access.CanView &&
-                      !widget.IsDeleted &&
-                      widget.IsActive
-                orderby access.DefaultSortOrder, widget.DefaultOrder, widget.WidgetName
-                select new
-                {
-                    access.WidgetId,
-                    access.CanView,
-                    access.CanConfigure,
-                    access.IsDefaultVisible,
-                    RoleDefaultGridX = access.DefaultGridX,
-                    RoleDefaultGridY = access.DefaultGridY,
-                    RoleDefaultWidth = access.DefaultWidth,
-                    RoleDefaultHeight = access.DefaultHeight,
-                    RoleDefaultSortOrder = access.DefaultSortOrder,
-                    widget.WidgetCode,
-                    widget.WidgetName,
-                    widget.Description,
-                    widget.Category,
-                    widget.ComponentKey,
-                    widget.DataSourceKey,
-                    WidgetDefaultWidth = widget.DefaultWidth,
-                    WidgetDefaultHeight = widget.DefaultHeight,
-                    WidgetDefaultOrder = widget.DefaultOrder
-                }).ToListAsync();
-
-            var userLayouts = await _db.UserDashboardLayouts
-                .Where(layout => layout.UserId == currentUserId && !layout.IsDeleted)
-                .ToListAsync();
-
-            var layoutLookup = userLayouts.ToDictionary(layout => layout.WidgetId);
-
-            var widgets = roleWidgets
-                .Select(widget =>
-                {
-                    layoutLookup.TryGetValue(widget.WidgetId, out var layout);
-
-                    var width = layout != null ? layout.Width : (widget.RoleDefaultWidth > 0 ? widget.RoleDefaultWidth : widget.WidgetDefaultWidth);
-                    var height = layout != null ? layout.Height : (widget.RoleDefaultHeight > 0 ? widget.RoleDefaultHeight : widget.WidgetDefaultHeight);
-                    var sortOrder = layout != null ? layout.SortOrder : widget.RoleDefaultSortOrder;
-
-                    return new DashboardWidgetDto
-                    {
-                        WidgetId = widget.WidgetId,
-                        WidgetCode = widget.WidgetCode,
-                        WidgetName = widget.WidgetName,
-                        Description = widget.Description,
-                        Category = widget.Category,
-                        ComponentKey = widget.ComponentKey,
-                        DataSourceKey = widget.DataSourceKey,
-                        DefaultWidth = widget.WidgetDefaultWidth,
-                        DefaultHeight = widget.WidgetDefaultHeight,
-                        DefaultOrder = widget.WidgetDefaultOrder,
-                        CanView = widget.CanView,
-                        CanConfigure = widget.CanConfigure,
-                        IsDefaultVisible = widget.IsDefaultVisible,
-                        HasCustomLayout = layout != null,
-                        IsHidden = layout?.IsHidden ?? !widget.IsDefaultVisible,
-                        IsPinned = layout?.IsPinned ?? false,
-                        GridX = layout?.GridX ?? widget.RoleDefaultGridX,
-                        GridY = layout?.GridY ?? widget.RoleDefaultGridY,
-                        Width = width,
-                        Height = height,
-                        SortOrder = sortOrder,
-                        ConfigJson = layout?.ConfigJson
-                    };
-                })
-                .OrderBy(widget => widget.SortOrder)
-                .ThenBy(widget => widget.GridY)
-                .ThenBy(widget => widget.GridX)
-                .ThenBy(widget => widget.DefaultOrder)
-                .ToList();
-
-            return Result<IEnumerable<DashboardWidgetDto>>.Success(widgets);
-        }
-
-        public async Task<Result> SaveWidgetLayoutAsync(string roleName, long currentUserId, DashboardWidgetLayoutSaveRequestDto request)
-        {
-            var role = await GetRoleAsync(roleName);
-            if (role == null)
-            {
-                return Result.Failure("Role not found.", 404);
-            }
-
-            if (request == null)
-            {
-                return Result.Failure("Widget layout is required.", 400);
-            }
-
-            if (request.Widgets == null)
-            {
-                return Result.Failure("Widget layout is required.", 400);
-            }
-
-            var allowedWidgetIds = await _db.RoleDashboardWidgets
-                .Where(access => access.RoleId == role.Id && !access.IsDeleted && access.CanView)
-                .Select(access => access.WidgetId)
-                .ToHashSetAsync();
-
-            var requestedWidgets = request.Widgets
-                .GroupBy(widget => widget.WidgetId)
-                .Select(group => group.Last())
-                .ToList();
-
-            var invalidWidgets = requestedWidgets
-                .Where(widget => !allowedWidgetIds.Contains(widget.WidgetId))
-                .Select(widget => widget.WidgetId)
-                .Distinct()
-                .ToList();
-
-            if (invalidWidgets.Any())
-            {
-                return Result.Failure($"The following widgets are not available for this role: {string.Join(", ", invalidWidgets)}", 403);
-            }
-
-            var existingLayouts = await _db.UserDashboardLayouts
-                .Where(layout => layout.UserId == currentUserId && !layout.IsDeleted)
-                .ToListAsync();
-            var existingLookup = existingLayouts.ToDictionary(layout => layout.WidgetId);
-
-            var now = DateTime.UtcNow;
-            foreach (var widget in requestedWidgets)
-            {
-                if (existingLookup.TryGetValue(widget.WidgetId, out var existing))
-                {
-                    existing.GridX = widget.GridX;
-                    existing.GridY = widget.GridY;
-                    existing.Width = widget.Width > 0 ? widget.Width : existing.Width;
-                    existing.Height = widget.Height > 0 ? widget.Height : existing.Height;
-                    existing.SortOrder = widget.SortOrder;
-                    existing.IsHidden = widget.IsHidden;
-                    existing.IsPinned = widget.IsPinned;
-                    existing.ConfigJson = widget.ConfigJson;
-                    existing.IsDeleted = false;
-                    existing.UpdatedAt = now;
-                    existing.UpdatedById = currentUserId;
-                }
-                else
-                {
-                    _db.UserDashboardLayouts.Add(new UserDashboardLayout
-                    {
-                        UserId = currentUserId,
-                        WidgetId = widget.WidgetId,
-                        GridX = widget.GridX,
-                        GridY = widget.GridY,
-                        Width = widget.Width > 0 ? widget.Width : 4,
-                        Height = widget.Height > 0 ? widget.Height : 3,
-                        SortOrder = widget.SortOrder,
-                        IsHidden = widget.IsHidden,
-                        IsPinned = widget.IsPinned,
-                        ConfigJson = widget.ConfigJson,
-                        IsDeleted = false,
-                        CreatedAt = now,
-                        UpdatedAt = now,
-                        CreatedById = currentUserId,
-                        UpdatedById = currentUserId
-                    });
-                }
-            }
-
-            await _db.SaveChangesAsync();
-            return Result.Success(200);
-        }
-
-        public async Task<Result<IEnumerable<DashboardWidgetAdminDto>>> GetWidgetCatalogAsync()
-        {
-            var roleCounts = await _db.RoleDashboardWidgets
-                .Where(access => !access.IsDeleted)
-                .GroupBy(access => access.WidgetId)
-                .Select(group => new
-                {
-                    WidgetId = group.Key,
-                    RoleCount = group.Select(item => item.RoleId).Distinct().Count()
-                })
-                .ToListAsync();
-
-            var roleCountLookup = roleCounts.ToDictionary(x => x.WidgetId, x => x.RoleCount);
-
-            var widgets = await _db.DashboardWidgets
-                .OrderBy(widget => widget.DefaultOrder)
-                .ThenBy(widget => widget.WidgetName)
-                .Select(widget => new DashboardWidgetAdminDto
-                {
-                    WidgetId = widget.WidgetId,
-                    WidgetCode = widget.WidgetCode,
-                    WidgetName = widget.WidgetName,
-                    Description = widget.Description,
-                    Category = widget.Category,
-                    ComponentKey = widget.ComponentKey,
-                    DataSourceKey = widget.DataSourceKey,
-                    DefaultWidth = widget.DefaultWidth,
-                    DefaultHeight = widget.DefaultHeight,
-                    DefaultOrder = widget.DefaultOrder,
-                    IsActive = widget.IsActive,
-                    IsDeleted = widget.IsDeleted,
-                    CreatedAt = widget.CreatedAt,
-                    UpdatedAt = widget.UpdatedAt,
-                    RoleCount = 0
-                })
-                .ToListAsync();
-
-            foreach (var widget in widgets)
-            {
-                if (roleCountLookup.TryGetValue(widget.WidgetId, out var roleCount))
-                {
-                    widget.RoleCount = roleCount;
-                }
-            }
-
-            return Result<IEnumerable<DashboardWidgetAdminDto>>.Success(widgets);
-        }
-
-        public async Task<Result<DashboardWidgetAdminDto>> GetWidgetByIdAsync(long widgetId)
-        {
-            var widget = await _db.DashboardWidgets.FirstOrDefaultAsync(w => w.WidgetId == widgetId);
-            if (widget == null)
-            {
-                return Result<DashboardWidgetAdminDto>.Failure("Widget not found.", 404);
-            }
-
-            var roleCount = await _db.RoleDashboardWidgets
-                .Where(access => access.WidgetId == widgetId && !access.IsDeleted)
-                .Select(access => access.RoleId)
-                .Distinct()
-                .CountAsync();
-
-            return Result<DashboardWidgetAdminDto>.Success(new DashboardWidgetAdminDto
-            {
-                WidgetId = widget.WidgetId,
-                WidgetCode = widget.WidgetCode,
-                WidgetName = widget.WidgetName,
-                Description = widget.Description,
-                Category = widget.Category,
-                ComponentKey = widget.ComponentKey,
-                DataSourceKey = widget.DataSourceKey,
-                DefaultWidth = widget.DefaultWidth,
-                DefaultHeight = widget.DefaultHeight,
-                DefaultOrder = widget.DefaultOrder,
-                IsActive = widget.IsActive,
-                IsDeleted = widget.IsDeleted,
-                CreatedAt = widget.CreatedAt,
-                UpdatedAt = widget.UpdatedAt,
-                RoleCount = roleCount
-            });
-        }
-
-        public async Task<Result<DashboardWidgetAdminDto>> SaveWidgetAsync(DashboardWidgetUpsertDto dto, long? currentUserId = null)
-        {
-            if (dto == null)
-            {
-                return Result<DashboardWidgetAdminDto>.Failure("Widget data is required.", 400);
-            }
-
-            if (string.IsNullOrWhiteSpace(dto.WidgetCode))
-            {
-                return Result<DashboardWidgetAdminDto>.Failure("Widget code is required.", 400);
-            }
-
-            if (string.IsNullOrWhiteSpace(dto.WidgetName))
-            {
-                return Result<DashboardWidgetAdminDto>.Failure("Widget name is required.", 400);
-            }
-
-            var widgetCode = dto.WidgetCode.Trim();
-            var widgetName = dto.WidgetName.Trim();
-
-            var existingByCode = await _db.DashboardWidgets
-                .FirstOrDefaultAsync(widget => widget.WidgetCode == widgetCode && widget.WidgetId != dto.WidgetId);
-            if (existingByCode != null)
-            {
-                return Result<DashboardWidgetAdminDto>.Failure("Widget code is already in use by another widget.", 400);
-            }
-
-            var now = DateTime.UtcNow;
-            DashboardWidget? widget = null;
-
-            if (dto.WidgetId > 0)
-            {
-                widget = await _db.DashboardWidgets.FirstOrDefaultAsync(item => item.WidgetId == dto.WidgetId);
-                if (widget == null)
-                {
-                    return Result<DashboardWidgetAdminDto>.Failure("Widget not found.", 404);
-                }
-            }
-            else
-            {
-                widget = new DashboardWidget
-                {
-                    CreatedAt = now
-                };
-                _db.DashboardWidgets.Add(widget);
-            }
-
-            var activeWidget = widget!;
-
-            activeWidget.WidgetCode = widgetCode;
-            activeWidget.WidgetName = widgetName;
-            activeWidget.Description = string.IsNullOrWhiteSpace(dto.Description) ? null : dto.Description.Trim();
-            activeWidget.Category = string.IsNullOrWhiteSpace(dto.Category) ? null : dto.Category.Trim();
-            activeWidget.ComponentKey = string.IsNullOrWhiteSpace(dto.ComponentKey) ? null : dto.ComponentKey.Trim();
-            activeWidget.DataSourceKey = string.IsNullOrWhiteSpace(dto.DataSourceKey) ? null : dto.DataSourceKey.Trim();
-            activeWidget.DefaultWidth = dto.DefaultWidth > 0 ? dto.DefaultWidth : 4;
-            activeWidget.DefaultHeight = dto.DefaultHeight > 0 ? dto.DefaultHeight : 3;
-            activeWidget.DefaultOrder = dto.DefaultOrder;
-            activeWidget.IsActive = dto.IsActive;
-            activeWidget.IsDeleted = false;
-            activeWidget.UpdatedAt = now;
-
-            if (dto.WidgetId > 0)
-            {
-                _db.DashboardWidgets.Update(activeWidget);
-            }
-
-            await _db.SaveChangesAsync();
-
-            var roleCount = await _db.RoleDashboardWidgets
-                .Where(access => access.WidgetId == activeWidget.WidgetId && !access.IsDeleted)
-                .Select(access => access.RoleId)
-                .Distinct()
-                .CountAsync();
-
-            return Result<DashboardWidgetAdminDto>.Success(new DashboardWidgetAdminDto
-            {
-                WidgetId = activeWidget.WidgetId,
-                WidgetCode = activeWidget.WidgetCode,
-                WidgetName = activeWidget.WidgetName,
-                Description = activeWidget.Description,
-                Category = activeWidget.Category,
-                ComponentKey = activeWidget.ComponentKey,
-                DataSourceKey = activeWidget.DataSourceKey,
-                DefaultWidth = activeWidget.DefaultWidth,
-                DefaultHeight = activeWidget.DefaultHeight,
-                DefaultOrder = activeWidget.DefaultOrder,
-                IsActive = activeWidget.IsActive,
-                IsDeleted = activeWidget.IsDeleted,
-                CreatedAt = activeWidget.CreatedAt,
-                UpdatedAt = activeWidget.UpdatedAt,
-                RoleCount = roleCount
-            }, dto.WidgetId > 0 ? 200 : 201);
-        }
-
-        public async Task<Result> DeleteWidgetAsync(long widgetId, long? currentUserId = null)
-        {
-            var widget = await _db.DashboardWidgets.FirstOrDefaultAsync(item => item.WidgetId == widgetId);
-            if (widget == null)
-            {
-                return Result.Failure("Widget not found.", 404);
-            }
-
-            var now = DateTime.UtcNow;
-            widget.IsDeleted = true;
-            widget.IsActive = false;
-            widget.UpdatedAt = now;
-
-            var roleAccessRows = await _db.RoleDashboardWidgets
-                .Where(access => access.WidgetId == widgetId && !access.IsDeleted)
-                .ToListAsync();
-            foreach (var row in roleAccessRows)
-            {
-                row.IsDeleted = true;
-                row.UpdatedAt = now;
-                row.UpdatedById = currentUserId;
-            }
-
-            var userLayoutRows = await _db.UserDashboardLayouts
-                .Where(layout => layout.WidgetId == widgetId && !layout.IsDeleted)
-                .ToListAsync();
-            foreach (var row in userLayoutRows)
-            {
-                row.IsDeleted = true;
-                row.UpdatedAt = now;
-                row.UpdatedById = currentUserId;
-            }
-
-            _db.DashboardWidgets.Update(widget);
-            await _db.SaveChangesAsync();
-            return Result.Success(200);
-        }
-
-        public async Task<Result<IEnumerable<DashboardWidgetRoleAccessDto>>> GetWidgetAccessAsync(long widgetId)
-        {
-            var widgetExists = await _db.DashboardWidgets.AnyAsync(widget => widget.WidgetId == widgetId && !widget.IsDeleted);
-            if (!widgetExists)
-            {
-                return Result<IEnumerable<DashboardWidgetRoleAccessDto>>.Failure("Widget not found.", 404);
-            }
-
-            var roles = await _db.Roles
-                .Where(role => !role.IsDeleted)
-                .OrderBy(role => role.Name)
-                .ToListAsync();
-
-            var accessRows = await _db.RoleDashboardWidgets
-                .Where(access => access.WidgetId == widgetId && !access.IsDeleted)
-                .ToListAsync();
-            var lookup = accessRows.ToDictionary(row => row.RoleId);
-
-            var access = roles.Select(role =>
-            {
-                lookup.TryGetValue(role.Id, out var row);
-                return new DashboardWidgetRoleAccessDto
-                {
-                    RoleId = role.Id,
-                    RoleName = role.Name,
-                    CanView = row?.CanView ?? false,
-                    CanConfigure = row?.CanConfigure ?? false,
-                    IsDefaultVisible = row?.IsDefaultVisible ?? false,
-                    DefaultGridX = row?.DefaultGridX ?? 0,
-                    DefaultGridY = row?.DefaultGridY ?? 0,
-                    DefaultWidth = row?.DefaultWidth ?? 4,
-                    DefaultHeight = row?.DefaultHeight ?? 3,
-                    DefaultSortOrder = row?.DefaultSortOrder ?? 0
-                };
-            }).ToList();
-
-            return Result<IEnumerable<DashboardWidgetRoleAccessDto>>.Success(access);
-        }
-
-        public async Task<Result> SaveWidgetAccessAsync(long widgetId, DashboardWidgetRoleAccessSaveRequestDto request, long? currentUserId = null)
-        {
-            var widget = await _db.DashboardWidgets.FirstOrDefaultAsync(item => item.WidgetId == widgetId && !item.IsDeleted);
-            if (widget == null)
-            {
-                return Result.Failure("Widget not found.", 404);
-            }
-
-            if (request?.RoleAccess == null)
-            {
-                return Result.Failure("Role access data is required.", 400);
-            }
-
-            var roles = await _db.Roles
-                .Where(role => !role.IsDeleted)
-                .Select(role => role.Id)
-                .ToHashSetAsync();
-
-            var roleAccess = request.RoleAccess
-                .Where(item => roles.Contains(item.RoleId))
-                .GroupBy(item => item.RoleId)
-                .Select(group => group.Last())
-                .ToList();
-
-            if (roleAccess.Count == 0)
-            {
-                return Result.Failure("No valid role access rows were supplied.", 400);
-            }
-
-            var existingRows = await _db.RoleDashboardWidgets
-                .Where(access => access.WidgetId == widgetId)
-                .ToListAsync();
-            var lookup = existingRows.ToDictionary(row => row.RoleId);
-            var now = DateTime.UtcNow;
-
-            foreach (var item in roleAccess)
-            {
-                if (lookup.TryGetValue(item.RoleId, out var existing))
-                {
-                    existing.CanView = item.CanView;
-                    existing.CanConfigure = item.CanConfigure;
-                    existing.IsDefaultVisible = item.IsDefaultVisible;
-                    existing.DefaultGridX = item.DefaultGridX;
-                    existing.DefaultGridY = item.DefaultGridY;
-                    existing.DefaultWidth = item.DefaultWidth > 0 ? item.DefaultWidth : 4;
-                    existing.DefaultHeight = item.DefaultHeight > 0 ? item.DefaultHeight : 3;
-                    existing.DefaultSortOrder = item.DefaultSortOrder;
-                    existing.IsDeleted = false;
-                    existing.UpdatedAt = now;
-                    existing.UpdatedById = currentUserId;
-                }
-                else
-                {
-                    _db.RoleDashboardWidgets.Add(new RoleDashboardWidget
-                    {
-                        RoleId = item.RoleId,
-                        WidgetId = widgetId,
-                        CanView = item.CanView,
-                        CanConfigure = item.CanConfigure,
-                        IsDefaultVisible = item.IsDefaultVisible,
-                        DefaultGridX = item.DefaultGridX,
-                        DefaultGridY = item.DefaultGridY,
-                        DefaultWidth = item.DefaultWidth > 0 ? item.DefaultWidth : 4,
-                        DefaultHeight = item.DefaultHeight > 0 ? item.DefaultHeight : 3,
-                        DefaultSortOrder = item.DefaultSortOrder,
-                        IsDeleted = false,
-                        CreatedAt = now,
-                        UpdatedAt = now,
-                        CreatedById = currentUserId,
-                        UpdatedById = currentUserId
-                    });
-                }
-            }
-
-            await _db.SaveChangesAsync();
-            return Result.Success(200);
-        }
-
         private IQueryable<TaskTrackingSystem.Database.AppDbContextModels.Task> BuildAccessibleTaskQuery(string roleName, long currentUserId)
         {
             var query = _db.Tasks.Where(t => t.IsDeleted != true);
@@ -671,16 +156,6 @@ namespace TaskTrackingSystem.WebApi.Features.Dashboard
             return string.Equals(roleName, "Admin", StringComparison.OrdinalIgnoreCase);
         }
 
-        private async Task<RoleEntity?> GetRoleAsync(string roleName)
-        {
-            if (string.IsNullOrWhiteSpace(roleName))
-            {
-                return null;
-            }
-
-            return await _db.Roles.FirstOrDefaultAsync(role => role.Name == roleName && !role.IsDeleted);
-        }
-
         private static bool IsManager(string roleName)
         {
             return string.Equals(roleName, "Manager", StringComparison.OrdinalIgnoreCase);

TaskTrackingSystem.WebApi/Program.cs

@@ -128,147 +128,6 @@ static async System.Threading.Tasks.Task EnsureSeedDataAsync(WebApplication app)
         backlogMenu.UpdatedAt = DateTime.UtcNow;
     }
 
-    var widgetSetupMenu = await db.Menus.FirstOrDefaultAsync(m => m.MenuCode == "DASHBOARD_WIDGETS");
-    if (widgetSetupMenu == null)
-    {
-        widgetSetupMenu = new Menu
-        {
-            MenuCode = "DASHBOARD_WIDGETS",
-            MenuName = "Widget Setup",
-            MenuUrl = "/widget-setup",
-            Icon = "layout-grid",
-            Visible = true,
-            OrderNo = 26,
-            IsDeleted = false,
-            CreatedAt = DateTime.UtcNow
-        };
-        db.Menus.Add(widgetSetupMenu);
-        await db.SaveChangesAsync();
-    }
-    else
-    {
-        widgetSetupMenu.MenuName = "Widget Setup";
-        widgetSetupMenu.MenuUrl = "/widget-setup";
-        widgetSetupMenu.Icon = "layout-grid";
-        widgetSetupMenu.Visible = true;
-        widgetSetupMenu.OrderNo = 26;
-        widgetSetupMenu.IsDeleted = false;
-        widgetSetupMenu.UpdatedAt = DateTime.UtcNow;
-    }
-
-    var adminRole = await db.Roles.FirstOrDefaultAsync(r => r.Name == "Admin" && !r.IsDeleted);
-    if (adminRole != null && widgetSetupMenu.MenuId > 0)
-    {
-        var adminMenuAccess = await db.RoleMenus.FirstOrDefaultAsync(rm => rm.RoleId == adminRole.Id && rm.MenuId == widgetSetupMenu.MenuId);
-        if (adminMenuAccess == null)
-        {
-            db.RoleMenus.Add(new RoleMenu
-            {
-                RoleId = adminRole.Id,
-                MenuId = widgetSetupMenu.MenuId,
-                IsDeleted = false,
-                CreatedAt = DateTime.UtcNow
-            });
-        }
-        else
-        {
-            adminMenuAccess.IsDeleted = false;
-            adminMenuAccess.UpdatedAt = DateTime.UtcNow;
-        }
-    }
-
-    var widgetSeeds = new[]
-    {
-        new DashboardWidget { WidgetCode = "WIDGET_GREETING_BANNER", WidgetName = "Greeting Banner", Description = "A friendly greeting panel with the current date.", Category = "Overview", ComponentKey = "GreetingBanner", DataSourceKey = "CurrentUser", DefaultWidth = 4, DefaultHeight = 2, DefaultOrder = 1, IsActive = true, IsDeleted = false, CreatedAt = DateTime.UtcNow },
-        new DashboardWidget { WidgetCode = "WIDGET_KPI_CARDS", WidgetName = "KPI Cards", Description = "Quick counts for users, projects, and tasks.", Category = "Overview", ComponentKey = "KpiCards", DataSourceKey = "DashboardSummary", DefaultWidth = 4, DefaultHeight = 2, DefaultOrder = 2, IsActive = true, IsDeleted = false, CreatedAt = DateTime.UtcNow },
-        new DashboardWidget { WidgetCode = "WIDGET_CALENDAR_STRIP", WidgetName = "Calendar Strip", Description = "A compact weekly view with due tasks.", Category = "Planning", ComponentKey = "CalendarStrip", DataSourceKey = "DueTasks", DefaultWidth = 4, DefaultHeight = 3, DefaultOrder = 3, IsActive = true, IsDeleted = false, CreatedAt = DateTime.UtcNow },
-        new DashboardWidget { WidgetCode = "WIDGET_PROJECT_PROGRESS", WidgetName = "Project Progress", Description = "Shows completion progress for active projects.", Category = "Analytics", ComponentKey = "ProjectProgressChart", DataSourceKey = "ProjectProgress", DefaultWidth = 4, DefaultHeight = 3, DefaultOrder = 4, IsActive = true, IsDeleted = false, CreatedAt = DateTime.UtcNow },
-        new DashboardWidget { WidgetCode = "WIDGET_TIMELINE", WidgetName = "Timeline", Description = "Highlights project timing and start/end dates.", Category = "Planning", ComponentKey = "TimelineChart", DataSourceKey = "Projects", DefaultWidth = 4, DefaultHeight = 3, DefaultOrder = 5, IsActive = true, IsDeleted = false, CreatedAt = DateTime.UtcNow },
-        new DashboardWidget { WidgetCode = "WIDGET_TASK_TRAY", WidgetName = "Task Tray", Description = "A small queue of work the user can pick up next.", Category = "Work", ComponentKey = "TaskTray", DataSourceKey = "Tasks", DefaultWidth = 4, DefaultHeight = 3, DefaultOrder = 6, IsActive = true, IsDeleted = false, CreatedAt = DateTime.UtcNow },
-        new DashboardWidget { WidgetCode = "WIDGET_WORKLOAD", WidgetName = "Workload", Description = "Team load distribution across members.", Category = "Analytics", ComponentKey = "WorkloadChart", DataSourceKey = "ProjectsAndUsers", DefaultWidth = 4, DefaultHeight = 3, DefaultOrder = 7, IsActive = true, IsDeleted = false, CreatedAt = DateTime.UtcNow },
-        new DashboardWidget { WidgetCode = "WIDGET_AUDIT_FEED", WidgetName = "Audit Feed", Description = "Recent administrative activity.", Category = "Admin", ComponentKey = "AuditFeed", DataSourceKey = "AuditLogs", DefaultWidth = 4, DefaultHeight = 3, DefaultOrder = 8, IsActive = true, IsDeleted = false, CreatedAt = DateTime.UtcNow }
-    };
-
-    var widgetAccessTemplates = new Dictionary<string, (bool admin, bool manager, bool employee)>(StringComparer.OrdinalIgnoreCase)
-    {
-        ["WIDGET_GREETING_BANNER"] = (true, true, true),
-        ["WIDGET_KPI_CARDS"] = (true, true, true),
-        ["WIDGET_CALENDAR_STRIP"] = (true, true, true),
-        ["WIDGET_PROJECT_PROGRESS"] = (true, true, false),
-        ["WIDGET_TIMELINE"] = (true, true, false),
-        ["WIDGET_TASK_TRAY"] = (true, true, true),
-        ["WIDGET_WORKLOAD"] = (true, true, false),
-        ["WIDGET_AUDIT_FEED"] = (true, false, false)
-    };
-
-    var roles = await db.Roles.Where(r => !r.IsDeleted).ToListAsync();
-
-    foreach (var seed in widgetSeeds)
-    {
-        var existingWidget = await db.DashboardWidgets.FirstOrDefaultAsync(w => w.WidgetCode == seed.WidgetCode);
-        if (existingWidget == null)
-        {
-            db.DashboardWidgets.Add(seed);
-            await db.SaveChangesAsync();
-            existingWidget = seed;
-        }
-        else
-        {
-            existingWidget.WidgetName = seed.WidgetName;
-            existingWidget.Description = seed.Description;
-            existingWidget.Category = seed.Category;
-            existingWidget.ComponentKey = seed.ComponentKey;
-            existingWidget.DataSourceKey = seed.DataSourceKey;
-            existingWidget.DefaultWidth = seed.DefaultWidth;
-            existingWidget.DefaultHeight = seed.DefaultHeight;
-            existingWidget.DefaultOrder = seed.DefaultOrder;
-            existingWidget.IsActive = seed.IsActive;
-            existingWidget.IsDeleted = false;
-            existingWidget.UpdatedAt = DateTime.UtcNow;
-        }
-
-        var template = widgetAccessTemplates[seed.WidgetCode];
-        foreach (var role in roles)
-        {
-            var shouldView = role.Name.Equals("Admin", StringComparison.OrdinalIgnoreCase)
-                ? template.admin
-                : role.Name.Equals("Manager", StringComparison.OrdinalIgnoreCase)
-                    ? template.manager
-                    : template.employee;
-
-            var existingAccess = await db.RoleDashboardWidgets.FirstOrDefaultAsync(row => row.RoleId == role.Id && row.WidgetId == existingWidget.WidgetId);
-            if (existingAccess == null)
-            {
-                db.RoleDashboardWidgets.Add(new RoleDashboardWidget
-                {
-                    RoleId = role.Id,
-                    WidgetId = existingWidget.WidgetId,
-                    CanView = shouldView,
-                    CanConfigure = role.Name.Equals("Admin", StringComparison.OrdinalIgnoreCase),
-                    IsDefaultVisible = shouldView,
-                    DefaultGridX = 0,
-                    DefaultGridY = 0,
-                    DefaultWidth = seed.DefaultWidth,
-                    DefaultHeight = seed.DefaultHeight,
-                    DefaultSortOrder = seed.DefaultOrder,
-                    IsDeleted = false,
-                    CreatedAt = DateTime.UtcNow
-                });
-            }
-            else
-            {
-                existingAccess.CanView = shouldView;
-                existingAccess.CanConfigure = role.Name.Equals("Admin", StringComparison.OrdinalIgnoreCase);
-                existingAccess.IsDefaultVisible = shouldView;
-                existingAccess.DefaultWidth = seed.DefaultWidth;
-                existingAccess.DefaultHeight = seed.DefaultHeight;
-                existingAccess.DefaultSortOrder = seed.DefaultOrder;
-                existingAccess.IsDeleted = false;
-                existingAccess.UpdatedAt = DateTime.UtcNow;
-            }
-        }
-    }
-
     // Soft-delete existing tasks that belong to deleted projects
     var orphanedTasks = await db.Tasks
         .Where(t => t.IsDeleted != true && t.Project.IsDeleted == true)

TaskTrackingSystem.WebApp/Components/Layout/MainLayout.razor

@@ -118,7 +118,6 @@
         "reports" => "Reports",
         "roles" => "Roles & Access",
         "users" => "Users",
-        "widget-setup" => "Widget Setup",
         _ => "Workspace"
     };
 

TaskTrackingSystem.WebApp/Components/Layout/NavMenu.razor

@@ -53,10 +53,6 @@
                 <i data-lucide="file-text" class="h-4 w-4 mr-3 text-slate-400 shrink-0"></i>
                 <span>Audit Logs</span>
             </NavLink>
-            <NavLink class="nav-link-item" href="/widget-setup" Match="NavLinkMatch.All">
-                <i data-lucide="layout-grid" class="h-4 w-4 mr-3 text-slate-400 shrink-0"></i>
-                <span>Widget Setup</span>
-            </NavLink>
         }
     }
     else

TaskTrackingSystem.WebApp/Components/Pages/Home.razor

@@ -3,12 +3,11 @@
 @page "/dashboard"
 @using Microsoft.AspNetCore.Authorization
 @using Microsoft.AspNetCore.Components.Authorization
-@using System.Security.Claims
 @using TaskTrackingSystem.Shared.Models.Task
 @using TaskTrackingSystem.Shared.Models.User
 @using TaskTrackingSystem.Shared.Models.Project
 @using TaskTrackingSystem.Shared.Models.Dashboard
-@using TaskTrackingSystem.Shared.Models.AuditLog
+@using TaskTrackingSystem.Shared.Enums
 @rendermode @(new InteractiveServerRenderMode(prerender: false))
 @attribute [Microsoft.AspNetCore.Authorization.Authorize]
 @inject ApiClientService ApiClient
@@ -16,268 +15,251 @@
 @inject AuthenticationStateProvider AuthStateProvider
 @inject MenuAuthorizationService MenuAuthorization
 
-<PageTitle>Dashboard</PageTitle>
-
-@if (isLoading)
-{
-    <div class="flex items-center justify-center py-40">
-        <div class="flex flex-col items-center space-y-4 text-violet-600">
-            <svg class="h-10 w-10 animate-spin" viewBox="0 0 24 24">
-                <circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4" fill="none"></circle>
-                <path class="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4z"></path>
-            </svg>
-            <span class="text-sm font-semibold text-slate-500">Loading dashboard widgets...</span>
-        </div>
-    </div>
-}
-else
-{
-    <div class="space-y-6">
-        <div class="flex flex-col gap-4 lg:flex-row lg:items-end lg:justify-between">
+<PageTitle>Overview</PageTitle>
+
+<div class="space-y-8 text-slate-900">
+    <div class="rounded-[32px] border border-slate-200 bg-white px-8 py-8 text-slate-900 shadow-sm shadow-slate-200/60">
+        <div class="flex flex-col gap-6 lg:flex-row lg:items-end lg:justify-between">
             <div>
-                <p class="text-sm font-semibold uppercase tracking-wider text-violet-600">Dashboard</p>
-                <h2 class="mt-1 text-3xl font-bold tracking-tight text-slate-900">Welcome back, @currentUserName</h2>
-                <p class="mt-1 text-slate-500">This dashboard is now driven only by role-aware widgets.</p>
+                <p class="text-sm font-semibold uppercase tracking-[0.22em] text-violet-600">Overview</p>
+                <h2 class="mt-2 text-4xl font-bold tracking-tight text-slate-900">Welcome back, @currentUserName</h2>
+                <p class="mt-3 max-w-2xl text-sm text-slate-600">
+                    Projects, tasks, and team activity at a glance.
+                </p>
             </div>
             <div class="flex flex-wrap gap-3">
                 @if (canCreateTask)
                 {
-                    <a href="/tasks" class="inline-flex items-center rounded-xl bg-violet-600 px-4 py-2.5 text-sm font-semibold text-white shadow-sm transition-colors hover:bg-violet-700">
+                    <a href="/tasks/all" class="inline-flex items-center rounded-2xl bg-violet-600 px-5 py-3 text-sm font-semibold text-white shadow-lg shadow-violet-900/20 transition-colors hover:bg-violet-500">
                         <i data-lucide="plus" class="mr-2 h-4 w-4"></i>
                         New Task
                     </a>
                 }
-                <a href="/reports/tasks" class="inline-flex items-center rounded-xl border border-slate-200 bg-white px-4 py-2.5 text-sm font-semibold text-slate-700 transition-colors hover:bg-slate-50">
+                <a href="/reports/tasks" class="inline-flex items-center rounded-2xl border border-slate-200 bg-white px-5 py-3 text-sm font-semibold text-slate-700 shadow-sm transition-colors hover:bg-slate-50">
                     <i data-lucide="bar-chart-3" class="mr-2 h-4 w-4"></i>
                     Reports
                 </a>
-                @if (currentUserRole.Equals("Admin", StringComparison.OrdinalIgnoreCase))
-                {
-                    <a href="/widget-setup" class="inline-flex items-center rounded-xl border border-violet-200 bg-violet-50 px-4 py-2.5 text-sm font-semibold text-violet-700 transition-colors hover:bg-violet-100">
-                        <i data-lucide="layout-grid" class="mr-2 h-4 w-4"></i>
-                        Widget Setup
-                    </a>
-                }
             </div>
         </div>
+    </div>
 
-        @if (!string.IsNullOrWhiteSpace(widgetLayoutMessage))
-        {
-            <div class="rounded-xl border border-emerald-100 bg-emerald-50 px-4 py-3">
-                <p class="text-sm font-medium text-emerald-700">@widgetLayoutMessage</p>
+    <div class="grid grid-cols-1 gap-4 sm:grid-cols-2 xl:grid-cols-4">
+        <div class="rounded-[24px] border border-slate-200 bg-white p-5 text-slate-900 shadow-sm shadow-slate-200/50">
+            <div class="flex items-center justify-between">
+                <div class="flex h-12 w-12 items-center justify-center rounded-2xl bg-violet-500 text-white">
+                    <i data-lucide="users" class="h-5 w-5"></i>
+                </div>
+                <span class="text-sm font-semibold text-emerald-500">+12 this month</span>
             </div>
-        }
+            <p class="mt-5 text-4xl font-bold">@summary.TotalUsers</p>
+            <p class="mt-2 text-sm text-slate-500">Total users</p>
+        </div>
 
-        <div class="rounded-3xl border border-slate-100 bg-white shadow-sm overflow-hidden">
-            <div class="flex flex-col gap-3 border-b border-slate-100 bg-gradient-to-r from-slate-50 to-white px-6 py-5 md:flex-row md:items-center md:justify-between">
+        <div class="rounded-[24px] border border-slate-200 bg-white p-5 text-slate-900 shadow-sm shadow-slate-200/50">
+            <div class="flex items-center justify-between">
+                <div class="flex h-12 w-12 items-center justify-center rounded-2xl bg-sky-500 text-white">
+                    <i data-lucide="folder-kanban" class="h-5 w-5"></i>
+                </div>
+                <span class="text-sm font-semibold text-emerald-500">+3 this month</span>
+            </div>
+            <p class="mt-5 text-4xl font-bold">@summary.ActiveProjectsCount</p>
+            <p class="mt-2 text-sm text-slate-500">Total projects</p>
+        </div>
+
+        <div class="rounded-[24px] border border-slate-200 bg-white p-5 text-slate-900 shadow-sm shadow-slate-200/50">
+            <div class="flex items-center justify-between">
+                <div class="flex h-12 w-12 items-center justify-center rounded-2xl bg-emerald-500 text-white">
+                    <i data-lucide="check-square" class="h-5 w-5"></i>
+                </div>
+                <span class="text-sm font-semibold text-emerald-500">+24 this week</span>
+            </div>
+            <p class="mt-5 text-4xl font-bold">@ActiveTasksCount</p>
+            <p class="mt-2 text-sm text-slate-500">Active tasks</p>
+        </div>
+
+        <div class="rounded-[24px] border border-slate-200 bg-white p-5 text-slate-900 shadow-sm shadow-slate-200/50">
+            <div class="flex items-center justify-between">
+                <div class="flex h-12 w-12 items-center justify-center rounded-2xl bg-amber-500 text-white">
+                    <i data-lucide="trending-up" class="h-5 w-5"></i>
+                </div>
+                <span class="text-sm font-semibold text-emerald-500">+5% vs last mo</span>
+            </div>
+            <p class="mt-5 text-4xl font-bold">@CompletionRate%</p>
+            <p class="mt-2 text-sm text-slate-500">Completion rate</p>
+        </div>
+    </div>
+
+    <div class="grid grid-cols-1 gap-5 xl:grid-cols-[minmax(0,1.7fr)_minmax(340px,1fr)]">
+        <div class="rounded-[28px] border border-slate-200 bg-white p-6 text-slate-900 shadow-sm shadow-slate-200/60">
+            <div class="flex items-start justify-between gap-4">
                 <div>
-                    <p class="text-xs font-semibold uppercase tracking-wider text-violet-600">Widgets</p>
-                    <h3 class="mt-1 text-lg font-bold text-slate-900">Live role-based dashboard</h3>
-                    <p class="mt-1 text-sm text-slate-500">Drag to reorder when editing is enabled.</p>
+                    <h3 class="text-2xl font-bold text-slate-900">Project Activity</h3>
+                    <p class="mt-1 text-sm text-slate-500">Created and completed tasks over the last six months.</p>
                 </div>
-                <div class="flex items-center gap-2">
-                    <button @onclick="ToggleWidgetEditMode" class="inline-flex items-center rounded-xl border border-slate-200 bg-white px-4 py-2 text-sm font-semibold text-slate-700 hover:bg-slate-50 transition-colors">
-                        <i data-lucide="grip-vertical" class="mr-2 h-4 w-4"></i>
-                        @(isWidgetEditMode ? "Done editing" : "Reorder widgets")
-                    </button>
-                    @if (isWidgetEditMode)
+                <div class="text-sm text-slate-500">@ActivityRangeLabel</div>
+            </div>
+
+            <div class="mt-6">
+                <svg viewBox="0 0 760 340" class="h-[340px] w-full">
+                    <defs>
+                        <linearGradient id="activityFill" x1="0" x2="0" y1="0" y2="1">
+                            <stop offset="0%" stop-color="#7c3aed" stop-opacity="0.18" />
+                            <stop offset="100%" stop-color="#7c3aed" stop-opacity="0" />
+                        </linearGradient>
+                    </defs>
+
+                    @for (var i = 0; i < 5; i++)
+                    {
+                        var y = 60 + (i * 55);
+                        <line x1="48" y1="@y" x2="730" y2="@y" stroke="#e2e8f0" stroke-width="1" />
+                    }
+
+                    @for (var i = 0; i < 6; i++)
+                    {
+                        var x = 60 + (i * 125);
+                        <line x1="@x" y1="40" x2="@x" y2="280" stroke="#e2e8f0" stroke-width="1" />
+                    }
+
+                    <path d="@ActivityAreaPath" fill="url(#activityFill)" />
+                    <path d="@ActivityLinePath" fill="none" stroke="#7c3aed" stroke-width="4" stroke-linecap="round" stroke-linejoin="round" />
+
+                    @foreach (var point in ActivityPoints)
                     {
-                        <button @onclick="SaveWidgetLayoutAsync" disabled="@isSavingWidgetLayout" class="inline-flex items-center rounded-xl bg-violet-600 px-4 py-2 text-sm font-semibold text-white hover:bg-violet-700 disabled:opacity-50 transition-colors">
-                            <i data-lucide="save" class="mr-2 h-4 w-4"></i>
-                            @(isSavingWidgetLayout ? "Saving..." : "Save layout")
-                        </button>
+                        <circle cx="@point.X" cy="@point.Y" r="5" fill="#7c3aed" stroke="#ddd6fe" stroke-width="3" />
+                    }
+
+                </svg>
+
+                <div class="mt-4 flex items-center justify-between text-xs text-slate-500">
+                    @foreach (var label in ActivityLabels)
+                    {
+                        <span class="w-1/6 text-center">@label</span>
                     }
                 </div>
             </div>
+        </div>
 
-            <div class="p-6">
-                @if (dashboardWidgets.Any())
-                {
-                    <div class="grid grid-cols-1 xl:grid-cols-2 gap-4">
-                        @foreach (var widget in dashboardWidgets)
+        <div class="rounded-[28px] border border-slate-200 bg-white p-6 text-slate-900 shadow-sm shadow-slate-200/60">
+            <h3 class="text-2xl font-bold text-slate-900">Task Distribution</h3>
+            <p class="mt-1 text-sm text-slate-500">@TotalTasksCount total tasks</p>
+
+            <div class="mt-8 flex justify-center">
+                <div class="relative">
+                    <svg viewBox="0 0 220 220" class="h-56 w-56">
+                        <circle cx="110" cy="110" r="74" fill="none" stroke="#e5e7eb" stroke-width="24" />
+                        @foreach (var slice in DonutSlices)
                         {
-                            <div draggable="@isWidgetEditMode"
-                                 @ondragstart="() => BeginWidgetDrag(widget.WidgetId)"
-                                 @ondrop="() => DropWidget(widget.WidgetId)"
-                                 @ondragover:preventDefault="true"
-                                 class="rounded-2xl border border-slate-100 bg-slate-50/70 p-5 shadow-sm transition-all @(GetWidgetCardClasses(widget))">
-                                <div class="flex items-start justify-between gap-4">
-                                    <div class="min-w-0">
-                                        <p class="text-[10px] font-bold uppercase tracking-wider text-slate-400">@DisplayWidgetCategory(widget.Category)</p>
-                                        <h4 class="mt-1 truncate text-base font-bold text-slate-900">@widget.WidgetName</h4>
-                                        <p class="mt-1 line-clamp-2 text-sm text-slate-500">@(widget.Description ?? "No description provided.")</p>
-                                    </div>
-                                    <div class="flex flex-col items-end gap-2">
-                                        <span class="rounded-full border border-slate-200 bg-white px-2.5 py-1 text-[10px] font-semibold text-slate-500">@widget.ComponentKey</span>
-                                        @if (widget.CanConfigure)
-                                        {
-                                            <span class="rounded-full bg-violet-50 px-2.5 py-1 text-[10px] font-semibold text-violet-700">Configurable</span>
-                                        }
-                                    </div>
-                                </div>
-
-                                <div class="mt-4 flex flex-wrap gap-2">
-                                    <span class="rounded-full border border-slate-200 bg-white px-3 py-1 text-[10px] font-semibold text-slate-500">Size @widget.Width x @widget.Height</span>
-                                    <span class="rounded-full border border-slate-200 bg-white px-3 py-1 text-[10px] font-semibold text-slate-500">Order @widget.SortOrder</span>
-                                    @if (widget.IsPinned)
-                                    {
-                                        <span class="rounded-full bg-emerald-50 px-3 py-1 text-[10px] font-semibold text-emerald-700">Pinned</span>
-                                    }
-                                    @if (widget.IsHidden)
-                                    {
-                                        <span class="rounded-full bg-slate-100 px-3 py-1 text-[10px] font-semibold text-slate-500">Hidden</span>
-                                    }
-                                </div>
-
-                                <div class="mt-4 rounded-xl border border-slate-200 bg-white p-4">
-                                    @if (widget.ComponentKey == "GreetingBanner")
-                                    {
-                                        <div class="flex items-center justify-between gap-4">
-                                            <div>
-                                                <p class="text-sm font-semibold text-slate-900">Good @GetGreetingPeriod(), @currentUserName</p>
-                                                <p class="mt-1 text-xs text-slate-500">@DateTime.Now.ToString("dddd, MMMM d, yyyy h:mm tt")</p>
-                                            </div>
-                                            <div class="flex h-12 w-12 items-center justify-center rounded-2xl bg-violet-50 font-bold text-violet-700">
-                                                @(currentUserName.Length > 0 ? currentUserName[0].ToString().ToUpper() : "U")
-                                            </div>
-                                        </div>
-                                    }
-                                    else if (widget.ComponentKey == "KpiCards")
-                                    {
-                                        <div class="grid grid-cols-3 gap-3">
-                                            <div class="rounded-xl bg-violet-50 p-3">
-                                                <p class="text-[10px] font-semibold uppercase text-violet-600">Users</p>
-                                                <p class="mt-1 text-2xl font-bold text-violet-900">@summary.TotalUsers</p>
-                                            </div>
-                                            <div class="rounded-xl bg-emerald-50 p-3">
-                                                <p class="text-[10px] font-semibold uppercase text-emerald-600">Projects</p>
-                                                <p class="mt-1 text-2xl font-bold text-emerald-900">@summary.ActiveProjectsCount</p>
-                                            </div>
-                                            <div class="rounded-xl bg-blue-50 p-3">
-                                                <p class="text-[10px] font-semibold uppercase text-blue-600">Tasks</p>
-                                                <p class="mt-1 text-2xl font-bold text-blue-900">@summary.PendingTasksCount</p>
-                                            </div>
-                                        </div>
-                                    }
-                                    else if (widget.ComponentKey == "ProjectProgressChart")
-                                    {
-                                        <div class="space-y-3">
-                                            @foreach (var pp in projectProgress.Take(3))
-                                            {
-                                                <div>
-                                                    <div class="flex items-center justify-between text-sm">
-                                                        <span class="truncate pr-4 font-semibold text-slate-800">@pp.ProjectName</span>
-                                                        <span class="text-slate-500">@pp.CompletedTasksCount / @pp.TotalTasksCount</span>
-                                                    </div>
-                                                    <div class="mt-2 h-2 overflow-hidden rounded-full bg-slate-100">
-                                                        <div class="h-full rounded-full bg-violet-600" style="width: @pp.CompletionPercentage%"></div>
-                                                    </div>
-                                                </div>
-                                            }
-                                        </div>
-                                    }
-                                    else if (widget.ComponentKey == "AuditFeed")
-                                    {
-                                        @if (auditLogs.Any())
-                                        {
-                                            <div class="space-y-2">
-                                                @foreach (var log in auditLogs.Take(5))
-                                                {
-                                                    <div class="flex items-start justify-between gap-3 rounded-xl bg-slate-50 p-3">
-                                                        <div class="min-w-0">
-                                                            <p class="truncate text-sm font-semibold text-slate-800">@log.Action @log.Module</p>
-                                                            <p class="line-clamp-1 text-xs text-slate-500">@log.Description</p>
-                                                        </div>
-                                                        <span class="shrink-0 text-[10px] text-slate-400">@log.CreatedAt.ToString("MMM d, HH:mm")</span>
-                                                    </div>
-                                                }
-                                            </div>
-                                        }
-                                        else
-                                        {
-                                            <p class="text-sm text-slate-500">No audit logs available yet.</p>
-                                        }
-                                    }
-                                    else if (widget.ComponentKey == "TimelineChart")
-                                    {
-                                        <div class="space-y-2">
-                                            @foreach (var project in projectsList.OrderBy(p => p.StartDate).Take(3))
-                                            {
-                                                <div class="rounded-xl border border-slate-100 bg-slate-50 p-3">
-                                                    <div class="flex items-center justify-between gap-2">
-                                                        <p class="truncate text-sm font-semibold text-slate-800">@project.Name</p>
-                                                        <span class="text-[10px] text-slate-500">@DisplayFormats.Date(project.StartDate) - @DisplayFormats.Date(project.EndDate)</span>
-                                                    </div>
-                                                </div>
-                                            }
-                                        </div>
-                                    }
-                                    else if (widget.ComponentKey == "TaskTray")
-                                    {
-                                        <div class="space-y-2">
-                                            @foreach (var task in taskList.Where(t => t.StatusId != AppTaskStatus.Done).OrderBy(t => t.DueDate).Take(4))
-                                            {
-                                                <div class="rounded-xl bg-slate-50 p-3">
-                                                    <p class="truncate text-sm font-semibold text-slate-800">@task.Title</p>
-                                                    <p class="mt-1 text-xs text-slate-500">Due @task.DueDate.ToString("MMM d")</p>
-                                                </div>
-                                            }
-                                        </div>
-                                    }
-                                    else if (widget.ComponentKey == "WorkloadChart")
-                                    {
-                                        <div class="space-y-3">
-                                            @foreach (var team in GetTeamWorkload())
-                                            {
-                                                <div>
-                                                    <div class="flex items-center justify-between text-sm">
-                                                        <span class="font-semibold text-slate-800">@team.Name</span>
-                                                        <span class="text-slate-500">@team.TaskCount tasks</span>
-                                                    </div>
-                                                    <div class="mt-2 h-2 overflow-hidden rounded-full bg-slate-100">
-                                                        <div class="h-full rounded-full bg-emerald-500" style="width: @team.BarWidth%"></div>
-                                                    </div>
-                                                </div>
-                                            }
-                                        </div>
-                                    }
-                                    else
-                                    {
-                                        <p class="text-sm text-slate-500">Widget preview for <span class="font-semibold text-slate-900">@widget.ComponentKey</span> is not configured yet.</p>
-                                    }
-                                </div>
-                            </div>
+                            <circle cx="110" cy="110" r="74"
+                                    fill="none"
+                                    stroke="@slice.Color"
+                                    stroke-width="24"
+                                    stroke-linecap="round"
+                                    stroke-dasharray="@slice.DashArray"
+                                    stroke-dashoffset="@slice.DashOffset"
+                                    transform="rotate(-90 110 110)" />
                         }
+                    </svg>
+                    <div class="pointer-events-none absolute inset-0 flex flex-col items-center justify-center">
+                        <div class="text-3xl font-bold text-slate-900">@TotalTasksCount</div>
+                        <div class="text-xs text-slate-500">tasks</div>
+                    </div>
+                </div>
+            </div>
+
+            <div class="mt-3 space-y-3">
+                @foreach (var item in DistributionLegend)
+                {
+                    <div class="flex items-center justify-between rounded-2xl border border-slate-200 bg-slate-50 px-4 py-3">
+                        <div class="flex items-center gap-3">
+                            <span class="h-3 w-3 rounded-full" style="background-color: @item.Color"></span>
+                            <span class="text-sm text-slate-600">@item.Label</span>
+                        </div>
+                        <span class="text-sm font-semibold text-slate-900">@item.Count</span>
+                    </div>
+                }
+            </div>
+        </div>
+    </div>
+
+    <div class="grid grid-cols-1 gap-5 xl:grid-cols-3">
+        <div class="rounded-[28px] border border-slate-200 bg-white p-6 text-slate-900 shadow-sm shadow-slate-200/60 xl:col-span-2">
+            <div class="flex items-center justify-between">
+                <div>
+                    <h3 class="text-xl font-bold text-slate-900">Recent Projects</h3>
+                    <p class="mt-1 text-sm text-slate-500">What the team is working on right now.</p>
+                </div>
+            </div>
+
+            <div class="mt-5 space-y-3">
+                @foreach (var project in projectsList.OrderByDescending(p => p.CreatedAt).Take(4))
+                {
+                    <div class="rounded-2xl border border-slate-200 bg-slate-50 px-4 py-4">
+                        <div class="flex items-center justify-between gap-4">
+                            <div class="min-w-0">
+                                <p class="truncate text-sm font-semibold text-slate-900">@project.Name</p>
+                                <p class="mt-1 text-xs text-slate-500">@DisplayFormats.Date(project.StartDate) to @DisplayFormats.Date(project.EndDate)</p>
+                            </div>
+                            <span class="text-xs font-semibold text-slate-600">@TaskCountForProject(project.Id) tasks</span>
+                        </div>
                     </div>
                 }
-                else
+            </div>
+        </div>
+
+        <div class="rounded-[28px] border border-slate-200 bg-white p-6 text-slate-900 shadow-sm shadow-slate-200/60">
+            <h3 class="text-xl font-bold text-slate-900">Team Snapshot</h3>
+            <p class="mt-1 text-sm text-slate-500">People with the most assigned work.</p>
+
+            <div class="mt-5 space-y-4">
+                @foreach (var person in TeamSnapshot)
                 {
-                    <div class="rounded-xl border border-dashed border-slate-200 bg-slate-50 p-10 text-center">
-                        <p class="text-sm font-semibold text-slate-700">No widgets available for your role</p>
-                        <p class="mt-1 text-sm text-slate-500">Ask an administrator to enable widgets for this role.</p>
+                    <div>
+                        <div class="flex items-center justify-between text-sm">
+                            <span class="font-semibold text-slate-900">@person.Name</span>
+                            <span class="text-slate-500">@person.Count tasks</span>
+                        </div>
+                        <div class="mt-2 h-2 overflow-hidden rounded-full bg-slate-200">
+                            <div class="h-full rounded-full bg-emerald-500" style="width: @person.BarWidth%"></div>
+                        </div>
                     </div>
                 }
             </div>
+
+            <a href="/users" class="mt-5 inline-flex w-full items-center justify-center rounded-2xl border border-slate-200 bg-white px-4 py-3 text-sm font-semibold text-slate-700 shadow-sm transition-colors hover:bg-slate-50">
+                View team
+            </a>
         </div>
     </div>
-}
+</div>
 
 @code {
-    private bool isLoading = true;
     private DashboardSummaryDto summary = new();
+    private List<TaskStatusOverviewDto> taskStatuses = new();
     private List<ProjectProgressDto> projectProgress = new();
-    private List<DashboardWidgetDto> dashboardWidgets = new();
-    private List<AuditLogDto> auditLogs = new();
     private List<TaskDto> taskList = new();
     private List<UserDto> usersList = new();
     private List<ProjectDto> projectsList = new();
     private string currentUserName = "User";
-    private string currentUserRole = "Member";
     private bool canCreateTask = false;
-    private bool isWidgetEditMode = false;
-    private bool isSavingWidgetLayout = false;
-    private long? draggedWidgetId;
-    private string? widgetLayoutMessage;
+
+    private List<string> ActivityLabels => ActivityMonths.Select(m => m.Label).ToList();
+
+    private IReadOnlyList<ActivityMonth> ActivityMonths =>
+        GetActivityMonths();
+
+    private string ActivityRangeLabel =>
+        $"{ActivityMonths.First().Label} - {ActivityMonths.Last().Label}";
+
+    private string ActivityLinePath => BuildActivityPath(ActivityMonths, false);
+    private string ActivityAreaPath => BuildActivityPath(ActivityMonths, true);
+    private IReadOnlyList<ActivityPoint> ActivityPoints => BuildActivityPoints();
+    private IReadOnlyList<DistributionSlice> DonutSlices => BuildDonutSlices();
+    private IReadOnlyList<DistributionItem> DistributionLegend => BuildDistributionLegend();
+    private int TotalTasksCount => taskList.Count;
+    private int ActiveTasksCount => taskList.Count(t => t.StatusId != AppTaskStatus.Done);
+    private int CompletedTasksCount => taskList.Count(t => t.StatusId == AppTaskStatus.Done);
+    private int CompletionRate => TotalTasksCount > 0 ? (int)Math.Round((double)CompletedTasksCount / TotalTasksCount * 100) : 0;
+    private IEnumerable<(string Name, int Count, int BarWidth)> TeamSnapshot => BuildTeamSnapshot();
 
     protected override async Task OnInitializedAsync()
     {
@@ -294,29 +276,22 @@ else
             var authState = await AuthStateProvider.GetAuthenticationStateAsync();
             var user = authState.User;
             currentUserName = user.Identity?.Name ?? "User";
-            currentUserRole = user.FindFirst(ClaimTypes.Role)?.Value ?? "Member";
-
             var summaryResult = await client.GetFromJsonAsync<Result<DashboardSummaryDto>>("Dashboard/summary", Serialization.CaseInsensitive);
             if (summaryResult?.IsSuccess == true && summaryResult.Value != null)
             {
                 summary = summaryResult.Value;
             }
 
-            var progressResult = await client.GetFromJsonAsync<Result<List<ProjectProgressDto>>>("Dashboard/project-progress", Serialization.CaseInsensitive);
-            if (progressResult?.IsSuccess == true && progressResult.Value != null)
+            var tasksOverviewResult = await client.GetFromJsonAsync<Result<List<TaskStatusOverviewDto>>>("Dashboard/tasks-overview", Serialization.CaseInsensitive);
+            if (tasksOverviewResult?.IsSuccess == true && tasksOverviewResult.Value != null)
             {
-                projectProgress = progressResult.Value;
+                taskStatuses = tasksOverviewResult.Value;
             }
 
-            var widgetsResult = await client.GetFromJsonAsync<Result<List<DashboardWidgetDto>>>("Dashboard/widgets", Serialization.CaseInsensitive);
-            if (widgetsResult?.IsSuccess == true && widgetsResult.Value != null)
-            {
-                dashboardWidgets = widgetsResult.Value;
-            }
-
-            if (user.IsInRole("Admin"))
+            var progressResult = await client.GetFromJsonAsync<Result<List<ProjectProgressDto>>>("Dashboard/project-progress", Serialization.CaseInsensitive);
+            if (progressResult?.IsSuccess == true && progressResult.Value != null)
             {
-                auditLogs = await client.GetFromJsonAsync<List<AuditLogDto>>("AuditLog", Serialization.CaseInsensitive) ?? new();
+                projectProgress = progressResult.Value;
             }
 
             taskList = await client.GetFromJsonAsync<List<TaskDto>>("Task", Serialization.CaseInsensitive) ?? new();
@@ -325,11 +300,7 @@ else
         }
         catch (Exception ex)
         {
-            Console.WriteLine($"Dashboard widgets load error: {ex.Message}");
-        }
-        finally
-        {
-            isLoading = false;
+            Console.WriteLine($"Dashboard load error: {ex.Message}");
         }
     }
 
@@ -338,141 +309,166 @@ else
         await JS.InvokeVoidAsync("initIcons");
     }
 
-    private string DisplayWidgetCategory(string? category) =>
-        string.IsNullOrWhiteSpace(category) ? "General" : category;
+    private static string GetMonthLabel(DateTime date) => date.ToString("MMM");
 
-    private string GetGreetingPeriod()
+    private IReadOnlyList<ActivityMonth> GetActivityMonths()
     {
-        var hour = DateTime.Now.Hour;
-        if (hour < 12) return "morning";
-        if (hour < 17) return "afternoon";
-        return "evening";
-    }
-
-    private IEnumerable<(string Name, int TaskCount, int BarWidth)> GetTeamWorkload()
-    {
-        var relevantUsers = usersList
-            .Where(u => !u.Username.Equals(currentUserName, StringComparison.OrdinalIgnoreCase))
-            .Take(6)
-            .ToList();
+        var months = new List<ActivityMonth>();
+        var now = DateTime.Today;
+        var start = new DateTime(now.Year, now.Month, 1).AddMonths(-5);
 
-        var maxTasks = Math.Max(taskList.Count, 1);
-        return relevantUsers.Select(user =>
+        for (var i = 0; i < 6; i++)
         {
-            var taskCount = taskList.Count(t => t.AssignedTo == user.Id);
-            var width = Math.Max(10, (int)Math.Round((double)taskCount / maxTasks * 100));
-            return (Name: $"{user.FirstName} {user.LastName}", TaskCount: taskCount, BarWidth: width);
-        });
+            var monthStart = start.AddMonths(i);
+            var nextMonth = monthStart.AddMonths(1);
+            var created = taskList.Count(task => task.CreatedAt >= monthStart && task.CreatedAt < nextMonth);
+            var completed = taskList.Count(task => task.CompletedAt.HasValue && task.CompletedAt.Value >= monthStart && task.CompletedAt.Value < nextMonth);
+            months.Add(new ActivityMonth(GetMonthLabel(monthStart), created, completed));
+        }
+
+        return months;
     }
 
-    private string GetWidgetCardClasses(DashboardWidgetDto widget)
+    private string BuildActivityPath(IReadOnlyList<ActivityMonth> months, bool filled)
     {
-        var classes = new List<string>
+        if (months.Count == 0)
         {
-            "border-slate-100",
-            widget.IsHidden ? "opacity-75 bg-slate-100/70" : "bg-slate-50/70"
-        };
+            return string.Empty;
+        }
+
+        const double left = 48;
+        const double right = 730;
+        const double top = 48;
+        const double bottom = 280;
+        const double maxValue = 20;
+
+        double X(int i) => left + (i * ((right - left) / (months.Count - 1)));
+        double Y(double value) => bottom - Math.Min(value, maxValue) / maxValue * (bottom - top);
 
-        classes.Add(isWidgetEditMode ? "cursor-grab hover:shadow-md" : "cursor-default");
+        var values = months.Select(m => (double)m.Created).ToList();
+        var points = new List<string>();
 
-        if (draggedWidgetId == widget.WidgetId)
+        for (var i = 0; i < months.Count; i++)
         {
-            classes.Add("ring-2 ring-violet-300");
+            points.Add($"{X(i):0},{Y(values[i]):0}");
         }
 
-        return string.Join(" ", classes);
-    }
-
-    private void ToggleWidgetEditMode()
-    {
-        isWidgetEditMode = !isWidgetEditMode;
-        widgetLayoutMessage = null;
-        draggedWidgetId = null;
-    }
+        var linePath = $"M {points[0]}";
+        if (points.Count > 1)
+        {
+            for (var i = 1; i < points.Count; i++)
+            {
+                linePath += $" L {points[i]}";
+            }
+        }
 
-    private void BeginWidgetDrag(long widgetId)
-    {
-        if (!isWidgetEditMode)
+        if (!filled)
         {
-            return;
+            return linePath;
         }
 
-        draggedWidgetId = widgetId;
+        return $"{linePath} L {X(months.Count - 1):0},{bottom:0} L {X(0):0},{bottom:0} Z";
     }
 
-    private void DropWidget(long targetWidgetId)
+    private IReadOnlyList<ActivityPoint> BuildActivityPoints()
     {
-        if (!isWidgetEditMode || draggedWidgetId == null || draggedWidgetId == targetWidgetId)
+        var points = new List<ActivityPoint>();
+        var months = ActivityMonths;
+        if (months.Count == 0)
         {
-            draggedWidgetId = null;
-            return;
+            return points;
         }
 
-        var fromIndex = dashboardWidgets.FindIndex(widget => widget.WidgetId == draggedWidgetId.Value);
-        var toIndex = dashboardWidgets.FindIndex(widget => widget.WidgetId == targetWidgetId);
-        if (fromIndex < 0 || toIndex < 0)
-        {
-            draggedWidgetId = null;
-            return;
-        }
+        const double left = 48;
+        const double right = 730;
+        const double top = 48;
+        const double bottom = 280;
+        var maxValue = Math.Max(months.Max(m => m.Created), 1);
+        double X(int i) => left + (i * ((right - left) / (months.Count - 1)));
+        double Y(double value) => bottom - Math.Min(value, maxValue) / (double)maxValue * (bottom - top);
 
-        var moved = dashboardWidgets[fromIndex];
-        dashboardWidgets.RemoveAt(fromIndex);
-        if (fromIndex < toIndex)
+        for (var i = 0; i < months.Count; i++)
         {
-            toIndex--;
+            points.Add(new ActivityPoint(X(i), Y(months[i].Created)));
         }
-        dashboardWidgets.Insert(toIndex, moved);
-        draggedWidgetId = null;
+
+        return points;
     }
 
-    private async Task SaveWidgetLayoutAsync()
+    private IReadOnlyList<DistributionSlice> BuildDonutSlices()
     {
-        if (isSavingWidgetLayout)
+        var colors = new[]
         {
-            return;
-        }
+            "#10b981",
+            "#8b5cf6",
+            "#06b6d4",
+            "#ef4444"
+        };
 
-        isSavingWidgetLayout = true;
-        widgetLayoutMessage = null;
+        var counts = new[]
+        {
+            CompletedTasksCount,
+            taskStatuses.FirstOrDefault(s => s.StatusId == AppTaskStatus.InProgress)?.TaskCount ?? 0,
+            taskStatuses.FirstOrDefault(s => s.StatusId == AppTaskStatus.Todo)?.TaskCount ?? 0,
+            Math.Max(taskList.Count(t => t.DueDate.Date < DateTime.Today && t.StatusId != AppTaskStatus.Done), 0)
+        };
 
-        try
+        var total = counts.Sum();
+        if (total <= 0)
         {
-            var client = ApiClient.CreateClient();
-            var request = new DashboardWidgetLayoutSaveRequestDto
-            {
-                Widgets = dashboardWidgets.Select((widget, index) => new DashboardWidgetLayoutItemDto
-                {
-                    WidgetId = widget.WidgetId,
-                    GridX = 0,
-                    GridY = index,
-                    Width = widget.Width > 0 ? widget.Width : widget.DefaultWidth,
-                    Height = widget.Height > 0 ? widget.Height : widget.DefaultHeight,
-                    SortOrder = index,
-                    IsHidden = widget.IsHidden,
-                    IsPinned = widget.IsPinned,
-                    ConfigJson = widget.ConfigJson
-                }).ToList()
-            };
-
-            var response = await client.PutAsJsonAsync("Dashboard/widgets/layout", request);
-            if (response.IsSuccessStatusCode)
-            {
-                widgetLayoutMessage = "Widget layout saved.";
-                isWidgetEditMode = false;
-            }
-            else
-            {
-                widgetLayoutMessage = $"Failed to save layout. {(int)response.StatusCode} {response.ReasonPhrase}";
-            }
+            total = 1;
         }
-        catch (Exception ex)
+
+        var circumference = 2 * Math.PI * 74;
+        var slices = new List<DistributionSlice>();
+        var offset = 0.0;
+        for (var i = 0; i < counts.Length; i++)
         {
-            widgetLayoutMessage = $"Failed to save layout: {ex.Message}";
+            var value = counts[i];
+            var fraction = value / (double)total;
+            var dash = $"{circumference * fraction:0.##} {circumference:0.##}";
+            var dashOffset = circumference - (circumference * offset);
+            slices.Add(new DistributionSlice(colors[i], dash, dashOffset));
+            offset += fraction;
         }
-        finally
+        return slices;
+    }
+
+    private IReadOnlyList<DistributionItem> BuildDistributionLegend()
+    {
+        return new List<DistributionItem>
         {
-            isSavingWidgetLayout = false;
-        }
+            new("Completed", CompletedTasksCount, "#10b981"),
+            new("In Progress", taskStatuses.FirstOrDefault(s => s.StatusId == AppTaskStatus.InProgress)?.TaskCount ?? 0, "#8b5cf6"),
+            new("To Do", taskStatuses.FirstOrDefault(s => s.StatusId == AppTaskStatus.Todo)?.TaskCount ?? 0, "#06b6d4"),
+            new("Overdue", taskList.Count(t => t.DueDate.Date < DateTime.Today && t.StatusId != AppTaskStatus.Done), "#ef4444")
+        };
     }
+
+    private IEnumerable<(string Name, int Count, int BarWidth)> BuildTeamSnapshot()
+    {
+        var relevantUsers = usersList
+            .Where(u => !u.Username.Equals(currentUserName, StringComparison.OrdinalIgnoreCase))
+            .Take(5)
+            .ToList();
+
+        var maxTasks = Math.Max(taskList.Count, 1);
+        return relevantUsers
+            .Select(user =>
+            {
+                var count = taskList.Count(task => task.AssignedTo == user.Id);
+                var barWidth = Math.Max(10, (int)Math.Round((double)count / maxTasks * 100));
+                return (Name: $"{user.FirstName} {user.LastName}", Count: count, BarWidth: barWidth);
+            })
+            .OrderByDescending(item => item.Count)
+            .ToList();
+    }
+
+    private int TaskCountForProject(long projectId) =>
+        taskList.Count(task => task.ProjectId == projectId);
+
+    private readonly record struct ActivityMonth(string Label, int Created, int Completed);
+    private readonly record struct ActivityPoint(double X, double Y);
+    private readonly record struct DistributionSlice(string Color, string DashArray, double DashOffset);
+    private readonly record struct DistributionItem(string Label, int Count, string Color);
 }

TaskTrackingSystem.WebApp/Components/Pages/WidgetSetup.razor

@@ -1,800 +0,0 @@
-@page "/widget-setup"
-@using Microsoft.AspNetCore.Authorization
-@using Microsoft.AspNetCore.Components.Authorization
-@using TaskTrackingSystem.Shared.Models.Dashboard
-@using TaskTrackingSystem.Shared.Models.Role
-@rendermode @(new InteractiveServerRenderMode(prerender: false))
-@attribute [Microsoft.AspNetCore.Authorization.Authorize]
-@inject ApiClientService ApiClient
-@inject IJSRuntime JS
-@inject AuthenticationStateProvider AuthStateProvider
-
-<PageTitle>Widget Setup</PageTitle>
-
-<SuccessAlert Message="@successMessage" />
-
-<div class="space-y-6">
-    <div class="flex flex-col gap-4 lg:flex-row lg:items-end lg:justify-between">
-        <div>
-            <p class="text-sm font-semibold uppercase tracking-wider text-violet-600">Dashboard Admin</p>
-            <h2 class="mt-1 text-3xl font-bold tracking-tight text-slate-900">Widget Setup</h2>
-            <p class="mt-1 text-slate-500">Manage the widget catalog and decide which roles can use each widget.</p>
-        </div>
-        @if (isAdmin)
-        {
-            <button @onclick="OpenCreateModal" class="inline-flex items-center rounded-lg bg-violet-600 px-4 py-2.5 text-sm font-medium text-white shadow-sm transition-colors hover:bg-violet-700">
-                <i data-lucide="plus" class="mr-2 h-4 w-4"></i>
-                New Widget
-            </button>
-        }
-    </div>
-
-    @if (isLoading)
-    {
-        <LoadingSpinner Message="Loading widgets..." />
-    }
-    else if (!isAdmin)
-    {
-        <div class="rounded-2xl border border-rose-100 bg-rose-50 p-6 text-rose-700">
-            You do not have permission to manage dashboard widgets.
-        </div>
-    }
-    else
-    {
-        <div class="grid gap-6 xl:grid-cols-[360px_minmax(0,1fr)]">
-            <div class="rounded-2xl border border-slate-200 bg-white shadow-sm overflow-hidden">
-                <div class="border-b border-slate-100 bg-slate-50/70 p-4">
-                    <div class="flex items-center justify-between gap-3 mb-2">
-                        <label class="block text-xs font-semibold uppercase tracking-wider text-slate-500">Search widgets</label>
-                        <div class="flex items-center gap-2">
-                            @if (hasPendingOrderChanges)
-                            {
-                                <span class="rounded-full bg-amber-50 px-2.5 py-1 text-[10px] font-semibold uppercase tracking-wider text-amber-700">Order changed</span>
-                            }
-                            <button @onclick="SaveWidgetOrderAsync" disabled="@(!hasPendingOrderChanges || isSavingWidgetOrder)"
-                                    class="rounded-lg bg-violet-600 px-3 py-2 text-sm font-medium text-white transition-colors hover:bg-violet-700 disabled:opacity-50">
-                                @(isSavingWidgetOrder ? "Saving order..." : "Save order")
-                            </button>
-                        </div>
-                    </div>
-                    <input @bind-value="searchInput" @bind-value:event="oninput" type="text" placeholder="Search by code, name, or category"
-                           class="w-full rounded-lg border border-slate-200 px-3 py-2 text-sm text-slate-900 placeholder:text-slate-400 focus:outline-none focus:ring-2 focus:ring-violet-600 focus:border-transparent" />
-                </div>
-                <div class="max-h-[70vh] overflow-y-auto p-3">
-                    @if (FilteredWidgets.Any())
-                    {
-                        @foreach (var widget in FilteredWidgets)
-                        {
-                            var isSelected = selectedWidget?.WidgetId == widget.WidgetId;
-                            <button @onclick="() => SelectWidget(widget)"
-                                    draggable="true"
-                                    @ondragstart="() => BeginWidgetDrag(widget.WidgetId)"
-                                    @ondrop="() => DropWidget(widget.WidgetId)"
-                                    @ondragover:preventDefault="true"
-                                    class="mb-2 w-full rounded-xl border px-4 py-3 text-left transition-all @(isSelected ? "border-violet-300 bg-violet-50 shadow-sm" : "border-slate-200 bg-white hover:bg-slate-50") @(draggedWidgetId == widget.WidgetId ? "ring-2 ring-violet-300" : "")">
-                                <div class="flex items-start justify-between gap-3">
-                                    <div class="min-w-0">
-                                        <p class="truncate text-sm font-semibold text-slate-900">@widget.WidgetName</p>
-                                        <p class="mt-0.5 truncate text-xs text-slate-500">@widget.WidgetCode</p>
-                                    </div>
-                                    <span class="rounded-full bg-slate-100 px-2 py-1 text-[10px] font-semibold text-slate-500">@widget.RoleCount roles</span>
-                                </div>
-                                <div class="mt-2 flex flex-wrap gap-2 text-[10px] font-semibold uppercase tracking-wider">
-                                    <span class="rounded-full bg-white px-2 py-1 text-slate-500 border border-slate-200">@DisplayCategory(widget.Category)</span>
-                                    <span class="rounded-full @(widget.IsActive ? "bg-emerald-50 text-emerald-700" : "bg-slate-100 text-slate-500") px-2 py-1">@((widget.IsActive) ? "Active" : "Hidden")</span>
-                                </div>
-                                <div class="mt-2 flex items-center justify-between text-[10px] text-slate-400">
-                                    <span>Drag to reorder</span>
-                                    <span>Order @widget.DefaultOrder</span>
-                                </div>
-                            </button>
-                        }
-                    }
-                    else
-                    {
-                        <div class="rounded-xl border border-dashed border-slate-200 p-6 text-center text-sm text-slate-500">
-                            No widgets found.
-                        </div>
-                    }
-                </div>
-            </div>
-
-            <div class="space-y-6">
-                @if (selectedWidget != null)
-                {
-                    <div class="rounded-2xl border border-slate-200 bg-white shadow-sm">
-                        <div class="flex flex-col gap-3 border-b border-slate-100 bg-slate-50/70 px-5 py-4 md:flex-row md:items-center md:justify-between">
-                            <div>
-                                <p class="text-xs font-semibold uppercase tracking-wider text-violet-600">Selected Widget</p>
-                                <h3 class="mt-1 text-xl font-bold text-slate-900">@selectedWidget.WidgetName</h3>
-                                <p class="text-sm text-slate-500">@selectedWidget.WidgetCode</p>
-                            </div>
-                            <div class="flex flex-wrap gap-2">
-                                <button @onclick="OpenEditModal" class="inline-flex items-center rounded-lg border border-slate-200 bg-white px-3 py-2 text-sm font-medium text-slate-700 hover:bg-slate-50">
-                                    <i data-lucide="pencil" class="mr-2 h-4 w-4"></i>Edit
-                                </button>
-                                <button @onclick="RequestDeleteSelectedWidget" class="inline-flex items-center rounded-lg border border-rose-200 bg-rose-50 px-3 py-2 text-sm font-medium text-rose-700 hover:bg-rose-100">
-                                    <i data-lucide="trash-2" class="mr-2 h-4 w-4"></i>Delete
-                                </button>
-                            </div>
-                        </div>
-
-                        <div class="grid gap-4 p-5 md:grid-cols-2 xl:grid-cols-4">
-                            <div class="rounded-xl bg-slate-50 p-4">
-                                <p class="text-[10px] font-semibold uppercase tracking-wider text-slate-400">Component</p>
-                                <p class="mt-1 text-sm font-semibold text-slate-900">@selectedWidget.ComponentKey</p>
-                            </div>
-                            <div class="rounded-xl bg-slate-50 p-4">
-                                <p class="text-[10px] font-semibold uppercase tracking-wider text-slate-400">Category</p>
-                                <p class="mt-1 text-sm font-semibold text-slate-900">@DisplayCategory(selectedWidget.Category)</p>
-                            </div>
-                            <div class="rounded-xl bg-slate-50 p-4">
-                                <p class="text-[10px] font-semibold uppercase tracking-wider text-slate-400">Default Size</p>
-                                <p class="mt-1 text-sm font-semibold text-slate-900">@selectedWidget.DefaultWidth x @selectedWidget.DefaultHeight</p>
-                            </div>
-                            <div class="rounded-xl bg-slate-50 p-4">
-                                <p class="text-[10px] font-semibold uppercase tracking-wider text-slate-400">Roles</p>
-                                <p class="mt-1 text-sm font-semibold text-slate-900">@selectedWidget.RoleCount</p>
-                            </div>
-                        </div>
-                    </div>
-
-                    <div class="rounded-2xl border border-slate-200 bg-white shadow-sm">
-                        <div class="flex items-center justify-between border-b border-slate-100 px-5 py-4">
-                            <div>
-                                <p class="text-xs font-semibold uppercase tracking-wider text-violet-600">Role Access</p>
-                                <h3 class="mt-1 text-lg font-bold text-slate-900">Who can use this widget</h3>
-                            </div>
-                            <button @onclick="SaveAccessAsync" disabled="@isSavingAccess"
-                                    class="inline-flex items-center rounded-lg bg-violet-600 px-4 py-2 text-sm font-medium text-white transition-colors hover:bg-violet-700 disabled:opacity-50">
-                                <i data-lucide="save" class="mr-2 h-4 w-4"></i>
-                                @(isSavingAccess ? "Saving..." : "Save Access")
-                            </button>
-                        </div>
-
-                        <div class="border-b border-slate-100 bg-slate-50/60 px-5 py-4">
-                            <div class="flex flex-wrap items-center gap-2">
-                                <span class="text-xs font-semibold uppercase tracking-wider text-slate-500">Presets</span>
-                                <button @onclick="ApplyPresetFullAccess" class="rounded-full border border-slate-200 bg-white px-3 py-1.5 text-xs font-semibold text-slate-700 hover:bg-slate-50">Full access</button>
-                                <button @onclick="ApplyPresetTeamDefault" class="rounded-full border border-slate-200 bg-white px-3 py-1.5 text-xs font-semibold text-slate-700 hover:bg-slate-50">Team default</button>
-                                <button @onclick="ApplyPresetClear" class="rounded-full border border-slate-200 bg-white px-3 py-1.5 text-xs font-semibold text-slate-700 hover:bg-slate-50">Clear all</button>
-                            </div>
-                        </div>
-
-                        <div class="overflow-x-auto">
-                            <table class="w-full">
-                                <thead>
-                                    <tr class="border-b border-slate-100 bg-slate-50/60 text-left text-xs font-semibold uppercase tracking-wider text-slate-500">
-                                        <th class="px-5 py-3">Role</th>
-                                        <th class="px-5 py-3">View</th>
-                                        <th class="px-5 py-3">Configure</th>
-                                        <th class="px-5 py-3">Default Visible</th>
-                                        <th class="px-5 py-3">Grid X</th>
-                                        <th class="px-5 py-3">Grid Y</th>
-                                        <th class="px-5 py-3">Width</th>
-                                        <th class="px-5 py-3">Height</th>
-                                        <th class="px-5 py-3">Sort</th>
-                                    </tr>
-                                </thead>
-                                <tbody class="divide-y divide-slate-100">
-                                    @foreach (var access in selectedWidgetAccess)
-                                    {
-                                        <tr class="hover:bg-slate-50/50">
-                                            <td class="px-5 py-4">
-                                                <div>
-                                                    <p class="text-sm font-semibold text-slate-900">@access.RoleName</p>
-                                                    <p class="text-xs text-slate-400">Role #@access.RoleId</p>
-                                                </div>
-                                            </td>
-                                            <td class="px-5 py-4">
-                                                <input type="checkbox" class="h-4 w-4 rounded accent-violet-600" @bind="access.CanView" />
-                                            </td>
-                                            <td class="px-5 py-4">
-                                                <input type="checkbox" class="h-4 w-4 rounded accent-violet-600" @bind="access.CanConfigure" />
-                                            </td>
-                                            <td class="px-5 py-4">
-                                                <input type="checkbox" class="h-4 w-4 rounded accent-violet-600" @bind="access.IsDefaultVisible" />
-                                            </td>
-                                            <td class="px-5 py-4">
-                                                <input type="number" class="w-20 rounded-lg border border-slate-200 px-2 py-1.5 text-sm" @bind="access.DefaultGridX" />
-                                            </td>
-                                            <td class="px-5 py-4">
-                                                <input type="number" class="w-20 rounded-lg border border-slate-200 px-2 py-1.5 text-sm" @bind="access.DefaultGridY" />
-                                            </td>
-                                            <td class="px-5 py-4">
-                                                <input type="number" class="w-20 rounded-lg border border-slate-200 px-2 py-1.5 text-sm" @bind="access.DefaultWidth" />
-                                            </td>
-                                            <td class="px-5 py-4">
-                                                <input type="number" class="w-20 rounded-lg border border-slate-200 px-2 py-1.5 text-sm" @bind="access.DefaultHeight" />
-                                            </td>
-                                            <td class="px-5 py-4">
-                                                <input type="number" class="w-20 rounded-lg border border-slate-200 px-2 py-1.5 text-sm" @bind="access.DefaultSortOrder" />
-                                            </td>
-                                        </tr>
-                                    }
-                                </tbody>
-                            </table>
-                        </div>
-
-                        @if (!string.IsNullOrWhiteSpace(accessErrorMessage))
-                        {
-                            <div class="border-t border-slate-100 p-4">
-                                <div class="rounded-xl border border-rose-100 bg-rose-50 px-4 py-3 text-sm text-rose-700">@accessErrorMessage</div>
-                            </div>
-                        }
-                    </div>
-                }
-                else
-                {
-                    <div class="rounded-2xl border border-dashed border-slate-200 bg-white p-10 text-center text-slate-500 shadow-sm">
-                        Select a widget to manage access.
-                    </div>
-                }
-            </div>
-        </div>
-    }
-</div>
-
-@if (showWidgetModal)
-{
-    <div class="fixed inset-0 z-50 flex items-center justify-center bg-black/40 backdrop-blur-sm">
-        <div class="mx-4 w-full max-w-2xl overflow-hidden rounded-2xl bg-white shadow-2xl">
-            <div class="flex items-center justify-between border-b border-slate-100 px-6 py-4">
-                <div>
-                    <h3 class="text-lg font-semibold text-slate-900">@(isEditingWidget ? "Edit Widget" : "New Widget")</h3>
-                    <p class="text-sm text-slate-500">Define the widget catalog entry here.</p>
-                </div>
-                <button @onclick="CloseWidgetModal" class="rounded-lg p-1.5 text-slate-400 hover:bg-slate-100 hover:text-slate-600">
-                    <i data-lucide="x" class="h-5 w-5"></i>
-                </button>
-            </div>
-            <div class="space-y-4 p-6">
-                <div class="grid gap-4 md:grid-cols-2">
-                    <div>
-                        <label class="mb-1.5 block text-sm font-medium text-slate-700">Widget Code</label>
-                        <input @bind="formWidgetCode" type="text" placeholder="WIDGET_TASKS"
-                               class="w-full rounded-lg border border-slate-200 px-3 py-2 text-sm text-slate-900 focus:border-transparent focus:outline-none focus:ring-2 focus:ring-violet-600" />
-                    </div>
-                    <div>
-                        <label class="mb-1.5 block text-sm font-medium text-slate-700">Widget Name</label>
-                        <input @bind="formWidgetName" type="text" placeholder="Task Overview"
-                               class="w-full rounded-lg border border-slate-200 px-3 py-2 text-sm text-slate-900 focus:border-transparent focus:outline-none focus:ring-2 focus:ring-violet-600" />
-                    </div>
-                </div>
-                <div>
-                    <label class="mb-1.5 block text-sm font-medium text-slate-700">Description</label>
-                    <textarea @bind="formDescription" rows="3" class="w-full rounded-lg border border-slate-200 px-3 py-2 text-sm text-slate-900 focus:border-transparent focus:outline-none focus:ring-2 focus:ring-violet-600"></textarea>
-                </div>
-                <div class="grid gap-4 md:grid-cols-2">
-                    <div>
-                        <label class="mb-1.5 block text-sm font-medium text-slate-700">Category</label>
-                        <input @bind="formCategory" type="text" placeholder="Overview"
-                               class="w-full rounded-lg border border-slate-200 px-3 py-2 text-sm text-slate-900 focus:border-transparent focus:outline-none focus:ring-2 focus:ring-violet-600" />
-                    </div>
-                    <div>
-                        <label class="mb-1.5 block text-sm font-medium text-slate-700">Component Key</label>
-                        <input @bind="formComponentKey" type="text" placeholder="GreetingBanner"
-                               class="w-full rounded-lg border border-slate-200 px-3 py-2 text-sm text-slate-900 focus:border-transparent focus:outline-none focus:ring-2 focus:ring-violet-600" />
-                    </div>
-                </div>
-                <div class="grid gap-4 md:grid-cols-4">
-                    <div>
-                        <label class="mb-1.5 block text-sm font-medium text-slate-700">Data Source</label>
-                        <input @bind="formDataSourceKey" type="text" placeholder="DashboardSummary"
-                               class="w-full rounded-lg border border-slate-200 px-3 py-2 text-sm text-slate-900 focus:border-transparent focus:outline-none focus:ring-2 focus:ring-violet-600" />
-                    </div>
-                    <div>
-                        <label class="mb-1.5 block text-sm font-medium text-slate-700">Width</label>
-                        <input @bind="formDefaultWidth" type="number" min="1" class="w-full rounded-lg border border-slate-200 px-3 py-2 text-sm text-slate-900 focus:border-transparent focus:outline-none focus:ring-2 focus:ring-violet-600" />
-                    </div>
-                    <div>
-                        <label class="mb-1.5 block text-sm font-medium text-slate-700">Height</label>
-                        <input @bind="formDefaultHeight" type="number" min="1" class="w-full rounded-lg border border-slate-200 px-3 py-2 text-sm text-slate-900 focus:border-transparent focus:outline-none focus:ring-2 focus:ring-violet-600" />
-                    </div>
-                    <div>
-                        <label class="mb-1.5 block text-sm font-medium text-slate-700">Order</label>
-                        <input @bind="formDefaultOrder" type="number" class="w-full rounded-lg border border-slate-200 px-3 py-2 text-sm text-slate-900 focus:border-transparent focus:outline-none focus:ring-2 focus:ring-violet-600" />
-                    </div>
-                </div>
-                <div class="flex items-center gap-2">
-                    <input @bind="formIsActive" type="checkbox" class="h-4 w-4 rounded accent-violet-600" id="widgetActiveToggle" />
-                    <label for="widgetActiveToggle" class="text-sm font-medium text-slate-700">Active</label>
-                </div>
-                @if (!string.IsNullOrWhiteSpace(widgetErrorMessage))
-                {
-                    <div class="rounded-xl border border-rose-100 bg-rose-50 px-4 py-3 text-sm text-rose-700">@widgetErrorMessage</div>
-                }
-            </div>
-            <div class="flex items-center justify-end gap-3 border-t border-slate-100 bg-slate-50/60 px-6 py-4">
-                <button @onclick="CloseWidgetModal" class="rounded-lg px-4 py-2 text-sm font-medium text-slate-600 hover:bg-slate-100">Cancel</button>
-                <button @onclick="SaveWidgetAsync" disabled="@isSavingWidget"
-                        class="rounded-lg bg-violet-600 px-4 py-2 text-sm font-medium text-white transition-colors hover:bg-violet-700 disabled:opacity-50">
-                    @(isSavingWidget ? "Saving..." : "Save Widget")
-                </button>
-            </div>
-        </div>
-    </div>
-}
-
-<ConfirmDialog IsVisible="@showConfirmDialog"
-               Title="@confirmTitle"
-               Message="@confirmMessage"
-               ConfirmText="@confirmButtonText"
-               Icon="@confirmIcon"
-               IconBgClass="@confirmIconBg"
-               IconTextClass="@confirmIconText"
-               ButtonClass="@confirmButtonClass"
-               OnConfirm="HandleConfirmAction"
-               OnCancel="CloseConfirmDialog" />
-
-@code {
-    private bool isLoading = true;
-    private bool isAdmin;
-    private bool showWidgetModal;
-    private bool isEditingWidget;
-    private bool isSavingWidget;
-    private bool isSavingAccess;
-    private bool isSavingWidgetOrder;
-    private bool hasPendingOrderChanges;
-    private bool showConfirmDialog;
-    private string? successMessage;
-    private string? widgetErrorMessage;
-    private string? accessErrorMessage;
-    private string searchInput = string.Empty;
-    private List<DashboardWidgetAdminDto> widgets = new();
-    private DashboardWidgetAdminDto? selectedWidget;
-    private List<DashboardWidgetRoleAccessDto> selectedWidgetAccess = new();
-    private long? draggedWidgetId;
-
-    private long editingWidgetId;
-    private string formWidgetCode = string.Empty;
-    private string formWidgetName = string.Empty;
-    private string? formDescription;
-    private string? formCategory;
-    private string? formComponentKey;
-    private string? formDataSourceKey;
-    private int formDefaultWidth = 4;
-    private int formDefaultHeight = 3;
-    private int formDefaultOrder;
-    private bool formIsActive = true;
-
-    private string confirmTitle = string.Empty;
-    private string confirmMessage = string.Empty;
-    private string confirmButtonText = string.Empty;
-    private string confirmIcon = string.Empty;
-    private string confirmIconBg = string.Empty;
-    private string confirmIconText = string.Empty;
-    private string confirmButtonClass = string.Empty;
-    private Func<Task>? confirmAction;
-
-    protected override async Task OnInitializedAsync()
-    {
-        var authState = await AuthStateProvider.GetAuthenticationStateAsync();
-        var user = authState.User;
-        isAdmin = user.IsInRole("Admin");
-
-        if (!isAdmin)
-        {
-            isLoading = false;
-            return;
-        }
-
-        await LoadWidgetsAsync();
-        if (widgets.Any())
-        {
-            await SelectWidget(widgets.First());
-        }
-
-        isLoading = false;
-    }
-
-    protected override async Task OnAfterRenderAsync(bool firstRender)
-    {
-        await JS.InvokeVoidAsync("initIcons");
-    }
-
-    private IEnumerable<DashboardWidgetAdminDto> FilteredWidgets =>
-        string.IsNullOrWhiteSpace(searchInput)
-            ? widgets
-            : widgets.Where(widget =>
-                widget.WidgetCode.Contains(searchInput, StringComparison.OrdinalIgnoreCase) ||
-                widget.WidgetName.Contains(searchInput, StringComparison.OrdinalIgnoreCase) ||
-                (widget.Category != null && widget.Category.Contains(searchInput, StringComparison.OrdinalIgnoreCase)));
-
-    private async Task LoadWidgetsAsync()
-    {
-        var client = ApiClient.CreateClient();
-        var result = await client.GetFromJsonAsync<Result<List<DashboardWidgetAdminDto>>>("Dashboard/admin/widgets", Serialization.CaseInsensitive);
-        widgets = result?.Value ?? new();
-        hasPendingOrderChanges = false;
-    }
-
-    private async Task SelectWidget(DashboardWidgetAdminDto widget)
-    {
-        selectedWidget = widget;
-        accessErrorMessage = null;
-        var client = ApiClient.CreateClient();
-        var result = await client.GetFromJsonAsync<Result<List<DashboardWidgetRoleAccessDto>>>($"Dashboard/admin/widgets/{widget.WidgetId}/access", Serialization.CaseInsensitive);
-        selectedWidgetAccess = result?.Value ?? new();
-    }
-
-    private void OpenCreateModal()
-    {
-        isEditingWidget = false;
-        editingWidgetId = 0;
-        formWidgetCode = string.Empty;
-        formWidgetName = string.Empty;
-        formDescription = null;
-        formCategory = null;
-        formComponentKey = null;
-        formDataSourceKey = null;
-        formDefaultWidth = 4;
-        formDefaultHeight = 3;
-        formDefaultOrder = widgets.Count > 0 ? widgets.Max(widget => widget.DefaultOrder) + 1 : 1;
-        formIsActive = true;
-        widgetErrorMessage = null;
-        showWidgetModal = true;
-    }
-
-    private void OpenEditModal()
-    {
-        if (selectedWidget == null)
-        {
-            return;
-        }
-
-        isEditingWidget = true;
-        editingWidgetId = selectedWidget.WidgetId;
-        formWidgetCode = selectedWidget.WidgetCode;
-        formWidgetName = selectedWidget.WidgetName;
-        formDescription = selectedWidget.Description;
-        formCategory = selectedWidget.Category;
-        formComponentKey = selectedWidget.ComponentKey;
-        formDataSourceKey = selectedWidget.DataSourceKey;
-        formDefaultWidth = selectedWidget.DefaultWidth;
-        formDefaultHeight = selectedWidget.DefaultHeight;
-        formDefaultOrder = selectedWidget.DefaultOrder;
-        formIsActive = selectedWidget.IsActive;
-        widgetErrorMessage = null;
-        showWidgetModal = true;
-    }
-
-    private void CloseWidgetModal()
-    {
-        showWidgetModal = false;
-        widgetErrorMessage = null;
-    }
-
-    private async Task SaveWidgetAsync()
-    {
-        widgetErrorMessage = null;
-
-        if (string.IsNullOrWhiteSpace(formWidgetCode))
-        {
-            widgetErrorMessage = "Widget code is required.";
-            return;
-        }
-
-        if (string.IsNullOrWhiteSpace(formWidgetName))
-        {
-            widgetErrorMessage = "Widget name is required.";
-            return;
-        }
-
-        isSavingWidget = true;
-        var client = ApiClient.CreateClient();
-        try
-        {
-            var dto = new DashboardWidgetUpsertDto
-            {
-                WidgetId = editingWidgetId,
-                WidgetCode = formWidgetCode.Trim(),
-                WidgetName = formWidgetName.Trim(),
-                Description = string.IsNullOrWhiteSpace(formDescription) ? null : formDescription.Trim(),
-                Category = string.IsNullOrWhiteSpace(formCategory) ? null : formCategory.Trim(),
-                ComponentKey = string.IsNullOrWhiteSpace(formComponentKey) ? null : formComponentKey.Trim(),
-                DataSourceKey = string.IsNullOrWhiteSpace(formDataSourceKey) ? null : formDataSourceKey.Trim(),
-                DefaultWidth = formDefaultWidth,
-                DefaultHeight = formDefaultHeight,
-                DefaultOrder = formDefaultOrder,
-                IsActive = formIsActive
-            };
-
-            HttpResponseMessage response;
-            if (isEditingWidget)
-            {
-                response = await client.PutAsJsonAsync($"Dashboard/admin/widgets/{editingWidgetId}", dto);
-            }
-            else
-            {
-                response = await client.PostAsJsonAsync("Dashboard/admin/widgets", dto);
-            }
-
-            var result = await response.Content.ReadFromJsonAsync<Result<DashboardWidgetAdminDto>>(Serialization.CaseInsensitive);
-            if (result == null || !result.IsSuccess)
-            {
-                widgetErrorMessage = result?.ErrorMessage ?? "Failed to save widget.";
-                return;
-            }
-
-            await LoadWidgetsAsync();
-            selectedWidget = widgets.FirstOrDefault(widget => widget.WidgetId == result.Value?.WidgetId) ?? widgets.FirstOrDefault();
-            if (selectedWidget != null)
-            {
-                await SelectWidget(selectedWidget);
-            }
-
-            CloseWidgetModal();
-            successMessage = isEditingWidget ? "Widget updated successfully." : "Widget created successfully.";
-        }
-        catch (Exception ex)
-        {
-            widgetErrorMessage = ex.Message;
-        }
-        finally
-        {
-            isSavingWidget = false;
-        }
-    }
-
-    private async Task SaveAccessAsync()
-    {
-        if (selectedWidget == null)
-        {
-            return;
-        }
-
-        isSavingAccess = true;
-        accessErrorMessage = null;
-        try
-        {
-            var client = ApiClient.CreateClient();
-            var request = new DashboardWidgetRoleAccessSaveRequestDto
-            {
-                RoleAccess = selectedWidgetAccess
-            };
-
-            var response = await client.PutAsJsonAsync($"Dashboard/admin/widgets/{selectedWidget.WidgetId}/access", request);
-            var result = await response.Content.ReadFromJsonAsync<Result>(Serialization.CaseInsensitive);
-            if (result == null || !result.IsSuccess)
-            {
-                accessErrorMessage = result?.ErrorMessage ?? "Failed to save widget access.";
-                return;
-            }
-
-            successMessage = $"Access saved for {selectedWidget.WidgetName}.";
-            await LoadWidgetsAsync();
-            selectedWidget = widgets.FirstOrDefault(widget => widget.WidgetId == selectedWidget.WidgetId) ?? selectedWidget;
-        }
-        catch (Exception ex)
-        {
-            accessErrorMessage = ex.Message;
-        }
-        finally
-        {
-            isSavingAccess = false;
-        }
-    }
-
-    private void BeginWidgetDrag(long widgetId)
-    {
-        draggedWidgetId = widgetId;
-    }
-
-    private void DropWidget(long targetWidgetId)
-    {
-        if (draggedWidgetId == null || draggedWidgetId == targetWidgetId)
-        {
-            draggedWidgetId = null;
-            return;
-        }
-
-        var fromIndex = widgets.FindIndex(widget => widget.WidgetId == draggedWidgetId.Value);
-        var toIndex = widgets.FindIndex(widget => widget.WidgetId == targetWidgetId);
-        if (fromIndex < 0 || toIndex < 0)
-        {
-            draggedWidgetId = null;
-            return;
-        }
-
-        var moved = widgets[fromIndex];
-        widgets.RemoveAt(fromIndex);
-        if (fromIndex < toIndex)
-        {
-            toIndex--;
-        }
-        widgets.Insert(toIndex, moved);
-        hasPendingOrderChanges = true;
-        draggedWidgetId = null;
-    }
-
-    private async Task SaveWidgetOrderAsync()
-    {
-        if (!hasPendingOrderChanges || isSavingWidgetOrder)
-        {
-            return;
-        }
-
-        isSavingWidgetOrder = true;
-        widgetErrorMessage = null;
-
-        try
-        {
-            var client = ApiClient.CreateClient();
-            for (var index = 0; index < widgets.Count; index++)
-            {
-                var widget = widgets[index];
-                var dto = new DashboardWidgetUpsertDto
-                {
-                    WidgetId = widget.WidgetId,
-                    WidgetCode = widget.WidgetCode,
-                    WidgetName = widget.WidgetName,
-                    Description = widget.Description,
-                    Category = widget.Category,
-                    ComponentKey = widget.ComponentKey,
-                    DataSourceKey = widget.DataSourceKey,
-                    DefaultWidth = widget.DefaultWidth,
-                    DefaultHeight = widget.DefaultHeight,
-                    DefaultOrder = index + 1,
-                    IsActive = widget.IsActive
-                };
-
-                var response = await client.PutAsJsonAsync($"Dashboard/admin/widgets/{widget.WidgetId}", dto);
-                var result = await response.Content.ReadFromJsonAsync<Result<DashboardWidgetAdminDto>>(Serialization.CaseInsensitive);
-                if (result == null || !result.IsSuccess)
-                {
-                    widgetErrorMessage = result?.ErrorMessage ?? "Failed to save widget order.";
-                    return;
-                }
-            }
-
-            await LoadWidgetsAsync();
-            if (selectedWidget != null)
-            {
-                selectedWidget = widgets.FirstOrDefault(widget => widget.WidgetId == selectedWidget.WidgetId);
-            }
-            hasPendingOrderChanges = false;
-            successMessage = "Widget order saved.";
-        }
-        catch (Exception ex)
-        {
-            widgetErrorMessage = ex.Message;
-        }
-        finally
-        {
-            isSavingWidgetOrder = false;
-        }
-    }
-
-    private void ApplyPresetFullAccess()
-    {
-        if (selectedWidget == null)
-        {
-            return;
-        }
-
-        foreach (var access in selectedWidgetAccess)
-        {
-            access.CanView = true;
-            access.CanConfigure = access.RoleName.Equals("Admin", StringComparison.OrdinalIgnoreCase);
-            access.IsDefaultVisible = true;
-            access.DefaultGridX = 0;
-            access.DefaultGridY = 0;
-            access.DefaultWidth = selectedWidget.DefaultWidth;
-            access.DefaultHeight = selectedWidget.DefaultHeight;
-            access.DefaultSortOrder = selectedWidget.DefaultOrder;
-        }
-    }
-
-    private void ApplyPresetTeamDefault()
-    {
-        if (selectedWidget == null)
-        {
-            return;
-        }
-
-        var adminOnlyWidget = selectedWidget.Category != null &&
-            selectedWidget.Category.Contains("Admin", StringComparison.OrdinalIgnoreCase);
-
-        foreach (var access in selectedWidgetAccess)
-        {
-            var isAdmin = access.RoleName.Equals("Admin", StringComparison.OrdinalIgnoreCase);
-            var isManager = access.RoleName.Equals("Manager", StringComparison.OrdinalIgnoreCase);
-            var canView = isAdmin || isManager || !adminOnlyWidget;
-
-            access.CanView = canView;
-            access.CanConfigure = isAdmin;
-            access.IsDefaultVisible = canView;
-            access.DefaultGridX = 0;
-            access.DefaultGridY = 0;
-            access.DefaultWidth = selectedWidget.DefaultWidth;
-            access.DefaultHeight = selectedWidget.DefaultHeight;
-            access.DefaultSortOrder = selectedWidget.DefaultOrder;
-        }
-    }
-
-    private void ApplyPresetClear()
-    {
-        if (selectedWidget == null)
-        {
-            return;
-        }
-
-        foreach (var access in selectedWidgetAccess)
-        {
-            access.CanView = false;
-            access.CanConfigure = false;
-            access.IsDefaultVisible = false;
-            access.DefaultGridX = 0;
-            access.DefaultGridY = 0;
-            access.DefaultWidth = selectedWidget.DefaultWidth;
-            access.DefaultHeight = selectedWidget.DefaultHeight;
-            access.DefaultSortOrder = selectedWidget.DefaultOrder;
-        }
-    }
-
-    private void RequestDeleteSelectedWidget()
-    {
-        if (selectedWidget == null)
-        {
-            return;
-        }
-
-        confirmTitle = "Delete widget?";
-        confirmMessage = $"This will hide '{selectedWidget.WidgetName}' from the catalog and remove its role access.";
-        confirmButtonText = "Delete";
-        confirmIcon = "trash-2";
-        confirmIconBg = "bg-rose-50";
-        confirmIconText = "text-rose-600";
-        confirmButtonClass = "bg-rose-600 hover:bg-rose-700";
-        confirmAction = DeleteSelectedWidgetAsync;
-        showConfirmDialog = true;
-    }
-
-    private async Task DeleteSelectedWidgetAsync()
-    {
-        if (selectedWidget == null)
-        {
-            return;
-        }
-
-        var client = ApiClient.CreateClient();
-        var response = await client.DeleteAsync($"Dashboard/admin/widgets/{selectedWidget.WidgetId}");
-        var result = await response.Content.ReadFromJsonAsync<Result>(Serialization.CaseInsensitive);
-        if (result == null || !result.IsSuccess)
-        {
-            accessErrorMessage = result?.ErrorMessage ?? "Failed to delete widget.";
-            return;
-        }
-
-        await LoadWidgetsAsync();
-        selectedWidget = widgets.FirstOrDefault();
-        if (selectedWidget != null)
-        {
-            await SelectWidget(selectedWidget);
-        }
-        else
-        {
-            selectedWidgetAccess = new();
-        }
-
-        successMessage = "Widget deleted successfully.";
-    }
-
-    private async Task HandleConfirmAction()
-    {
-        showConfirmDialog = false;
-        if (confirmAction != null)
-        {
-            await confirmAction();
-        }
-    }
-
-    private void CloseConfirmDialog()
-    {
-        showConfirmDialog = false;
-    }
-
-    private static string DisplayCategory(string? category) =>
-        string.IsNullOrWhiteSpace(category) ? "Uncategorized" : category;
-}