@salesforcedevs/dw-components 1.3.302 → 1.3.304-alpha.1

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@salesforcedevs/dw-components",
-    "version": "1.3.302",
+    "version": "1.3.304-alpha.1",
     "description": "Lightning web components for https://developer.salesforce.com",
     "license": "MIT",
     "engines": {
@@ -25,6 +25,5 @@
         "@types/lodash.uniqby": "^4.7.7",
         "@types/setimmediate": "^1.0.2",
         "setimmediate": "^1.0.5"
-    },
-    "gitHead": "c3601af5d8b2307e904fcbf63e4ae0ab997f5eaf"
+    }
 }

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.html

@@ -1,10 +1,10 @@
 <template>
     <dx-select
-        if:false={noTranslationsAvailable}
         options={languages}
         onchange={handleLanguageChange}
         placement="bottom-end"
         value={selectedLanguage}
         disabled={noTranslationsAvailable}
+        loading={loading}
     ></dx-select>
 </template>

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

@@ -26,7 +26,8 @@ export const normalizePostLink = (post: {
 
 export default class LanguageSelector extends LightningElement {
     @track languages = [] as SelectOption[];
-    @track selectedLanguage?: string;
+    selectedLanguage?: string;
+    loading = true;
     @api postAcf!: string;
     @api postId?: string;
 
@@ -69,6 +70,8 @@ export default class LanguageSelector extends LightningElement {
             });
         } catch (e) {
             console.error(e);
+        } finally {
+            this.loading = false;
         }
 
         this.selectedLanguage =

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.