Merge pull request mendixlabs#251 from mendixlabs/fix/171-workflow-user-targeting-rebased

feat: support full user targeting on workflow USER TASK (fixes mendixlabs#169)

Author: ako

cmd/mxcli/lsp_completions_gen.go

@@ -304,7 +304,7 @@ Nested folders use `/` separator: `'Parent/Child/Grandchild'`. Missing folders a
 | Drop workflow | `drop workflow Module.Name;` | |
 
 **Workflow Activity Types:**
-- `user task <name> '<caption>' [page Mod.Page] [targeting microflow Mod.MF] [outcomes '<out>' { } ...];`
+- `user task <name> '<caption>' [page Mod.Page] [targeting [users|groups] microflow Mod.MF] [targeting [users|groups] xpath '<expr>'] [outcomes '<out>' { } ...];`
 - `call microflow Mod.MF [comment '<text>'] [outcomes '<out>' { } ...];`
 - `call workflow Mod.WF [comment '<text>'];`
 - `decision ['<caption>'] outcomes '<out>' { } ...;`
@@ -340,8 +340,8 @@ Modify an existing workflow's properties, activities, outcomes, paths, condition
 | Set parameter | `set parameter $Var: Module.Entity` | Workflow context parameter |
 | Set activity page | `set activity name page Module.Page` | Change user task page |
 | Set activity description | `set activity name description 'text'` | Activity description |
-| Set activity targeting | `set activity name targeting microflow Module.MF` | Target user assignment |
-| Set activity XPath | `set activity name targeting xpath '[expr]'` | XPath targeting |
+| Set activity targeting | `set activity name targeting [users\|groups] microflow Module.MF` | Target user/group assignment |
+| Set activity XPath | `set activity name targeting [users\|groups] xpath '[expr]'` | XPath targeting |
 | Set activity due date | `set activity name due date 'expr'` | Activity-level due date |
 | Insert activity | `insert after name call microflow Module.MF` | Insert after named activity |
 | Drop activity | `drop activity name` | Remove activity by name |

docs/01-project/MDL_QUICK_REFERENCE.md

@@ -0,0 +1,108 @@
+-- ============================================================================
+-- Workflow User Targeting — all targeting variants
+-- ============================================================================
+--
+-- Covers USER TASK and MULTI USER TASK with:
+--   TARGETING USERS MICROFLOW   (user targeting via microflow)
+--   TARGETING USERS XPATH       (user targeting via XPath)
+--   TARGETING GROUPS MICROFLOW  (group targeting via microflow)
+--   TARGETING GROUPS XPATH      (group targeting via XPath)
+--   TARGETING MICROFLOW         (legacy short form, still valid)
+--   TARGETING XPATH             (legacy short form, still valid)
+--
+-- ============================================================================
+
+-- Prerequisites
+
+CREATE PERSISTENT ENTITY WFTarget.Request (
+  Status: String(200)
+);
+
+-- Targeting microflows: (System.Workflow, context) -> List of System.User
+CREATE MICROFLOW WFTarget.ACT_GetUsers (
+  $Workflow: System.Workflow,
+  $Context: WFTarget.Request
+)
+RETURNS List of System.User AS $Users
+BEGIN
+  @position(200,200)
+  RETRIEVE $Users FROM System.User;
+  @position(400,200) RETURN $Users;
+END;
+/
+
+CREATE MICROFLOW WFTarget.ACT_GetGroups (
+  $Workflow: System.Workflow,
+  $Context: WFTarget.Request
+)
+RETURNS List of System.UserGroup AS $Groups
+BEGIN
+  @position(200,200)
+  RETRIEVE $Groups FROM System.UserGroup;
+  @position(400,200) RETURN $Groups;
+END;
+/
+
+CREATE PAGE WFTarget.TaskPage (
+  Title: 'Task Page',
+  Layout: Atlas_Core.Atlas_Default,
+  Params: { $WorkflowUserTask: System.WorkflowUserTask }
+) {
+  LAYOUTGRID g1 {
+    ROW r1 {
+      COLUMN c1 (DesktopWidth: 12) {
+        DYNAMICTEXT txt1 (Content: 'Task', RenderMode: H2)
+      }
+    }
+  }
+}
+
+-- Workflow with all targeting variants
+
+CREATE WORKFLOW WFTarget.TargetingDemo
+  PARAMETER $WorkflowContext: WFTarget.Request
+BEGIN
+  -- TARGETING USERS MICROFLOW (explicit user targeting)
+  USER TASK ByUserMF 'User microflow targeting'
+    PAGE WFTarget.TaskPage
+    TARGETING USERS MICROFLOW WFTarget.ACT_GetUsers
+    OUTCOMES 'Done' { };
+
+  -- TARGETING USERS XPATH (explicit user xpath targeting)
+  USER TASK ByUserXP 'User xpath targeting'
+    PAGE WFTarget.TaskPage
+    TARGETING USERS XPATH '[Name = ''admin'']'
+    OUTCOMES 'Done' { };
+
+  -- TARGETING GROUPS MICROFLOW (group microflow targeting)
+  USER TASK ByGroupMF 'Group microflow targeting'
+    PAGE WFTarget.TaskPage
+    TARGETING GROUPS MICROFLOW WFTarget.ACT_GetGroups
+    OUTCOMES 'Done' { };
+
+  -- TARGETING GROUPS XPATH (group xpath targeting)
+  USER TASK ByGroupXP 'Group xpath targeting'
+    PAGE WFTarget.TaskPage
+    TARGETING GROUPS XPATH '[Name = ''Administrators'']'
+    OUTCOMES 'Done' { };
+
+  -- TARGETING MICROFLOW (legacy short form)
+  USER TASK LegacyMF 'Legacy microflow targeting'
+    PAGE WFTarget.TaskPage
+    TARGETING MICROFLOW WFTarget.ACT_GetUsers
+    OUTCOMES 'Done' { };
+
+  -- TARGETING XPATH (legacy short form)
+  USER TASK LegacyXP 'Legacy xpath targeting'
+    PAGE WFTarget.TaskPage
+    TARGETING XPATH '[Name = ''admin'']'
+    OUTCOMES 'Done' { };
+
+  -- MULTI USER TASK with group targeting
+  MULTI USER TASK MultiByGroup 'Multi group targeting'
+    PAGE WFTarget.TaskPage
+    TARGETING GROUPS MICROFLOW WFTarget.ACT_GetGroups
+    OUTCOMES 'Done' { };
+
+END WORKFLOW;
+/

docs/11-proposals/PROPOSAL_agent_document_support.md

@@ -56,10 +56,11 @@ type WorkflowUserTaskNode struct {
 func (n *WorkflowUserTaskNode) workflowActivityNode() {}
 
 // WorkflowTargetingNode represents user targeting strategy.
+// Kind: "microflow", "xpath", "group_microflow", "group_xpath", or ""
 type WorkflowTargetingNode struct {
-	Kind      string        // "microflow", "xpath", or ""
-	Microflow QualifiedName // for microflow targeting
-	XPath     string        // for xpath targeting
+	Kind      string        // "microflow", "xpath", "group_microflow", "group_xpath", or ""
+	Microflow QualifiedName // for microflow targeting (user or group)
+	XPath     string        // for xpath targeting (user or group)
 }
 
 // WorkflowUserTaskOutcomeNode represents an outcome of a user task.

mdl-examples/doctype-tests/workflow-user-targeting.mdl

@@ -426,11 +426,19 @@ func formatUserTask(a *workflows.UserTask, indent string) []string {
 		switch us := a.UserSource.(type) {
 		case *workflows.MicroflowBasedUserSource:
 			if us.Microflow != "" {
-				lines = append(lines, fmt.Sprintf("%s  targeting microflow %s", indent, us.Microflow))
+				lines = append(lines, fmt.Sprintf("%s  targeting users microflow %s", indent, us.Microflow))
 			}
 		case *workflows.XPathBasedUserSource:
 			if us.XPath != "" {
-				lines = append(lines, fmt.Sprintf("%s  targeting xpath '%s'", indent, us.XPath))
+				lines = append(lines, fmt.Sprintf("%s  targeting users xpath '%s'", indent, us.XPath))
+			}
+		case *workflows.MicroflowGroupSource:
+			if us.Microflow != "" {
+				lines = append(lines, fmt.Sprintf("%s  targeting groups microflow %s", indent, us.Microflow))
+			}
+		case *workflows.XPathGroupSource:
+			if us.XPath != "" {
+				lines = append(lines, fmt.Sprintf("%s  targeting groups xpath '%s'", indent, us.XPath))
 			}
 		}
 	}

mdl/ast/ast_workflow.go

@@ -251,6 +251,14 @@ func buildUserTask(n *ast.WorkflowUserTaskNode) *workflows.UserTask {
 		task.UserSource = &workflows.XPathBasedUserSource{
 			XPath: n.Targeting.XPath,
 		}
+	case "group_microflow":
+		task.UserSource = &workflows.MicroflowGroupSource{
+			Microflow: n.Targeting.Microflow.Module + "." + n.Targeting.Microflow.Name,
+		}
+	case "group_xpath":
+		task.UserSource = &workflows.XPathGroupSource{
+			XPath: n.Targeting.XPath,
+		}
 	}
 
 	// Outcomes
@@ -667,11 +675,25 @@ func autoBindActivitiesInFlow(ctx *ExecContext, activities []workflows.WorkflowA
 }
 
 // autoBindCallMicroflow resolves microflow parameters and auto-generates ParameterMappings.
+// Also ensures a default VoidConditionOutcome exists (required by Mendix runtime — CE6686).
 func autoBindCallMicroflow(ctx *ExecContext, task *workflows.CallMicroflowTask) {
 	// Sanitize name
 	task.Name = sanitizeActivityName(task.Name)
 
-	// Skip if already has parameter mappings
+	// Auto-generate Default outcome if no outcomes specified.
+	// This must run regardless of whether parameter mappings exist,
+	// because the Mendix runtime requires a VoidConditionOutcome on
+	// every CallMicroflowTask (CE6686: "outcomes do not match").
+	if len(task.Outcomes) == 0 {
+		outcome := &workflows.VoidConditionOutcome{
+			Flow: &workflows.Flow{},
+		}
+		outcome.BaseElement.ID = model.ID(types.GenerateID())
+		outcome.Flow.BaseElement.ID = model.ID(types.GenerateID())
+		task.Outcomes = append(task.Outcomes, outcome)
+	}
+
+	// Skip parameter auto-binding if already has explicit mappings
 	if len(task.ParameterMappings) > 0 {
 		return
 	}
@@ -705,16 +727,6 @@ func autoBindCallMicroflow(ctx *ExecContext, task *workflows.CallMicroflowTask)
 			mapping.BaseElement.ID = model.ID(types.GenerateID())
 			task.ParameterMappings = append(task.ParameterMappings, mapping)
 		}
-
-		// Auto-generate Default outcome if no outcomes specified
-		if len(task.Outcomes) == 0 {
-			outcome := &workflows.VoidConditionOutcome{
-				Flow: &workflows.Flow{},
-			}
-			outcome.BaseElement.ID = model.ID(types.GenerateID())
-			outcome.Flow.BaseElement.ID = model.ID(types.GenerateID())
-			task.Outcomes = append(task.Outcomes, outcome)
-		}
 		break
 	}
 }

