@salesforcedevs/dw-components 1.3.212 → 1.3.214

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@salesforcedevs/dw-components",
-    "version": "1.3.212",
+    "version": "1.3.214",
     "description": "Lightning web components for https://developer.salesforce.com",
     "license": "MIT",
     "engines": {
@@ -24,5 +24,5 @@
         "@types/setimmediate": "^1.0.2",
         "setimmediate": "^1.0.5"
     },
-    "gitHead": "c44b761d642918baab3ab00a40ac29a599d26f6e"
+    "gitHead": "9e7c77ace387fd5b0aa4abd5d1ab160c6c902926"
 }

package/src/modules/dw/j2sCardSequence/j2sCardSequence.html

@@ -4,6 +4,8 @@
         communicate-step-changes="true"
         force-initially-visible={forceInitiallyVisible}
         initial-step-index={initialStepIndex}
+        lwc:ref="stepSequence"
+        onslotchange={handleStepSequenceSlotChange}
         onstepsequencechange={handleStepSequenceChange}
         optimize-position-after-animation="true"
         session-storage-id={sessionStorageId}

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

@@ -4,6 +4,8 @@ import { getListWithUuids } from "dxUtils/list";
 import { toJson } from "dxUtils/normalizers";
 import J2sCardSequenceStep from "dw/j2sCardSequenceStep";
 
