Merge pull request #11427 from bbc/support-iso-timestamp-most-read

WSTEAMA-1136: Add support for ISO string timestamp in Most Read component

src/app/components/MostRead/Canonical/LastUpdated/index.tsx

@@ -8,7 +8,7 @@ interface LastUpdatedProps {
   prefix: string;
   script: TypographyScript;
   service: Services;
-  timestamp: number;
+  timestamp: number | string;
   timezone: string;
 }
 

src/app/components/MostRead/types.ts

@@ -83,6 +83,6 @@ export interface MostReadData {
     rank: number;
     href: string;
     title: string;
-    timestamp: number;
+    timestamp: number | string;
   }[];
 }

src/app/lib/utilities/filterPopularStaleData/isDataStale.js

@@ -13,7 +13,7 @@ export const isDataStale = formattedTimestamp => {
 };
 
 const isMoreThan60Days = unixTimestamp =>
-  unixTimestamp < Date.now() - SHOULD_RENDER_LAST_UPDATED_TIME;
+  new Date(unixTimestamp) < Date.now() - SHOULD_RENDER_LAST_UPDATED_TIME;
 
 export const shouldRenderLastUpdated = lastUpdated =>
   lastUpdated && isMoreThan60Days(lastUpdated);

src/app/lib/utilities/filterPopularStaleData/isDataStale.test.js

@@ -22,13 +22,20 @@ describe('mostReadRecordIsFresh', () => {
 });
 
 describe('shouldRenderLastUpdated', () => {
-  it('should return lastUpdated time if older than 60 days', () => {
-    expect(shouldRenderLastUpdated(calcTimestampDaysAgo(61))).toEqual(true);
-    expect(shouldRenderLastUpdated(calcTimestampDaysAgo(100))).toEqual(true);
-  });
-
-  it('should return null if less than 60 days old', () => {
-    expect(shouldRenderLastUpdated(currentTime)).toEqual(false);
-    expect(shouldRenderLastUpdated(calcTimestampDaysAgo(59))).toEqual(false);
-  });
+  it.each`
+    timestamp                                            | scenario                                               | shouldRender
+    ${calcTimestampDaysAgo(61).getTime()}                | ${'date is 61 days ago and timestamp format is unix'}  | ${true}
+    ${new Date(calcTimestampDaysAgo(61)).toISOString()}  | ${'date is 61 days ago and timestamp format is ISO'}   | ${true}
+    ${calcTimestampDaysAgo(100).getTime()}               | ${'date is 100 days ago and timestamp format is unix'} | ${true}
+    ${new Date(calcTimestampDaysAgo(100)).toISOString()} | ${'date is 100 days ago and timestamp format is ISO'}  | ${true}
+    ${currentTime.getTime()}                             | ${'date is now and timestamp format is unix'}          | ${false}
+    ${currentTime.toISOString()}                         | ${'date is now and timestamp format is ISO'}           | ${false}
+    ${calcTimestampDaysAgo(59).getTime()}                | ${'date is 59 days ago and timestamp format is unix'}  | ${false}
+    ${new Date(calcTimestampDaysAgo(59)).toISOString()}  | ${'date is 59 days ago and timestamp format is ISO'}   | ${false}
+  `(
+    'should return $shouldRender for $timestamp because $scenario',
+    ({ timestamp, shouldRender }) => {
+      expect(shouldRenderLastUpdated(timestamp)).toEqual(shouldRender);
+    },
+  );
 });