@salesforcedevs/docs-components 1.3.138-coveo-alpha → 1.3.138-coveo-alpha2

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@salesforcedevs/docs-components",
-    "version": "1.3.138-coveo-alpha",
+    "version": "1.3.138-coveo-alpha2",
     "description": "Docs Lightning web components for DSC",
     "license": "MIT",
     "main": "index.js",

package/src/modules/doc/amfReference/amfReference.html

@@ -6,6 +6,7 @@
         coveo-public-access-token={coveoPublicAccessToken}
         coveo-search-hub={coveoSearchHub}
         coveo-advanced-query-config={coveoAdvancedQueryConfig}
+        version={versionForCoveo}
         breadcrumbs={breadcrumbs}
         sidebar-header={sidebarHeader}
         sidebar-value={selectedSidebarValue}

package/src/modules/doc/amfReference/amfReference.ts

@@ -34,6 +34,7 @@ export default class AmfReference extends LightningElement {
     @api sidebarHeader!: string;
     @api coveoOrganizationId!: string;
     @api coveoPublicAccessToken!: string;
+    @api coveoAdvancedQueryConfig!: string;
     @api coveoSearchHub!: string;
     @api useOldSidebar?: boolean = false;
     @api tocTitle?: string;
@@ -110,6 +111,7 @@ export default class AmfReference extends LightningElement {
             ) {
                 this.showVersionBanner = true;
             }
+            this.setReferenceVersionForCoveo();
         }
 
         // This is to check if the url is hash based and redirect if needed
@@ -121,19 +123,17 @@ export default class AmfReference extends LightningElement {
         }
     }
 
-    private get coveoAdvancedQueryConfig(config: string): string {
-        try {
-            const coveoAgConfig = JSON.parse(config);
-            if(this.showVersionBanner) {
-                coveoAgConfig.version = this.getSelectedVersion();
-            } else {
-                coveoAgConfig.version = "latest";
+    private setReferenceVersionForCoveo(): void {
+        let version = "latest";
+        const allVersions = this.getVersions();
+        if (allVersions.length > 1 && this.selectedVersion) {
+            const currentGAVersionRef = allVersions[0];
+            if (this.selectedVersion.id !== currentGAVersionRef.id) {
+                version = this.selectedVersion.id;
             }
-    
-            return JSON.stringify(coveoAgConfig);
-        } catch (error) {
-            console.log(`Error during version implementation.`)
         }
+        console.log("AMFReferences: " + version);
+        this.versionForCoveo = version;
     }
 
     @api
@@ -171,6 +171,7 @@ export default class AmfReference extends LightningElement {
     protected selectedSidebarValue = undefined;
 
     protected selectedVersion: ReferenceVersion | null = null;
+    protected versionForCoveo: string = "latest";
 
     private hasRendered = false;
 

package/src/modules/doc/breadcrumbItem/breadcrumbItem.ts

@@ -53,7 +53,7 @@ export default class BreadcrumbItem extends LightningElement {
     private onLinkClick(event: Event): void {
         track(event.target!, "custEv_breadcrumbClick", {
             click_text: this.label,
-            click_url: this.href,
+            click_url: `${window.location.origin}${this.href}`,
             element_type: "link",
             nav_type: "breadcrumb",
             nav_level: this.level ? this.level + 1 : 1,
@@ -62,7 +62,7 @@ export default class BreadcrumbItem extends LightningElement {
 
         track(event.target!, "custEv_linkClick", {
             click_text: this.label,
-            click_url: this.href,
+            click_url: `${window.location.origin}${this.href}`,
             element_title: this.label,
             element_type: "link",
             content_category: "cta"

package/src/modules/doc/contentLayout/contentLayout.ts

@@ -33,8 +33,19 @@ export default class ContentLayout extends LightningElement {
     @api coveoOrganizationId!: string;
     @api coveoPublicAccessToken!: string;
     @api coveoSearchHub!: string;
-    @api coveoAdvancedQueryConfig!: string;
+
     @api useOldSidebar?: boolean = false;
+    @api
+    get version(): string {
+        return this._newVersion;
+    }
+
+    set version(val) {
+        if (val) {
+            this._newVersion = val;
+        }
+        console.log("Content Layout: " + this._newVersion);
+    }
 
     @api
     get breadcrumbs() {
@@ -70,13 +81,32 @@ export default class ContentLayout extends LightningElement {
         this.template.querySelector("dx-sidebar")?.setInputValue(searchTerm);
     }
 
+    @api
+    set coveoAdvancedQueryConfig(config) {
+        const coveoConfig = toJson(config);
+        if (this._newVersion !== "latest") {
+            coveoConfig.version = this._newVersion;
+        }
+        this._coveoAdvancedQueryConfig = coveoConfig;
+    }
+
+    get coveoAdvancedQueryConfig() {
+        console.log(
+            "AQ Content Layout: " +
+                JSON.stringify(this._coveoAdvancedQueryConfig)
+        );
+        return this._coveoAdvancedQueryConfig;
+    }
+
     @track
     private _sidebarContent: unknown;
 
     private _breadcrumbs = null;
+    protected _newVersion: string = "latest";
 
     @track
     private _tocOptions: Array<unknown>;
+    private _coveoAdvancedQueryConfig!: string;
 
     private tocOptionIdsSet = new Set();
     private anchoredElements: AnchorMap = {};

package/src/modules/doc/header/header.css

@@ -40,8 +40,8 @@ header:not(.has-brand) > .header_l2 {
 }
 
 .header_lang-dropdown {
-    --button-primary-color: var(--dx-g-blue-vibrant-50);
-    --button-primary-color-hover: var(--dx-g-blue-vibrant-40);
+    --button-primary-color: var(--dx-g-blue-vibrant-40);
+    --button-primary-color-hover: var(--dx-g-blue-vibrant-30);
 }
 
 .header_lang-dropdown > dx-button {

package/src/modules/doc/header/header.ts

@@ -133,6 +133,7 @@ export default class Header extends HeaderBase {
     private onLangChange(event: CustomEvent<string>): void {
         const { detail } = event;
         this._language = detail;
+
         this.dispatchEvent(new CustomEvent("langchange", { detail }));
     }
 

package/src/modules/doc/xmlContent/xmlContent.ts

@@ -16,6 +16,7 @@ import { SearchSyncer } from "docUtils/SearchSyncer";
 import { LightningElementWithState } from "docBaseElements/lightningElementWithState";
 import { oldVersionDocInfo } from "docUtils/utils";
 import { Breadcrumb, DocPhaseInfo, Language } from "typings/custom";
+import { track as trackGTM } from "dxUtils/analytics";
 
 // TODO: Imitating from actual implementation as doc-content use it like this. We should refactor it later.
 const handleContentError = (error): void => console.log(error);
@@ -364,6 +365,17 @@ export default class DocXmlContent extends LightningElementWithState<{
             ({ id }) => id === event.detail
         );
         this.pageReference.docId = this.language.url;
+
+        trackGTM(event.target!, "custEv_ctaLinkClick", {
+            click_text: event.detail,
+            element_title: "language selector",
+            click_url: `${window.location.origin}${this.pageReferenceToString(
+                this.pageReference
+            )}`,
+            element_type: "link",
+            content_category: "cta"
+        });
+
         this.updateUrl();
         this.fetchDocument();
     };