Merge branch 'stage' into ecommerce-multi-env

Author: Rene Davila

blocks/form/form.js

@@ -4,6 +4,7 @@ import { readBlockConfig } from '../../scripts/aem.js';
 import { sendDigitalDataEvent } from '../../scripts/martech.js';
 import { getFormName } from './utils.js';
 import { resolveServiceLine } from './ecommerce.js';
+import { buildLeadFormFields } from './submit.js';
 
 export default async function decorate(block) {
   const { container, formDef } = await extractSheetDefinition(block);
@@ -71,7 +72,9 @@ export default async function decorate(block) {
       form.addEventListener('focusin', () => {
         sendDigitalDataEvent({
           event: 'formStart',
+          eventName: 'formStart',
           formName: getFormName(form),
+          ...buildLeadFormFields(form),
         });
       }, { once: true });
 

blocks/form/submit.js

@@ -35,12 +35,14 @@ function readFieldsetLabel(form, classFragment) {
 }
 
 /** modal vs inline, from the form's placement. */
-function getFormType(form) {
+export function getFormType(form) {
   return form.closest('.modal') ? 'modal' : 'inline';
 }
 
-/** header / footer / body, from the form's placement. */
-function getFormSource(form) {
+/** header / footer / body, from the carried opener origin or the form's placement. */
+export function getFormSource(form) {
+  const carried = form.closest('[data-form-source]')?.dataset.formSource;
+  if (carried === 'header' || carried === 'footer' || carried === 'body') return carried;
   if (form.closest('header, .header')) return 'header';
   if (form.closest('footer, .footer')) return 'footer';
   return 'body';
@@ -60,6 +62,23 @@ function collectLeadDataPoints(form) {
   };
 }
 
+/**
+ * The BR.430 field set shared by `formStart` and `formSubmit` — same shape, read fresh at
+ * whatever point the caller fires. PII fields are Y/N presence flags only.
+ * @param {HTMLFormElement} form
+ * @returns {{formType:string, formSource:string, leadId:null, eCommEntryPoint:'N', pageUrl:string}}
+ */
+export function buildLeadFormFields(form) {
+  return {
+    formType: getFormType(form),
+    formSource: getFormSource(form),
+    leadId: null,
+    eCommEntryPoint: 'N',
+    pageUrl: window.location.href,
+    ...collectLeadDataPoints(form),
+  };
+}
+
 /**
  * Fire the `formSubmit` analytics event with the lead-form data points. PII is emitted as Y/N
  * presence flags only. `leadId` is passed through (currently null until the backend returns it).
@@ -100,12 +119,9 @@ function sendDataToAnalytics(form, options = {}) {
     formElement: form,
     quoteType,
     serviceType,
-    formType: getFormType(form),
-    formSource: getFormSource(form),
+    ...buildLeadFormFields(form),
     leadId,
     eCommEntryPoint,
-    pageUrl: window.location.href,
-    ...collectLeadDataPoints(form),
   });
 }
 

blocks/modal/modal.js

@@ -16,6 +16,9 @@ export async function createModal(contentNodes, config) {
   const dialog = document.createElement('dialog');
   const dialogContent = document.createElement('div');
   dialogContent.classList.add('modal-content');
+  if (config?.formSource) {
+    dialogContent.dataset.formSource = config.formSource;
+  }
   dialogContent.append(...contentNodes);
   dialog.append(dialogContent);
 

en-ca/sitemap.xml

@@ -262,7 +262,7 @@
   </url>
   <url>
     <loc>https://www.shredit.com/en-ca/blog/10-most-dangerous-ways-to-dispose-of-hard-drives</loc>
-    <lastmod>2025-07-16</lastmod>
+    <lastmod>2026-09-09</lastmod>
   </url>
   <url>
     <loc>https://www.shredit.com/en-ca/blog/10-reasons-why-all-businesses-need-safeguards</loc>
@@ -280,10 +280,6 @@
     <loc>https://www.shredit.com/en-ca/blog/12-months-until-gdpr-starts</loc>
     <lastmod>2025-07-16</lastmod>
   </url>
-  <url>
-    <loc>https://www.shredit.com/en-ca/blog/12-simple-ways-to-improve-information-security</loc>
-    <lastmod>2025-07-16</lastmod>
-  </url>
   <url>
     <loc>https://www.shredit.com/en-ca/blog/12-ways-to-make-your-home-office-cyber-secure</loc>
     <lastmod>2025-07-16</lastmod>
@@ -448,10 +444,6 @@
     <loc>https://www.shredit.com/en-ca/blog/9-reasons-why-we-need-a-national-data-breach-law</loc>
     <lastmod>2025-07-16</lastmod>
   </url>
-  <url>
-    <loc>https://www.shredit.com/en-ca/blog/9-reasons-an-organizations-reputation-is-important</loc>
-    <lastmod>2025-07-16</lastmod>
-  </url>
   <url>
     <loc>https://www.shredit.com/en-ca/blog/9-surprising-facts-about-medical-identity-theft</loc>
     <lastmod>2025-07-16</lastmod>
@@ -546,7 +538,7 @@
   </url>
   <url>
     <loc>https://www.shredit.com/en-ca/blog/best-ways-to-protect-confidential-information</loc>
-    <lastmod>2025-07-16</lastmod>
+    <lastmod>2026-10-05</lastmod>
   </url>
   <url>
     <loc>https://www.shredit.com/en-ca/blog/ceo-is-not-the-only-one-to-blame-for-a-data-breach</loc>
@@ -904,10 +896,6 @@
     <loc>https://www.shredit.com/en-ca/blog/how-millennials-affect-the-workplace-data-security</loc>
     <lastmod>2025-07-16</lastmod>
   </url>
-  <url>
-    <loc>https://www.shredit.com/en-ca/blog/essential-data-protection-strategies-for-small-businesses</loc>
-    <lastmod>2025-07-16</lastmod>
-  </url>
   <url>
     <loc>https://www.shredit.com/en-ca/blog/employee-retention-and-recruitment-strategy-update</loc>
     <lastmod>2025-07-16</lastmod>