Saga diagram initial message displaying wrong icon

Event messages were being shown as Commands.
Particular · Jun 2, 2015 · a0abb10 · a0abb10
1 parent f82d96f
commit a0abb10
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 6 deletions.
diff --git a/src/ServiceInsight/Saga/SagaMessage.cs b/src/ServiceInsight/Saga/SagaMessage.cs
@@ -20,6 +20,18 @@ public class SagaMessage : PropertyChangedBase
 
         public bool IsPublished { get; set; }
 
+        public MessageIntent Intent { get; set; }
+
+        public bool IsEventMessage
+        {
+            get { return Intent == MessageIntent.Publish; }
+        }
+
+        public bool IsCommandMessage
+        {
+            get { return !IsEventMessage && !IsTimeout; }
+        }
+
         public virtual bool IsTimeout
         {
             get

diff --git a/src/ServiceInsight/Saga/SagaUpdateControl.xaml b/src/ServiceInsight/Saga/SagaUpdateControl.xaml
@@ -212,18 +212,26 @@
                                             VerticalAlignment="Top"
                                             Style="{StaticResource FailedMessageMarker}" />
 
-                            <ContentControl x:Name="MessageTypeIcon"
-                                            Grid.Column="0"
+                            <ContentControl Grid.Column="0"
                                             Width="20"
                                             Margin="0,4,0,0"
                                             HorizontalAlignment="Center"
                                             VerticalAlignment="Center"
                                             Template="{StaticResource CommandIcon}"
                                             ToolTip="Command"
-                                            Visibility="{Binding IsTimeout,
-                                                                 Converter={StaticResource BoolToVisibilityConverterInverted}}" />
-                            <ContentControl x:Name="TimeoutIcon"
-                                            Grid.Column="0"
+                                            Visibility="{Binding IsCommandMessage,
+                                                                 Converter={StaticResource BoolToVisibilityConverter}}" />
+                            <ContentControl Grid.Column="0"
+                                            HorizontalAlignment="Center"
+                                            VerticalAlignment="Center"
+                                            Margin="0,4,0,0"
+                                            Template="{StaticResource EventIcon}"
+                                            ToolTip="Event"
+                                            Width="22" 
+                                            Visibility="{Binding IsEventMessage,
+                                                                Converter={StaticResource BoolToVisibilityConverter}}">
+                            </ContentControl>
+                            <ContentControl Grid.Column="0"
                                             Width="24"
                                             Margin="0,8,0,0"
                                             HorizontalAlignment="Center"