From 0c3a8c5f4ef4735ba5a784c6e916b3289834682b Mon Sep 17 00:00:00 2001
From: Peter Pisljar <peter.pisljar@gmail.com>
Date: Mon, 14 Sep 2020 17:00:23 +0200
Subject: [PATCH] updating datatable type (#77320)

---
 .../expressions/common/expression_types/specs/boolean.ts | 1 -
 .../common/expression_types/specs/datatable.ts           | 9 +++------
 .../expressions/common/expression_types/specs/num.ts     | 1 -
 .../expressions/common/expression_types/specs/number.ts  | 1 -
 .../expressions/common/expression_types/specs/string.ts  | 1 -
 5 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/plugins/expressions/common/expression_types/specs/boolean.ts b/src/plugins/expressions/common/expression_types/specs/boolean.ts
index adbdeafc34fd2..73b0b98eaaf06 100644
--- a/src/plugins/expressions/common/expression_types/specs/boolean.ts
+++ b/src/plugins/expressions/common/expression_types/specs/boolean.ts
@@ -41,7 +41,6 @@ export const boolean: ExpressionTypeDefinition<'boolean', boolean> = {
     },
     datatable: (value): Datatable => ({
       type: 'datatable',
-      meta: {},
       columns: [{ id: 'value', name: 'value', meta: { type: name } }],
       rows: [{ value }],
     }),
diff --git a/src/plugins/expressions/common/expression_types/specs/datatable.ts b/src/plugins/expressions/common/expression_types/specs/datatable.ts
index dd3c653878de7..c201e99faeb03 100644
--- a/src/plugins/expressions/common/expression_types/specs/datatable.ts
+++ b/src/plugins/expressions/common/expression_types/specs/datatable.ts
@@ -52,7 +52,10 @@ export type DatatableRow = Record<string, any>;
 export interface DatatableColumnMeta {
   type: DatatableColumnType;
   field?: string;
+  index?: string;
   params?: SerializableState;
+  source?: string;
+  sourceParams?: SerializableState;
 }
 /**
  * This type represents the shape of a column in a `Datatable`.
@@ -63,17 +66,11 @@ export interface DatatableColumn {
   meta: DatatableColumnMeta;
 }
 
-export interface DatatableMeta {
-  type?: string;
-  source?: string;
-}
-
 /**
  * A `Datatable` in Canvas is a unique structure that represents tabulated data.
  */
 export interface Datatable {
   type: typeof name;
-  meta?: DatatableMeta;
   columns: DatatableColumn[];
   rows: DatatableRow[];
 }
diff --git a/src/plugins/expressions/common/expression_types/specs/num.ts b/src/plugins/expressions/common/expression_types/specs/num.ts
index 041747f39740b..d208a9dcf73c8 100644
--- a/src/plugins/expressions/common/expression_types/specs/num.ts
+++ b/src/plugins/expressions/common/expression_types/specs/num.ts
@@ -73,7 +73,6 @@ export const num: ExpressionTypeDefinition<'num', ExpressionValueNum> = {
     },
     datatable: ({ value }): Datatable => ({
       type: 'datatable',
-      meta: {},
       columns: [{ id: 'value', name: 'value', meta: { type: 'number' } }],
       rows: [{ value }],
     }),
diff --git a/src/plugins/expressions/common/expression_types/specs/number.ts b/src/plugins/expressions/common/expression_types/specs/number.ts
index c5fdacf3408a1..c30d3fe943d42 100644
--- a/src/plugins/expressions/common/expression_types/specs/number.ts
+++ b/src/plugins/expressions/common/expression_types/specs/number.ts
@@ -55,7 +55,6 @@ export const number: ExpressionTypeDefinition<typeof name, number> = {
     },
     datatable: (value): Datatable => ({
       type: 'datatable',
-      meta: {},
       columns: [{ id: 'value', name: 'value', meta: { type: 'number' } }],
       rows: [{ value }],
     }),
diff --git a/src/plugins/expressions/common/expression_types/specs/string.ts b/src/plugins/expressions/common/expression_types/specs/string.ts
index 3d52707279bfc..0869e21e455f7 100644
--- a/src/plugins/expressions/common/expression_types/specs/string.ts
+++ b/src/plugins/expressions/common/expression_types/specs/string.ts
@@ -40,7 +40,6 @@ export const string: ExpressionTypeDefinition<typeof name, string> = {
     },
     datatable: (value): Datatable => ({
       type: 'datatable',
-      meta: {},
       columns: [{ id: 'value', name: 'value', meta: { type: 'string' } }],
       rows: [{ value }],
     }),