diff --git a/fe-admin/src/pages/contracts/ContractCreatePage.tsx b/fe-admin/src/pages/contracts/ContractCreatePage.tsx index a1d4a3e..5ba13d5 100644 --- a/fe-admin/src/pages/contracts/ContractCreatePage.tsx +++ b/fe-admin/src/pages/contracts/ContractCreatePage.tsx @@ -309,6 +309,11 @@ function ContractHeaderForm({ const [budgetManual, setBudgetManual] = useState(false) const [budgetManualName, setBudgetManualName] = useState('') const [budgetManualAmount, setBudgetManualAmount] = useState(0) + // [Plan B S29 Chunk D 2026-05-22 Mig 32] V2 workflow pin lúc create — mirror + // PE PeWorkspaceCreateView pattern. Drafter pick V2 workflow IsUserSelectable + // filter ApplicableType=Contract(3). Nếu blank → BE fallback V1 auto pick + // (7 prod contract giữ behavior cũ). + const [approvalWorkflowId, setApprovalWorkflowId] = useState('') // Reset type về default khi typeFilter (parent prop) thay đổi useEffect(() => { setType(defaultType) }, [defaultType]) @@ -327,6 +332,19 @@ function ContractHeaderForm({ queryKey: ['templates-by-type', type], queryFn: async () => (await api.get('/forms/templates', { params: { type } })).data, }) + // [Plan B S29 Chunk D Mig 32] V2 workflows ApplicableType=Contract(3) filter + // IsUserSelectable=true (admin ghim cho user pick). Mirror PE Mig 25 pattern. + const approvalWorkflows = useQuery({ + queryKey: ['approval-workflows-v2-contract'], + queryFn: async () => { + const res = await api.get<{ types: { applicableType: number; history: { id: string; code: string; version: number; name: string; isActive: boolean; isUserSelectable: boolean }[] }[] }>( + '/approval-workflows-v2', + { params: { applicableType: 3 } }, + ) + const typeBucket = res.data.types.find(t => t.applicableType === 3) + return (typeBucket?.history ?? []).filter(w => w.isUserSelectable) + }, + }) // Eligible Budgets: cùng Project + Phase=DaDuyet (BE-side filter). const eligibleBudgets = useQuery({ queryKey: ['eligible-budgets', projectId], @@ -357,6 +375,9 @@ function ContractHeaderForm({ bypassProcurementAndCCM: bypass, draftData: null, ...budgetPayload, + // [Plan B S29 Chunk D Mig 32] Pin V2 workflow nếu user chọn; null → + // BE fallback V1 auto pick. + approvalWorkflowId: approvalWorkflowId || null, }) return res.data.id }, @@ -395,6 +416,29 @@ function ContractHeaderForm({ templates={templates.data ?? []} typeReadonly={false} /> + {/* [Plan B S29 Chunk D Mig 32] V2 workflow picker — mutually exclusive + với V1. Blank → BE fallback V1 auto pick (7 prod contract behavior). + Mirror PE PeWorkspaceCreateView pattern. */} +
+ + + {approvalWorkflows.data && approvalWorkflows.data.length === 0 && ( +

+ Chưa có quy trình duyệt V2 nào được admin ghim cho HĐ — HĐ sẽ chạy theo V1 mặc định. +

+ )} +
diff --git a/fe-user/src/pages/contracts/ContractCreatePage.tsx b/fe-user/src/pages/contracts/ContractCreatePage.tsx index a1d4a3e..5ba13d5 100644 --- a/fe-user/src/pages/contracts/ContractCreatePage.tsx +++ b/fe-user/src/pages/contracts/ContractCreatePage.tsx @@ -309,6 +309,11 @@ function ContractHeaderForm({ const [budgetManual, setBudgetManual] = useState(false) const [budgetManualName, setBudgetManualName] = useState('') const [budgetManualAmount, setBudgetManualAmount] = useState(0) + // [Plan B S29 Chunk D 2026-05-22 Mig 32] V2 workflow pin lúc create — mirror + // PE PeWorkspaceCreateView pattern. Drafter pick V2 workflow IsUserSelectable + // filter ApplicableType=Contract(3). Nếu blank → BE fallback V1 auto pick + // (7 prod contract giữ behavior cũ). + const [approvalWorkflowId, setApprovalWorkflowId] = useState('') // Reset type về default khi typeFilter (parent prop) thay đổi useEffect(() => { setType(defaultType) }, [defaultType]) @@ -327,6 +332,19 @@ function ContractHeaderForm({ queryKey: ['templates-by-type', type], queryFn: async () => (await api.get('/forms/templates', { params: { type } })).data, }) + // [Plan B S29 Chunk D Mig 32] V2 workflows ApplicableType=Contract(3) filter + // IsUserSelectable=true (admin ghim cho user pick). Mirror PE Mig 25 pattern. + const approvalWorkflows = useQuery({ + queryKey: ['approval-workflows-v2-contract'], + queryFn: async () => { + const res = await api.get<{ types: { applicableType: number; history: { id: string; code: string; version: number; name: string; isActive: boolean; isUserSelectable: boolean }[] }[] }>( + '/approval-workflows-v2', + { params: { applicableType: 3 } }, + ) + const typeBucket = res.data.types.find(t => t.applicableType === 3) + return (typeBucket?.history ?? []).filter(w => w.isUserSelectable) + }, + }) // Eligible Budgets: cùng Project + Phase=DaDuyet (BE-side filter). const eligibleBudgets = useQuery({ queryKey: ['eligible-budgets', projectId], @@ -357,6 +375,9 @@ function ContractHeaderForm({ bypassProcurementAndCCM: bypass, draftData: null, ...budgetPayload, + // [Plan B S29 Chunk D Mig 32] Pin V2 workflow nếu user chọn; null → + // BE fallback V1 auto pick. + approvalWorkflowId: approvalWorkflowId || null, }) return res.data.id }, @@ -395,6 +416,29 @@ function ContractHeaderForm({ templates={templates.data ?? []} typeReadonly={false} /> + {/* [Plan B S29 Chunk D Mig 32] V2 workflow picker — mutually exclusive + với V1. Blank → BE fallback V1 auto pick (7 prod contract behavior). + Mirror PE PeWorkspaceCreateView pattern. */} +
+ + + {approvalWorkflows.data && approvalWorkflows.data.length === 0 && ( +

+ Chưa có quy trình duyệt V2 nào được admin ghim cho HĐ — HĐ sẽ chạy theo V1 mặc định. +

+ )} +