add DecisionOptionName to WorkflowEventEntity

Author: mehdy-karimpour

Signum.Engine.Extensions/Workflow/CaseActivityLogic.cs

@@ -1121,7 +1121,7 @@ private static void ExecuteBoundaryTimer(CaseActivityEntity ca, WorkflowEventEnt
                     }.Save();
                     break;
                 case WorkflowEventType.BoundaryInterruptingTimer:
-                    ca.MakeDone(DoneType.Timeout, null);
+                    ca.MakeDone(DoneType.Timeout, boundaryEvent.DecisionOptionName);
                     break;
                 default:
                     throw new InvalidOperationException("Unexpected Boundary Timer Type " + boundaryEvent.Type);

Signum.Engine.Extensions/Workflow/WorkflowNodeGraph.cs

@@ -2,6 +2,7 @@
 using Signum.Utilities.DataStructures;
 using Signum.Entities.Authorization;
 using Signum.Engine.Authorization;
+using Signum.Entities.Reflection;
 
 namespace Signum.Engine.Workflow;
 
@@ -223,6 +224,19 @@ public void Validate(List<WorkflowIssue> issuesContainer, Action<WorkflowGateway
 
             if (e.Type.IsTimer())
             {
+                if (e.Type == WorkflowEventType.BoundaryInterruptingTimer)
+                {
+                    var activity = Activities.GetOrThrow(e.BoundaryOf!);
+                    if (string.IsNullOrWhiteSpace(e.DecisionOptionName) && activity.Type == WorkflowActivityType.Decision)
+                        issues.AddError(e, WorkflowValidationMessage.BoundaryTimer0OfActivity1ShouldHave2BecauseActivityIs3.NiceToString(e, activity, e.NicePropertyName(a => a.DecisionOptionName), WorkflowActivityType.Decision.NiceToString()));
+
+                    if (!string.IsNullOrWhiteSpace(e.DecisionOptionName) && activity.Type != WorkflowActivityType.Decision)
+                        issues.AddError(e, WorkflowValidationMessage.BoundaryTimer0OfActivity1CanNotHave2BecauseActivityIsNot3.NiceToString(e, activity, e.NicePropertyName(a => a.DecisionOptionName), WorkflowActivityType.Decision.NiceToString()));
+
+                    if (!string.IsNullOrWhiteSpace(e.DecisionOptionName) && !activity.DecisionOptions.Any(a => a.Name == e.DecisionOptionName))
+                        issues.AddError(e, WorkflowValidationMessage.BoundaryTimer0OfActivity1HasInvalid23.NiceToString(e, activity, e.NicePropertyName(a => a.DecisionOptionName), e.DecisionOptionName));
+                }
+
                 var boundaryOutput = NextConnections(e).Only();
 
                 if (boundaryOutput == null || boundaryOutput.Type != ConnectionType.Normal)

Signum.Entities.Extensions/Workflow/Workflow.cs

@@ -277,6 +277,12 @@ public enum WorkflowValidationMessage
     DecisionOption0IsDeclaredButNeverUsedInAConnection,
     [Description("Decision option name '{0}' is not declared in any activity")]
     DecisionOptionName0IsNotDeclaredInAnyActivity,
+    [Description("Boundary timer '{0}' of activity '{1}' can not have {2} because activity is not {3}")]
+    BoundaryTimer0OfActivity1CanNotHave2BecauseActivityIsNot3,
+    [Description("Boundary timer '{0}' of activity '{1}' should have {2} because activity is {3}")]
+    BoundaryTimer0OfActivity1ShouldHave2BecauseActivityIs3,
+    [Description("Boundary timer '{0}' of activity '{1}' has invalid {2}: '{3}'")]
+    BoundaryTimer0OfActivity1HasInvalid23,
 }
 
 public enum WorkflowActivityMonitorMessage

Signum.Entities.Extensions/Workflow/WorkflowActivity.cs

@@ -126,6 +126,7 @@ public ModelEntity GetModel()
             MainEntityType = we.Lane.Pool.Workflow.MainEntityType,
             Type = we.Type,
             RunRepeatedly = we.RunRepeatedly,
+            DecisionOptionName = we.DecisionOptionName,
             Timer = we.Timer,
             BpmnElementId = we.BpmnElementId
         }).ToMList());

Signum.Entities.Extensions/Workflow/WorkflowEvent.cs

@@ -19,6 +19,9 @@ public class WorkflowEventEntity : Entity, IWorkflowNodeEntity, IWithModel
 
     public bool RunRepeatedly { get; set; }
 
+    [StringLengthValidator(Min = 3, Max = 100)]
+    public string? DecisionOptionName { get; set; }
+
     public WorkflowTimerEmbedded? Timer { get; set; }
 
     public Lite<WorkflowActivityEntity>? BoundaryOf { get; set; }
@@ -37,6 +40,7 @@ public ModelEntity GetModel()
             Name = this.Name,
             Type = this.Type,
             RunRepeatedly = this.RunRepeatedly,
