@salesforcedevs/dw-components 1.3.311 → 1.3.315

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@salesforcedevs/dw-components",
-    "version": "1.3.311",
+    "version": "1.3.315",
     "description": "Lightning web components for https://developer.salesforce.com",
     "license": "MIT",
     "engines": {
@@ -26,5 +26,5 @@
         "@types/setimmediate": "^1.0.2",
         "setimmediate": "^1.0.5"
     },
-    "gitHead": "8fd492d08f22c6ce74ebed62b3c35772f6c6075f"
+    "gitHead": "34d3cd484a1021e0d46ab30391a433076018b87e"
 }

package/src/modules/dw/contentArchive/utils.ts

@@ -15,7 +15,7 @@ const ARCHIVE_CONTENT_URL = `${ARCHIVE_BASE_URL}/latest-post-per-site`;
 const ARCHIVE_FILTER_LIST_URL = `${ARCHIVE_BASE_URL}/archives-filters?order=DESC`;
 export const PER_PAGE_COUNT = 10;
 
-export const normalizePostLink = (post: {
+const normalizePostLink = (post: {
     acf: { language: string };
     link: string;
 }) => {

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

@@ -3,6 +3,7 @@ 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";
 
@@ -18,8 +19,8 @@ export type StepDatum = {
         formId?: string;
         j2sTerms?: string;
         notAvailableAlertInfo?: {
-            title: string;
-            body: string;
+            default: AlertInfo;
+            [key: string]: AlertInfo;
         };
         participatingCountryCodes?: string[];
         salesforceEmployeeAlertInfo?: {

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

@@ -45,6 +45,7 @@
         </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,15 +16,17 @@ 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 ? "final-card-with-action" : "";
+        return this.stepIndex === 2 && this.selectedCountry === "IN"
+            ? "final-card-with-action"
+            : "";
     }
 
     private get isPrimaryActionDisabled() {
@@ -58,6 +60,14 @@ 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();
     }
@@ -76,9 +86,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
@@ -99,8 +109,9 @@ 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"
         );
@@ -124,7 +135,11 @@ export default class J2sCardSequenceStep extends LightningElement {
         }
 
         if (secondaryActionMarkupContainer) {
-            secondaryActionMarkupContainer.innerHTML = secondaryActionHtml || "";
+            // new special exception on step 2 to only show secondary action for IN
+            secondaryActionMarkupContainer.innerHTML =
+                secondaryActionHtml && this.showSecondaryAction
+                    ? secondaryActionHtml
+                    : "";
         }
     }
 

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

@@ -1,10 +1,15 @@
 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",
@@ -96,11 +101,17 @@ export default class J2sForm extends LightningElementWithState<J2sFormState> {
         }
     }
 
-    private participatingCountryCodes = ["US", "CA", "IN"];
-    private countriesWithReferralInput = ["US", "CA", "IN"];
+    private countriesWithReferralInput = ["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);
     }
@@ -124,7 +135,9 @@ export default class J2sForm extends LightningElementWithState<J2sFormState> {
     }
 
     get notAvailableAlertInfo() {
-        return this.formMetadata.notAvailableAlertInfo;
+        return this.formMetadata.notAvailableAlertInfo[
+            this.state.MailingCountry || "default"
+        ];
     }
 
     get salesforceEmployeeAlertInfo() {

package/src/modules/dw/languageSelector/languageSelector.ts

@@ -1,7 +1,6 @@
 import { track as trackClick } from "dxUtils/analytics";
 import { api, LightningElement, track } from "lwc";
 import { SelectOption } from "typings/custom";
-import { normalizePostLink } from "../contentArchive/utils";
 
 const ANALYTICS_INFO = {
     element_title: "Select Language",
@@ -13,6 +12,18 @@ const language_local_names_map: any = {
     english: "English"
 };
 
+const normalizePostLink = (post: {
+    acf: { language: string };
+    link: string;
+}) => {
+    switch (post.acf.language) {
+        case "japanese":
+            return post.link.replace("/blogs/", "/jpblogs/");
+        default:
+            return post.link;
+    }
+};
+
 export default class LanguageSelector extends LightningElement {
     @track languages = [] as SelectOption[];
     selectedLanguage?: string;