@salesforcedevs/docs-components 1.3.139-coveo-fix-test4 → 1.3.147

package/LICENSE

@@ -0,0 +1,12 @@
+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.

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@salesforcedevs/docs-components",
-    "version": "1.3.139-coveo-fix-test4",
+    "version": "1.3.147",
     "description": "Docs Lightning web components for DSC",
     "license": "MIT",
     "main": "index.js",
@@ -24,5 +24,5 @@
         "@types/lodash.orderby": "^4.6.7",
         "@types/lodash.uniqby": "^4.7.7"
     },
-    "gitHead": "4629fdd9ca18a13480044ad43515b91945d16aad"
+    "gitHead": "c046874452685c28208a52392b494ad791c3f305"
 }

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

@@ -16,8 +16,7 @@ import type {
     ReferenceSetConfig,
     AmfMetaTopicType,
     RouteMeta,
-    ParsedMarkdownTopic,
-    CoveoAdvancedQueryXMLConfig
+    ParsedMarkdownTopic
 } from "./types";
 
 import {
@@ -35,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,9 +110,6 @@ export default class AmfReference extends LightningElement {
                 this.oldVersionInfo
             ) {
                 this.showVersionBanner = true;
-                const newCoveoQueryConfig = this._coveoAdvancedQueryConfig;
-                newCoveoQueryConfig.version = selectedVersion.id;
-                this._coveoAdvancedQueryConfig = newCoveoQueryConfig;
             }
         }
 
@@ -125,31 +122,6 @@ export default class AmfReference extends LightningElement {
         }
     }
 
-    @api
-    set coveoAdvancedQueryConfig(config: CoveoAdvancedQueryXMLConfig) {
-        try {
-            const coveoConfig =
-                typeof config === "string" ? JSON.parse(config) : config;
-            this._coveoAdvancedQueryConfig = coveoConfig;
-        } catch (e) {
-            this._coveoAdvancedQueryConfig = {
-                locale: "en-us",
-                version: "latest",
-                topicid: this._currentReferenceId
-            };
-        }
-        console.log(
-            "Setting AQ: " + JSON.stringify(this._coveoAdvancedQueryConfig)
-        );
-    }
-
-    private get coveoAdvancedQueryConfig(): CoveoAdvancedQueryXMLConfig {
-        console.log(
-            "Getting AQ: " + JSON.stringify(this._coveoAdvancedQueryConfig)
-        );
-        return this._coveoAdvancedQueryConfig;
-    }
-
     @api
     get docPhaseInfo() {
         return this.selectedReferenceDocPhase;
@@ -176,7 +148,6 @@ export default class AmfReference extends LightningElement {
     protected _amfConfigMap: Map<string, AmfConfig> = new Map();
     protected _referenceSetConfig!: ReferenceSetConfig;
     protected _currentReferenceId = "";
-    protected _coveoAdvancedQueryConfig!: CoveoAdvancedQueryXMLConfig;
 
     protected parentReferenceUrls = [];
     protected amfMap: Record<string, AmfModelRecord> = {};
@@ -1286,9 +1257,6 @@ export default class AmfReference extends LightningElement {
             this.versions = this.getVersions();
             if (this.oldVersionInfo) {
                 this.showVersionBanner = true;
-                const newCoveoQueryConfig = this._coveoAdvancedQueryConfig;
-                newCoveoQueryConfig.version = this.getSelectedVersion().id;
-                this._coveoAdvancedQueryConfig = newCoveoQueryConfig;
             }
             this.updateDocPhase();
             this.selectedSidebarValue = window.location.pathname;

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

@@ -8,12 +8,6 @@ export interface AmfTopicType {
     type: string;
 }
 
-export type CoveoAdvancedQueryXMLConfig = {
-    locale?: string;
-    version?: string;
-    topicid?: string;
-};
-
 export interface AmfMetadataTopic extends AmfTopicType {
     meta: string;
     identifier: string;

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/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();
     };