@salesforcedevs/docs-components 0.55.3-dw-locales1 → 0.55.5-alpha01

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@salesforcedevs/docs-components",
-    "version": "0.55.3-dw-locales1",
+    "version": "0.55.5-alpha01",
     "description": "Docs Lightning web components for DSC",
     "license": "MIT",
     "main": "index.js",

package/src/modules/doc/content/content.ts

@@ -150,11 +150,26 @@ export default class Content extends LightningElement {
                     is: ContentCallout
                 });
                 const detailEls = calloutEl.querySelectorAll(
-                    "p, div.data, ol, ul, .codeSection, .mediaBd > span.ph"
+                    "p, div.data, ol, ul, p+.codeSection, .mediaBd > span.ph"
                 );
                 detailEls.forEach((detailEl) => {
-                    calloutCompEl.appendChild(detailEl);
+                    if (detailEl.innerHTML.trim() !== "") {
+                        calloutCompEl.appendChild(detailEl);
+                    }
                 });
+
+                let flag = 1;
+                for (let i = 0; i < detailEls.length; i++) {
+                    flag &= detailEls[i].innerHTML.trim() === "";
+                }
+
+                if (flag) {
+                    const codeEls = calloutEl.querySelectorAll(".codeSection");
+                    codeEls.forEach((codeEl) => {
+                        calloutCompEl.appendChild(codeEl);
+                    });
+                }
+
                 const type = calloutEl.querySelector("h4").textContent;
                 const typeLower = type.toLowerCase();
                 Object.assign(calloutCompEl, {

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

@@ -21,6 +21,12 @@ export enum HistoryState {
     REPLACE_STATE = "replaceState"
 }
 
+export type Labels = {
+    language_english: string;
+    language_japanese: string;
+    toc_title: string;
+};
+
 export type TreeNode = {
     label: string;
     name: string;

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

@@ -8,18 +8,22 @@ import {
     DocumentData,
     DocLanguage,
     DocVersion,
+    Labels,
     TreeNode
 } from "./types";
-import { Language } from "typings/custom";
-import { getLanguageDisplayTextById } from "dxUtils/language";
+
+const LOCALE_TO_LABEL = {
+    "en-us": "language_english",
+    "ja-jp": "language_japanese"
+};
 
 export class FetchContent {
     private apiDomain: string;
-    private languages: Array<Language> = [];
+    private labels: Labels;
 
-    constructor(apiDomain: string, languages: Array<Language>) {
+    constructor(apiDomain: string, labels: Labels) {
         this.apiDomain = apiDomain;
-        this.languages = languages;
+        this.labels = labels;
     }
 
     async fetchDocumentData(docId: string): Promise<DocumentData | null> {
@@ -144,10 +148,11 @@ export class FetchContent {
     }
 
     private normalizeLanguage(language: ApiDocLanguage): DocLanguage {
-
+        const labelKey = language.locale && LOCALE_TO_LABEL[language.locale];
         return (
             language && {
-                label: getLanguageDisplayTextById(this.languages, language.locale) || 
+                label:
+                    (labelKey && this.labels && this.labels[labelKey]) ||
                     language.label,
                 id: language.locale,
                 code: language.code,

package/src/modules/doc/xmlContent/xmlContent.html

@@ -9,7 +9,7 @@
         sidebar-content={sidebarContent}
         sidebar-value={sidebarValue}
         onselect={handleSelect}
-        use-old-sidebar
+        use-old-sidebar={useOldSidebar}
     >
         <div slot="sidebar-header" class="document-pickers">
             <dx-dropdown

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

@@ -1,9 +1,11 @@
 import { api, track } from "lwc";
+import { toJson } from "dxUtils/normalizers";
 import { FetchContent } from "./utils";
 import {
     CoveoAdvancedQueryXMLConfig,
     DocLanguage,
     DocVersion,
+    Labels,
     TreeNode,
     Header,
     HistoryState,
@@ -11,8 +13,6 @@ import {
 } from "./types";
 import { SearchSyncer } from "docUtils/SearchSyncer";
 import { LightningElementWithState } from "docBaseElements/lightningElementWithState";
-import { Language } from "typings/custom";
-import { DEFAULT_LANGUAGES } from "dxUtils/constants";
 
 // TODO: Imitating from actual implementation as doc-content use it like this. We should refactor it later.
 const handleContentError = (error): void => console.log(error);
@@ -27,16 +27,15 @@ export default class DocXmlContent extends LightningElementWithState<{
     @api coveoPublicAccessToken!: string;
 
     @api
-    get allLanguages(): Array<Language> {
-        return this._allLanguages;
+    get labels() {
+        return this._labels;
     }
 
-    set allLanguages(value: string) {
-        if (value) {
-            this._allLanguages = JSON.parse(value);
-        }
+    set labels(value) {
+        this._labels = toJson(value);
     }
 
+    private _labels: Labels = null;
     private availableLanguages: Array<DocLanguage> = [];
     private availableVersions: Array<DocVersion> = [];
     private contentProvider: FetchContent;
@@ -88,7 +87,6 @@ export default class DocXmlContent extends LightningElementWithState<{
         shouldStopPropagation: true,
         target: window
     });
-    private _allLanguages: Array<Language> = DEFAULT_LANGUAGES;
 
     @track private pageReference: PageReference = {};
 
@@ -111,10 +109,8 @@ export default class DocXmlContent extends LightningElementWithState<{
             window.location.href = "/docs";
             return;
         }
-        this.contentProvider = new FetchContent(
-            this.apiDomain,
-            this.allLanguages
-        );
+
+        this.contentProvider = new FetchContent(this.apiDomain, this._labels);
         this.fetchDocument().then(() => (this.loaded = true));
         window.addEventListener("popstate", this.handlePopState);
 
@@ -184,17 +180,24 @@ export default class DocXmlContent extends LightningElementWithState<{
         return this.pageReference.deliverable;
     }
 
+    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 !(
+            process.env.COVEO_ORGANIZATION_ID &&
+            process.env.COVEO_PUBLIC_ACCESS_TOKEN &&
+            (!this.version?.releaseVersion ||
+                (this.version?.releaseVersion &&
+                    parseInt(this.version.releaseVersion.replace("v", ""), 10) >
+                        51))
+        );
+    }
+
     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
         };
     }