@salesforcedevs/docs-components 1.3.138-coveo-fix2 → 1.3.138-coveo-fix4

package/package.json

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

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

@@ -1,6 +1,5 @@
 <template>
     <doc-content-layout
-        if:true={loaded}
         use-old-sidebar={useOldSidebar}
         class="content-type content-type-reference"
         coveo-organization-id={coveoOrganizationId}
@@ -8,6 +7,7 @@
         coveo-search-hub={coveoSearchHub}
         coveo-advanced-query-config={coveoAdvancedQueryConfig}
         breadcrumbs={breadcrumbs}
+        version={version}
         sidebar-header={sidebarHeader}
         sidebar-value={selectedSidebarValue}
         sidebar-content={navigation}

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,
@@ -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;
@@ -109,6 +110,7 @@ export default class AmfReference extends LightningElement {
                 this.oldVersionInfo
             ) {
                 this.showVersionBanner = true;
+                this.version = this.selectedVersion.id.replace("v", "");
             }
         }
 
@@ -142,26 +144,6 @@ export default class AmfReference extends LightningElement {
         this._expandChildren = normalizeBoolean(value);
     }
 
-    @api
-    get coveoAdvancedQueryConfig(): { [key: string]: any } {
-        const coveoConfig = toJson(this._coveoAdvancedQueryConfig);
-        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)
-        );
-        return this._coveoAdvancedQueryConfig;
-    }
-
-    set coveoAdvancedQueryConfig(config) {
-        this._coveoAdvancedQueryConfig = config;
-    }
-
     // model
     protected _amfConfigList: AmfConfig[] = [];
     protected _amfConfigMap: Map<string, AmfConfig> = new Map();
@@ -182,8 +164,7 @@ export default class AmfReference extends LightningElement {
     private isParentLevelDocPhaseEnabled = false;
     private selectedReferenceDocPhase?: string | null = null;
     private _expandChildren?: boolean = false;
-    private loaded = false;
-    private _coveoAdvancedQueryConfig!: { [key: string]: any };
+    private version = "latest";
 
     /**
      * Key for storing the currently selected reference url. This will be used to save the
@@ -204,7 +185,6 @@ export default class AmfReference extends LightningElement {
     }
 
     connectedCallback(): void {
-        this.loaded = true;
         this.addEventListener(
             "api-navigation-selection-changed",
             this._boundOnApiNavigationChanged
@@ -1279,6 +1259,7 @@ export default class AmfReference extends LightningElement {
             this.versions = this.getVersions();
             if (this.oldVersionInfo) {
                 this.showVersionBanner = true;
+                this.version = this.getSelectedVersion().id.replace("v", "");
             }
             this.updateDocPhase();
             this.selectedSidebarValue = window.location.pathname;

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

@@ -17,6 +17,7 @@
                 trees={sidebarContent}
                 value={sidebarValue}
                 header={sidebarHeader}
+                version={version}
                 coveo-organization-id={coveoOrganizationId}
                 coveo-public-access-token={coveoPublicAccessToken}
                 coveo-search-hub={coveoSearchHub}

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

@@ -35,6 +35,7 @@ export default class ContentLayout extends LightningElement {
     @api coveoSearchHub!: string;
     @api coveoAdvancedQueryConfig!: string;
     @api useOldSidebar?: boolean = false;
+    @api version!: string;
 
     @api
     get breadcrumbs() {