Merge pull request #630 from Particular/saga-view-ordering

Orders saga data before displaying them. Resolves #598.
Particular · Nov 15, 2016 · 3f6b35a · 3f6b35a
2 parents 2dbee26 + 590ac9a
commit 3f6b35a
Showing 1 changed file with 14 additions and 1 deletion.
diff --git a/src/ServiceInsight/Saga/SagaWindowViewModel.cs b/src/ServiceInsight/Saga/SagaWindowViewModel.cs
@@ -134,7 +134,7 @@ void RefreshSaga(SagaInfo originatingSaga)
                         previousSagaId = Data.SagaId;
                     }
 
-                    Data = serviceControl.GetSagaById(originatingSaga.SagaId);
+                    Data = FetchOrderedSagaData(originatingSaga.SagaId);
 
                     if (Data != null)
                     {
@@ -178,6 +178,19 @@ void RefreshSaga(SagaInfo originatingSaga)
             }
         }
 
+        private SagaData FetchOrderedSagaData(Guid sagaId)
+        {
+            var sagaData = serviceControl.GetSagaById(sagaId);
+            if (sagaData?.Changes != null)
+            {
+                sagaData.Changes = sagaData.Changes.OrderBy(x => x.StartTime)
+                                                   .ThenBy(x => x.FinishTime)
+                                                   .ToList();
+            }
+
+            return sagaData;
+        }
+
         static void ProcessDataValues(IEnumerable<SagaUpdate> list)
         {
             var oldValues = new List<SagaUpdatedValue>();