gatsby-core-theme 42.0.8 → 42.0.10

package/CHANGELOG.md

@@ -1,3 +1,24 @@
+## [42.0.10](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v42.0.9...v42.0.10) (2025-02-14)
+
+
+### Bug Fixes
+
+* add the trackerlink on operator banner function ([e532ee2](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/e532ee2f81d21102b4ba63a22ec67ebab37a9392))
+* sports schedule data ([7ac242c](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/7ac242c7ab46e2ff0b2836a340bf95f7eb540dbd))
+* update floating area to hide sticky cta when no tracker link present ([c6efe93](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/c6efe936aa3bb3783cc7275983c036599e7d777e))
+* update tracker link import ([6d89daa](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/6d89daa6b787c066e39effd0e6a1bed5f1e5c8c5))
+* update trackerLinkActive path ([e01b5b5](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/e01b5b5d305024d9f6fa39727f134c1cece54cc5))
+
+
+* Merge branch 'tm-5218-hide-sticky-cta-conditionally' into 'master' ([5cdb94e](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/5cdb94e82455e56a49ee46865d5d5a9e25f1fcff))
+
+## [42.0.9](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v42.0.8...v42.0.9) (2025-02-13)
+
+
+### Bug Fixes
+
+* add button key as props ([68fdc3b](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/68fdc3b483b5a07f95200fa71828393d74077a4c))
+
 ## [42.0.8](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v42.0.7...v42.0.8) (2025-02-13)
 
 

package/package.json

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

package/src/components/atoms/header-operator-bannner/index.js

@@ -7,6 +7,7 @@ import { TrackingKeys } from '~constants/tracking-api'
 import { getAltText, imagePrettyUrl } from '~helpers/getters'
 
 import styles from './header-operator-bannner.module.scss'
+import { trackerLinkActive } from "~helpers/tracker.mjs";
 
 const HeaderOperatorBaner = ({
   operator,
@@ -56,17 +57,9 @@ const HeaderOperatorBaner = ({
       </>
     )
   }
-
-  const trackerLinkActive = () => {
-    if (!operator || !operator?.links) {
-      return false
-    }
-
-    return operator?.links[template] || operator?.links?.main
-  }
-
+  
   return (
-    trackerLinkActive() && (
+    trackerLinkActive(operator) && (
       <div className={`${styles.operatorBanner}`}>
         {logo?.filename && (
           <LazyImage

package/src/components/molecules/floating-area/index.js

@@ -10,9 +10,11 @@ import { TrackingKeys } from "~constants/tracking-api";
 import { mainSettings } from "../../../constants/site-settings/main";
 import styles from "./floating-area.module.scss";
 import { layout } from "../../../constants/site-settings/navigation";
+import { trackerLinkActive } from "~helpers/tracker.mjs";
 
 const showOperatorBanner = (operator, pageTemplate) =>
   mainSettings[pageTemplate]?.operator_banner &&
+  trackerLinkActive(operator) &&
   !["not_recommended", "inactive", "blacklisted", "coming_soon"].includes(
     operator.status
   );

package/src/components/molecules/newsletter/form/index.js

@@ -13,6 +13,7 @@ const NewsletterForm = ({
   handleApi,
   redirectUrl,
   submitText = "Submit",
+  buttonKey = "send_button",
   market,
   setErr,
   path,
@@ -33,6 +34,7 @@ const NewsletterForm = ({
         setIP(data.ip)
       })
       .catch((err) => {
+        // eslint-disable-next-line no-console
         console.log(`Error ${err}`);
       });
   };
@@ -95,6 +97,7 @@ const NewsletterForm = ({
       customeSubmit={handelSubmit}
       customError
       buttonLabel={submitText}
+      buttonKey={buttonKey}
       path={path}
       showLabels={showLabels}
       titleType={titleType}
@@ -113,6 +116,7 @@ NewsletterForm.propTypes = {
   showLabels: PropTypes.bool,
   titleType: PropTypes.string,
   buttonIcon: PropTypes.element,
+  buttonKey: PropTypes.string
 };
 
 export default NewsletterForm;

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

@@ -18,6 +18,7 @@ const FormComponent = ({
   hasButton = true,
   showButtonIcon = true,
   buttonLabel = 'Submit',
+  buttonKey = 'send_button',
   disabled = true,
   showLabels = true,
   customeSubmit = null,
@@ -193,7 +194,7 @@ const FormComponent = ({
             <button disabled={state.loading} className={styles.formButton || ''} type="submit">
               {state.loading
                 ? useTranslate('loading_btn', 'sending...')
-                : useTranslate('send_button', buttonLabel)}
+                : useTranslate(buttonKey, buttonLabel)}
               {showButtonIcon ? (
                 buttonIcon
               ) : null}
@@ -230,5 +231,6 @@ FormComponent.propTypes = {
   path: PropTypes.string,
   titleType: PropTypes.string,
   buttonIcon: PropTypes.element,
+  buttonKey: PropTypes.string
 };
 export default FormComponent;

package/src/helpers/schedule.mjs

@@ -9,19 +9,24 @@ export function zeroPadding(num, places) {
 export function filterScheduleByDate(schedule) {
   const today = new Date().setHours(0, 0, 0, 0);
   let todayFound = false;
-  Object.keys(schedule.soccer).forEach((key) => {
+  let todayNextIndex = null;
+  Object.keys(schedule.soccer).forEach((key, index) => {
     if (new Date(key).setHours(0, 0, 0, 0) === today) {
       schedule.soccer[key] = { ...schedule.soccer[key], active: true};
       todayFound = true;
+      todayNextIndex = index;
     }
   });
 
+
+
   let nextDay = false;
   if(!todayFound) {
-    Object.keys(schedule.soccer).forEach((key) => {
+    Object.keys(schedule.soccer).forEach((key, index) => {
       if (!nextDay && new Date(key).setHours(0, 0, 0, 0) > today) {
         schedule.soccer[key] = { ...schedule.soccer[key], active: true};
         nextDay = true;
+        todayNextIndex = index;
       }
     });
   }
@@ -34,6 +39,13 @@ export function filterScheduleByDate(schedule) {
     }
   }
 
+  if(todayNextIndex !== null && todayNextIndex - 2 > 0) {
+    const indexSlice = todayNextIndex - 2;
+    const entries = Object.entries(schedule.soccer);
+    const remainingEntries = entries.slice(indexSlice);
+    schedule.soccer = Object.fromEntries(remainingEntries);
+  }
+
   return schedule;
 }