Undefined date csv

server/routes/utils/dataReportHelpers.ts

@@ -7,29 +7,29 @@
 import converter from 'json-2-csv';
 import _ from 'lodash';
 import moment from 'moment-timezone';
 import { DATA_REPORT_CONFIG } from './constants';
 import {
   buildOpenSearchQuery,
   Filter,
   Query,
   OpenSearchQueryConfig,
 } from '../../../../../src/plugins/data/common';
 import { string } from 'joi';
 
 export var metaData = {
   saved_search_id: <string>null,
   report_format: <string>null,
   start: <string>null,
   end: <string>null,
   fields: <string>null,
   type: <string>null,
   timeFieldName: <string>null,
   sorting: <string>null,
   fields_exist: <boolean>false,
   selectedFields: <any>[],
   paternName: <string>null,
   searchSourceJSON: <any>[],
   dateFields: <any>[],
 };
 
 // Get the selected columns by the user.
@@ -52,7 +52,7 @@
 // Build the OpenSearch query from the meta data
 // is_count is set to 1 if we building the count query but 0 if we building the fetch data query
 export const buildRequestBody = (
   report: any,
   allowLeadingWildcards: boolean,
   is_count: number
 ) => {
@@ -119,13 +119,13 @@
 
 // Fetch the data from OpenSearch
 export const getOpenSearchData = (
   arrayHits: any,
   report: { _source: any },
   params: { excel: any; limit: number },
   dateFormat: string,
   timezone: string
 ) => {
   let hits: any = [];
   for (let valueRes of arrayHits) {
     for (let data of valueRes.hits) {
       const fields = data.fields;
@@ -135,21 +135,27 @@
         let keys;
         keys = dateField.split('.');
         const dateValue = data._source[dateField];
-        const fieldDateValue = fields[dateField];
         const isDateFieldPresent = isKeyPresent(data._source, dateField);
 
         if (isDateFieldPresent) {
+          const fieldDateValue = fields[dateField];
           // if its not a nested date field
           if (keys.length === 1) {
             // if conditions to determine if the date field's value is an array or a string
-            if (typeof dateValue === 'string') {
-              data._source[keys] = moment.utc(dateValue).tz(timezone).format(dateFormat);
-            } else if (
-              dateValue.length !== 0 &&
-              dateValue instanceof Array
+            if (
+              typeof dateValue === 'string' ||
+              typeof dateValue === 'number'
             ) {
+              data._source[keys] = moment
+                .utc(dateValue)
+                .tz(timezone)
+                .format(dateFormat);
+            } else if (dateValue.length !== 0 && dateValue instanceof Array) {
               fieldDateValue.forEach((element, index) => {
-                data._source[keys][index] = moment.utc(element).tz(timezone).format(dateFormat);
+                data._source[keys][index] = moment
+                  .utc(element)
+                  .tz(timezone)
+                  .format(dateFormat);
               });
             } else {
               data._source[keys] = [];
@@ -158,15 +164,19 @@
           } else {
             let keyElement = keys.shift();
             // if conditions to determine if the date field's value is an array or a string
-            if (typeof fieldDateValue === 'string') {
-              keys.push(moment.utc(fieldDateValue).tz(timezone).format(dateFormat));
-            } else if (
-              dateValue.length !== 0 &&
-              dateValue instanceof Array
+            if (
+              typeof fieldDateValue === 'string' ||
+              typeof fieldDateValue === 'number'
             ) {
+              keys.push(
+                moment.utc(fieldDateValue).tz(timezone).format(dateFormat)
+              );
+            } else if (dateValue.length !== 0 && dateValue instanceof Array) {
               let tempArray: string[] = [];
               fieldDateValue.forEach((index) => {
-                tempArray.push(moment.utc(index).tz(timezone).format(dateFormat));
+                tempArray.push(
+                  moment.utc(index).tz(timezone).format(dateFormat)
+                );
               });
               keys.push(tempArray);
             } else {
@@ -205,7 +215,7 @@
 
 //Convert the data to Csv format
 export const convertToCSV = async (dataset, csvSeparator) => {
   let convertedData: any = [];
   const options = {
     delimiter: { field: csvSeparator, eol: '\n' },
     emptyFieldValue: ' ',
@@ -254,7 +264,7 @@
  * This is intend to avoid CSV injection in Microsoft Excel.
  * @param doc   document
  */
 function sanitize(doc: any) {
   for (const field in doc) {
     if (doc[field] == null) continue;
     if (
@@ -311,4 +321,4 @@
     docvalue_fields: docValues,
   };
   return requestBody;
-};
+};