Fix undefined date error while generating CSV report (opensearch-proj…

…ect#309) (opensearch-project#310) * Fix undefined date while generating csv * Add test * Revert "Add test" This reverts commit 9471f30. --------- (cherry picked from commit 241c6f5) Signed-off-by: Rupal Mahajan <[email protected]> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
joshuali925 · Feb 21, 2024 · cccd9e1 · cccd9e1
1 parent 128d67d
commit cccd9e1
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/server/routes/utils/dataReportHelpers.ts b/server/routes/utils/dataReportHelpers.ts
@@ -135,7 +135,7 @@ export const getOpenSearchData = (
         let keys;
         keys = dateField.split('.');
         const dateValue = data._source[dateField];
-        const fieldDateValue = fields[dateField];
+        const fieldDateValue = fields !== undefined ? fields[dateField] : undefined;
         const isDateFieldPresent = isKeyPresent(data._source, dateField);
 
         if (isDateFieldPresent) {
@@ -146,7 +146,8 @@ export const getOpenSearchData = (
               data._source[keys] = moment.utc(dateValue).tz(timezone).format(dateFormat);
             } else if (
               dateValue.length !== 0 &&
-              dateValue instanceof Array
+              dateValue instanceof Array &&
+              fieldDateValue !== undefined
             ) {
               fieldDateValue.forEach((element, index) => {
                 data._source[keys][index] = moment.utc(element).tz(timezone).format(dateFormat);
@@ -158,11 +159,12 @@ export const getOpenSearchData = (
           } 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') {
+            if (fieldDateValue !== undefined && typeof fieldDateValue === 'string') {
               keys.push(moment.utc(fieldDateValue).tz(timezone).format(dateFormat));
             } else if (
               dateValue.length !== 0 &&
-              dateValue instanceof Array
+              dateValue instanceof Array &&
+              fieldDateValue !== undefined
             ) {
               let tempArray: string[] = [];
               fieldDateValue.forEach((index) => {