Merged PR 2285: tweak to live link

tweak to live link

Related work items: #22423

components/case/summary/utils/liveEvent.js

@@ -6,9 +6,15 @@ export function isEventLiveNow(item) {
 
     if (isNaN(start.getTime())) return false;
 
-    if (item.pinswg_enddateoftheevent) {
-        const end = new Date(item.pinswg_enddateoftheevent);
+    const endDateValue =
+        item.pinswg_enddateofevent || item.pinswg_enddateoftheevent;
+
+    if (endDateValue) {
+        const end = new Date(endDateValue);
         if (isNaN(end.getTime())) return false;
+
+        end.setHours(23, 59, 59, 999);
+
         return now >= start && now <= end;
     }
 

components/search/liveLink.js

@@ -1,32 +1,16 @@
-import Link from "next/link";
 import useTranslation from "next-translate/useTranslation";
-
-const isSameDay = (dateA, dateB) =>
-    dateA.getFullYear() === dateB.getFullYear() &&
-    dateA.getMonth() === dateB.getMonth() &&
-    dateA.getDate() === dateB.getDate();
-
-const getLiveEvent = (detailsObj) => {
-    const events = detailsObj?.pinswg_sips_pinswg_sipsevent || [];
-
-    if (!Array.isArray(events) || events.length === 0) return null;
-
-    const now = new Date();
-
-    return events.find((event) => {
-        if (!event?.pinswg_dateeventrequested) return false;
-
-        const eventDate = new Date(event.pinswg_dateeventrequested);
-
-        return isSameDay(eventDate, now);
-    });
-};
+import { getLivePublishedEvent } from "../case/summary/utils/liveEvent";
 
 const LiveLink = ({ detailsObj }) => {
     let { t } = useTranslation();
-    const liveEvent = getLiveEvent(detailsObj);
 
-    if (!liveEvent || !liveEvent.pinswg_linktotheevent) return null;
+    const eventsObj = {
+        value: detailsObj?.pinswg_sips_pinswg_sipsevent || []
+    };
+
+    const liveEvent = getLivePublishedEvent(eventsObj);
+
+    if (!liveEvent) return null;
 
     return (
         <div className="govuk-!-margin-top-3">