gatsby-core-theme 30.0.46 → 30.0.48

package/CHANGELOG.md

@@ -1,3 +1,22 @@
+## [30.0.48](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v30.0.47...v30.0.48) (2024-01-09)
+
+
+### Bug Fixes
+
+* tracker params ([3047a28](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/3047a289212ecad77bb74391908d5e508a95e0f7))
+
+## [30.0.47](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v30.0.46...v30.0.47) (2024-01-08)
+
+
+### Bug Fixes
+
+* added lang value to .env ([3571ad7](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/3571ad7b0f9b929c13e546a654e313e056b733cf))
+* added prop to hide captions ([ce903f6](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/ce903f67e1f8ff2de59ed976440802633e78e7b3))
+* remove quote marks ([0c5b5d6](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/0c5b5d6e9b85bd8072d3a6bbd18c85968ee44058))
+
+
+* Merge branch 'tm-3969-html-lang' into 'master' ([b94b620](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/b94b62097c889162e9b18915ef3e4239397971a8))
+
 ## [30.0.46](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v30.0.45...v30.0.46) (2024-01-08)
 
 

package/package.json

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

package/src/components/molecules/carousel/default-slide/index.js

@@ -7,10 +7,15 @@ import LazyImage from '~hooks/lazy-image';
 import { imagePrettyUrl, getAltText } from '~helpers/getters';
 import styles from './default-slide.module.scss';
 
-const Slide = ({ item = {}, imageSizes = { width: null, height: 930 }, slideTitle = '' }) => {
+const Slide = ({
+  item = {},
+  imageSizes = { width: null, height: 930 },
+  slideTitle = '',
+  hideCaptions = false,
+}) => {
   return (
     <>
-      {item.title && <span className={styles.title || ''}>{item.title}</span>}
+      {item.title && !hideCaptions && <span className={styles.title || ''}>{item.title}</span>}
       {item.image && (
         <LazyImage
           className={styles.image || ''}
@@ -35,6 +40,7 @@ Slide.propTypes = {
   }),
   primaryBtnText: PropTypes.string,
   secondaryBtnText: PropTypes.string,
+  hideCaptions: PropTypes.bool,
   imageSizes: PropTypes.shape({ width: PropTypes.any, height: PropTypes.any }),
   slideTitle: PropTypes.string,
 };

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

@@ -6,6 +6,7 @@ import { getUrl, getPageImage, imagePrettyUrl } from '~helpers/getters';
 import keygen from '~helpers/keygen';
 
 export function getLanguage(language) {
+  if (process.env.GATSBY_SITE_LANG) return process.env.GATSBY_SITE_LANG;
   if (language === 'no') return 'nb-NO';
   return language || 'en';
 }

package/src/components/pages/tracker/index-ssr.js

@@ -186,7 +186,8 @@ export async function getServerData({ pageContext, headers, url }) {
     pageContext.operator,
     pageContext.page.path,
     pageContext.page,
-    headers
+    headers,
+    url
   );
   return res;
 }

package/src/helpers/tracker.mjs

@@ -39,11 +39,20 @@ function isJsonString(str) {
   return true;
 }
 
+function deparam(paramStr) {
+  const paramArr = paramStr.split('&');     
+  const paramObj = {};
+  paramArr.forEach(e=>{
+      const param = e.split('=');
+      paramObj[param[0]] = decodeURIComponent(param[1]);
+  });
+  return paramObj;
+}
+
 /* eslint-disable no-return-assign */
 /* eslint-disable import/prefer-default-export */
-export async function getAffiliateLink(operator, path, page, headers) {
+export async function getAffiliateLink(operator, path, page, headers, url) {
   const trackerName = await getTrackerName(operator, page, path);
-
   const cookie =
     headers && headers.get('cookie')
       ? headers
@@ -53,6 +62,12 @@ export async function getAffiliateLink(operator, path, page, headers) {
           .reduce((acc, [k, v]) => (acc[k.trim().replace('"', '')] = v) && acc, {})
       : { affObject: JSON.stringify({}) };
 
+
+  let extraParams = null
+  if(url && url.split('?').length === 2) {
+    extraParams = deparam(`${url.split('?')[1]}`);
+  }
+
   const urlParam = {
     site_id: process.env.SITE_ID,
     operator_short_name: operator.short_name,
@@ -62,7 +77,9 @@ export async function getAffiliateLink(operator, path, page, headers) {
     market_short_code: operator.market,
     ip_address: headers ? headers.get('x-real-ip') || headers.get('host') : '127.0.0.1',
     ...(isJsonString(cookie.affObject) ? JSON.parse(cookie.affObject) : {}),
+    ...(extraParams || {})
   };
+
   const res = await fetch(
     `${process.env.GATSBY_TRACKING_API_URL}?${new URLSearchParams(urlParam).toString()}`
   ).catch((err) => null);

package/src/helpers/tracker.test.js

@@ -73,4 +73,33 @@ describe('Tracker Helper', () => {
       `${process.env.GATSBY_TRACKING_API_URL}?${new URLSearchParams(urlParam).toString()}`
     );
   });
+
+  test('getAffiliateLink url params extras', async () => {
+    await Tracker.getAffiliateLink(
+      operator,
+      '/no/visit/rizk',
+      { template: 'default' },
+      null,
+      '/path?extraparam=val&extraparam2=val2'
+    );
+
+    const tracker = Tracker.getTrackerName(operator, 'default', '/no/visit/rizk');
+
+    const urlParam = {
+      site_id: process.env.SITE_ID,
+      operator_short_name: operator.short_name,
+      operator_type: operator.type,
+      language: operator.market.split('_')[1],
+      tracker_name: tracker.name,
+      market_short_code: operator.market,
+      ip_address: '127.0.0.1',
+      extraparam: 'val',
+      extraparam2: 'val2',
+    };
+
+    expect(fetch).toBeCalledTimes(1);
+    expect(fetch).toBeCalledWith(
+      `${process.env.GATSBY_TRACKING_API_URL}?${new URLSearchParams(urlParam).toString()}`
+    );
+  });
 });