@salesforcedevs/dw-components 1.3.176-canary.1 → 1.3.180-canary.0

package/package.json

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

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

@@ -13,6 +13,7 @@
             <dx-step-sequence-step key={stepDatum.id}>
                 <dw-j2s-card-sequence-step
                     country-options={countries}
+                    has-already-registered={hasAlreadyRegistered}
                     is-loading={isLoading}
                     oncountrychange={handleCountryChange}
                     ongetstarted={handleGetStarted}

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

@@ -13,7 +13,6 @@ export type StepDatum = {
           };
     formData?: {
         countriesWithReferralInput?: string[];
-        countriesWithRequiredJobRole?: string[];
         formId?: string;
         j2sTerms?: string;
         notAvailableAlertInfo?: {
@@ -111,6 +110,7 @@ export default class J2sCardSequence extends LightningElement {
 
     private countries: any[] = [];
     private currentSequenceStep = 0;
+    private hasAlreadyRegistered = false;
     private forceInitiallyVisible = false;
     private formSubmissionFailureState: Partial<DrmFormData> | null = null;
     private recaptchaToken = "";
@@ -308,6 +308,9 @@ export default class J2sCardSequence extends LightningElement {
                     this.jumpToStepIndex(2, false);
                     this.initialStepIndex = 0; // don't save final step in storage; rather, reset the starting step
                     this.resetRecaptcha();
+                    this.selectedCountry =
+                        this.formIncomingUserInfo.MailingCountry || ""; // reset selected country after form submission since this impact's form behavior
+                    this.hasAlreadyRegistered = true;
                 } else {
                     throw new Error(
                         `Form submission failed. (status: ${resOutput.status}, message: ${resOutput.errorMessage})`

package/src/modules/dw/j2sCardSequenceStep/j2sCardSequenceStep.html

@@ -24,6 +24,7 @@
                         id={stepDatum.formData.formId}
                         countries={countryOptions}
                         form-metadata={stepDatum.formData}
+                        has-already-registered={hasAlreadyRegistered}
                         incoming-user-info={userInfo}
                         onformvaliditychange={handleFormValidityChange}
                         recaptcha-token={recaptchaToken}

package/src/modules/dw/j2sCardSequenceStep/j2sCardSequenceStep.ts

@@ -5,6 +5,7 @@ import J2sForm from "dw/j2sForm";
 
 export default class J2sCardSequenceStep extends LightningElement {
     @api countryOptions: any[] = [];
+    @api hasAlreadyRegistered = false;
     @api isLoading = false;
     @api recaptchaToken = "";
     @api selectedCountry = "";
@@ -29,7 +30,10 @@ export default class J2sCardSequenceStep extends LightningElement {
     }
 
     private get isJ2sFormInvalid() {
-        return this.stepIndex === 1 && this._isJ2sFormInvalid;
+        return (
+            this.hasAlreadyRegistered ||
+            (this.stepIndex === 1 && this._isJ2sFormInvalid)
+        );
     }
     private set isJ2sFormInvalid(value: boolean) {
         this._isJ2sFormInvalid = value;

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

@@ -132,6 +132,13 @@
                 variant="accented"
             ></dx-alert>
         </div>
+        <div class="form-row" if:true={hasAlreadyRegistered}>
+            <dx-alert
+                alert-info={alreadyRegisteredAlertInfo}
+                type="danger"
+                variant="accented"
+            ></dx-alert>
+        </div>
         <div class="form-row" if:true={isSalesforceEmployee}>
             <dx-alert
                 alert-info={salesforceEmployeeAlertInfo}

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

@@ -42,6 +42,7 @@ export default class J2sForm extends LightningElementWithState<J2sFormState> {
     private _isInitialRender = true;
     private _recaptchaToken = "";
 
+    @api hasAlreadyRegistered = false;
     @api formMetadata: any = {};
     @api id = "";
     @api incomingUserInfo = {} as DrmFormData;
@@ -118,6 +119,10 @@ export default class J2sForm extends LightningElementWithState<J2sFormState> {
         return this.state.RelationshipToSalesforce === "Salesforce Employee";
     }
 
+    get alreadyRegisteredAlertInfo() {
+        return this.formMetadata.alreadyRegisteredAlertInfo;
+    }
+
     get notAvailableAlertInfo() {
         return this.formMetadata.notAvailableAlertInfo;
     }

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

@@ -3075,7 +3075,6 @@ const tbidUserInfo = {
 
 export const formMetadata = {
     countriesWithReferralInput: ["IN"],
-    countriewWithRequiredJobRole: ["CA"],
     j2sTerms:
         'I agree to the Journey to Salesforce Program Terms, subject to the <a href="http://www.google.com">Salesforce Program Agreement</a>.',
     notAvailableAlertInfo: {

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

@@ -1,61 +0,0 @@
-export const stepSequenceData = {
-    animateTransitions: "true",
-    stepsData: [
-        {
-            bodyHtml:
-                '<p class="dx-text-display-7">Register for Journey to Salesforce and you\'ll be on your way to becoming a Salesforce Developer.</p><ul class="dx-text-display-8"><li>Step 1: Log in or sign up for a free Trailblazer.me account</li><li>Step 2: Confirm your program registration</li><li>Step 3: Begin your journey!</li></ul>',
-            primaryAction: {
-                text: "Get Started"
-            },
-            showStepNumber: "true",
-            stepTitle: "Get started now."
-        },
-        {
-            bodyHtml:
-                '<p class="dx-text-display-7">You\'re almost done! Please review your information and agree to the Journey to Salesforce program terms and conditions.</p>',
-            formData: {
-                countriesWithReferralInput: ["IN"],
-                countriesWithRequiredJobRole: ["CA"],
-                formId: "j2s-form",
-                j2sTerms:
-                    'I agree to the Journey to Salesforce Program Terms, subject to the <a href="http://www.google.com">Salesforce Program Agreement</a>.',
-                notAvailableAlertInfo: {
-                    title: "Not Available",
-                    body:
-                        'The Journey to Salesforce program is not currently available in your country. See the <a href="https://www.google.com/">program FAQs</a> for a list of participating countries.'
-                },
-                participatingCountryCodes: ["US", "CA", "IN"]
-            },
-            primaryAction: {
-                text: "Complete Registration"
-            },
-            secondaryActionHtml:
-                '<span class="required-notice">* Required to participate in Journey to Salesforce</span>',
-            showStepNumber: "true",
-            stepTitle: "Complete your registration."
-        },
-        {
-            bodyHtml:
-                '<div class="dx-text-display-8"><p>Welcome to Journey to Salesforce! Congratulations on taking this step in your journey towards becoming a Salesforce Developer. Through this program you\'ll gain the knowledge, experience, and skills to help you excel in the Salesforce ecosystem.</p><p>To get started, click the button below to join the Journey to Salesforce community, and make sure to check your email for links to bookmark!</p></div>',
-            headerData: {
-                backgroundColor: "green-vibrant-95",
-                iconSymbol: "check-circle",
-                iconSprite: "general",
-                iconColor: "green-vibrant-65",
-                textColor: "indigo-vibrant-20"
-            },
-            primaryAction: {
-                iconSprite: "utility",
-                iconSymbol: "new_window",
-                link:
-                    "https://salesforce-external.slack.com/archives/C05HJK4PGJV",
-                text: "Join Slack",
-                variant: "custom"
-            },
-            secondaryActionHtml:
-                '<span class="dx-text-display-7">Ready to jump in?</span>',
-            showStepNumber: "true",
-            stepTitle: "Your Registration is Confirmed"
-        }
-    ]
-};