mdl/executor/cmd_workflows.go

@@ -659,6 +659,7 @@ ACTIVITY: A C T I V I T Y;
 CONDITION: C O N D I T I O N;
 OFF: O F F;
 USERS: U S E R S;
+GROUPS: G R O U P S;
 
 // Data transformer tokens
 DATA: D A T A;

mdl/executor/cmd_workflows_write.go

@@ -2820,17 +2820,17 @@ workflowActivityStmt
 workflowUserTaskStmt
     : USER TASK IDENTIFIER STRING_LITERAL
       (PAGE qualifiedName)?
-      (TARGETING MICROFLOW qualifiedName)?
-      (TARGETING XPATH STRING_LITERAL)?
+      (TARGETING (USERS | GROUPS)? MICROFLOW qualifiedName)?
+      (TARGETING (USERS | GROUPS)? XPATH STRING_LITERAL)?
       (ENTITY qualifiedName)?
       (DUE DATE_TYPE STRING_LITERAL)?
       (DESCRIPTION STRING_LITERAL)?
       (OUTCOMES workflowUserTaskOutcome+)?
       (BOUNDARY EVENT workflowBoundaryEventClause+)?
     | MULTI USER TASK IDENTIFIER STRING_LITERAL
       (PAGE qualifiedName)?
-      (TARGETING MICROFLOW qualifiedName)?
-      (TARGETING XPATH STRING_LITERAL)?
+      (TARGETING (USERS | GROUPS)? MICROFLOW qualifiedName)?
+      (TARGETING (USERS | GROUPS)? XPATH STRING_LITERAL)?
       (ENTITY qualifiedName)?
       (DUE DATE_TYPE STRING_LITERAL)?
       (DESCRIPTION STRING_LITERAL)?
@@ -3860,7 +3860,7 @@ keyword
 
     // Workflow
     | ABORT | ACTIVITY | ANNOTATION | BOUNDARY | BY | COMPLETE_TASK
-    | CONDITION | DATE | DECISION | DUE | INTERRUPTING | JUMP
+    | CONDITION | DATE | DECISION | DUE | GROUPS | INTERRUPTING | JUMP
     | LOCK | MULTI | NODE | NON | NOTIFICATION | NOTIFY
     | OPEN | OUTCOME | OUTCOMES | OVERVIEW | PARALLEL | PAUSE
     | REASON | RESTART | RETRY | SPLIT | TARGETING | TASK | TIMER