Merge pull request #4269 from minvws/release/2.48.3

Release/2.48.3
minvws · May 30, 2022 · 8ecb650 · 8ecb650
2 parents 54bdb33 + 86a2f3a
commit 8ecb650
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/packages/app/src/utils/get-last-insertion-date-of-page.ts b/packages/app/src/utils/get-last-insertion-date-of-page.ts
@@ -11,10 +11,17 @@ export function getLastInsertionDateOfPage(
   return pageMetrics.reduce((lastDate, metricProperty) => {
     const metricOrUnixDate = get(data, metricProperty);
 
-    const metricDate =
-      typeof metricOrUnixDate === 'number'
-        ? metricOrUnixDate
-        : metricOrUnixDate?.last_value?.date_of_insertion_unix || 0;
+    let metricDate: number;
+
+    if (typeof metricOrUnixDate === 'number') {
+      metricDate = metricOrUnixDate;
+    } else if (typeof metricOrUnixDate?.last_value?.date_of_insertion_unix !== 'undefined') {
+      metricDate = metricOrUnixDate?.last_value?.date_of_insertion_unix;
+    } else if (typeof metricOrUnixDate?.values !== 'undefined') {
+      metricDate = metricOrUnixDate?.values.reduce((max: number, value: any) => value.date_of_insertion_unix > max ? value.date_of_insertion_unix : max, 0);
+    } else {
+      metricDate = 0;
+    }
 
     return metricDate > lastDate ? metricDate : lastDate;
   }, 0);