diff --git a/src/Backend/SolutionErp.Api/Controllers/ApprovalWorkflowsV2Controller.cs b/src/Backend/SolutionErp.Api/Controllers/ApprovalWorkflowsV2Controller.cs
index 5feb8b0..beeedac 100644
--- a/src/Backend/SolutionErp.Api/Controllers/ApprovalWorkflowsV2Controller.cs
+++ b/src/Backend/SolutionErp.Api/Controllers/ApprovalWorkflowsV2Controller.cs
@@ -21,8 +21,9 @@ public class ApprovalWorkflowsV2Controller(IMediator mediator) : ControllerBase
[HttpGet]
public async Task
> Overview(
[FromQuery] int? applicableType,
+ [FromQuery] bool? isUserSelectable,
CancellationToken ct)
- => Ok(await mediator.Send(new GetAwAdminOverviewQuery(applicableType), ct));
+ => Ok(await mediator.Send(new GetAwAdminOverviewQuery(applicableType, isUserSelectable), ct));
[HttpPost]
[Authorize(Policy = "Workflows.Create")]
diff --git a/src/Backend/SolutionErp.Application/ApprovalWorkflowsV2/ApprovalWorkflowV2AdminFeatures.cs b/src/Backend/SolutionErp.Application/ApprovalWorkflowsV2/ApprovalWorkflowV2AdminFeatures.cs
index 646ca61..45e5973 100644
--- a/src/Backend/SolutionErp.Application/ApprovalWorkflowsV2/ApprovalWorkflowV2AdminFeatures.cs
+++ b/src/Backend/SolutionErp.Application/ApprovalWorkflowsV2/ApprovalWorkflowV2AdminFeatures.cs
@@ -86,7 +86,12 @@ internal static class AwLabels
// ========== GET overview ==========
// Filter `applicableType=null` → return tất cả, `=N` → chỉ type đó.
-public record GetAwAdminOverviewQuery(int? ApplicableType = null) : IRequest;
+// [Plan AA S24 t1] `IsUserSelectable` filter cho user read-only matrix view —
+// chỉ workflow ghim (Mig 25 admin pin). Admin Designer KHÔNG truyền param →
+// return tất cả như cũ.
+public record GetAwAdminOverviewQuery(
+ int? ApplicableType = null,
+ bool? IsUserSelectable = null) : IRequest;
public class GetAwAdminOverviewQueryHandler(
IApplicationDbContext db,
@@ -106,6 +111,11 @@ public class GetAwAdminOverviewQueryHandler(
query = query.Where(d => d.ApplicableType == typeEnum);
}
+ if (request.IsUserSelectable is bool ius)
+ {
+ query = query.Where(d => d.IsUserSelectable == ius);
+ }
+
var definitions = await query.ToListAsync(ct);
// Resolve dept names
diff --git a/src/Backend/SolutionErp.Domain/Identity/MenuKeys.cs b/src/Backend/SolutionErp.Domain/Identity/MenuKeys.cs
index f92ed4d..14eb115 100644
--- a/src/Backend/SolutionErp.Domain/Identity/MenuKeys.cs
+++ b/src/Backend/SolutionErp.Domain/Identity/MenuKeys.cs
@@ -83,6 +83,10 @@ public static class MenuKeys
public static string PurchaseEvaluationList(string typeCode) => $"Pe_{typeCode}_List";
public static string PurchaseEvaluationCreate(string typeCode) => $"Pe_{typeCode}_Create";
public static string PurchaseEvaluationPending(string typeCode) => $"Pe_{typeCode}_Pending";
+ // [Plan AA S24 t1] User read-only view ma trận phân quyền của workflow V2
+ // admin Designer đã ghim (IsUserSelectable=true). Suffix `_WfView` distinct
+ // với admin `PeWf_*` (Designer write).
+ public static string PurchaseEvaluationWorkflowView(string typeCode) => $"Pe_{typeCode}_WfView";
// Workflow admin leaf per PE type — dưới PeWorkflows, click leaf mở
// /system/pe-workflows/{typeCode}
diff --git a/src/Backend/SolutionErp.Infrastructure/Persistence/DbInitializer.cs b/src/Backend/SolutionErp.Infrastructure/Persistence/DbInitializer.cs
index a7733f1..98d14fc 100644
--- a/src/Backend/SolutionErp.Infrastructure/Persistence/DbInitializer.cs
+++ b/src/Backend/SolutionErp.Infrastructure/Persistence/DbInitializer.cs
@@ -1430,10 +1430,14 @@ public static class DbInitializer
foreach (var code in MenuKeys.PurchaseEvaluationTypeCodes)
{
var label = peTypeLabels.GetValueOrDefault(code, code);
- tree.Add((MenuKeys.PurchaseEvaluationGroup(code), label, MenuKeys.PurchaseEvaluations, peOrder++, "FileCheck"));
- tree.Add((MenuKeys.PurchaseEvaluationList(code), "Danh sách", MenuKeys.PurchaseEvaluationGroup(code), peOrder++, "List"));
- tree.Add((MenuKeys.PurchaseEvaluationCreate(code), "Thao tác", MenuKeys.PurchaseEvaluationGroup(code), peOrder++, "Plus"));
- tree.Add((MenuKeys.PurchaseEvaluationPending(code),"Duyệt", MenuKeys.PurchaseEvaluationGroup(code), peOrder++, "CheckCircle2"));
+ tree.Add((MenuKeys.PurchaseEvaluationGroup(code), label, MenuKeys.PurchaseEvaluations, peOrder++, "FileCheck"));
+ // [Plan AA S24 t1] "Luồng duyệt" leaf phía trên "Danh sách" — read-only
+ // view ma trận phân quyền workflow V2 admin Designer ghim. User biết
+ // trước khi tạo phiếu ai duyệt step nào.
+ tree.Add((MenuKeys.PurchaseEvaluationWorkflowView(code), "Luồng duyệt", MenuKeys.PurchaseEvaluationGroup(code), peOrder++, "Network"));
+ tree.Add((MenuKeys.PurchaseEvaluationList(code), "Danh sách", MenuKeys.PurchaseEvaluationGroup(code), peOrder++, "List"));
+ tree.Add((MenuKeys.PurchaseEvaluationCreate(code), "Thao tác", MenuKeys.PurchaseEvaluationGroup(code), peOrder++, "Plus"));
+ tree.Add((MenuKeys.PurchaseEvaluationPending(code), "Duyệt", MenuKeys.PurchaseEvaluationGroup(code), peOrder++, "CheckCircle2"));
}
// PE workflow admin leaves dưới `PeWorkflows`
@@ -1444,18 +1448,32 @@ public static class DbInitializer
tree.Add((MenuKeys.PeWorkflowTypeLeaf(code), label, MenuKeys.PeWorkflows, peWfOrder++, "FileCheck"));
}
- var existingKeys = await db.MenuItems.Select(m => m.Key).ToListAsync();
+ var existingItems = await db.MenuItems.ToDictionaryAsync(m => m.Key);
var added = 0;
+ var reordered = 0;
foreach (var (key, label, parent, o, icon) in tree)
{
- if (existingKeys.Contains(key)) continue;
+ if (existingItems.TryGetValue(key, out var existing))
+ {
+ // [Plan AA S24 t1] Shift Order khi insert leaf mới giữa list cũ —
+ // existing rows phải UPDATE Order theo seed list canonical.
+ // Idempotent: skip nếu Order đã match. KHÔNG đụng Label / ParentKey
+ // / Icon (label backfill section riêng phía dưới).
+ if (existing.Order != o)
+ {
+ existing.Order = o;
+ reordered++;
+ }
+ continue;
+ }
db.MenuItems.Add(new MenuItem { Key = key, Label = label, ParentKey = parent, Order = o, Icon = icon });
added++;
}
- if (added > 0)
+ if (added > 0 || reordered > 0)
{
await db.SaveChangesAsync();
- logger.LogInformation("Seeded {Count} menu items", added);
+ if (added > 0) logger.LogInformation("Seeded {Count} menu items", added);
+ if (reordered > 0) logger.LogInformation("Reordered {Count} menu items", reordered);
}
// Backfill label updates for menu items renamed via business changes.
@@ -1546,11 +1564,13 @@ public static class DbInitializer
AppRoles.Director, AppRoles.AuthorizedSigner,
};
- // Menu keys cần grant: PurchaseEvaluations root + per-type group + 3 leaf
+ // Menu keys cần grant: PurchaseEvaluations root + per-type group + 4 leaf
+ // ([Plan AA S24 t1] thêm WfView read-only matrix view).
var menuKeys = new List { MenuKeys.PurchaseEvaluations };
foreach (var typeCode in MenuKeys.PurchaseEvaluationTypeCodes)
{
menuKeys.Add(MenuKeys.PurchaseEvaluationGroup(typeCode));
+ menuKeys.Add(MenuKeys.PurchaseEvaluationWorkflowView(typeCode));
menuKeys.Add(MenuKeys.PurchaseEvaluationList(typeCode));
menuKeys.Add(MenuKeys.PurchaseEvaluationCreate(typeCode));
menuKeys.Add(MenuKeys.PurchaseEvaluationPending(typeCode));