gatsby-core-theme 44.2.16 → 44.2.18

package/CHANGELOG.md

@@ -1,3 +1,32 @@
+## [44.2.18](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v44.2.17...v44.2.18) (2025-06-23)
+
+
+### Bug Fixes
+
+* add time translations for notifications ([8635372](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/8635372cb96cd6afb817bd25b1f6d094b16c077f))
+* add translation ([3646134](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/36461348749e99752e08ff4fc16ff8c11b9861bf))
+* conflicts ([b4a714f](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/b4a714f50b5da363067570f425be34be3b49cbd8))
+* operator cta ([2498397](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/24983978555b5d72b19e4e55e9c981266e4dcd4c))
+* resolve mentioned issues ([efc2af3](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/efc2af3c70a2d000246d7b626ff7b681e5dd10b7))
+* test ([4e99e0b](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/4e99e0ba5fe28f0997d33379fd4b22e62de43334))
+* test ([5b776de](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/5b776def206fd0472a53a3e44ded5505ffeda13c))
+* test ([3c20ccb](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/3c20ccb5e3d6d7a0ca2ed4d227da330de016deb2))
+* validate data ([d76d52b](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/d76d52b3b58cb5412b6436fd8845482f61d2960c))
+
+
+* Merge branch 'tm-5453-cta-button' into 'master' ([5fd74f4](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/5fd74f4a828e8520e516760c0f462292866f7f19))
+* Merge branch 'tm-5536-time-translations' into 'master' ([d7f6855](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/d7f68553a167bddbdf44a4c5e091d491f4d735c4))
+
+## [44.2.17](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v44.2.16...v44.2.17) (2025-06-20)
+
+
+### Bug Fixes
+
+* autosuggest logic ([75fb409](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/75fb409a4b6f72d93adbb4b98525ba655599e51b))
+
+
+* Merge branch 'tm-5552-autosuggest-logic' into 'master' ([6520798](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/6520798d46a2be6beaf5ff24f8bb37aad90de7dc))
+
 ## [44.2.16](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v44.2.15...v44.2.16) (2025-06-19)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gatsby-core-theme",
-  "version": "44.2.16",
+  "version": "44.2.18",
   "description": "Gatsby Theme NPM Package",
   "author": "",
   "license": "ISC",

package/src/components/atoms/admin/bar/layout-section/index.js

@@ -12,9 +12,9 @@ const LayoutSection = ({ menus }) => {
       case "page":
         return `site-pages/${id}`;
       case "operator":
-        return `operators/${id.operator_id}/sites-data/edit/${id.id}`;
+        return `operators/${id?.operator_id}/sites-data/edit/${id?.id}`;
       case "game":
-        return `games/${id.game_id}/sites?site_name=${process.env.GATSBY_SITE_NAME}`;
+        return `games/${id?.game_id}/sites?site_name=${process.env.GATSBY_SITE_NAME}`;
       case "author":
         return `site-authors/${id}`;
       case "payment_method":
@@ -40,9 +40,9 @@ const LayoutSection = ({ menus }) => {
                 <li key={keygen()}>
                   <Redirect
                     icon={link?.icon}
-                    path={paths(link?.type, link.data)}
-                    linkText={link.buttonText}
-                    description={link.description}
+                    path={paths(link?.type, link?.data)}
+                    linkText={link?.buttonText}
+                    description={link?.description}
                   />
                 </li>
               ))}

package/src/components/atoms/button/operator-cta.js

