gatsby-core-theme 44.6.5 → 44.7.1

package/CHANGELOG.md

@@ -1,3 +1,32 @@
+## [44.7.1](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v44.7.0...v44.7.1) (2025-11-13)
+
+
+### Bug Fixes
+
+* process faq ([4c47357](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/4c473570c2d0beeed83203c3df210886ec14dadb))
+
+# [44.7.0](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v44.6.5...v44.7.0) (2025-11-11)
+
+
+### Bug Fixes
+
+* check if document is defined ([66d9a72](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/66d9a72b0558554f067397eeecc5154babf511e8))
+* check if document is defined ([f494c2e](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/f494c2eb9ac11fde9cca672e19ee188a11f59fa9))
+* check if url is defined ([fd48ca0](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/fd48ca061cf9f28214b2da2fba94df10715d2a5a))
+
+
+* Merge branch 'en-219-aff-object' into 'master' ([dc0c407](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/dc0c4077fe66195a7ec18cb72b822a07a85379fc))
+
+
+### Features
+
+* affObject helper ([9933dd5](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/9933dd593c2de10742a4a6385bf8a66ff6316a82))
+
+
+### Tests
+
+* aff object ([16e96a1](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/16e96a1ae81531a12cfa0c295ff245062076a586))
+
 ## [44.6.5](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v44.6.4...v44.6.5) (2025-11-10)
 
 

package/package.json

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

package/src/helpers/tracker.mjs

@@ -2,6 +2,7 @@
 /* eslint-disable no-underscore-dangle */
 import { generateTrackerLink } from "./generators.mjs";
 import { stripSuffixSlash } from "./strings.mjs";
