@salesforcedevs/dw-components 1.3.109 → 1.3.120-alpha.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@salesforcedevs/dw-components",
-    "version": "1.3.109",
+    "version": "1.3.120-alpha.0",
     "description": "Lightning web components for https://developer.salesforce.com",
     "license": "MIT",
     "engines": {
@@ -24,5 +24,5 @@
         "@types/setimmediate": "^1.0.2",
         "setimmediate": "^1.0.5"
     },
-    "gitHead": "bd688e3e86b4d0d9d58765892bbffeec9dce2a1a"
+    "gitHead": "e10d764cbe3b3e9956eb47572b4dd3b4bed760e3"
 }

package/src/modules/dw/deSignupForm/deSignupForm.css

@@ -25,7 +25,9 @@ span {
 }
 
 dx-checkbox,
-.privacy-notice {
+.privacy-notice,
+span.privacy-terms,
+span.marketing-terms {
     width: 100%;
     margin-bottom: var(--dx-g-spacing-lg);
 }

package/src/modules/dw/deSignupForm/deSignupForm.html

@@ -51,8 +51,8 @@
             options={countries}
             placeholder="Select Country/Region"
             required
-            value=""
-            onchange={handleCountryChange}
+            value={country}
+            onchange={handleConsent}
         ></dx-select>
         <dx-input
             label="Postal Code"
@@ -77,27 +77,36 @@
             onchange={handleUsernameChange}
         ></dx-input>
 
-        <dx-checkbox required name="eula" value="accepted">
+        <dx-checkbox required name="eula" value="accepted" if:true={legalText}>
             <span lwc:dom="manual" class="legal-terms"></span>
         </dx-checkbox>
-        <dx-checkbox
-            if:true={showMarketingCheckbox}
-            name="opt_in"
-            value="False"
-        >
+
+        <template if:false={showMarketingCheckbox}>
             <span lwc:dom="manual" class="marketing-terms"></span>
-        </dx-checkbox>
+        </template>
+        <template if:true={showMarketingCheckbox}>
+            <dx-checkbox
+                name="marketingCheckbox"
+                class="marketing-terms"
+                value="false"
+                onchange={handleMarketingCheckbox}
+            >
+                <span>{marketingText}</span>
+            </dx-checkbox>
+        </template>
+
+        <template if:false={showLegalCheckbox}>
+            <span lwc:dom="manual" class="legal-checkbox privacy-terms"></span>
+        </template>
         <dx-checkbox
-            if:true={showPrivacyCheckbox}
-            required
-            name="privacy"
-            value="privacy_accepted"
+            if:true={showLegalCheckbox}
+            class="privacy-terms"
+            value={legalCheckbox}
+            required="true"
         >
-            <span lwc:dom="manual" class="privacy-terms"></span>
+            <span lwc:dom="manual" class="legal-checkbox privacy-terms"></span>
         </dx-checkbox>
-        <template if:false={showPrivacyCheckbox}>
-            <span lwc:dom="manual" class="privacy-terms privacy-notice"></span>
-        </template>
+
         <dx-button
             class="submit-button"
             disabled={disableSubmit}

package/src/modules/dw/deSignupForm/deSignupForm.ts

@@ -2,6 +2,7 @@ import { LightningElement, api, track } from "lwc";
 import { toJson } from "dxUtils/normalizers";
 import { track as trackGtm } from "dxUtils/analytics";
 import { submitForm, ErrorCode, SignupForm, UserData } from "./submitForm";
+import { CountryOptions } from "typings/custom";
 
 type SelectOption = { value: string; label: string };
 type Country = SelectOption & {
@@ -16,15 +17,6 @@ const DUPLICATE_USERNAME_MESSAGE =
 const SIGN_UP_LABEL = "Sign me Up";
 
 export default class DeSignupForm extends LightningElement {
-    @api
-    get countries() {
-        return this._countries;
-    }
-
-    set countries(value) {
-        this._countries = toJson(value);
-    }
-
     @api
     get roles() {
         return this._roles;
@@ -33,17 +25,20 @@ export default class DeSignupForm extends LightningElement {
     set roles(value) {
         this._roles = toJson(value);
     }
-
-    @api marketingText: string = "";
-    @api privacyText: string = "";
+    @api countries: string = "";
+    @api drmDomain: string = "";
     @api legalText: string = "";
 
     private country: Country = null;
     private disableSubmit = false;
     private username = "";
-    private updateCheckboxLabels = true;
-    private _countries: Array<Country>;
     private _roles: Array<SelectOption>;
+    private showMarketingCheckbox: boolean = false;
+    private marketingCheckbox: boolean = false;
+    private marketingText: string = "";
+    private showLegalCheckbox: boolean = false;
+    private privacyText: string = "";
+
     @track knownDuplicateUsers = [];
 
     get usernameError(): string {
@@ -56,34 +51,18 @@ export default class DeSignupForm extends LightningElement {
         return !this.knownDuplicateUsers.includes(this.username);
     }
 
-    get showMarketingCheckbox(): boolean {
-        return this.country && this.country.showMarketingCheckbox;
-    }
-
-    get showPrivacyCheckbox(): boolean {
-        return this.country && !!this.country.privacyOptIn;
-    }
-
     get buttonLabel(): string {
         return this.disableSubmit ? "Beep boop processing" : SIGN_UP_LABEL;
     }
 
-    renderedCallback(): void {
-        if (!this.updateCheckboxLabels) {
-            return;
-        }
+    connectedCallback(): void {
+        this.getCountryList();
+    }
 
-        this.updateCheckboxLabels =
-            this.updateInnerHtml("span.legal-terms", this.legalText) ||
-            this.updateInnerHtml(
-                "span.marketing-terms",
-                this.marketingText,
-                this.showMarketingCheckbox
-            ) ||
-            this.updateInnerHtml(
-                "span.privacy-terms",
-                this.country?.privacyText || this.privacyText
-            );
+    renderedCallback(): void {
+        this.updateInnerHtml("span.legal-terms", this.legalText);
+        this.updateInnerHtml("span.marketing-terms", this.marketingText);
+        this.updateInnerHtml("span.legal-checkbox", this.privacyText);
     }
 
     handleSubmit(event: Event): void {
@@ -115,7 +94,8 @@ export default class DeSignupForm extends LightningElement {
                         "https://developer.salesforce.com/signup/success",
                     form_country: formData.user.country,
                     form_name: "Dev Edition Signup",
-                    form_primary_product_interest: "Developer Edition"
+                    form_primary_product_interest: "Developer Edition",
+                    offer_type: "free trial"
                 });
                 window.location.href = "/signup/success";
             })
@@ -140,13 +120,6 @@ export default class DeSignupForm extends LightningElement {
         this.username = event.detail;
     }
 
-    handleCountryChange(event: CustomEvent<{ value: string }>): void {
-        this.country = this.countries.find(
-            ({ value }) => value === event.detail.value
-        );
-        this.updateCheckboxLabels = true;
-    }
-
     private prepareUserData(): SignupForm | null {
         const fields = Array.from(
             this.template.querySelectorAll<HTMLFormElement>(
@@ -158,9 +131,14 @@ export default class DeSignupForm extends LightningElement {
             value: element.value
         }));
 
-        const checkboxes = this.getCheckboxesResult();
+        let validCheckboxes = true;
+        Array.from(
+            this.template.querySelectorAll<HTMLInputElement>("dx-checkbox")
+        ).forEach((checkbox) => {
+            validCheckboxes = validCheckboxes && checkbox.reportValidity();
+        });
 
-        if (fields.some((field) => !field.valid) || !checkboxes.valid) {
+        if (fields.some((field) => !field.valid) || !validCheckboxes) {
             return null;
         }
 
@@ -169,17 +147,15 @@ export default class DeSignupForm extends LightningElement {
             userData[field.name] = field.value;
         });
 
-        (userData as UserData).consent = this.country.showMarketingCheckbox
+        (userData as UserData).consent = this.showMarketingCheckbox
             ? "Explicit"
-            : "Implied ";
+            : "Implied";
         const InfoEmail =
-            this.country.showMarketingCheckbox && !checkboxes.values.opt_in
+            this.showMarketingCheckbox && !this.marketingCheckbox
                 ? "False"
                 : "True";
-
         const formData: SignupForm = {
             user: userData as UserData,
-            eula: checkboxes.values.eula,
             default_driver: DEFAULT_DRIVER,
             info_email: InfoEmail
         };
@@ -187,24 +163,75 @@ export default class DeSignupForm extends LightningElement {
         return formData;
     }
 
-    private getCheckboxesResult(): {
-        valid: boolean;
-        values: { eula: string; opt_in: "true" | "false" };
-    } {
-        let valid = true;
-        const values: { eula: string; opt_in: "true" | "false" } = {
-            eula: "",
-            opt_in: "false"
-        };
+    handleConsent(countrySelectElement: any) {
+        this.country = countrySelectElement.target.value;
+        countrySelectElement = countrySelectElement.target;
+        const countryOptions = countrySelectElement.options.find(
+            (option: any) => option.value === countrySelectElement.value
+        );
+        this.setLegalAndMarketingData(countryOptions);
+        this.marketingCheckbox = false;
+    }
 
-        Array.from(
-            this.template.querySelectorAll<HTMLInputElement>("dx-checkbox")
-        ).forEach((checkbox) => {
-            valid = valid && checkbox.reportValidity();
-            values[checkbox.name] = checkbox.checked;
-        });
+    handleMarketingCheckbox(marketingCheckbox: any) {
+        this.marketingCheckbox = marketingCheckbox.target.checked;
+    }
 
-        return { valid, values };
+    setLegalAndMarketingData(countryOptions: CountryOptions) {
+        // Set the checkbox text
+        this.setCheckboxTextSet(
+            countryOptions.marketingText,
+            countryOptions.learnMore
+                ? `${countryOptions.legalText} </br> ${countryOptions.learnMore}`
+                : countryOptions.legalText
+        );
+
+        // Toggle visibility of legal/marketing data
+        this.toggleLegalAndMarketingVisibility(
+            countryOptions.showMarketingText,
+            countryOptions.showLegalCheckbox
+        );
+    }
+
+    setCheckboxTextSet(marketingText: string, privacyText: string) {
+        this.marketingText = marketingText;
+        this.privacyText = privacyText;
+    }
+
+    toggleLegalAndMarketingVisibility(
+        showMarketingCheckbox: boolean,
+        showLegalCheckbox: boolean
+    ) {
+        this.showMarketingCheckbox = showMarketingCheckbox;
+        this.showLegalCheckbox = showLegalCheckbox;
+    }
+
+    setInnerHtml(element: HTMLElement, value: string) {
+        // disable lwc warning because text received from json has HTML
+        // eslint-disable-next-line @lwc/lwc/no-inner-html
+        element.innerHTML = value;
+    }
+
+    async getCountryList() {
+        if (!this.drmDomain) {
+            return;
+        }
+        const errorMsg = "Error while getting county list";
+        try {
+            const res = await fetch(
+                `${this.drmDomain}/utilities/services/apexrest/countries`
+            );
+
+            if (!res.ok) {
+                throw new Error(errorMsg);
+            }
+
+            const data = await res.json();
+            // eslint-disable-next-line @lwc/lwc/no-api-reassignments
+            this.countries = JSON.stringify(data);
+        } catch (error) {
+            console.error(error);
+        }
     }
 
     private updateInnerHtml(

package/src/modules/dw/deSignupForm/submitForm.ts

@@ -20,7 +20,6 @@ export type UserData = {
 
 export type SignupForm = {
     user: UserData;
-    eula: string;
     default_driver: string;
     info_email: "True" | "False";
 };

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.