fix bug

elastic · Feb 1, 2021 · 064794b · 064794b
1 parent a17d9d5
commit 064794b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/x-pack/plugins/lens/public/datatable_visualization/components/toolbar.tsx b/x-pack/plugins/lens/public/datatable_visualization/components/toolbar.tsx
@@ -17,6 +17,7 @@ export function TableToolbar(props: VisualizationToolbarProps<DatatableVisualiza
   state.columns.forEach((column) => {
     columnMap[column.columnId] = column;
   });
+  const datasourceLayer = frame.datasourceLayers[state.layerId];
   return (
     <EuiFlexGroup gutterSize="none" justifyContent="spaceBetween">
       <ToolbarPopover
@@ -28,10 +29,8 @@ export function TableToolbar(props: VisualizationToolbarProps<DatatableVisualiza
         buttonDataTestSubj="lnsColumnsButton"
       >
         <EuiFlexGroup gutterSize="m" direction="column">
-          {frame.datasourceLayers[state.layerId].getTableSpec().map(({ columnId }) => {
-            const label = props.frame.datasourceLayers[state.layerId].getOperationForColumnId(
-              columnId
-            )?.label;
+          {datasourceLayer.getTableSpec().map(({ columnId }) => {
+            const label = datasourceLayer.getOperationForColumnId(columnId)?.label;
             const isHidden = columnMap[columnId].hidden;
             return (
               <EuiFlexItem key={columnId}>

diff --git a/x-pack/plugins/lens/public/datatable_visualization/visualization.tsx b/x-pack/plugins/lens/public/datatable_visualization/visualization.tsx
@@ -13,7 +13,6 @@ import type {
   SuggestionRequest,
   Visualization,
   VisualizationSuggestion,
-  Operation,
   DatasourcePublicAPI,
 } from '../types';
 import { LensIconChartDatatable } from '../assets/chart_datatable';
@@ -219,9 +218,8 @@ export const datatableVisualization: Visualization<DatatableVisualizationState>
     });
 
     const columns = sortedColumns!
-      .map((columnId) => ({ columnId, operation: datasource!.getOperationForColumnId(columnId) }))
-      .filter((o): o is { columnId: string; operation: Operation } => !!o.operation)
-      .map(({ columnId }) => columnMap[columnId]);
+      .filter((columnId) => datasource!.getOperationForColumnId(columnId))
+      .map((columnId) => columnMap[columnId]);
 
     return {
       type: 'expression',
@@ -275,7 +273,7 @@ export const datatableVisualization: Visualization<DatatableVisualizationState>
             if (column.columnId === event.data.columnId) {
               return {
                 ...column,
-                hidden: !!column.hidden,
+                hidden: !column.hidden,
               };
             } else {
               return column;