diff --git a/fe-admin/src/App.tsx b/fe-admin/src/App.tsx index bb532a1..d402f63 100644 --- a/fe-admin/src/App.tsx +++ b/fe-admin/src/App.tsx @@ -37,6 +37,7 @@ function App() { } /> } /> } /> + } /> } /> } /> } /> diff --git a/fe-admin/src/components/Layout.tsx b/fe-admin/src/components/Layout.tsx index 7c65f9c..1bd7370 100644 --- a/fe-admin/src/components/Layout.tsx +++ b/fe-admin/src/components/Layout.tsx @@ -52,11 +52,19 @@ function resolvePath(key: string): string | null { if (action === 'Create') return `/contracts/new?type=${typeInt}` if (action === 'Pending') return `/contracts?type=${typeInt}&pendingMe=1` } + + // Workflow admin per ContractType: Wf_ → /system/workflows/ + const wfMatch = key.match(/^Wf_(.+)$/) + if (wfMatch) { + const code = wfMatch[1] + if (TYPE_CODE_TO_INT[code]) return `/system/workflows/${code}` + } + return null } -// Admin side: hide the per-ContractType submenu (Ct_*) — that's a user-app -// concern. Admin manages workflow config via /system/workflows instead. +// Admin side: hide the per-ContractType contract submenu (Ct_*) — that's a +// user-app concern. Keep Wf_* workflow-admin leaves. function isAdminHidden(key: string): boolean { return key.startsWith('Ct_') } diff --git a/fe-admin/src/pages/system/WorkflowsPage.tsx b/fe-admin/src/pages/system/WorkflowsPage.tsx index eb14438..53b2dd8 100644 --- a/fe-admin/src/pages/system/WorkflowsPage.tsx +++ b/fe-admin/src/pages/system/WorkflowsPage.tsx @@ -1,4 +1,5 @@ import { useMemo, useState, type FormEvent } from 'react' +import { useParams } from 'react-router-dom' import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query' import { GitBranch, Plus, Trash2, CheckCircle2, Info, History } from 'lucide-react' import { toast } from 'sonner' @@ -63,16 +64,31 @@ function copyFromDefinition(d: DefinitionDto): EditStep[] { // ===== Page ===== +// Map URL type code → int. Mirror Wf_ menu key. +const TYPE_CODE_TO_INT: Record = { + ThauPhu: 1, + GiaoKhoan: 2, + NhaCungCap: 3, + DichVu: 4, + MuaBan: 5, + NguyenTacNcc: 6, + NguyenTacDv: 7, +} + export function WorkflowsPage() { const qc = useQueryClient() + const { typeCode } = useParams<{ typeCode?: string }>() const overview = useQuery({ queryKey: ['workflow-overview'], queryFn: async () => (await api.get<{ types: TypeSummaryDto[] }>('/workflows')).data, }) - const [activeType, setActiveType] = useState(null) - const tab = activeType ?? overview.data?.types[0]?.contractType ?? 1 - const currentType = overview.data?.types.find(t => t.contractType === tab) + // URL drives which type to show. `/system/workflows` (no param) → show + // landing hint to pick from sidebar; `/system/workflows/` → open that. + const selectedTypeInt = typeCode ? TYPE_CODE_TO_INT[typeCode] : null + const currentType = selectedTypeInt + ? overview.data?.types.find(t => t.contractType === selectedTypeInt) + : null return (
@@ -80,38 +96,41 @@ export function WorkflowsPage() { title={ - Quy trình duyệt hợp đồng + {currentType ? `Quy trình: ${currentType.contractTypeLabel}` : 'Quy trình duyệt hợp đồng'} } - description="Mỗi loại HĐ có quy trình riêng, hỗ trợ versioning. Tạo version mới → HĐ tương lai chạy theo. HĐ cũ vẫn giữ quy trình cũ." + description={ + currentType + ? 'Tạo version mới → HĐ tương lai dùng. HĐ đã tạo giữ version cũ (pinned lúc tạo).' + : 'Chọn loại HĐ từ menu bên trái để xem + chỉnh quy trình duyệt.' + } /> - {/* Tabs */} - {overview.data && ( -
+ {overview.isLoading &&
Đang tải…
} + + {/* Landing: no type picked yet */} + {overview.data && !currentType && ( +
{overview.data.types.map(t => ( - +
+
+

{t.contractTypeLabel}

+ {t.active && ( + + {t.active.code} v{String(t.active.version).padStart(2, '0')} + + )} +
+
+ {t.active + ? `${t.active.steps.length} bước · ${t.history.length} version${t.history.length > 1 ? 's' : ''}` + : 'Chưa có quy trình'} +
+
))}
)} - {overview.isLoading &&
Đang tải…
} - {currentType && qc.invalidateQueries({ queryKey: ['workflow-overview'] })} />}
) diff --git a/src/Backend/SolutionErp.Application/Permissions/Queries/GetMyMenuTree/GetMyMenuTreeQuery.cs b/src/Backend/SolutionErp.Application/Permissions/Queries/GetMyMenuTree/GetMyMenuTreeQuery.cs index f02c6bf..278ac28 100644 --- a/src/Backend/SolutionErp.Application/Permissions/Queries/GetMyMenuTree/GetMyMenuTreeQuery.cs +++ b/src/Backend/SolutionErp.Application/Permissions/Queries/GetMyMenuTree/GetMyMenuTreeQuery.cs @@ -46,31 +46,38 @@ public class GetMyMenuTreeQueryHandler( Update: g.Any(p => p.CanUpdate), Delete: g.Any(p => p.CanDelete))); - // Build tree. Children of `Contracts` (type submenu) inherit parent's - // permission so we don't need per-subitem permission rows. This keeps - // the permission matrix clean while allowing deep menu structures for - // pure navigation. - var (contractsRead, contractsCreate, contractsUpdate, contractsDelete) = - resolved.TryGetValue(MenuKeys.Contracts, out var cf) ? cf : (false, false, false, false); + // Build tree. Descendants of certain roots inherit parent perms so + // we don't add per-subitem permission rows for pure-navigation menus. + // Keys: `Contracts` (Ct_* subitems) and `Workflows` (Wf_* subitems). + (bool Read, bool Create, bool Update, bool Delete) GetFlags(string key) => + resolved.TryGetValue(key, out var f) ? f : (false, false, false, false); - List BuildChildren(string? parentKey, bool inheritContractsPerm) => menus + var contractsFlags = GetFlags(MenuKeys.Contracts); + var workflowsFlags = GetFlags(MenuKeys.Workflows); + + List BuildChildren(string? parentKey, string? inheritFromKey) => menus .Where(m => m.ParentKey == parentKey) .Select(m => { var flags = resolved.TryGetValue(m.Key, out var f) ? f : (false, false, false, false); - // If this node is a descendant of Contracts and has no explicit - // perms, take parent Contracts perms. - if (inheritContractsPerm && !resolved.ContainsKey(m.Key)) - flags = (contractsRead, contractsCreate, contractsUpdate, contractsDelete); + if (inheritFromKey is not null && !resolved.ContainsKey(m.Key)) + { + flags = inheritFromKey == MenuKeys.Contracts ? contractsFlags : workflowsFlags; + } + + // Propagate inheritance downward from Contracts/Workflows roots + var nextInherit = inheritFromKey + ?? (m.Key == MenuKeys.Contracts ? MenuKeys.Contracts + : m.Key == MenuKeys.Workflows ? MenuKeys.Workflows + : null); - var childInherits = inheritContractsPerm || m.Key == MenuKeys.Contracts; return new MenuNodeDto(m.Key, m.Label, m.ParentKey, m.Order, m.Icon, flags.Item1, flags.Item2, flags.Item3, flags.Item4, - BuildChildren(m.Key, childInherits)); + BuildChildren(m.Key, nextInherit)); }) .ToList(); - var tree = BuildChildren(null, inheritContractsPerm: false); + var tree = BuildChildren(null, inheritFromKey: null); // Filter: chỉ trả về node có CanRead=true (hoặc có child CanRead=true) static bool HasAccess(MenuNodeDto n) => n.CanRead || n.Children.Any(HasAccess); diff --git a/src/Backend/SolutionErp.Domain/Identity/MenuKeys.cs b/src/Backend/SolutionErp.Domain/Identity/MenuKeys.cs index fa0277f..7e95ead 100644 --- a/src/Backend/SolutionErp.Domain/Identity/MenuKeys.cs +++ b/src/Backend/SolutionErp.Domain/Identity/MenuKeys.cs @@ -31,6 +31,10 @@ public static class MenuKeys public static string ContractTypeCreate(string typeCode) => $"Ct_{typeCode}_Create"; public static string ContractTypePending(string typeCode) => $"Ct_{typeCode}_Pending"; + // Workflow admin per ContractType — sub-menu dưới `Workflows`, click leaf + // → mở /system/workflows/{typeCode} (filter theo type thay vì tab). + public static string WorkflowTypeLeaf(string typeCode) => $"Wf_{typeCode}"; + public static readonly string[] All = [ Dashboard, diff --git a/src/Backend/SolutionErp.Infrastructure/Persistence/DbInitializer.cs b/src/Backend/SolutionErp.Infrastructure/Persistence/DbInitializer.cs index 62f571b..04905a9 100644 --- a/src/Backend/SolutionErp.Infrastructure/Persistence/DbInitializer.cs +++ b/src/Backend/SolutionErp.Infrastructure/Persistence/DbInitializer.cs @@ -207,6 +207,15 @@ public static class DbInitializer tree.Add((MenuKeys.ContractTypePending(code),"Duyệt", MenuKeys.ContractTypeGroup(code), order++, "CheckCircle2")); } + // Per-type workflow admin leaves dưới `Workflows` — mỗi loại là 1 + // menu item, click vào → mở designer scoped cho loại đó. + var wfOrder = 95; + foreach (var code in MenuKeys.ContractTypeCodes) + { + var label = typeLabels.GetValueOrDefault(code, code); + tree.Add((MenuKeys.WorkflowTypeLeaf(code), label, MenuKeys.Workflows, wfOrder++, "FileText")); + } + var existingKeys = await db.MenuItems.Select(m => m.Key).ToListAsync(); var added = 0; foreach (var (key, label, parent, o, icon) in tree)