@salesforcedevs/dw-components 1.3.148-canary.16 → 1.3.148-canary.18

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@salesforcedevs/dw-components",
-    "version": "1.3.148-canary.16",
+    "version": "1.3.148-canary.18",
     "description": "Lightning web components for https://developer.salesforce.com",
     "license": "MIT",
     "engines": {

package/src/modules/dw/j2sCardSequence/j2sCardSequence.ts

@@ -109,17 +109,23 @@ export default class J2sCardSequence extends LightningElement {
 
     private get formIncomingUserInfo() {
         if (!this.tbidUserInfo) {
-            return "{}";
+            return {};
         }
 
-        return JSON.stringify({
-            firstName: this.tbidUserInfo.given_name,
-            lastName: this.tbidUserInfo.family_name,
-            email: this.tbidUserInfo.email,
-            jobRole: this.tbidUserInfo.custom_attributes?.Role,
-            companyName: this.tbidUserInfo.custom_attributes?.CompanyName,
-            country: this.tbidUserInfo.custom_attributes?.Country
-        });
+        return {
+            firstName: decodeURIComponent(this.tbidUserInfo.given_name),
+            lastName: decodeURIComponent(this.tbidUserInfo.family_name),
+            email: decodeURIComponent(this.tbidUserInfo.email),
+            jobRole: decodeURIComponent(
+                this.tbidUserInfo.custom_attributes?.Role
+            ),
+            companyName: decodeURIComponent(
+                this.tbidUserInfo.custom_attributes?.CompanyName
+            ),
+            country: decodeURIComponent(
+                this.tbidUserInfo.custom_attributes?.Country
+            )
+        };
     }
 
     private get initialStepIndex() {

package/src/modules/dw/j2sForm/j2sForm.css

@@ -50,3 +50,7 @@
     display: flex;
     justify-content: center;
 }
+
+dx-input[disabled] {
+    --dx-c-input-background: revert;
+}

package/src/modules/dw/j2sForm/j2sForm.html

@@ -57,9 +57,10 @@
                 label="Email"
                 missing-error-message="Enter your email address"
                 validity-on-blur="true"
+                disabled
+                readonly="true"
                 required
                 value={state.email}
-                onchange={handleFormFieldChange}
             ></dx-input>
             <dx-select
                 label="Country/Region"
@@ -77,6 +78,7 @@
                 name="Referral_Email__c"
                 class="referral-email-field full-width"
                 label="If anyone has referred you, please share their Email ID below, with their consent."
+                validity-on-blur="true"
                 type="email"
                 onchange={handleFormFieldChange}
             ></dx-input>

package/src/modules/dw/j2sForm/j2sForm.ts

@@ -35,12 +35,12 @@ export default class J2sForm extends LightningElementWithState<J2sFormState> {
     private _countriesJson = "";
     private _countriesLookup: any = {}; // TODO typings
     private _didSetFormId = false;
-    private _incomingUserInfo: any = {}; // TODO typings
     private _isInitialRender = true;
     private _recaptchaToken = "";
 
-    @api id = "";
     @api formMetadata: any = {};
+    @api id = "";
+    @api incomingUserInfo: any = {};
     @api referralText = "";
 
     @api
@@ -59,14 +59,6 @@ export default class J2sForm extends LightningElementWithState<J2sFormState> {
         this._countriesLookup = countriesLookup;
     }
 
-    @api
-    get incomingUserInfo() {
-        return this._incomingUserInfo;
-    }
-    set incomingUserInfo(value: string) {
-        this._incomingUserInfo = toJson(value);
-    }
-
     @api
     get formDataForDrm() {
         // We should be able to just get the formData from the form automatically using `new FormData(theForm)`,
@@ -126,7 +118,7 @@ export default class J2sForm extends LightningElementWithState<J2sFormState> {
 
     connectedCallback() {
         const initialState: Partial<J2sFormState> = {
-            ...this._incomingUserInfo,
+            ...this.incomingUserInfo,
             isFormValid: false,
             showMarketingText: true
         };
@@ -136,6 +128,8 @@ export default class J2sForm extends LightningElementWithState<J2sFormState> {
         if (initialCountryData) {
             initialState.showLegalCheckbox =
                 initialCountryData.showLegalCheckbox;
+            initialState.showMarketingText =
+                initialCountryData.showMarketingText;
             initialState.legalText = initialCountryData.legalText;
             initialState.marketingText = initialCountryData.marketingText;
             initialState.learnMore = initialCountryData.learnMore;
@@ -251,7 +245,8 @@ export default class J2sForm extends LightningElementWithState<J2sFormState> {
             learnMore: countryData.learnMore,
             legalText: countryData.legalText,
             marketingText: countryData.marketingText,
-            showLegalCheckbox: countryData.showLegalCheckbox
+            showLegalCheckbox: countryData.showLegalCheckbox,
+            showMarketingText: countryData.showMarketingText
         });
 
         // Because updating the country can update the required fields, we need to re-set form