From e2d291da7f57707835259e1b75057cd5a0d3b810 Mon Sep 17 00:00:00 2001
From: Michael Dokolin <mikhail.dokolin@elastic.co>
Date: Wed, 25 Aug 2021 18:17:36 +0200
Subject: [PATCH] Fix datatable canvas element to use column id instead of name

---
 .../plugins/canvas/public/components/datatable/datatable.tsx  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/x-pack/plugins/canvas/public/components/datatable/datatable.tsx b/x-pack/plugins/canvas/public/components/datatable/datatable.tsx
index db21379dfed92..5668c93c28b27 100644
--- a/x-pack/plugins/canvas/public/components/datatable/datatable.tsx
+++ b/x-pack/plugins/canvas/public/components/datatable/datatable.tsx
@@ -40,6 +40,8 @@ const getIcon = (type: DatatableColumnType | null) => {
 
 const getColumnName = (col: DatatableColumn) => (typeof col === 'string' ? col : col.name);
 
+const getColumnId = (col: DatatableColumn) => (typeof col === 'string' ? col : col.id);
+
 const getColumnType = (col: DatatableColumn) => col.meta?.type || null;
 
 const getFormattedValue = (val: any, type: any) => {
@@ -85,7 +87,7 @@ export const Datatable: FC<Props> = ({
                 <tr key={i} className="canvasDataTable__tr">
                   {datatable.columns.map((col) => (
                     <td key={`row-${i}-${getColumnName(col)}`} className="canvasDataTable__td">
-                      {getFormattedValue(row[getColumnName(col)], getColumnType(col))}
+                      {getFormattedValue(row[getColumnId(col)], getColumnType(col))}
                     </td>
                   ))}
                 </tr>