From 9241f229937aeaf9684bb54bccf587f01e8541c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hartmut=20N=C3=B6renberg?= <hn@hartmut-noerenberg.com>
Date: Fri, 3 Apr 2026 16:17:16 +0200
Subject: [PATCH] =?UTF-8?q?fix(ux):=20resolve=20tickets=20#58=20#60=20?=
 =?UTF-8?q?=E2=80=94=20wizard=20review=20labels=20and=20assignment=20CTA?=
 =?UTF-8?q?=20clarity?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

#58: Split the merged "Type: BD / INT" field in the wizard review step into
separate "Order Type", "Allocation Type", and "Status on create" rows so
users can clearly distinguish commercial classification from lifecycle status.

#60: Relabel FillOpenDemandModal staging CTA from "+ Add to Plan" to
"+ Queue Assignment" and the proceed CTA from "Review (N)" to
"Review Queued (N)" to make the staged/non-final nature of the action clear.
Also correct the project detail Assignments label from "N active" to
"N planned" and update the tooltip to include PROPOSED in the definition.

Co-Authored-By: claude-flow <ruv@ruv.net>
---
 apps/web/src/app/(app)/projects/[id]/page.tsx            | 4 ++--
 .../src/components/allocations/FillOpenDemandModal.tsx   | 4 ++--
 apps/web/src/components/projects/ProjectWizard.tsx       | 9 ++++++++-
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/apps/web/src/app/(app)/projects/[id]/page.tsx b/apps/web/src/app/(app)/projects/[id]/page.tsx
index 88bda71..43ebfba 100644
--- a/apps/web/src/app/(app)/projects/[id]/page.tsx
+++ b/apps/web/src/app/(app)/projects/[id]/page.tsx
@@ -113,8 +113,8 @@ export default async function ProjectDetailPage({ params }: ProjectDetailPagePro
             <dd className="mt-0.5 text-sm text-gray-900">{project.allocationType}</dd>
           </div>
           <div>
-            <dt className="text-xs text-gray-500 flex items-center">Assignments<InfoTooltip content="Number of active resource assignments (confirmed or in-progress allocations) on this project." /></dt>
-            <dd className="mt-0.5 text-sm text-gray-900">{activeAssignments.length} active</dd>
+            <dt className="text-xs text-gray-500 flex items-center">Assignments<InfoTooltip content="Number of non-cancelled resource assignments on this project — includes PROPOSED (staged), CONFIRMED, and ACTIVE statuses." /></dt>
+            <dd className="mt-0.5 text-sm text-gray-900">{activeAssignments.length} planned</dd>
           </div>
           <div>
             <dt className="text-xs text-gray-500 flex items-center">Open Demands<InfoTooltip content="Staffing requirements that still need resources. Unfilled seats are demand positions not yet assigned to a person." /></dt>
diff --git a/apps/web/src/components/allocations/FillOpenDemandModal.tsx b/apps/web/src/components/allocations/FillOpenDemandModal.tsx
index 66576bb..975ce7a 100644
--- a/apps/web/src/components/allocations/FillOpenDemandModal.tsx
+++ b/apps/web/src/components/allocations/FillOpenDemandModal.tsx
@@ -368,7 +368,7 @@ export function FillOpenDemandModal({ allocation, onClose, onSuccess }: FillOpen
                   disabled={!resourceId || !avail || isAlreadyPlanned(resourceId)}
                   className="px-4 py-2 border border-brand-600 text-brand-600 rounded-lg hover:bg-brand-50 dark:hover:bg-brand-900/20 text-sm font-medium disabled:opacity-40 disabled:cursor-not-allowed"
                 >
-                  + Add to Plan
+                  + Queue Assignment
                 </button>
                 {planned.length > 0 && (
                   <button
@@ -376,7 +376,7 @@ export function FillOpenDemandModal({ allocation, onClose, onSuccess }: FillOpen
                     onClick={() => setPhase("confirm")}
                     className="px-4 py-2 bg-brand-600 text-white rounded-lg hover:bg-brand-700 text-sm font-medium"
                   >
-                    Review ({planned.length})
+                    Review Queued ({planned.length})
                   </button>
                 )}
               </div>
diff --git a/apps/web/src/components/projects/ProjectWizard.tsx b/apps/web/src/components/projects/ProjectWizard.tsx
index 43c2c06..88e0c94 100644
--- a/apps/web/src/components/projects/ProjectWizard.tsx
+++ b/apps/web/src/components/projects/ProjectWizard.tsx
@@ -924,7 +924,14 @@ function Step5({ state, onChange, onSubmit, isSubmitting, submitError }: Step5Pr
             <span className="font-medium">{state.name || "—"}</span>
           </div>
           <div>
-            <span className="text-gray-500">Type:</span> {state.orderType} / {state.allocationType}
+            <span className="text-gray-500">Order Type:</span> {state.orderType}
+          </div>
+          <div>
+            <span className="text-gray-500">Allocation Type:</span> {state.allocationType}
+          </div>
+          <div>
+            <span className="text-gray-500">Status on create:</span>{" "}
+            {state.saveAsDraft ? "Draft" : "Active"}
           </div>
           <div>
             <span className="text-gray-500">Budget:</span>{" "}