@4site/engrid-scripts 0.22.8 → 0.22.10

package/dist/data-layer.js

@@ -86,68 +86,50 @@ export class DataLayer {
         return "";
     }
     onLoad() {
+        // Collect all data layer events and variables to push at once
+        const dataLayerData = {};
+        const dataLayerEvents = [];
         if (ENGrid.getGiftProcess()) {
             this.logger.log("EN_SUCCESSFUL_DONATION");
-            this.dataLayer.push({
-                event: "EN_SUCCESSFUL_DONATION",
-            });
+            dataLayerEvents.push("EN_SUCCESSFUL_DONATION");
             this.addEndOfGiftProcessEventsToDataLayer();
         }
         else {
             this.logger.log("EN_PAGE_VIEW");
-            this.dataLayer.push({
-                event: "EN_PAGE_VIEW",
-            });
+            dataLayerEvents.push("EN_PAGE_VIEW");
         }
         if (window.pageJson) {
             const pageJson = window.pageJson;
             for (const property in pageJson) {
                 if (!Number.isNaN(pageJson[property])) {
-                    this.dataLayer.push({
-                        event: `EN_PAGEJSON_${property.toUpperCase()}-${pageJson[property]}`,
-                    });
-                    this.dataLayer.push({
-                        [`'EN_PAGEJSON_${property.toUpperCase()}'`]: pageJson[property],
-                    });
+                    dataLayerEvents.push(`EN_PAGEJSON_${property.toUpperCase()}-${pageJson[property]}`);
+                    dataLayerData[`'EN_PAGEJSON_${property.toUpperCase()}'`] =
+                        pageJson[property];
                 }
                 else {
-                    this.dataLayer.push({
-                        event: `EN_PAGEJSON_${property.toUpperCase()}-${this.transformJSON(pageJson[property])}`,
-                    });
-                    this.dataLayer.push({
-                        [`'EN_PAGEJSON_${property.toUpperCase()}'`]: this.transformJSON(pageJson[property]),
-                    });
+                    dataLayerEvents.push(`EN_PAGEJSON_${property.toUpperCase()}-${this.transformJSON(pageJson[property])}`);
+                    dataLayerData[`'EN_PAGEJSON_${property.toUpperCase()}'`] =
+                        this.transformJSON(pageJson[property]);
                 }
-                this.dataLayer.push({
-                    event: "EN_PAGEJSON_" + property.toUpperCase(),
-                    eventValue: pageJson[property],
-                });
+                dataLayerEvents.push("EN_PAGEJSON_" + property.toUpperCase());
+                dataLayerData.eventValue = pageJson[property];
             }
             if (ENGrid.getPageCount() === ENGrid.getPageNumber()) {
-                this.dataLayer.push({
-                    event: "EN_SUBMISSION_SUCCESS_" + pageJson.pageType.toUpperCase(),
-                });
-                this.dataLayer.push({
-                    [`'EN_SUBMISSION_SUCCESS_${pageJson.pageType.toUpperCase()}'`]: "TRUE",
-                });
+                dataLayerEvents.push("EN_SUBMISSION_SUCCESS_" + pageJson.pageType.toUpperCase());
+                dataLayerData[`'EN_SUBMISSION_SUCCESS_${pageJson.pageType.toUpperCase()}'`] = "TRUE";
             }
         }
         const urlParams = new URLSearchParams(window.location.search);
         urlParams.forEach((value, key) => {
-            this.dataLayer.push({
-                event: `EN_URLPARAM_${key.toUpperCase()}-${this.transformJSON(value)}`,
-            });
-            this.dataLayer.push({
-                [`'EN_URLPARAM_${key.toUpperCase()}'`]: this.transformJSON(value),
-            });
+            dataLayerEvents.push(`EN_URLPARAM_${key.toUpperCase()}-${this.transformJSON(value)}`);
+            dataLayerData[`'EN_URLPARAM_${key.toUpperCase()}'`] =
+                this.transformJSON(value);
         });
         if (ENGrid.getPageType() === "DONATION") {
             const recurrFreqEls = document.querySelectorAll('[name="transaction.recurrfreq"]');
             const recurrValues = [...recurrFreqEls].map((el) => el.value);
-            this.dataLayer.push({
-                event: "EN_RECURRING_FREQUENCIES",
-                [`'EN_RECURRING_FREQEUENCIES'`]: recurrValues,
-            });
+            dataLayerEvents.push("EN_RECURRING_FREQUENCIES");
+            dataLayerData[`'EN_RECURRING_FREQEUENCIES'`] = recurrValues;
         }
         let fastFormFill = false;
         // Fast Form Fill - Personal Details
@@ -156,20 +138,14 @@ export class DataLayer {
             const allPersonalMandatoryInputsAreFilled = FastFormFill.allMandatoryInputsAreFilled(fastPersonalDetailsFormBlock);
             const somePersonalMandatoryInputsAreFilled = FastFormFill.someMandatoryInputsAreFilled(fastPersonalDetailsFormBlock);
             if (allPersonalMandatoryInputsAreFilled) {
-                this.dataLayer.push({
-                    event: "EN_FASTFORMFILL_PERSONALINFO_SUCCESS",
-                });
+                dataLayerEvents.push("EN_FASTFORMFILL_PERSONALINFO_SUCCESS");
                 fastFormFill = true;
             }
             else if (somePersonalMandatoryInputsAreFilled) {
-                this.dataLayer.push({
-                    event: "EN_FASTFORMFILL_PERSONALINFO_PARTIALSUCCESS",
-                });
+                dataLayerEvents.push("EN_FASTFORMFILL_PERSONALINFO_PARTIALSUCCESS");
             }
             else {
-                this.dataLayer.push({
-                    event: "EN_FASTFORMFILL_PERSONALINFO_FAILURE",
-                });
+                dataLayerEvents.push("EN_FASTFORMFILL_PERSONALINFO_FAILURE");
             }
         }
         // Fast Form Fill - Address Details
@@ -178,31 +154,29 @@ export class DataLayer {
             const allAddressMandatoryInputsAreFilled = FastFormFill.allMandatoryInputsAreFilled(fastAddressDetailsFormBlock);
             const someAddressMandatoryInputsAreFilled = FastFormFill.someMandatoryInputsAreFilled(fastAddressDetailsFormBlock);
             if (allAddressMandatoryInputsAreFilled) {
-                this.dataLayer.push({
-                    event: "EN_FASTFORMFILL_ADDRESS_SUCCESS",
-                });
+                dataLayerEvents.push("EN_FASTFORMFILL_ADDRESS_SUCCESS");
                 fastFormFill = fastFormFill ? true : false; // Only set to true if it was true before
             }
             else if (someAddressMandatoryInputsAreFilled) {
-                this.dataLayer.push({
-                    event: "EN_FASTFORMFILL_ADDRESS_PARTIALSUCCESS",
-                });
+                dataLayerEvents.push("EN_FASTFORMFILL_ADDRESS_PARTIALSUCCESS");
             }
             else {
-                this.dataLayer.push({
-                    event: "EN_FASTFORMFILL_ADDRESS_FAILURE",
-                });
+                dataLayerEvents.push("EN_FASTFORMFILL_ADDRESS_FAILURE");
             }
         }
         if (fastFormFill) {
-            this.dataLayer.push({
-                event: "EN_FASTFORMFILL_ALL_SUCCESS",
-            });
+            dataLayerEvents.push("EN_FASTFORMFILL_ALL_SUCCESS");
         }
         else {
-            this.dataLayer.push({
-                event: "EN_FASTFORMFILL_ALL_FAILURE",
-            });
+            dataLayerEvents.push("EN_FASTFORMFILL_ALL_FAILURE");
+        }
+        // Push all collected events individually (GTM requirement)
+        dataLayerEvents.forEach((event) => {
+            this.dataLayer.push({ event });
+        });
+        // Push all collected variables at once
+        if (Object.keys(dataLayerData).length > 0) {
+            this.dataLayer.push(dataLayerData);
         }
         this.attachEventListeners();
     }

