From 37b5b41c7043941da2fe25a4442fe00ec9a73c25 Mon Sep 17 00:00:00 2001
From: Dzmitry Tamashevich <diaamnj@mail.ru>
Date: Mon, 28 Jun 2021 19:30:08 +0300
Subject: [PATCH] [Discover] fix single doc view

---
 .../application/components/table/table.tsx    |  8 ++-
 .../components/table/table_columns.tsx        | 63 +++++++++----------
 2 files changed, 37 insertions(+), 34 deletions(-)

diff --git a/src/plugins/discover/public/application/components/table/table.tsx b/src/plugins/discover/public/application/components/table/table.tsx
index 6844ba19d7bcd1..065b146105a651 100644
--- a/src/plugins/discover/public/application/components/table/table.tsx
+++ b/src/plugins/discover/public/application/components/table/table.tsx
@@ -17,7 +17,7 @@ import {
   ElasticSearchHit,
   DocViewRenderProps,
 } from '../../doc_views/doc_views_types';
-import { DOC_VIEW_COLUMNS } from './table_columns';
+import { ACTIONS_COLUMN, MAIN_COLUMNS } from './table_columns';
 
 export interface DocViewerTableProps {
   columns?: string[];
@@ -62,6 +62,10 @@ export const DocViewerTable = ({
 
   const formattedHit = useMemo(() => indexPattern?.formatHit(hit, 'html'), [hit, indexPattern]);
 
+  const tableColumns = useMemo(() => {
+    return filter ? [ACTIONS_COLUMN, ...MAIN_COLUMNS] : MAIN_COLUMNS;
+  }, [filter]);
+
   const onToggleColumn = useCallback(
     (field: string) => {
       if (!onRemoveColumn || !onAddColumn || !columns) {
@@ -128,7 +132,7 @@ export const DocViewerTable = ({
     <EuiInMemoryTable
       className="kbnDocViewer__table"
       items={items}
-      columns={DOC_VIEW_COLUMNS}
+      columns={tableColumns}
       rowProps={onSetRowProps}
       pagination={false}
       responsive={false}
diff --git a/src/plugins/discover/public/application/components/table/table_columns.tsx b/src/plugins/discover/public/application/components/table/table_columns.tsx
index 3b1f93c8f47918..462362d543e7a2 100644
--- a/src/plugins/discover/public/application/components/table/table_columns.tsx
+++ b/src/plugins/discover/public/application/components/table/table_columns.tsx
@@ -14,39 +14,38 @@ import { FieldRecord } from './table';
 import { TableActions } from './table_cell_actions';
 import { TableFieldValue } from './table_cell_value';
 
-export const DOC_VIEW_COLUMNS: Array<EuiBasicTableColumn<FieldRecord>> = [
-  {
-    field: 'action',
-    className: 'kbnDocViewer__tableActionsCell',
-    width: '108px',
-    name: (
-      <EuiText size="xs">
-        <strong>
-          <FormattedMessage
-            id="discover.fieldChooser.discoverField.actions"
-            defaultMessage="Actions"
-          />
-        </strong>
-      </EuiText>
-    ),
-    render: (
-      { flattenedField, isActive, onFilter, onToggleColumn }: FieldRecord['action'],
-      { field: { fieldName, fieldMapping } }: FieldRecord
-    ) => {
-      return (
-        onFilter && (
-          <TableActions
-            isActive={isActive}
-            fieldName={fieldName}
-            fieldMapping={fieldMapping}
-            flattenedField={flattenedField}
-            onFilter={onFilter}
-            onToggleColumn={onToggleColumn}
-          />
-        )
-      );
-    },
+export const ACTIONS_COLUMN: EuiBasicTableColumn<FieldRecord> = {
+  field: 'action',
+  className: 'kbnDocViewer__tableActionsCell',
+  width: '108px',
+  name: (
+    <EuiText size="xs">
+      <strong>
+        <FormattedMessage
+          id="discover.fieldChooser.discoverField.actions"
+          defaultMessage="Actions"
+        />
+      </strong>
+    </EuiText>
+  ),
+  render: (
+    { flattenedField, isActive, onFilter, onToggleColumn }: FieldRecord['action'],
+    { field: { fieldName, fieldMapping } }: FieldRecord
+  ) => {
+    return (
+      <TableActions
+        isActive={isActive}
+        fieldName={fieldName}
+        fieldMapping={fieldMapping}
+        flattenedField={flattenedField}
+        onFilter={onFilter!}
+        onToggleColumn={onToggleColumn}
+      />
+    );
   },
+};
+
+export const MAIN_COLUMNS: Array<EuiBasicTableColumn<FieldRecord>> = [
   {
     field: 'field',
     className: 'kbnDocViewer__tableFieldNameCell',