@salesforcedevs/dx-components 1.3.241 → 1.3.242-alpha2

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@salesforcedevs/dx-components",
-    "version": "1.3.241",
+    "version": "1.3.242-alpha2",
     "description": "DX Lightning web components",
     "license": "MIT",
     "engines": {
@@ -43,6 +43,5 @@
     },
     "volta": {
         "node": "16.19.1"
-    },
-    "gitHead": "ba302a7ca83b2a7dbbcdb3b7dcb8a34b50ccf7e2"
+    }
 }

package/src/assets/icons/salesforcebrand-sprite/svg/symbols.svg

@@ -272,7 +272,7 @@
             </g>
         </g>
     </symbol>
-    <symbol id="data-cloud" viewBox="0 0 56 56" xmlns="http://www.w3.org/2000/svg" style="fill:#fff">
+    <symbol id="data" viewBox="0 0 56 56" xmlns="http://www.w3.org/2000/svg" style="fill:#fff">
         <defs>
         <style>.acls-2,.acls-4{stroke-width:0}.acls-2{fill:#8a8ed1}.acls-4{fill:#fff}</style>
         </defs>
@@ -927,7 +927,7 @@
         </clipPath>
         </defs>
     </symbol>
-    <symbol fill="none" id="data-cloud" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56">
+    <symbol fill="none" id="data" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56">
         <path fill="#8a8ed1" d="m28,4C14.77,4,4,14.77,4,28c0,7.9,3.84,14.93,9.76,19.3.7-4.58,3.55-8.46,7.5-10.56-2.61-2.02-4.29-5.17-4.29-8.71,0-6.08,4.95-11.03,11.03-11.03s11.03,4.95,11.03,11.03c0,3.54-1.69,6.69-4.29,8.71,3.95,2.1,6.8,5.98,7.5,10.56,5.92-4.37,9.77-11.4,9.77-19.31,0-13.23-10.77-24-24-24Z"/>
         <path fill="#8a8ed1" d="m11.07,18.3c.69-1.2,2.21-1.61,3.41-.92,1.2.68,1.61,2.21.93,3.41h0c-.46.81-1.3,1.26-2.17,1.26-.42,0-.85-.11-1.24-.34-1.2-.68-1.61-2.21-.92-3.41Z"/>
         <path fill="#8a8ed1" d="m8.49,28.06c0-1.38,1.11-2.5,2.49-2.51,1.38,0,2.51,1.11,2.51,2.5s-1.11,2.5-2.49,2.5h-.01c-1.38,0-2.5-1.11-2.5-2.49Z"/>

package/src/modules/dx/codeBlock/codeBlock.html

@@ -11,7 +11,7 @@
                     <div class="toolbar-item">
                         <dx-dropdown
                             small="true"
-                            options={allLanguages}
+                            options={supportedLanguages}
                             value={selectedLanguageId}
                             onchange={onLanguageChange}
                         >

package/src/modules/dx/codeBlock/codeBlock.ts

@@ -44,11 +44,12 @@ export default class CodeBlock extends LightningElement {
     @api language: string = "";
     // if it is true, it renders code as is coming instead of wrapping it into html/xml comments tags.
     @api isEncoded = false;
+    @api showLanguageDropdown!: boolean;
+    private codeWithLanguages: { id: string; value: string }[] = [];
 
     private markupLangs = ["visualforce", "html", "xml"];
     private _codeBlockRendered: boolean = false;
     private componentLoaded: boolean = false;
-    private showLanguageDropdown: boolean = false;
     private copyBtnText: string = "Click to copy";
     private selectedLanguageLabel: string = "";
     private selectedLanguageId: string = "";
@@ -98,17 +99,62 @@ export default class CodeBlock extends LightningElement {
     set codeBlock(value: string) {
         this._codeBlockRendered = false;
         let match;
-        this._codeBlock = (
-            (match = preTagRegexp.exec(value.trim())) === null
-                ? value.trim()
-                : match[1]
-        ).trim();
+        if (this.showLanguageDropdown) {
+            let selectedLangBasedCode = "";
+            try {
+                const parsedValue = value && JSON.parse(value);
+                this.codeWithLanguages = parsedValue;
+                if (typeof parsedValue === "object" && parsedValue !== null) {
+                    this.selectedLanguageId = this.language;
+                    if (this.selectedLanguageId) {
+                        const selectedCode = this.codeWithLanguages.filter(
+                            (obj) => obj.id === this.selectedLanguageId
+                        );
+                        if (selectedCode.length > 0) {
+                            selectedLangBasedCode = selectedCode[0].value;
+                        }
+                    }
+                    const supportedLanguages = parsedValue.map(
+                        (obj: { id: string }) => obj.id
+                    );
+                    this._supportedLanguages = this.allLanguages.filter(
+                        (lang) => supportedLanguages.includes(lang.id)
+                    );
+                }
+            } catch (error) {
+                //console.log('Value is not a valid JSON string:', value);
+            }
+            this._codeBlock = (
+                (match = preTagRegexp.exec(selectedLangBasedCode.trim())) ===
+                null
+                    ? selectedLangBasedCode.trim()
+                    : match[1]
+            ).trim();
+        } else {
+            this._codeBlock = (
+                (match = preTagRegexp.exec(value.trim())) === null
+                    ? value.trim()
+                    : match[1]
+            ).trim();
+        }
     }
 
     get codeBlock(): string {
         return this._codeBlock;
     }
 
+    _supportedLanguages: CodeBlockLanguage[] = [];
+    @api
+    get supportedLanguages(): CodeBlockLanguage[] {
+        return this._supportedLanguages;
+    }
+    set supportedLanguages(value: string) {
+        const codeblockSupportedLanguages = JSON.parse(value);
+        this._supportedLanguages = this.allLanguages.filter((lang) =>
+            codeblockSupportedLanguages.includes(lang.id)
+        );
+    }
+
     @track private theme: CodeBlockTheme | null = null;
 
     @wire(getLocalStorageData, { key: "dx-codeblock-theme" })
@@ -223,6 +269,14 @@ export default class CodeBlock extends LightningElement {
             ) || this.allLanguages[0];
         this.selectedLanguageLabel = this.selectedLanguage.label;
         this.selectedLanguageId = this.selectedLanguage.id;
+        if (this.showLanguageDropdown) {
+            const selectedCode = this.codeWithLanguages.filter(
+                (codeObj) => codeObj.id === this.selectedLanguageId
+            );
+            if (selectedCode.length > 0) {
+                this._codeBlock = selectedCode[0].value;
+            }
+        }
         this.formatCodeBlock();
 
         gtmTrack(newLang, "custEv_ctaLinkClick", {

package/src/modules/dxBaseElements/headerBase/headerBase.ts

@@ -8,7 +8,7 @@ const VALID_BRANDS = [
     "analytics",
     "commerce",
     "employees",
-    "data-cloud",
+    "data",
     "industries",
     "integration",
     "learning",

package/src/modules/dxConstants/brands/brands.ts

@@ -2,7 +2,7 @@ import { Brand } from "typings/custom";
 
 export const BRANDS = [
     "employees",
-    "data-cloud",
+    "data",
     "marketing",
     "partners",
     "commerce",

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.