@salesforcedevs/dw-components 1.3.304-alpha.1 → 1.3.305-canary.2

package/package.json

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

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

@@ -3,7 +3,6 @@ import StepSequence from "dx/stepSequence";
 import { getListWithUuids } from "dxUtils/list";
 import { toJson } from "dxUtils/normalizers";
 import J2sCardSequenceStep from "dw/j2sCardSequenceStep";
-import { AlertInfo } from "typings/custom";
 
 const DRM_SUCCESS_STRING = "success";
 
@@ -19,8 +18,8 @@ export type StepDatum = {
         formId?: string;
         j2sTerms?: string;
         notAvailableAlertInfo?: {
-            default: AlertInfo;
-            [key: string]: AlertInfo;
+            title: string;
+            body: string;
         };
         participatingCountryCodes?: string[];
         salesforceEmployeeAlertInfo?: {

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

@@ -45,7 +45,6 @@
         </div>
         <div slot="primary-action-section">
             <dx-button
-                if:true={showPrimaryAction}
                 class="primary-action"
                 disabled={isPrimaryActionDisabled}
                 href={primaryActionLink}

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

@@ -16,17 +16,15 @@ export default class J2sCardSequenceStep extends LightningElement {
 
     @api
     public notifyFormSubmitFailure(formFailureData: Partial<DrmFormData>) {
-        ((this.template.querySelector(
-            "dw-j2s-form"
-        ) as unknown) as J2sForm)?.notifySubmitFailure(formFailureData);
+        (
+            this.template.querySelector("dw-j2s-form") as unknown as J2sForm
+        )?.notifySubmitFailure(formFailureData);
     }
 
     private isJ2sFormInvalid = false;
 
     private get stepClassName() {
-        return this.stepIndex === 2 && this.selectedCountry === "IN"
-            ? "final-card-with-action"
-            : "";
+        return this.stepIndex === 2 ? "final-card-with-action" : "";
     }
 
     private get isPrimaryActionDisabled() {
@@ -60,14 +58,6 @@ export default class J2sCardSequenceStep extends LightningElement {
         return this.stepDatum.primaryAction.linkTarget || "_blank";
     }
 
-    private get showPrimaryAction() {
-        return this.stepIndex !== 2 || this.selectedCountry === "IN";
-    }
-
-    private get showSecondaryAction() {
-        return this.showPrimaryAction; // same requirement as above for now
-    }
-
     renderedCallback() {
         this.updateStaticInnerHtml();
     }
@@ -86,9 +76,9 @@ export default class J2sCardSequenceStep extends LightningElement {
         if (this.stepIndex === 0) {
             this.dispatchEvent(new CustomEvent("getstarted"));
         } else if (this.stepIndex === 1) {
-            const j2sFormEl = (this.template.querySelector(
+            const j2sFormEl = this.template.querySelector(
                 "dw-j2s-form"
-            ) as unknown) as J2sForm;
+            ) as unknown as J2sForm;
             const formData = j2sFormEl.formDataForDrm;
 
             // For some countries, explicit approvals will be present; for others, it is implicitly assumed
@@ -109,9 +99,8 @@ export default class J2sCardSequenceStep extends LightningElement {
 
     private updateStaticInnerHtml() {
         const { bodyHtml, secondaryActionHtml } = this.stepDatum;
-        const bodyMarkupContainer = this.template.querySelector(
-            "span.body-markup"
-        );
+        const bodyMarkupContainer =
+            this.template.querySelector("span.body-markup");
         const secondaryActionMarkupContainer = this.template.querySelector(
             "span.secondary-action-markup"
         );
@@ -135,11 +124,7 @@ export default class J2sCardSequenceStep extends LightningElement {
         }
 
         if (secondaryActionMarkupContainer) {
-            // new special exception on step 2 to only show secondary action for IN
-            secondaryActionMarkupContainer.innerHTML =
-                secondaryActionHtml && this.showSecondaryAction
-                    ? secondaryActionHtml
-                    : "";
+            secondaryActionMarkupContainer.innerHTML = secondaryActionHtml || "";
         }
     }
 

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

@@ -1,15 +1,10 @@
 import { toJson } from "dxUtils/normalizers";
 import { stateMap } from "dwUtils/forms";
-import { DateTime } from "luxon";
 import { api } from "lwc";
 import debounce from "debounce";
 import { LightningElementWithState } from "dxBaseElements/lightningElementWithState";
 import { DrmFormData } from "dw/j2sCardSequence";
 
-const closingTimeUSCanada = DateTime.fromISO("2024-05-09", {
-    zone: "America/Los_Angeles"
-});
-
 // Hard-coding for now because we can't get information about an endpoint for this
 const tbidValidRoles = [
     "Developer",
@@ -101,17 +96,11 @@ export default class J2sForm extends LightningElementWithState<J2sFormState> {
         }
     }
 
-    private countriesWithReferralInput = ["IN"];
+    private participatingCountryCodes = ["US", "CA", "IN"];
+    private countriesWithReferralInput = ["US", "CA", "IN"];
     private requiredFormFields: HTMLElement[] = [];
     private showSubmitFailureAlert = false;
 
-    get participatingCountryCodes() {
-        if (DateTime.local() >= closingTimeUSCanada) {
-            return ["IN"];
-        }
-        return ["US", "CA", "IN"];
-    }
-
     get isNotParticipatingCountry() {
         return !this.isParticipatingCountry(this.state.MailingCountry);
     }
@@ -135,9 +124,7 @@ export default class J2sForm extends LightningElementWithState<J2sFormState> {
     }
 
     get notAvailableAlertInfo() {
-        return this.formMetadata.notAvailableAlertInfo[
-            this.state.MailingCountry || "default"
-        ];
+        return this.formMetadata.notAvailableAlertInfo;
     }
 
     get salesforceEmployeeAlertInfo() {