gatsby-core-theme 44.0.11 → 44.0.13

package/CHANGELOG.md

@@ -1,3 +1,24 @@
+## [44.0.13](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v44.0.12...v44.0.13) (2025-04-04)
+
+
+### Bug Fixes
+
+* add button for load more ([d16d21b](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/d16d21bf6c5bed846a062de234ce443a58fec8f7))
+* load more defaults ([7e00473](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/7e004730369a8efbaac84889b445a5d7af2ed629))
+
+
+* Merge branch 'tm-5374-loadmore' into 'master' ([53d0c78](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/53d0c78d6099efbf70484cc93849108a57843367))
+
+## [44.0.12](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v44.0.11...v44.0.12) (2025-04-03)
+
+
+### Bug Fixes
+
+* include cookie in tracker api ([a4a5968](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/a4a5968cacd3a5dfbcc381e3156f762d0541ff53))
+
+
+* Merge branch 'tracker_api' into 'master' ([bba03b2](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/bba03b25cbfb19ecd33865f0aae67c7ee62ecfa4))
+
 ## [44.0.11](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v44.0.10...v44.0.11) (2025-04-03)
 
 

package/package.json

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

package/src/components/atoms/button/button.js

@@ -1,26 +1,34 @@
-import React from 'react';
-import PropTypes from 'prop-types';
+import React from "react";
+import PropTypes from "prop-types";
 
