From e099bea72cf84c6b7ea29c285ed584a58fce2862 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Pior?= <piorek82@gmail.com>
Date: Wed, 26 Sep 2018 13:06:13 +0200
Subject: [PATCH] #7804 handle date object in column name

---
 .../dataGrid/model/selectors/column.ts        | 32 ++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/js/notebook/src/tableDisplay/dataGrid/model/selectors/column.ts b/js/notebook/src/tableDisplay/dataGrid/model/selectors/column.ts
index 7f053308cf..42ca6d5cbb 100644
--- a/js/notebook/src/tableDisplay/dataGrid/model/selectors/column.ts
+++ b/js/notebook/src/tableDisplay/dataGrid/model/selectors/column.ts
@@ -14,6 +14,7 @@
  *  limitations under the License.
  */
 
+import * as moment from 'moment-timezone/builds/moment-timezone-with-data';
 import {createSelector} from "reselect";
 import {DataModel} from "@phosphor/datagrid";
 import {
@@ -39,7 +40,36 @@ import IHihglighterState from "../../interface/IHighlighterState";
 
 export const DEFAULT_INDEX_COLUMN_NAME = 'index';
 
-export const selectColumnNames = createSelector(selectRawColumnNames, names => names.map(name => name !== null ? String(name) : null));
+
+const processColumnName = (name) => {
+  if (name === null) {
+    return name;
+  }
+
+  if (!Array.isArray(name)) {
+    return String(name);
+  }
+
+  const isDate = (value) => {
+    return value instanceof Object &&
+      value.hasOwnProperty('type') &&
+      value.hasOwnProperty('timestamp') &&
+      value.type === "Date";
+  };
+
+  return name.reduce((prev, curr, index, arr) => {
+    let processed = isDate(curr) ?
+      moment(curr.timestamp).format('YYYY-MM-DD') :
+      String(curr);
+
+    return `${prev} ${processed}`;
+  }, '');
+};
+
+export const selectColumnNames = createSelector(
+  selectRawColumnNames,
+  names => names.map(processColumnName)
+);
 
 export const selectBodyColumnNames = createSelector(
   [selectColumnNames, selectHasIndex],