+            DecisionOptionName = this.DecisionOptionName,
             Task = WorkflowEventTaskModel.GetModel(this),
             Timer = this.Timer,
             BpmnElementId = this.BpmnElementId,
@@ -51,6 +55,7 @@ public void SetModel(ModelEntity model)
         this.Name = wModel.Name;
         this.Type = wModel.Type;
         this.RunRepeatedly = wModel.RunRepeatedly;
+        this.DecisionOptionName = wModel.DecisionOptionName;
         this.Timer = wModel.Timer;
         this.BpmnElementId = wModel.BpmnElementId;
         this.CopyMixinsFrom(wModel);
@@ -62,6 +67,9 @@ public void SetModel(ModelEntity model)
         if (pi.Name == nameof(RunRepeatedly) && RunRepeatedly && Type != WorkflowEventType.BoundaryForkTimer)
             RunRepeatedly = false;
 
+        if (pi.Name == nameof(DecisionOptionName) && !string.IsNullOrWhiteSpace(DecisionOptionName) && Type != WorkflowEventType.BoundaryInterruptingTimer)
+            DecisionOptionName = null;
+
         return base.PropertyValidation(pi);
     }
 }
@@ -146,6 +154,9 @@ public class WorkflowEventModel : ModelEntity
 
     public bool RunRepeatedly { get; set; }
 
+    [StringLengthValidator(Min = 3, Max = 100)]
+    public string? DecisionOptionName { get; set; }
+
     public WorkflowEventTaskModel? Task { get; set; }
 
     public WorkflowTimerEmbedded? Timer { get; set; }

Signum.React.Extensions/Workflow/Signum.Entities.Workflow.ts

@@ -503,6 +503,7 @@ export interface WorkflowEventEntity extends Entities.Entity, IWorkflowNodeEntit
   lane: WorkflowLaneEntity;
   type: WorkflowEventType;
   runRepeatedly: boolean;
+  decisionOptionName: string | null;
   timer: WorkflowTimerEmbedded | null;
   boundaryOf: Entities.Lite<WorkflowActivityEntity> | null;
   xml: WorkflowXmlEmbedded;
@@ -515,6 +516,7 @@ export interface WorkflowEventModel extends Entities.ModelEntity {
   name: string | null;
   type: WorkflowEventType;
   runRepeatedly: boolean;
+  decisionOptionName: string | null;
   task: WorkflowEventTaskModel | null;
   timer: WorkflowTimerEmbedded | null;
   bpmnElementId: string;
@@ -847,6 +849,9 @@ export module WorkflowValidationMessage {
   export const Join0OfType1DoesNotMatchWithItsPairTheSplit2OfType3 = new MessageKey("WorkflowValidationMessage", "Join0OfType1DoesNotMatchWithItsPairTheSplit2OfType3");
   export const DecisionOption0IsDeclaredButNeverUsedInAConnection = new MessageKey("WorkflowValidationMessage", "DecisionOption0IsDeclaredButNeverUsedInAConnection");
   export const DecisionOptionName0IsNotDeclaredInAnyActivity = new MessageKey("WorkflowValidationMessage", "DecisionOptionName0IsNotDeclaredInAnyActivity");
+  export const BoundaryTimer0OfActivity1CanNotHave2BecauseActivityIsNot3 = new MessageKey("WorkflowValidationMessage", "BoundaryTimer0OfActivity1CanNotHave2BecauseActivityIsNot3");
+  export const BoundaryTimer0OfActivity1ShouldHave2BecauseActivityIs3 = new MessageKey("WorkflowValidationMessage", "BoundaryTimer0OfActivity1ShouldHave2BecauseActivityIs3");
+  export const BoundaryTimer0OfActivity1HasInvalid23 = new MessageKey("WorkflowValidationMessage", "BoundaryTimer0OfActivity1HasInvalid23");
 }
 
 export const WorkflowXmlEmbedded = new Type<WorkflowXmlEmbedded>("WorkflowXmlEmbedded");

Signum.React.Extensions/Workflow/Workflow/WorkflowEventModel.tsx

@@ -62,6 +62,7 @@ export default function WorkflowEventModelComponent(p: WorkflowEventModelCompone
       <ValueLine ctx={ctx.subCtx(we => we.name)} />
       <ValueLine ctx={ctx.subCtx(we => we.type)} readOnly={isTimer(ctx.value.type!)} optionItems={getTypeComboItems()} onChange={loadTask} />
       {ctx.value.type == "BoundaryForkTimer" && <ValueLine ctx={ctx.subCtx(a => a.runRepeatedly)} />}
+      {ctx.value.type == "BoundaryInterruptingTimer" && <ValueLine ctx={ctx.subCtx(a => a.decisionOptionName)} />}
       {ctx.value.task && <WorkflowEventTask ctx={ctx.subCtx(a => a.task!)} mainEntityType={ctx.value.mainEntityType} isConditional={isConditional()} />}
       {ctx.value.timer && <WorkflowTimer ctx={ctx.subCtx(a => a.timer!)} mainEntityType={ctx.value.mainEntityType}/>}
     </div>