@salesforcedevs/docs-components 0.55.5 → 0.55.8

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@salesforcedevs/docs-components",
-    "version": "0.55.5",
+    "version": "0.55.8",
     "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": "0adec410bc1b08455553d508e88596b30568019e"
+    "gitHead": "313a13007ee1311392232ec368c3bae0ba034cda"
 }

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

@@ -1,9 +1,7 @@
 export type CoveoAdvancedQueryXMLConfig = {
-    objecttype?: string;
-    sflocale__c?: string;
-    sfrelease__c?: string;
-    sfdelivarable__c?: string;
-    source?: string;
+    locale?: string;
+    version?: string;
+    topicid?: string;
 };
 
 export type PageReference = {

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

@@ -1,5 +1,5 @@
 import { api, track } from "lwc";
-import { toJson } from "dxUtils/normalizers";
+import { normalizeBoolean, toJson } from "dxUtils/normalizers";
 import { FetchContent } from "./utils";
 import {
     CoveoAdvancedQueryXMLConfig,
@@ -35,6 +35,15 @@ export default class DocXmlContent extends LightningElementWithState<{
         this._labels = toJson(value);
     }
 
+    @api
+    get enableCoveo() {
+        return this._enableCoveo;
+    }
+
+    set enableCoveo(value) {
+        this._enableCoveo = normalizeBoolean(value);
+    }
+
     private _labels: Labels = null;
     private availableLanguages: Array<DocLanguage> = [];
     private availableVersions: Array<DocVersion> = [];
@@ -51,6 +60,8 @@ export default class DocXmlContent extends LightningElementWithState<{
     private _pathName = "";
     private _pageHeader?: Header;
     private listenerAttached = false;
+    private _enableCoveo?: boolean = false;
+
     private searchSyncer = new SearchSyncer({
         callbacks: {
             onSearchChange: (nextSearchString: string): void => {
@@ -184,26 +195,23 @@ export default class DocXmlContent extends LightningElementWithState<{
         // Coveo is enabled and the version is greater than  51 (within the latest 3 versions)
         // TODO: we need a better fix for version number check
         return !(
-            process.env.COVEO_ORGANIZATION_ID &&
-            process.env.COVEO_PUBLIC_ACCESS_TOKEN &&
+            this.enableCoveo &&
+            this.coveoOrganizationId &&
+            this.coveoPublicAccessToken &&
             (!this.version?.releaseVersion ||
                 (this.version?.releaseVersion &&
-                    parseInt(this.version.releaseVersion.replace("v", ""), 10) >
-                        51))
+                    parseInt(
+                        this.version.releaseVersion.replace("v", ""),
+                        10
+                    ) >= 53))
         );
     }
 
     private get coveoAdvancedQueryConfig(): CoveoAdvancedQueryXMLConfig {
         return {
-            // Temporary fix for empty results on apexref page
-            ...(this.deliverable === "apexref"
-                ? { source: "Sitemap - Developer Docs Atlas - Apexref" }
-                : {
-                      objecttype: "HTDeveloperDocumentsC",
-                      sflocale__c: this.languageId,
-                      sfrelease__c: this.releaseVersionId,
-                      sfdelivarable__c: this.deliverable
-                  })
+            locale: this.languageId,
+            version: this.releaseVersionId,
+            topicid: this.deliverable
         };
     }