@salesforcedevs/docs-components 0.55.8 → 0.56.1

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@salesforcedevs/docs-components",
-    "version": "0.55.8",
+    "version": "0.56.1",
     "description": "Docs Lightning web components for DSC",
     "license": "MIT",
     "main": "index.js",
@@ -24,5 +24,5 @@
         "@types/lodash.orderby": "^4.6.7",
         "@types/lodash.uniqby": "^4.7.7"
     },
-    "gitHead": "313a13007ee1311392232ec368c3bae0ba034cda"
+    "gitHead": "49fdd771cee3f6d50a27cd505ca2a612f1887493"
 }

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

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

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

@@ -1,11 +1,10 @@
 import { api, track } from "lwc";
-import { normalizeBoolean, toJson } from "dxUtils/normalizers";
+import { normalizeBoolean } from "dxUtils/normalizers";
 import { FetchContent } from "./utils";
 import {
     CoveoAdvancedQueryXMLConfig,
     DocLanguage,
     DocVersion,
-    Labels,
     TreeNode,
     Header,
     HistoryState,
@@ -13,6 +12,8 @@ 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,12 +28,14 @@ export default class DocXmlContent extends LightningElementWithState<{
     @api coveoPublicAccessToken!: string;
 
     @api
-    get labels() {
-        return this._labels;
+    get allLanguages(): Array<Language> {
+        return this._allLanguages;
     }
 
-    set labels(value) {
-        this._labels = toJson(value);
+    set allLanguages(value: string) {
+        if (value) {
+            this._allLanguages = JSON.parse(value);
+        }
     }
 
     @api
@@ -44,7 +47,6 @@ export default class DocXmlContent extends LightningElementWithState<{
         this._enableCoveo = normalizeBoolean(value);
     }
 
-    private _labels: Labels = null;
     private availableLanguages: Array<DocLanguage> = [];
     private availableVersions: Array<DocVersion> = [];
     private contentProvider: FetchContent;
@@ -98,6 +100,7 @@ export default class DocXmlContent extends LightningElementWithState<{
         shouldStopPropagation: true,
         target: window
     });
+    private _allLanguages: Array<Language> = DEFAULT_LANGUAGES;
 
     @track private pageReference: PageReference = {};
 
@@ -120,8 +123,10 @@ export default class DocXmlContent extends LightningElementWithState<{
             window.location.href = "/docs";
             return;
         }
-
-        this.contentProvider = new FetchContent(this.apiDomain, this._labels);
+        this.contentProvider = new FetchContent(
+            this.apiDomain,
+            this.allLanguages
+        );
         this.fetchDocument().then(() => (this.loaded = true));
         window.addEventListener("popstate", this.handlePopState);
 
@@ -208,11 +213,16 @@ export default class DocXmlContent extends LightningElementWithState<{
     }
 
     private get coveoAdvancedQueryConfig(): CoveoAdvancedQueryXMLConfig {
-        return {
+        const config: { locale: string; topicid: string; version?: string } = {
             locale: this.languageId,
-            version: this.releaseVersionId,
             topicid: this.deliverable
         };
+
+        if (this.releaseVersionId && this.releaseVersionId !== "noversion") {
+            config.version = this.releaseVersionId;
+        }
+
+        return config;
     }
 
     private get pageHeader(): Header {