-import Link from '~hooks/link';
-import styles from './button.module.scss';
+import Link from "~hooks/link";
+import styles from "./button.module.scss";
 
 function Button({
   to = null,
-  btnText = 'Play now',
+  btnText = "Play now",
   targetBlank = false,
-  buttonType = 'primary',
-  buttonSize = 'm',
+  buttonType = "primary",
+  buttonSize = "m",
   isInternalLink = true,
   onClick = null,
   icon = null,
+  tag = "a",
 }) {
-  const classes = `${styles[buttonType] || ''} ${buttonSize ? styles[`${buttonSize}_size`] : ''} `;
+  const classes = `${styles[buttonType] || ""} ${
+    buttonSize ? styles[`${buttonSize}_size`] : ""
+  } `;
 
-  const btnTitle = typeof btnText === 'string' ? btnText : '';
+  const btnTitle = typeof btnText === "string" ? btnText : "";
 
   if (isInternalLink) {
     return (
-      <Link className={`${classes}`} to={to} title={btnTitle} aria-label={btnTitle}>
+      <Link
+        className={`${classes}`}
+        to={to}
+        title={btnTitle}
+        aria-label={btnTitle}
+      >
         {btnText}
         {icon && icon}
       </Link>
@@ -32,24 +40,34 @@ function Button({
 
   if (onClick) {
     extraProps = {
-      role: 'button',
+      role: "button",
     };
   }
 
-  return (
-    <a
-      title={btnTitle}
-      aria-label={btnTitle}
-      target={targetBlank ? '_blank' : ''}
-      rel="nofollow"
-      className={`${classes || ''}`}
-      {...linkAttr}
-      {...extraProps}
-    >
-      {btnText}
-      {icon && icon}
-    </a>
-  );
+  switch (tag) {
+    case "button":
+      return (
+        <button type="button" onClick={onClick} className={`${classes || ""}`}>
+          {btnText}
+          {icon && icon}
+        </button>
+      );
+    default:
+      return (
+        <a
+          title={btnTitle}
+          aria-label={btnTitle}
+          target={targetBlank ? "_blank" : ""}
+          rel="nofollow"
+          className={`${classes || ""}`}
+          {...linkAttr}
+          {...extraProps}
+        >
+          {btnText}
+          {icon && icon}
+        </a>
+      );
+  }
 }
 
 Button.propTypes = {
@@ -61,6 +79,7 @@ Button.propTypes = {
   buttonType: PropTypes.string,
   buttonSize: PropTypes.string,
   onClick: PropTypes.func,
+  tag: PropTypes.string,
 };
 
 export default Button;

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

@@ -26,7 +26,7 @@ const TopList = ({
         toplist={toplist}
         hasLoadMoreButton={toplist.show_load_more}
         initItemsCount={toplist.num_items_initial_load || 0}
-        loadItemsCount={toplist.num_items_load_more}
+        loadItemsCount={toplist.num_items_load_more || 0}
         pageTemplate={page?.template}
         moduleName={moduleName}
         module={module}

package/src/components/organisms/toplist/list/index.js

@@ -1,10 +1,10 @@
 /* eslint-disable no-return-assign */
-import React, { useRef } from 'react'
-import PropTypes from 'prop-types'
-import keygen from '~helpers/keygen'
-import Button from '~atoms/button/button'
-import Row from '~molecules/toplist/default-row'
-import styles from './list.module.scss'
+import React, { useRef } from "react";
+import PropTypes from "prop-types";
+import keygen from "~helpers/keygen";
+import Button from "~atoms/button/button";
+import Row from "~molecules/toplist/default-row";
+import styles from "./list.module.scss";
 
 export default function List({
   toplist,
@@ -15,42 +15,44 @@ export default function List({
   moduleName,
   pagePath,
   modulePosition,
-  buttonType = 'tertiary',
-  buttonSize = 'm',
+  buttonType = "tertiary",
+  buttonSize = "m",
 }) {
   const initLoadItems =
-    Number(initItemsCount) !== 0 ? Number(initItemsCount) : 10000
+    Number(initItemsCount) !== 0 ? Number(initItemsCount) : 10000;
   const loadingItems =
-    Number(loadItemsCount) !== 0 ? Number(loadItemsCount) : 10000
+    Number(loadItemsCount) !== 0 ? Number(loadItemsCount) : 10000;
 
-  const elRefs = useRef([])
+  const elRefs = useRef([]);
 
-  const loadMoreBtn = useRef(React.createRef())
+  const loadMoreBtn = useRef(React.createRef());
   const showLoadMoreButton =
-    hasLoadMoreButton === '1' && Number(initItemsCount) !== 0
+    hasLoadMoreButton === "1" && Number(initItemsCount) !== 0;
 
   function handleClick() {
     const displayed = elRefs.current.filter((item) =>
       item.classList.contains(styles.show)
-    ).length
-    const nextItem = loadingItems + displayed
+    ).length;
+
+    const nextItem = loadingItems + displayed;
+
     const lastItem =
       nextItem > elRefs.current.length
         ? elRefs.current.length + 1
-        : displayed + loadingItems
+        : displayed + loadingItems;
 
     elRefs.current
       .slice(displayed, lastItem)
-      .forEach((item) => item.classList.toggle(styles.show))
+      .forEach((item) => item.classList.toggle(styles.show));
 
-    if (loadingItems + displayed > elRefs.current.length) {
-      loadMoreBtn.current.classList.toggle(styles.hide)
+    if (loadingItems + displayed >= elRefs.current.length) {
+      loadMoreBtn.current.classList.toggle(styles.hide);
     }
   }
 
   return (
     <>
-      <ol className={styles.list || ''} key={keygen()}>
+      <ol className={styles.list || ""} key={keygen()}>
         {toplist.items?.map((item, index) => (
           <Row
             pagePath={pagePath}
@@ -69,29 +71,30 @@ export default function List({
         ))}
       </ol>
       {showLoadMoreButton && (
-        <div ref={loadMoreBtn} className={styles.loadMore || ''}>
+        <div ref={loadMoreBtn} className={styles.loadMore || ""}>
           <Button
             isInternalLink={false}
             btnText="Load More"
             onClick={() => handleClick()}
             buttonType={buttonType}
             buttonSize={buttonSize}
+            tag="button"
           />
         </div>
       )}
     </>
-  )
+  );
 }
 
 List.propTypes = {
   toplist: PropTypes.shape({
     items: PropTypes.arrayOf(
       PropTypes.shape({
-        name: PropTypes.string
+        name: PropTypes.string,
       })
     ),
     tracker: PropTypes.string,
-    one_liner: PropTypes.string
+    one_liner: PropTypes.string,
   }),
   hasLoadMoreButton: PropTypes.number,
   initItemsCount: PropTypes.string,
@@ -102,4 +105,4 @@ List.propTypes = {
   moduleName: PropTypes.string,
   buttonType: PropTypes.string,
   buttonSize: PropTypes.string,
-}
+};

package/src/helpers/tracker.mjs

@@ -128,6 +128,7 @@ function buildUrlParams(operator, trackerName, headers, cookie, extraParams) {
     split_test_variant: cookie.split_test_variant || null,
     pii_guard_id: cookie._gi || null,
     facebook_pixel_id: process.env.PIXEL_ID || null,
+    cookie: JSON.stringify(cookie),
     ...(affObject || {}),
     ...(affObject && !affObject.referer ? { referer: headers?.get("referrer") } : {}),
     ...(extraParams || {}),

package/src/helpers/tracker.test.js

@@ -115,10 +115,11 @@ describe("Tracker Helper", () => {
       tracker_name: tracker.name,
       market_short_code: operator.market,
       ip_address: "127.0.0.1",
+      cookie: '{"affObject":"{}"}'
     };
 
-    expect(fetch).toBeCalledTimes(1);
-    expect(fetch).toBeCalledWith(
+    expect(fetch).toHaveBeenCalledTimes(1);
+    expect(fetch).toHaveBeenCalledWith(
       `${process.env.GATSBY_TRACKING_API_URL}?${new URLSearchParams(
         urlParam
       ).toString()}`,
@@ -137,7 +138,7 @@ describe("Tracker Helper", () => {
 
     expect(fetch).toHaveBeenCalledTimes(1);
     expect(fetch).toHaveBeenCalledWith(
-      "testlink?site_id=82&operator_short_name=rizk&operator_type=sportsbook&language=en&tracker_name=main&market_short_code=ie_en&ip_address=127.0.0.1&extraparam=val&extraparam2=val2",
+      "testlink?site_id=82&operator_short_name=rizk&operator_type=sportsbook&language=en&tracker_name=main&market_short_code=ie_en&ip_address=127.0.0.1&cookie=%7B%22affObject%22%3A%22%7B%7D%22%7D&extraparam=val&extraparam2=val2",
       { headers: {} }
     );
   });