@salesforcedevs/docs-components 1.14.8-alpha7 → 1.14.8-ldh-alpha

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@salesforcedevs/docs-components",
-    "version": "1.14.8-alpha7",
+    "version": "1.14.8-ldh-alpha",
     "description": "Docs Lightning web components for DSC",
     "license": "MIT",
     "main": "index.js",

package/src/modules/doc/header/header.html

@@ -48,7 +48,7 @@
             </header>
         </dx-brand-theme-provider>
     </template>
-    <template lwc:if={showDocDivider}>
+    <template lwc:if={isHideHeader}>
         <div class="no-header-content"></div>
     </template>
 </template>

package/src/modules/doc/header/header.ts

@@ -17,6 +17,7 @@ const isStorybook = () => {
 export default class Header extends HeaderBase {
     @api langValuePath: string = "id"; // allows to override how language property is interpreted, follows valuePath dropdown api.
     @api headerHref: string = "/";
+    @api hideDocHeader: boolean = false;
 
     @api
     get scopedNavItems() {
@@ -51,6 +52,10 @@ export default class Header extends HeaderBase {
         return this.scopedNavItems && this.scopedNavItems.length > 0;
     }
 
+    private get isHideHeader(): boolean {
+        return this.hideDocHeader || this.showDocDivider;
+    }
+
     connectedCallback(): void {
         super.connectedCallback();
         this.tabletMatchMedia = window.matchMedia(
@@ -60,7 +65,8 @@ export default class Header extends HeaderBase {
         this.tabletMatchMedia.addEventListener("change", this.onTabletChange);
 
         if (
-            (window.location.pathname.includes("/docs/") &&
+            (!this.isHideHeader &&
+                window.location.pathname.includes("/docs/") &&
                 window.location.pathname !== "/docs/apis") ||
             window.location.pathname ===
                 "/tableau/embedding-playground/overview" ||
@@ -69,7 +75,11 @@ export default class Header extends HeaderBase {
             this.shouldRender = true;
         }
 
-        if (this.shouldRender && window.location.pathname.includes("/docs/")) {
+        if (
+            !this.isHideHeader &&
+            this.shouldRender &&
+            window.location.pathname.includes("/docs/")
+        ) {
             if (!this.brand && !this.mobile) {
                 this.shouldRender = false;
                 this.showDocDivider = true;

package/src/modules/doc/lwcContentLayout/lwcContentLayout.html

@@ -11,6 +11,8 @@
                 language={language}
                 bail-href={bailHref}
                 bail-label={bailLabel}
+                dev-center={devCenter}
+                brand={brand}
             >
                 <slot name="sidebar-header" slot="version-picker"></slot>
             </dx-sidebar-old>
@@ -30,6 +32,8 @@
                 language={language}
                 bail-href={bailHref}
                 bail-label={bailLabel}
+                dev-center={devCenter}
+                brand={brand}
             >
                 <slot name="sidebar-header" slot="version-picker"></slot>
             </dx-sidebar>

package/src/modules/doc/lwcContentLayout/lwcContentLayout.ts

@@ -1,3 +1,5 @@
+/* eslint-disable @lwc/lwc/no-document-query */
+import { api } from "lwc";
 import ContentLayout from "doc/contentLayout";
 
 const TOC_HEADER_TAG = "doc-heading";
@@ -6,6 +8,8 @@ const SPECIFICATION_TAB_TITLE = "Specification";
 export const OBSERVER_ATTACH_WAIT_TIME = 500;
 
 export default class LwcContentLayout extends ContentLayout {
+    @api devCenter: any;
+    @api brand: any;
     private rnbByTab: boolean = false;
 
     private setRNBByTab() {

package/src/modules/doc/nav/nav.ts

@@ -21,7 +21,6 @@ export default class Nav extends LightningElement {
     @api pageReference!: PageReference;
 
     handleSelected(event: CustomEvent) {
-        event.preventDefault();
         event.stopPropagation();
         const newPageReference = { ...this.pageReference };
         const target = event.detail.name.split("-");

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

@@ -38,11 +38,9 @@ export class FetchContent {
                 pdf_url,
                 deliverable
             } = await this.fetchResource<ApiDocData>(
-                `/cx-router/dsc/toc?projectId=sfdocs-asl_dev_guide&projectVersion=254-7-dev&locale=en-us`
+                `${this.apiDomain}/docs/get_document/${docId}`
             );
 
-            console.log(docId);
-
             const { normalizedToc, tocMap } = this.normalizeToc(toc);
             return {
                 availableLanguages:
@@ -72,24 +70,26 @@ export class FetchContent {
         deliverable: string,
         contentId: string,
         options: ContentApiOptions
-    ): Promise<String> {
-        return this.fetchResource<String>(
-            `/cx-router/dsc/topic?projectId=sfdocs-asl_dev_guide&projectVersion=254-7-dev&locale=en-us&topic=${contentId}`
+    ): Promise<ContentData> {
+        return this.fetchResource<ContentData>(
+            `${this.apiDomain}/docs/get_document_content/${deliverable}/${contentId}/${options.language}/${options.version}`
         );
     }
 
     private async fetchResource<T>(url: string): Promise<T> {
         const response = await fetch(url);
-        /*if (!response.ok) {
+        if (!response.ok) {
             throw new Error(response.statusText);
-        }*/
+        }
 
         const json = await response.json();
 
-        return json.response;
+        return json;
     }
 
-    private normalizeToc(apiToc: Array<ApiNavItem>): {
+    private normalizeToc(
+        apiToc: Array<ApiNavItem>
+    ): {
         tocMap: { [key: string]: TreeNode };
         normalizedToc: Array<TreeNode>;
     } {

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

@@ -251,18 +251,17 @@ export default class DocXmlContent extends LightningElementWithState<{
     private get useOldSidebar(): boolean {
         // 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 false;
-        // return !(
-        //     this.enableCoveo &&
-        //     this.coveoOrganizationId &&
-        //     this.coveoPublicAccessToken &&
-        //     (!this.version?.releaseVersion ||
-        //         (this.version?.releaseVersion &&
-        //             parseInt(
-        //                 this.version.releaseVersion.replace("v", ""),
-        //                 10
-        //             ) >= 53))
-        // );
+        return !(
+            this.enableCoveo &&
+            this.coveoOrganizationId &&
+            this.coveoPublicAccessToken &&
+            (!this.version?.releaseVersion ||
+                (this.version?.releaseVersion &&
+                    parseInt(
+                        this.version.releaseVersion.replace("v", ""),
+                        10
+                    ) >= 53))
+        );
     }
 
     private get coveoAdvancedQueryConfig(): CoveoAdvancedQueryXMLConfig {
@@ -347,7 +346,6 @@ export default class DocXmlContent extends LightningElementWithState<{
     }
 
     handleSelect(event: CustomEvent<{ name: string }>): void {
-        event.preventDefault();
         event.stopPropagation();
         const { name } = event.detail;
 
@@ -366,18 +364,15 @@ export default class DocXmlContent extends LightningElementWithState<{
                 contentDocumentId,
                 hash
             });
-            this.updateUrl(HistoryState.PUSH_STATE);
-            // Prevent default navigation
-            event.preventDefault();
+            this.updateUrl();
         }
     }
 
     handleNavClick(event: CustomEvent<{ pageReference: PageReference }>): void {
-        event.preventDefault();
         event.stopPropagation();
         const { pageReference } = event.detail;
         this.updatePageReference(pageReference);
-        this.updateUrl(HistoryState.PUSH_STATE);
+        this.updateUrl();
     }
 
     handleLanguageChange = (event: any) => {
@@ -548,7 +543,7 @@ export default class DocXmlContent extends LightningElementWithState<{
         );
 
         if (data) {
-            this.docContent = JSON.parse(data).content;
+            this.docContent = data.content;
             this.addMetatags();
 
             if (!this.pageReference.hash) {
@@ -585,14 +580,11 @@ export default class DocXmlContent extends LightningElementWithState<{
 
     updateUrl(method = HistoryState.PUSH_STATE): void {
         logCoveoPageView(this.coveoOrganizationId, this.coveoAnalyticsToken);
-        const url = this.pageReferenceToString(this.pageReference);
         window.history[method](
             {},
             "docs",
-            url
+            this.pageReferenceToString(this.pageReference)
         );
-        // Prevent default navigation
-        event?.preventDefault();
     }
 
     private updateHighlighting(searchParam: string): void {