@salesforcedevs/docs-components 1.3.138-coveo-alpha3 → 1.3.138-coveo-fix1

package/package.json

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

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

@@ -1,11 +1,11 @@
 <template>
     <doc-content-layout
+        if:true={loaded}
         use-old-sidebar={useOldSidebar}
         class="content-type content-type-reference"
         coveo-organization-id={coveoOrganizationId}
         coveo-public-access-token={coveoPublicAccessToken}
         coveo-search-hub={coveoSearchHub}
-        version={versionForCoveo}
         coveo-advanced-query-config={coveoAdvancedQueryConfig}
         breadcrumbs={breadcrumbs}
         sidebar-header={sidebarHeader}

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 } from "dxUtils/normalizers";
+import { normalizeBoolean, toJson } from "dxUtils/normalizers";
 import type {
     AmfConfig,
     AmfMetadataTopic,
@@ -34,7 +34,6 @@ 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,7 +110,6 @@ 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
@@ -123,19 +121,6 @@ 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;
@@ -157,6 +142,25 @@ export default class AmfReference extends LightningElement {
         this._expandChildren = normalizeBoolean(value);
     }
 
+    @api
+    get coveoAdvancedQueryConfig(): { [key: string]: any } {
+        return this._coveoAdvancedQueryConfig;
+    }
+
+    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.replace("v", "");
+            }
+        }
+        this._coveoAdvancedQueryConfig = coveoConfig;
+        console.log(
+            "AQ AMF Ref: " + JSON.stringify(this._coveoAdvancedQueryConfig)
+        );
+    }
+
     // model
     protected _amfConfigList: AmfConfig[] = [];
     protected _amfConfigMap: Map<string, AmfConfig> = new Map();
@@ -171,13 +175,14 @@ export default class AmfReference extends LightningElement {
     protected selectedSidebarValue = undefined;
 
     protected selectedVersion: ReferenceVersion | null = null;
-    protected versionForCoveo: string = "latest";
 
     private hasRendered = false;
 
     private isParentLevelDocPhaseEnabled = false;
     private selectedReferenceDocPhase?: string | null = null;
     private _expandChildren?: boolean = false;
+    private loaded = false;
+    private _coveoAdvancedQueryConfig!: { [key: string]: any };
 
     /**
      * Key for storing the currently selected reference url. This will be used to save the
@@ -198,6 +203,7 @@ export default class AmfReference extends LightningElement {
     }
 
     connectedCallback(): void {
+        this.loaded = true;
         this.addEventListener(
             "api-navigation-selection-changed",
             this._boundOnApiNavigationChanged

package/src/modules/doc/contentLayout/contentLayout.html

@@ -17,7 +17,7 @@
                 trees={sidebarContent}
                 value={sidebarValue}
                 header={sidebarHeader}
-                coveo-organization-id={getUpdateCoveoQuery}
+                coveo-organization-id={coveoOrganizationId}
                 coveo-public-access-token={coveoPublicAccessToken}
                 coveo-search-hub={coveoSearchHub}
                 coveo-advanced-query-config={coveoAdvancedQueryConfig}

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

@@ -33,19 +33,8 @@ 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() {
@@ -81,24 +70,13 @@ export default class ContentLayout extends LightningElement {
         this.template.querySelector("dx-sidebar")?.setInputValue(searchTerm);
     }
 
-    @api
-    set coveoAdvancedQueryConfig(config) {
-        this._coveoAdvancedQueryConfig = config;
-    }
-
-    get 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 = {};
@@ -146,23 +124,6 @@ export default class ContentLayout extends LightningElement {
         );
     }
 
-    private getUpdateCoveoQuery() {
-        console.log(
-            "Content-Layout Before: " +
-                JSON.stringify(this._coveoAdvancedQueryConfig)
-        );
-        const coveoConfig = toJson(this._coveoAdvancedQueryConfig);
-        if (this._newVersion !== "latest") {
-            coveoConfig.version = this._newVersion;
-        }
-        this._coveoAdvancedQueryConfig = coveoConfig;
-        console.log(
-            "After Content-Layout: " +
-                JSON.stringify(this._coveoAdvancedQueryConfig)
-        );
-        return this._coveoAdvancedQueryConfig;
-    }
-
     connectedCallback(): void {
         const hasParentHighlightListener = closest(
             "doc-xml-content",