Search by message id now performed when selected. Fixes #331

Particular · May 29, 2014 · fda9de9 · fda9de9
1 parent 826e365
commit fda9de9
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 24 deletions.
diff --git a/src/ServiceInsight.Desktop/MessageFlow/MessageFlowViewModel.cs b/src/ServiceInsight.Desktop/MessageFlow/MessageFlowViewModel.cs
@@ -131,9 +131,9 @@ public void CopyMessageUri(StoredMessage message)
             AppServices.Clipboard.CopyTo(serviceControl.GetUri(message).ToString());
         }
 
-        public void SearchByMessageId(StoredMessage message)
+        public void SearchByMessageId(StoredMessage message, bool performSearch = false)
         {
-            searchBar.Search(performSearch: false, searchQuery: message.MessageId);
+            searchBar.Search(performSearch: performSearch, searchQuery: message.MessageId);
             eventAggregator.Publish(new RequestSelectingEndpoint(message.ReceivingEndpoint));
         }
 

diff --git a/src/ServiceInsight.Desktop/MessageFlow/MessageNode.cs b/src/ServiceInsight.Desktop/MessageFlow/MessageNode.cs
@@ -13,7 +13,7 @@ public class MessageNode : DiagramNode
         int heightNoEndpoints = 56;
         const int endpointsHeight = 25;
 
-        public MessageNode(MessageFlowViewModel owner, StoredMessage message) 
+        public MessageNode(MessageFlowViewModel owner, StoredMessage message)
         {
             IsResizable = false;
             Owner = owner;
@@ -28,10 +28,10 @@ public MessageNode(MessageFlowViewModel owner, StoredMessage message)
         string ProcessSagaType(StoredMessage message)
         {
             if (message.Sagas == null) return string.Empty;
-            
+
             var originatingSaga = message.Sagas.FirstOrDefault();
             if (originatingSaga == null) return string.Empty;
-            
+
             return ProcessType(originatingSaga.SagaType);
         }
 
@@ -54,10 +54,7 @@ public StoredMessage Message
             get { return Data as StoredMessage; }
         }
 
-        public MessageFlowViewModel Owner
-        {
-            get; private set;
-        }
+        public MessageFlowViewModel Owner { get; private set; }
 
         public void CopyMessageUri()
         {
@@ -71,7 +68,7 @@ public void CopyConversationId()
 
         public void SearchMessage()
         {
-            Owner.SearchByMessageId(Message);
+            Owner.SearchByMessageId(Message, performSearch: true);
         }
 
         public async void Retry()
@@ -85,7 +82,6 @@ public async void Retry()
         public bool CanRetry()
         {
             return HasFailed;
-
         }
 
         public void ShowBody()
@@ -102,10 +98,7 @@ public void Refresh()
         {
         }
 
-        public bool ShowEndpoints
-        {
-            get; set;
-        }
+        public bool ShowEndpoints { get; set; }
 
         public void OnShowEndpointsChanged()
         {
@@ -146,21 +139,21 @@ public bool IsSagaCompleted
 
         public bool IsTimeout
         {
-            get 
+            get
             {
                 var isTimeoutString = Message.GetHeaderByKey(MessageHeaderKeys.IsSagaTimeout);
-                return !string.IsNullOrEmpty(isTimeoutString) && bool.Parse(isTimeoutString); 
+                return !string.IsNullOrEmpty(isTimeoutString) && bool.Parse(isTimeoutString);
             }
         }
 
         public DateTime? TimeSent
         {
-            get 
-            { 
+            get
+            {
                 var timeString = Message.GetHeaderByKey(MessageHeaderKeys.TimeSent);
                 if (string.IsNullOrEmpty(timeString))
                     return null;
-                return DateTime.ParseExact(timeString, HeaderInfo.MessageDateFormat, System.Globalization.CultureInfo.InvariantCulture); 
+                return DateTime.ParseExact(timeString, HeaderInfo.MessageDateFormat, System.Globalization.CultureInfo.InvariantCulture);
             }
         }
 
@@ -191,10 +184,7 @@ public bool HasSaga
             }
         }
 
-        public string ExceptionMessage
-        {
-            get; set;
-        }
+        public string ExceptionMessage { get; set; }
 
         public bool IsFocused
         {