+const DRM_SUCCESS_STRING = "success";
+
 export type StepDatum = {
     bodyHtml?:
         | string
@@ -79,8 +81,8 @@ export default class J2sCardSequence extends LightningElement {
     _recaptchaResetTimeoutId: number | null = null;
     _stepsData: StepDatum[] = [];
     @api drmDomain: string = "https://drm.my.salesforce-sites.com";
-    @api formHandler: string =
-        "https://formhandlermule-1s9xrb.5sc6y6-4.usa-e2.cloudhub.io/form_handler";
+    @api drmHandlerBaseUrl: string =
+        "https://dev1-infta-proxy.us-w2.cloudhub.io";
     @api tbidApiBaseUrl: string | undefined;
     @api useHistory: boolean = false;
 
@@ -128,6 +130,14 @@ export default class J2sCardSequence extends LightningElement {
         return Boolean(this.tbidUserInfo);
     }
 
+    private get drmEmailUrl() {
+        return `${this.drmHandlerBaseUrl}/getEmail`;
+    }
+
+    private get formHandlerUrl() {
+        return `${this.drmHandlerBaseUrl}/form_handler`;
+    }
+
     private get formIncomingUserInfo() {
         if (!this.tbidUserInfo) {
             return {} as DrmFormData;
@@ -141,8 +151,8 @@ export default class J2sCardSequence extends LightningElement {
             Company__c: this.tbidUserInfo.custom_attributes?.CompanyName,
             MailingCountry: this.tbidUserInfo.custom_attributes?.Country,
             MailingState: this.tbidUserInfo.address?.region,
-            RelationshipToSalesforce: this.tbidUserInfo.custom_attributes
-                ?.RelationshipToSalesforce
+            RelationshipToSalesforce:
+                this.tbidUserInfo.custom_attributes?.RelationshipToSalesforce
         };
 
         // Return above object but only with keys that have a truthy value, and with any URI-encoded values decoded
@@ -219,18 +229,16 @@ export default class J2sCardSequence extends LightningElement {
 
     renderedCallback() {
         if (!this.isLoading) {
-            ((this.template.querySelector(
-                "dx-step-sequence"
-            ) as unknown) as StepSequence)?.remeasureSteps();
+            (this.refs.stepSequence as StepSequence)?.remeasureSteps();
         }
 
         if (
             this.formSubmissionFailureState &&
             this.stepsData[this.currentSequenceStep].formData
         ) {
-            const j2sCardStep = (this.template.querySelectorAll(
+            const j2sCardStep = this.template.querySelectorAll(
                 "dw-j2s-card-sequence-step"
-            ) as unknown) as J2sCardSequenceStep[];
+            ) as unknown as J2sCardSequenceStep[];
             j2sCardStep[this.currentSequenceStep]?.notifyFormSubmitFailure(
                 this.formSubmissionFailureState
             );
@@ -267,6 +275,19 @@ export default class J2sCardSequence extends LightningElement {
         }
     }
 
+    handleStepSequenceSlotChange() {
+        requestAnimationFrame(() => {
+            // After the slots have slotted and there's been time to animate, we know the browser's layout of the
+            // sequence has completed.
+            this.dispatchEvent(
+                new CustomEvent("j2ssequencelaidout", {
+                    bubbles: true,
+                    composed: true
+                })
+            );
+        });
+    }
+
     handleGetStarted() {
         // If the user is not yet logged in, we need to prevent moving immediately to the next
         // step, but set storage up so that they are on the second step when they return to the
@@ -285,14 +306,14 @@ export default class J2sCardSequence extends LightningElement {
     }
 
     async handleFormSubmit({ detail: formData }: CustomEvent<DrmFormData>) {
-        if (!this.formHandler || !this.isLoggedIn) {
+        if (!this.formHandlerUrl || !this.isLoggedIn) {
             return;
         }
 
         this._isFormSubmitting = true;
 
         try {
-            const res = await fetch(this.formHandler, {
+            const res = await fetch(this.formHandlerUrl, {
                 method: "POST",
                 headers: {
                     "Content-Type": "application/json",
@@ -308,7 +329,7 @@ export default class J2sCardSequence extends LightningElement {
             if (res.ok) {
                 const resData = await res.json();
                 const resOutput = resData.handlePostRequestOutput || resData;
-                if (resOutput?.status === "success") {
+                if (resOutput?.status === DRM_SUCCESS_STRING) {
                     this.dispatchEvent(
                         new CustomEvent("registration", {
                             bubbles: true,
@@ -374,9 +395,7 @@ export default class J2sCardSequence extends LightningElement {
         if (andStoreIndex) {
             this.initialStepIndex = stepIndex; // update sessionStorage value
         }
-        ((this.template.querySelector(
-            "dx-step-sequence"
-        ) as unknown) as StepSequence)?.jumpToStep(stepIndex);
+        (this.refs.stepSequence as StepSequence)?.jumpToStep(stepIndex);
     }
 
     private async getCountryList() {
@@ -409,7 +428,16 @@ export default class J2sCardSequence extends LightningElement {
         try {
             const res = await fetch(`${this.tbidApiBaseUrl}/userinfo`);
             if (res.ok) {
-                this.tbidUserInfo = await res.json();
+                const userInfo = await res.json();
+                const emailOverride = await this.getDrmEmailOverride(
+                    userInfo?.user_id
+                );
+                this.tbidUserInfo = !emailOverride
+                    ? userInfo
+                    : {
+                          ...userInfo,
+                          email: emailOverride
+                      };
                 this.selectedCountry = this.formIncomingUserInfo.MailingCountry;
             }
         } catch (ex) {
@@ -424,4 +452,30 @@ export default class J2sCardSequence extends LightningElement {
 
         this._isTbidLoading = false;
     }
+
+    private async getDrmEmailOverride(
+        tbid: string
+    ): Promise<string | undefined> {
+        let resolvedEmail = "";
+
+        if (!tbid) {
+            return resolvedEmail;
+        }
+
+        try {
+            const res = await fetch(`${this.drmEmailUrl}?tbid=${tbid}`);
+            if (res.ok) {
+                const resData = await res.json();
+                if (resData.message === DRM_SUCCESS_STRING) {
+                    resolvedEmail = resData.Email;
+                }
+            }
+        } catch (ex) {
+            console.warn(
+                `Could not fetch email address from DRM, defaulting to TBID info. (Exception: ${ex})`
+            );
+        }
+
+        return resolvedEmail;
+    }
 }