package/dist/neverbounce.d.ts

@@ -12,6 +12,7 @@ export declare class NeverBounce {
     private logger;
     private shouldRun;
     private nbLoaded;
+    private bypassEmails;
     constructor(apiKey: string, dateField: string | null, statusField: string | null, dateFormat: string | undefined);
     private init;
     private clearStatus;
@@ -19,5 +20,6 @@ export declare class NeverBounce {
     private setEmailStatus;
     private insertAfter;
     private wrap;
+    private isBypassEmail;
     private validate;
 }

package/dist/neverbounce.js

@@ -14,6 +14,14 @@ export class NeverBounce {
         this.logger = new EngridLogger("NeverBounce", "#039bc4", "#dfdfdf", "📧");
         this.shouldRun = true;
         this.nbLoaded = false;
+        this.bypassEmails = [
+            "noaddress.ea",
+        ];
+        const searchParams = new URLSearchParams(window.location.search);
+        if (searchParams.has("bypassemailvalidation")) {
+            this.logger.log("Bypass Email Validation Enabled - not running NeverBounce");
+            return;
+        }
         this.emailField = document.getElementById("en__field_supporter_emailAddress");
         window._NBSettings = {
             apiKey: this.apiKey,
@@ -154,6 +162,10 @@ export class NeverBounce {
             this.logger.log("E-mail Field Not Found");
             return;
         }
+        if (this.isBypassEmail()) {
+            this.logger.log("Bypass email detected. Skipping status update.");
+            return;
+        }
         // Search page for the NB Wrapper div and set as variable
         const nb_email_field_wrapper = (document.getElementById("nb-wrapper"));
         // Search page for the NB Feedback div and set as variable
@@ -222,6 +234,12 @@ export class NeverBounce {
         (_a = el.parentNode) === null || _a === void 0 ? void 0 : _a.insertBefore(wrapper, el);
         wrapper.appendChild(el);
     }
+    isBypassEmail() {
+        if (!this.emailField || !this.emailField.value)
+            return false;
+        const email = this.emailField.value.toLowerCase();
+        return this.bypassEmails.some((bypassEmail) => email.includes(bypassEmail.toLowerCase()));
+    }
     validate() {
         var _a;
         if (!this.form.validate)
@@ -231,6 +249,10 @@ export class NeverBounce {
             this.logger.log("validate(): Should Not Run. Returning true.");
             return;
         }
+        if (this.isBypassEmail()) {
+            this.logger.log("Bypass email detected. Skipping validation.");
+            return;
+        }
         if (this.nbStatus) {
             this.nbStatus.value = nbResult;
         }

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const AppVersion = "0.22.8";
+export declare const AppVersion = "0.22.10";

package/dist/version.js

@@ -1 +1 @@
-export const AppVersion = "0.22.8";
+export const AppVersion = "0.22.10";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@4site/engrid-scripts",
-  "version": "0.22.8",
+  "version": "0.22.10",
   "description": "Scripts for the ENGRID Project",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -25,7 +25,7 @@
     "strongly-typed-events": "^2.0.9"
   },
   "homepage": "https://github.com/4site-interactive-studios/engrid#readme",
-  "gitHead": "06c2bc30e43887085cec5def6770db4dcc073297",
+  "gitHead": "c005c8d8cf69b549193e053ed270a5a04ffe57af",
   "devDependencies": {
     "nodemon": "^2.0.20"
   }