From 6648f8c5a132f0605cca46d40d5ac0a74b682e85 Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Tue, 28 Sep 2021 11:50:05 -0400
Subject: [PATCH] Tempo: Run search query with keyboard shortcut from input
 fields (#39247) (#39741)

* Tempo: Run query with keyboard shortcut from duration fields

(cherry picked from commit 9c4e7eb659e1efacdae04f31a9db51f7d12d55b7)

Co-authored-by: Connor Lindsey <cblindsey3@gmail.com>
---
 public/app/plugins/datasource/tempo/NativeSearch.tsx | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/public/app/plugins/datasource/tempo/NativeSearch.tsx b/public/app/plugins/datasource/tempo/NativeSearch.tsx
index 2bc1cf4c436..6c6926d8e00 100644
--- a/public/app/plugins/datasource/tempo/NativeSearch.tsx
+++ b/public/app/plugins/datasource/tempo/NativeSearch.tsx
@@ -72,6 +72,12 @@ const NativeSearch = ({ datasource, query, onChange, onBlur, onRunQuery }: Props
     return text;
   };
 
+  const onKeyDown = (keyEvent: React.KeyboardEvent) => {
+    if (keyEvent.key === 'Enter' && (keyEvent.shiftKey || keyEvent.ctrlKey)) {
+      onRunQuery();
+    }
+  };
+
   return (
     <div className={css({ maxWidth: '500px' })}>
       <InlineFieldRow>
@@ -140,6 +146,7 @@ const NativeSearch = ({ datasource, query, onChange, onBlur, onRunQuery }: Props
                 minDuration: v.currentTarget.value,
               })
             }
+            onKeyDown={onKeyDown}
           />
         </InlineField>
       </InlineFieldRow>
@@ -154,6 +161,7 @@ const NativeSearch = ({ datasource, query, onChange, onBlur, onRunQuery }: Props
                 maxDuration: v.currentTarget.value,
               })
             }
+            onKeyDown={onKeyDown}
           />
         </InlineField>
       </InlineFieldRow>
@@ -168,6 +176,7 @@ const NativeSearch = ({ datasource, query, onChange, onBlur, onRunQuery }: Props
                 limit: v.currentTarget.value ? parseInt(v.currentTarget.value, 10) : undefined,
               })
             }
+            onKeyDown={onKeyDown}
           />
         </InlineField>
       </InlineFieldRow>