@@ -95,8 +95,7 @@ const OperatorCtaButton = ({
     } `;
 
   return (
-    trackerLinkActive(operator, tracker) &&
-    (status === "active" ? (
+    trackerLinkActive(operator, tracker) && status === "active" ? (
       <a
         href={prettyLink || "#"}
         title={`${typeof translateBtn === "string" ? translateBtn : ""} ${titleSuffix || ""
@@ -121,7 +120,6 @@ const OperatorCtaButton = ({
         {icon && icon}
       </div>
     ))
-  )
 }
 
 OperatorCtaButton.propTypes = {

package/src/components/atoms/notifications/notification-items/cards-v2/index.js

@@ -1,3 +1,5 @@
+
+/* eslint-disable react/prop-types */
 import React from "react";
 import PropTypes from "prop-types";
 import LazyImage from "~hooks/lazy-image";
@@ -7,38 +9,14 @@ import { imagePrettyUrl, getExtraField } from "~helpers/getters";
 import { getAltText, getImageFilename } from "~helpers/image";
 import useTranslate from "~hooks/useTranslate/useTranslate";
 import CloseIcon from "~images/icons/close";
+import { getTimeAgo } from "~helpers/date-time";
 import styles from "./notification-items.module.scss";
 
 const CardsItems = ({ module, onClose, useBanner = false }) => {
   const { items } = module;
   const noNewUpdates = useTranslate("noNewUpdates", "No new items");
 
-  const getTimeAgo = (dateString) => {
-    const date = new Date(dateString.replace(" ", "T")); // Make it ISO-compliant
-    const now = new Date();
-
-    const diffMs = now.getTime() - date.getTime();
-    const diffMinutes = Math.floor(diffMs / (1000 * 60));
-    const diffHours = Math.floor(diffMinutes / 60);
-    const diffDays = Math.floor(diffHours / 24);
-    const diffMonths = Math.floor(diffDays / 30);
-
-    let timeAgo = "";
-
-    if (diffDays >= 32) {
-      timeAgo = `${diffMonths} month${diffMonths > 1 ? "s" : ""} ago`;
-    } else if (diffDays >= 1) {
-      timeAgo = `${diffDays} day${diffDays > 1 ? "s" : ""} ago`;
-    } else if (diffHours >= 1) {
-      timeAgo = `${diffHours} hour${diffHours > 1 ? "s" : ""} ago`;
-    } else {
-      timeAgo = `${diffMinutes} minute${diffMinutes !== 1 ? "s" : ""} ago`;
-    }
-
-    return timeAgo;
-  };
-
-  const content = (item) => {
+  const Content = ({ item }) => {
     const priorityImage = useBanner
       ? item?.banner || item?.relation?.logo?.fileName
       : item?.relation?.logo?.fileName;
@@ -52,6 +30,14 @@ const CardsItems = ({ module, onClose, useBanner = false }) => {
     const TitleTag = item?.title_tag || "label";
     const ribbon = getExtraField(item?.extra_fields, "notification_ribbon");
 
+    const { key, value } = getTimeAgo(
+      item?.manual_updated_at ||
+      item?.updated_at ||
+      item?.manual_created_at ||
+      item?.created_at
+    );
+    const timeAgo = `${value} ${useTranslate(key, key?.replace("_", " "))}`;
+
     return (
       <div className={styles.notificationContent}>
         {img && (
@@ -77,12 +63,7 @@ const CardsItems = ({ module, onClose, useBanner = false }) => {
             <div className={styles.ribbonAndTime}>
               {ribbon && <span className={styles.ribbon}>{ribbon}</span>}
               <span className={styles.extraContent}>
-                {getTimeAgo(
-                  item?.manual_updated_at ||
-                    item?.updated_at ||
-                    item?.manual_created_at ||
-                    item?.created_at
-                )}
+                {timeAgo}
               </span>
             </div>
           )}
@@ -90,6 +71,7 @@ const CardsItems = ({ module, onClose, useBanner = false }) => {
       </div>
     );
   };
+
   return (
     <div className={styles.container || ""}>
       <div className={styles.notificationsContainer || ""}>
@@ -120,7 +102,7 @@ const CardsItems = ({ module, onClose, useBanner = false }) => {
                   className={`${styles.notificationLink} cards-gtm`}
                   aria-label={`${item?.title} Link`}
                 >
-                  {content(item)}
+                  <Content item={item} />
                 </Link>
               </li>
             ))}

package/src/components/organisms/search/index.js

@@ -269,7 +269,7 @@ const SearchForm = ({
                 )}
               </div>
             )}
-            {(showRecommendedCasinos || showTopSearches) && (!filteredData || filteredData.length === 0) && (
+            {(showRecommendedCasinos || showTopSearches) && (!filteredData || filteredData.length === 0) && !autoCompleteLoading && (
               <VariableComponent
                 recommendedCasinos={recommendedCasinos}
                 topSearches={topSearches}

package/src/components/organisms/search/variable/index.js

@@ -28,7 +28,7 @@ const VariableComponent = ({
     >
       {showTopSearches && (
         <div className={styles.topSearches}>
-          <p>Top Searches:</p>
+          <p>{useTranslate("top_searches_bar", "Top Searches:")}</p>
           {topSearches?.map((item) => (
             <Link key={item.id} to={item?.link?.value}>
               {item?.label}

package/src/components/organisms/search/variable/searchVariable.test.js

@@ -29,8 +29,6 @@ describe("VariableComponent", () => {
       />
     );
 
-    expect(screen.getByText("Top Searches:")).toBeInTheDocument();
-
     topSearches.forEach((item) => {
       expect(screen.getByText(item.label)).toBeInTheDocument();
     });

package/src/helpers/date-time.js

@@ -28,3 +28,25 @@ export function formatDate(date, format, separator = '/', market = 'en-GB') {
   }
   return formattedDate;
 }
+
+export const getTimeAgo = (dateString) => {
+  const date = new Date(dateString.includes('Z') ? dateString : `${dateString.replace(" ", "T")}Z`);
+  const now = new Date(new Date().toISOString().slice(0, 19));
+
+  const diffMs = now.getTime() - date.getTime();
+  const diffMinutes = Math.floor(diffMs / (1000 * 60));
+  const diffHours = Math.floor(diffMinutes / 60);
+  const diffDays = Math.floor(diffHours / 24);
+  const diffMonths = Math.floor(diffDays / 30);
+
+  if (diffDays >= 32) {
+    return { value: diffMonths, key: diffMonths === 1 ? "month_ago" : "months_ago" };
+  }
+  if (diffDays >= 1) {
+    return { value: diffDays, key: diffDays === 1 ? "day_ago" : "days_ago" };
+  }
+  if (diffHours >= 1) {
+    return { value: diffHours, key: diffHours === 1 ? "hour_ago" : "hours_ago" };
+  }
+  return { value: diffMinutes, key: diffMinutes === 1 ? "minute_ago" : "minutes_ago" };
+};

package/src/helpers/date-time.test.js

@@ -1,4 +1,4 @@
-import { formatDate } from './date-time';
+import { formatDate, getTimeAgo } from './date-time';
 
 describe('Date-Time Helper', () => {
   test('formatDate()', () => {
@@ -7,4 +7,19 @@ describe('Date-Time Helper', () => {
     expect(formatDate('2020-04-23 11:45:10', 'MMM YYYY', '/', 'en-US')).toEqual('April 2020');
     expect(formatDate('2020-04-23 11:45:10', 'DD/MM/YYYY', '@@', 'en-US')).toEqual('04@@23@@2020');
   });
+
+
+  test('getTimeAgo()', () => {
+  const nowUTC = new Date(new Date().toISOString().slice(0, 19));
+
+  const minutesAgo = new Date(nowUTC.getTime() - 5 * 60 * 1000).toISOString().slice(0, 19); // 5 mins ago
+  const hoursAgo = new Date(nowUTC.getTime() - 2 * 60 * 60 * 1000).toISOString().slice(0, 19); // 2 hours ago
+  const daysAgo = new Date(nowUTC.getTime() - 10 * 24 * 60 * 60 * 1000).toISOString().slice(0, 19); // 10 days ago
+  const monthsAgo = new Date(nowUTC.getTime() - 65 * 24 * 60 * 60 * 1000).toISOString().slice(0, 19); // ~2 months ago
+
+  expect(getTimeAgo(minutesAgo)).toMatchObject({ key: 'minutes_ago', value: 5 });
+  expect(getTimeAgo(hoursAgo)).toMatchObject({ key: 'hours_ago', value: 2 });
+  expect(getTimeAgo(daysAgo)).toMatchObject({ key: 'days_ago', value: 10 });
+  expect(getTimeAgo(monthsAgo)).toMatchObject({ key: 'months_ago', value: 2 });
+});
 });