Merge branch 'dev' into component-consolidation

Author: davidornelas11

.github/pull_request_template.md

@@ -1,3 +1,7 @@
+<!-- PREFLIGHT CHECK - to be deleted before submitting PR -->
+<!--   - CHECK: Do tests need to be added or updated? -->
+<!--   - CHECK: Are data layer additions or updates needed? -->
+
 ### Description
 
 <!-- Description of problem -->
@@ -10,4 +14,3 @@
 - [Unity reference site](https://asu.github.io/asu-unity-stack/)
 - [Unity Design Kit](https://shared-assets.adobe.com/link/fb14b288-bf63-47e0-5d30-384de5560455)
 
-

README.md

@@ -9,6 +9,7 @@
   - [How to use the private package registry:](#how-to-use-the-private-package-registry)
     - [TROUBLESHOOTING ERRORS](#troubleshooting-errors)
   - [Packages in this repository](#packages-in-this-repository)
+  - [Cookie Consent](#cookie-consent)
   - [Deprecated packages](#deprecated-packages)
   - [Package Multi Output Targets](#package-multi-output-targets)
   - [Advanced Details for Unity Developers and Contributors](#advanced-details-for-unity-developers-and-contributors)
@@ -114,6 +115,10 @@ This repository contains multiple packages which are managed and published using
 11. [components-core](./packages/components-core/README.md)
 12. [unity-react-core](./packages/unity-react-core/README.md) *Now includes the component carousel package*
 
+## Cookie Consent
+
+The CSS for the cookie consent banner can be found in [unity-bootstrap-theme](./packages/unity-bootstrap-theme/src/css/cookie-consent.css). The JavaScript for the cookie consent banner can be found in [unity-bootstrap-theme as well in the JS location](./packages/unity-bootstrap-theme/src/js/cookie-consent.js). The Javascript can be placed in a script tag or included in a bundle. The CSS can be included in a bundle or included in a style tag.
+
 ## Deprecated packages
 
 Previously deprecated packages were located inside the `packages-disabled` folder. We are no longer keeping these deprecated packages active in the repository. Deprecated packages can still be found in git history.

packages/app-rfi/CHANGELOG.md

@@ -1,3 +1,15 @@
+# [@asu/app-rfi-v2.4.2](https://github.com/asu/asu-unity-stack/compare/@asu/app-rfi-v2.4.1...@asu/app-rfi-v2.4.2) (2025-01-30)
+
+
+### Bug Fixes
+
+* **app-rfi:** prevent sending pii to data layer ([9bef080](https://github.com/asu/asu-unity-stack/commit/9bef080877a1d855c3949e409cd87f056e49ff52))
+
+
+### Reverts
+
+* Revert "fix(app-rfi): ga track default disabled for pii" ([ca8207e](https://github.com/asu/asu-unity-stack/commit/ca8207e6df7d3473f95173c18b7766148dc1f32a))
+
 # [@asu/app-rfi-v2.4.1](https://github.com/asu/asu-unity-stack/compare/@asu/app-rfi-v2.4.0...@asu/app-rfi-v2.4.1) (2024-10-04)
 
 

packages/app-rfi/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@asu/app-rfi",
-  "version": "2.4.1",
+  "version": "2.4.2",
   "description": "ASU Request For Information (RFI) form",
   "main": "./dist/appRfi.cjs.js",
   "browser": "./dist/appRfi.umd.js",

packages/app-rfi/src/components/steps/questions/Country.js

@@ -4,6 +4,7 @@ import { gaEventPropTypes, trackGAEvent } from "../../../../../../shared";
 import { fetchCountries } from "../../../core/utils/fetchCountries";
 import { useRfiContext } from "../../../core/utils/rfiContext";
 import { RfiSelect } from "../../controls";
+import { PII_VALUE } from "../../../core/utils/constants";
 
 // Options
 function getCountryOptions(resultsArrayOfObjects) {
@@ -56,7 +57,7 @@ export const Country = ({ gaData }) => {
           ...gaData,
           event: "select",
           type: label,
-          text: e.target.selectedOptions[0].innerText,
+          text: PII_VALUE,
         })
       }
     />

packages/app-rfi/src/components/steps/questions/EmailAddress.js

@@ -2,6 +2,7 @@ import React from "react";
 
 import { gaEventPropTypes, trackGAEvent } from "../../../../../../shared";
 import { RfiEmailInput } from "../../controls";
+import { PII_VALUE } from "../../../core/utils/constants";
 
 /**
  * @param {{ gaData: import("../../../../../../shared/services/googleAnalytics").GAEventObject}} props
@@ -21,7 +22,7 @@ export const EmailAddress = ({ gaData }) => {
         trackGAEvent({
           ...gaData,
           type: label,
-          text: e.target.value,
+          text: PII_VALUE,
         })
       }
     />

packages/app-rfi/src/components/steps/questions/FirstName.js

@@ -2,6 +2,7 @@ import React from "react";
 
 import { gaEventPropTypes, trackGAEvent } from "../../../../../../shared";
 import { RfiTextInput } from "../../controls";
+import { PII_VALUE } from "../../../core/utils/constants";
 
 /**
  * @param {{ gaData: import("../../../../../../shared/services/googleAnalytics").GAEventObject}} props
@@ -21,7 +22,7 @@ export const FirstName = ({ gaData }) => {
         trackGAEvent({
           ...gaData,
           type: label,
-          text: e.target.value,
+          text: PII_VALUE,
         })
       }
     />

packages/app-rfi/src/components/steps/questions/LastName.js

@@ -2,6 +2,7 @@ import React from "react";
 
 import { gaEventPropTypes, trackGAEvent } from "../../../../../../shared";
 import { RfiTextInput } from "../../controls";
+import { PII_VALUE } from "../../../core/utils/constants";
 
 /**
  * @param {{ gaData: import("../../../../../../shared/services/googleAnalytics").GAEventObject}} props
@@ -21,7 +22,7 @@ export const LastName = ({ gaData }) => {
         trackGAEvent({
           ...gaData,
           type: label,
-          text: e.target.value,
+          text: PII_VALUE,
         })
       }
     />

packages/app-rfi/src/components/steps/questions/Phone.js

@@ -2,6 +2,7 @@ import React from "react";
 
 import { gaEventPropTypes, trackGAEvent } from "../../../../../../shared";
 import { RfiPhone } from "../../controls";
+import { PII_VALUE } from "../../../core/utils/constants";
 
 /**
  * @param {{ gaData: import("../../../../../../shared/services/googleAnalytics").GAEventObject}} props
@@ -21,7 +22,7 @@ export const Phone = ({ gaData }) => {
         trackGAEvent({
           ...gaData,
           type: label,
-          text: e.target.value,
+          text: PII_VALUE,
         })
       }
     />

packages/app-rfi/src/components/steps/questions/ZipCode.js

@@ -1,7 +1,7 @@
 import React, { useEffect } from "react";
 
 import { gaEventPropTypes, trackGAEvent } from "../../../../../../shared";
-import { KEY } from "../../../core/utils/constants";
+import { KEY, PII_VALUE } from "../../../core/utils/constants";
 import { useRfiContext } from "../../../core/utils/rfiContext";
 import { RfiTextInput } from "../../controls";
 
@@ -42,7 +42,7 @@ export const ZipCode = ({ gaData }) => {
         trackGAEvent({
           ...gaData,
           type: label,
-          text: e.target.value,
+          text: PII_VALUE,
         })
       }
     />