From 454afc21676e828ded36ab6acc7e7f5365a7e798 Mon Sep 17 00:00:00 2001
From: Wylie Conlon <wylieconlon@gmail.com>
Date: Thu, 24 Sep 2020 16:56:09 -0400
Subject: [PATCH] Add additional error message

---
 .../dimension_panel/dimension_editor.tsx             | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/dimension_editor.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/dimension_editor.tsx
index db7c89c48987d2..2572f732aa1b3f 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/dimension_editor.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/dimension_editor.tsx
@@ -281,10 +281,14 @@ export function DimensionEditor(props: DimensionEditorProps) {
             fullWidth
             isInvalid={Boolean(incompatibleSelectedOperationType)}
             error={
-              selectedColumn
-                ? i18n.translate('xpack.lens.indexPattern.invalidOperationLabel', {
-                    defaultMessage: 'To use this function, select a different field.',
-                  })
+              selectedColumn && incompatibleSelectedOperationType
+                ? selectedOperationDefinition?.input === 'field'
+                  ? i18n.translate('xpack.lens.indexPattern.invalidOperationLabel', {
+                      defaultMessage: 'To use this function, select a different field.',
+                    })
+                  : i18n.translate('xpack.lens.indexPattern.chooseFieldLabel', {
+                      defaultMessage: 'To use this function, select a field.',
+                    })
                 : undefined
             }
           >