From ecb81aae88f54592a71d8f568664f6ee8abca78f Mon Sep 17 00:00:00 2001
From: tomy2105 <t.petrovic@inet.hr>
Date: Thu, 15 Apr 2021 16:06:54 +0200
Subject: [PATCH] Sort Child Activities Based On Output Order

---
 .../elsa-designer-tree/elsa-designer-tree.tsx | 46 ++++++++++++++++++-
 .../src/models/domain.ts                      |  8 ++++
 2 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/src/designer/elsa-workflows-studio/src/components/designers/tree/elsa-designer-tree/elsa-designer-tree.tsx b/src/designer/elsa-workflows-studio/src/components/designers/tree/elsa-designer-tree/elsa-designer-tree.tsx
index 06469fef4..2a7d07169 100644
--- a/src/designer/elsa-workflows-studio/src/components/designers/tree/elsa-designer-tree/elsa-designer-tree.tsx
+++ b/src/designer/elsa-workflows-studio/src/components/designers/tree/elsa-designer-tree/elsa-designer-tree.tsx
@@ -1,7 +1,7 @@
 import {Component, Host, h, Prop, State, Event, EventEmitter, Listen, Watch, Method} from '@stencil/core';
 import {Map, addConnection, findActivity, getChildActivities, getInboundConnections, getOutboundConnections, removeActivity} from '../../../../utils/utils';
 import {cleanup, destroy, updateConnections} from '../../../../utils/jsplumb-helper';
-import {ActivityDescriptor, ActivityDesignDisplayContext, ActivityModel, ActivityTraits, ConnectionModel, EventTypes, WorkflowModel, WorkflowPersistenceBehavior} from "../../../../models";
+import {ActivityDescriptor, ActivityDesignDisplayContext, ActivityModel, ActivityTraits, ConnectionModel, EventTypes, WorkflowModel, WorkflowPersistenceBehavior, ConnectionDefinitionMapped} from "../../../../models";
 import {eventBus} from '../../../../services/event-bus';
 import jsPlumb from "jsplumb";
 import uuid = jsPlumb.jsPlumbUtil.uuid;
@@ -434,10 +434,52 @@ export class ElsaWorkflowDesigner {
     );
   }
 
+  sortActivitiesByOutputs(list: Array<ActivityModel>): Array<ActivityModel> {
+    let sortedActivities: Array<ActivityModel> = [];
+    let activity: ActivityModel = undefined;
+    const connections: Array<ConnectionDefinitionMapped> = this.getJsPlumbConnections();
+
+    if (list.length === 0)
+      return list;
+      
+    const sourceActivityConnection: ConnectionDefinitionMapped = connections.find(x => x.targetActivityId === list[0].activityId);
+
+    if (!sourceActivityConnection)
+      return list;
+
+    const sourceActivityId: string = sourceActivityConnection.sourceActivityId;
+    const sourceActivity: ActivityModel = this.workflowModel.activities.find(x => x.activityId === sourceActivityId);
+
+    if (!sourceActivity)
+      return list;
+
+    const sourceActivityConnections: Array<ConnectionDefinitionMapped> = connections.filter(x => x.sourceActivityId === sourceActivityId);
+    const sourceActivityDisplayContext = this.activityDisplayContexts[sourceActivity.activityId];
+    
+    if (sourceActivityDisplayContext.outcomes) {
+      sourceActivity.outcomes = sourceActivityDisplayContext.outcomes;
+    }
+
+    sourceActivity.outcomes.forEach(outcome => {
+      sourceActivityConnections.forEach(conn => {
+        if (outcome === conn.outcome) {
+          activity = this.workflowModel.activities.find(x => x.activityId === conn.targetActivityId);
+
+          if (activity)
+            sortedActivities.push(activity);
+        }
+      })
+    })
+    return sortedActivities;
+  }
+
   renderTree(activities: Array<ActivityModel>, isRoot: boolean, renderedActivities: Set<string>): any {
-    const list = activities.filter(x => !renderedActivities.has(x.activityId));
+    let list = activities.filter(x => !renderedActivities.has(x.activityId));
     const cssClass = isRoot ? "root" : undefined;
 
+    list = this.sortActivitiesByOutputs(list);
+    activities = list;
+
     if (list.length == 0)
       return null;
 
diff --git a/src/designer/elsa-workflows-studio/src/models/domain.ts b/src/designer/elsa-workflows-studio/src/models/domain.ts
index 90318394c..7e038015d 100644
--- a/src/designer/elsa-workflows-studio/src/models/domain.ts
+++ b/src/designer/elsa-workflows-studio/src/models/domain.ts
@@ -82,6 +82,14 @@ export interface ConnectionDefinition {
   outcome?: string;
 }
 
+export interface ConnectionDefinitionMapped {
+    sourceId: string;
+    sourceActivityId: string;
+    targetId: string;
+    targetActivityId: string;
+    outcome: string;
+}
+
 export interface ActivityDefinitionProperty {
   name: string;
   syntax?: string;