@salesforcedevs/dw-components 1.3.179 → 1.3.180-canary.1

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@salesforcedevs/dw-components",
-    "version": "1.3.179",
+    "version": "1.3.180-canary.1",
     "description": "Lightning web components for https://developer.salesforce.com",
     "license": "MIT",
     "engines": {
@@ -23,6 +23,5 @@
         "@types/lodash.uniqby": "^4.7.7",
         "@types/setimmediate": "^1.0.2",
         "setimmediate": "^1.0.5"
-    },
-    "gitHead": "ef5efd7169e688009ba79bd74e69c42adb277e09"
+    }
 }

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

@@ -13,10 +13,11 @@
             <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}
                     onformsubmit={handleFormSubmit}
+                    ongetstarted={handleGetStarted}
                     recaptcha-token={recaptchaToken}
                     selected-country={selectedCountry}
                     step-datum={stepDatum}

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}
@@ -46,7 +47,7 @@
             <dx-button
                 if:true={showPrimaryAction}
                 class="primary-action"
-                disabled={isJ2sFormInvalid}
+                disabled={isPrimaryActionDisabled}
                 href={primaryActionLink}
                 icon-sprite={stepDatum.primaryAction.iconSprite}
                 icon-symbol={stepDatum.primaryAction.iconSymbol}

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 = "";
@@ -20,7 +21,7 @@ export default class J2sCardSequenceStep extends LightningElement {
         )?.notifySubmitFailure(formFailureData);
     }
 
-    private _isJ2sFormInvalid = false;
+    private isJ2sFormInvalid = false;
 
     private get stepClassName() {
         return this.stepIndex === 2 && this.selectedCountry === "IN"
@@ -28,11 +29,11 @@ export default class J2sCardSequenceStep extends LightningElement {
             : "";
     }
 
-    private get isJ2sFormInvalid() {
-        return this.stepIndex === 1 && this._isJ2sFormInvalid;
-    }
-    private set isJ2sFormInvalid(value: boolean) {
-        this._isJ2sFormInvalid = value;
+    private get isPrimaryActionDisabled() {
+        return (
+            this.stepIndex === 1 &&
+            (this.hasAlreadyRegistered || this.isJ2sFormInvalid)
+        );
     }
 
     private get primaryActionLink() {
@@ -50,10 +51,9 @@ export default class J2sCardSequenceStep extends LightningElement {
     }
 
     private get primaryActionVariant() {
-        if (this.stepIndex === 1 && this.isJ2sFormInvalid) {
-            return "custom"; // override for disabled button styling
-        }
-        return this.stepDatum.primaryAction.variant;
+        return this.isPrimaryActionDisabled
+            ? "custom"
+            : this.stepDatum.primaryAction.variant;
     }
 
     private get primaryActionLinkTarget() {
@@ -81,7 +81,7 @@ export default class J2sCardSequenceStep extends LightningElement {
 
         if (this.stepIndex === 0) {
             this.dispatchEvent(new CustomEvent("getstarted"));
-        } else if (this.stepIndex === 1 && !this.isJ2sFormInvalid) {
+        } else if (this.stepIndex === 1) {
             const j2sFormEl = this.template.querySelector(
                 "dw-j2s-form"
             ) as unknown as J2sForm;

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/LICENSE

@@ -1,12 +0,0 @@
-Copyright (c) 2020, Salesforce.com, Inc.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-* Neither the name of Salesforce.com nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.