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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@salesforcedevs/docs-components",
-    "version": "1.3.138-coveo-alpha1",
+    "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

@@ -3,7 +3,7 @@ import { noCase } from "no-case";
 import { sentenceCase } from "sentence-case";
 import qs from "query-string";
 import { AmfModelParser } from "./utils";
-import { normalizeBoolean, toJson } from "dxUtils/normalizers";
+import { normalizeBoolean } from "dxUtils/normalizers";
 import type {
     AmfConfig,
     AmfMetadataTopic,
@@ -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;
@@ -111,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
@@ -122,6 +123,19 @@ export default class AmfReference extends LightningElement {
         }
     }
 
+    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;
+            }
+        }
+        console.log("AMFReferences: " + version);
+        this.versionForCoveo = version;
+    }
+
     @api
     get docPhaseInfo() {
         return this.selectedReferenceDocPhase;
@@ -143,25 +157,6 @@ export default class AmfReference extends LightningElement {
         this._expandChildren = normalizeBoolean(value);
     }
 
-    @api
-    set coveoAdvancedQueryConfig(config) {
-        const coveoConfig = toJson(config);
-        if (this.versions.length > 1 && this.selectedVersion) {
-            const currentGAVersionRef = this.versions[0];
-            if (this.selectedVersion.id !== currentGAVersionRef.id) {
-                coveoConfig.version = this.selectedVersion.id;
-            }
-        }
-        this._coveoAdvancedQueryConfig = coveoConfig;
-    }
-
-    get coveoAdvancedQueryConfig(): CoveoAdvancedQueryXMLConfig {
-        console.log(
-            "AMFReference: " + JSON.stringify(this._coveoAdvancedQueryConfig)
-        );
-        return this._coveoAdvancedQueryConfig;
-    }
-
     // model
     protected _amfConfigList: AmfConfig[] = [];
     protected _amfConfigMap: Map<string, AmfConfig> = new Map();
@@ -176,6 +171,7 @@ export default class AmfReference extends LightningElement {
     protected selectedSidebarValue = undefined;
 
     protected selectedVersion: ReferenceVersion | null = null;
+    protected versionForCoveo: string = "latest";
 
     private hasRendered = false;
 
@@ -183,8 +179,6 @@ export default class AmfReference extends LightningElement {
     private selectedReferenceDocPhase?: string | null = null;
     private _expandChildren?: boolean = false;
 
-    protected _coveoAdvancedQueryConfig!: CoveoAdvancedQueryXMLConfig;
-
     /**
      * Key for storing the currently selected reference url. This will be used to save the
      * previously selected reference url and restoring it when changing between reference versions.

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/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 = {};