+import { getCookie } from "./cookies.js";
 
 export function getTrackerName(operator, page, path) {
   const trackerLinks = operator ? Object.keys(operator.links) : [];
@@ -64,25 +65,24 @@ function clean(obj) {
 
 export function filterCfKeys(data) {
   const allowedKeys = [
-    'cf-iplongitude',
-    'cf-iplatitude',
-    'cf-ipcontinent',
-    'cf-ipcity',
-    'cf-region-code',
-    'cf-region',
-    'cf-postal-code',
-    'cf-ipcountry',
+    "cf-iplongitude",
+    "cf-iplatitude",
+    "cf-ipcontinent",
+    "cf-ipcity",
+    "cf-region-code",
+    "cf-region",
+    "cf-postal-code",
+    "cf-ipcountry",
   ];
 
   return Object.keys(data)
-    .filter(key => allowedKeys.includes(key))
+    .filter((key) => allowedKeys.includes(key))
     .reduce((obj, key) => {
       obj[key] = data[key];
       return obj;
     }, {});
 }
 
-
 // Helper to parse cookies from headers
 function parseCookies(headers) {
   const cookies = headers?.get("cookie");
@@ -95,19 +95,21 @@ function parseCookies(headers) {
       acc[key.trim().replace('"', "")] = value;
       return acc;
     }, {});
-};
+}
 
 // Helper to extract URL query parameters
 function extractUrlParams(url) {
   if (!url || !url.includes("?")) return null;
   return deparam(url.split("?")[1]);
-};
+}
 
 // Helper to construct URL parameters
 function buildUrlParams(operator, trackerName, headers, cookie, extraParams) {
   const ip = headers?.get("x-real-ip") || headers?.get("host") || "127.0.0.1";
   const userAgent = headers?.get("user-agent") || null;
-  const affObject = isJsonString(cookie.affObject) ? JSON.parse(cookie.affObject) : {};
+  const affObject = isJsonString(cookie.affObject)
+    ? JSON.parse(cookie.affObject)
+    : {};
 
   if (extraParams && extraParams.pt) affObject.module = extraParams.pt;
 
@@ -130,10 +132,12 @@ function buildUrlParams(operator, trackerName, headers, cookie, extraParams) {
     facebook_pixel_id: process.env.PIXEL_ID || null,
     cookie: JSON.stringify(cookie),
     ...(affObject || {}),
-    ...(affObject && !affObject.referer ? { referer: headers?.get("referrer") } : {}),
+    ...(affObject && !affObject.referer
+      ? { referer: headers?.get("referrer") }
+      : {}),
     ...(extraParams || {}),
   };
-};
+}
 
 // Main function
 export async function getAffiliateLink(operator, path, page, headers, url) {
@@ -141,8 +145,14 @@ export async function getAffiliateLink(operator, path, page, headers, url) {
     const trackerName = await getTrackerName(operator, page, path);
     const cookie = parseCookies(headers);
     const extraParams = extractUrlParams(url);
-    
-    const urlParam = buildUrlParams(operator, trackerName, headers, cookie, extraParams);
+
+    const urlParam = buildUrlParams(
+      operator,
+      trackerName,
+      headers,
+      cookie,
+      extraParams
+    );
 
     const queryString = new URLSearchParams(clean(urlParam)).toString();
     const trackingUrl = `${process.env.GATSBY_TRACKING_API_URL}?${queryString}`;
@@ -154,12 +164,44 @@ export async function getAffiliateLink(operator, path, page, headers, url) {
     // Parse the response
     const data = res.ok ? await res.json() : { success: false };
     return { props: data };
-    
   } catch (error) {
     console.error("Error fetching affiliate link:", error);
     return { props: { success: false } };
   }
 }
+export function getSocialIDs(url) {
+  const affObject = {};
+
+  if (url && url.split("?").length === 2) {
+    // eslint-disable-next-line prefer-destructuring
+    affObject.request_url = url.split("?")[0];
+    const extraData = deparam(url.split("?")[1]);
+
+    if (extraData.msclkid) {
+      affObject.microsoft_click_id = extraData.msclkid;
+    }
+
+    if (extraData.gclid) {
+      affObject.google_click_id = extraData.gclid;
+    }
+    if (extraData.fbclid) {
+      affObject.facebook_click_id = extraData.fbclid;
+    }
+  } else if (url) {
+    affObject.request_url = url;
+  }
+  if (typeof document !== "undefined") {
+    const facebookBrowserId = getCookie("_fbp");
+
+    if (facebookBrowserId) affObject.facebook_browser_id = facebookBrowserId;
+  }
+
+  const pixelId = process.env.PIXEL_ID;
+
+  if (pixelId) affObject.facebook_pixel_id = pixelId;
+
+  return affObject;
+}
 
 export function getTrackingAPIParams(
   pageTemplate,
@@ -172,7 +214,6 @@ export function getTrackingAPIParams(
   itemPosition
 ) {
   const urlParams = {};
-  let extraData = {};
 
   if (pageTemplate) {
     urlParams.page_type = pageTemplate;
@@ -199,25 +240,7 @@ export function getTrackingAPIParams(
   if (itemPosition) {
     urlParams.module_click_position = itemPosition;
   }
-
-  if (url && url.split("?").length === 2) {
-    // eslint-disable-next-line prefer-destructuring
-    urlParams.request_url = url.split("?")[0];
-    extraData = deparam(url.split("?")[1]);
-
-    if (extraData.msclkid) {
-      extraData.microsoft_click_id = extraData.msclkid;
-      delete extraData.msclkid;
-    }
-
-    if (extraData.gclid) {
-      extraData.google_click_id = extraData.gclid;
-      delete extraData.gclid;
-    }
-  } else if (url) {
-    urlParams.request_url = url;
-  }
-
+  const extraData = getSocialIDs(url);
   return { ...urlParams, ...extraData };
 }
 

package/src/helpers/tracker.test.js

@@ -18,7 +18,17 @@ describe("Tracker Helper", () => {
     market: "ie_en",
     links: {},
   };
-
+  test("getSocialIDs", () => {
+    const affObject = Tracker.getSocialIDs(
+      "https://example.com?fbclid=12345&gclid=67890&msclkid=abcde"
+    );
+    expect(affObject).toEqual({
+      request_url: "https://example.com",
+      facebook_click_id: "12345",
+      google_click_id: "67890",
+      microsoft_click_id: "abcde",
+    });
+  });
   test("trackerLinkActive with main tracker", () => {
     const trackerValid = Tracker.trackerLinkActive(operator);
     expect(trackerValid).toEqual("testing main link");
@@ -115,7 +125,7 @@ describe("Tracker Helper", () => {
       tracker_name: tracker.name,
       market_short_code: operator.market,
       ip_address: "127.0.0.1",
-      cookie: '{"affObject":"{}"}'
+      cookie: '{"affObject":"{}"}',
     };
 
     expect(fetch).toHaveBeenCalledTimes(1);
@@ -158,55 +168,55 @@ describe("Tracker Helper", () => {
     expect(params.request_url).toEqual("urlValue");
   });
 
-  test('should only return the allowed cf- keys', () => {
+  test("should only return the allowed cf- keys", () => {
     const inputData = {
-      'cf-iplongitude': '6.91320',
-      'cf-iplatitude': '52.32560',
-      'cf-ipcontinent': 'EU',
-      'cf-ipcity': 'Oldenzaal',
-      'cf-region-code': 'OV',
-      'cf-region': 'Overijssel',
-      'cf-postal-code': '7577',
-      'cf-ipcountry': 'NL',
-      'cf-ray': '8c1ea35e39439a30', // Should be filtered out
-      'some-other-key': 'test', // Should be filtered out
+      "cf-iplongitude": "6.91320",
+      "cf-iplatitude": "52.32560",
+      "cf-ipcontinent": "EU",
+      "cf-ipcity": "Oldenzaal",
+      "cf-region-code": "OV",
+      "cf-region": "Overijssel",
+      "cf-postal-code": "7577",
+      "cf-ipcountry": "NL",
+      "cf-ray": "8c1ea35e39439a30", // Should be filtered out
+      "some-other-key": "test", // Should be filtered out
     };
 
     const expectedOutput = {
-      'cf-iplongitude': '6.91320',
-      'cf-iplatitude': '52.32560',
-      'cf-ipcontinent': 'EU',
-      'cf-ipcity': 'Oldenzaal',
-      'cf-region-code': 'OV',
-      'cf-region': 'Overijssel',
-      'cf-postal-code': '7577',
-      'cf-ipcountry': 'NL',
+      "cf-iplongitude": "6.91320",
+      "cf-iplatitude": "52.32560",
+      "cf-ipcontinent": "EU",
+      "cf-ipcity": "Oldenzaal",
+      "cf-region-code": "OV",
+      "cf-region": "Overijssel",
+      "cf-postal-code": "7577",
+      "cf-ipcountry": "NL",
     };
 
     expect(Tracker.filterCfKeys(inputData)).toEqual(expectedOutput);
   });
 
-  test('should return an empty object if none of the allowed keys are present', () => {
+  test("should return an empty object if none of the allowed keys are present", () => {
     const inputData = {
-      'cf-ray': '8c1ea35e39439a30',
-      'cf-visitor': '{"scheme":"https"}',
-      'random-key': 'random-value',
+      "cf-ray": "8c1ea35e39439a30",
+      "cf-visitor": '{"scheme":"https"}',
+      "random-key": "random-value",
     };
 
     expect(Tracker.filterCfKeys(inputData)).toEqual({});
   });
 
-  test('should return the correct keys even if some allowed keys are missing', () => {
+  test("should return the correct keys even if some allowed keys are missing", () => {
     const inputData = {
-      'cf-iplatitude': '52.32560',
-      'cf-ipcity': 'Oldenzaal',
-      'cf-postal-code': '7577',
+      "cf-iplatitude": "52.32560",
+      "cf-ipcity": "Oldenzaal",
+      "cf-postal-code": "7577",
     };
 
     const expectedOutput = {
-      'cf-iplatitude': '52.32560',
-      'cf-ipcity': 'Oldenzaal',
-      'cf-postal-code': '7577',
+      "cf-iplatitude": "52.32560",
+      "cf-ipcity": "Oldenzaal",
+      "cf-postal-code": "7577",
     };
 
     expect(Tracker.filterCfKeys(inputData)).toEqual(expectedOutput);
@@ -221,7 +231,7 @@ describe("Tracker Helper", () => {
       "urlValue?fbclid=param1&msclkid=param2&gclid=param3"
     );
     expect(params.request_url).toEqual("urlValue");
-    // expect(params.facebook_click_id).toEqual('param1');
+    expect(params.facebook_click_id).toEqual("param1");
     expect(params.microsoft_click_id).toEqual("param2");
     expect(params.google_click_id).toEqual("param3");
   });

package/src/resolver/modules.mjs

@@ -283,7 +283,8 @@ export function processCardsV2(
       prefilledFilters?.providers;
 
     const moduleSelectedTypes =
-      (module?.cards_selector_filters && module?.cards_selector_filters.types) ||
+      (module?.cards_selector_filters &&
+        module?.cards_selector_filters.types) ||
       prefilledFilters?.types;
 
     const limit =
@@ -602,7 +603,6 @@ export function processFaq(module = {}, content, relationData, previewPageID) {
               )) ||
               ""
       );
-      item.answer = trailingSlash(content ? content[item.answer] : "");
     });
 }