@salesforcedevs/docs-components 1.14.8-alpha1 → 1.14.8-alpha101

package/package.json

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

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

@@ -6,6 +6,7 @@ import Button from "dx/button";
 import { highlightTerms } from "dxUtils/highlight";
 import ContentCallout from "doc/contentCallout";
 import ContentMedia from "doc/contentMedia";
+import { normalizeHtmlEntities } from "docUtils/utils";
 
 const HIGHLIGHTABLE_SELECTOR = [
     "p",
@@ -36,7 +37,7 @@ export default class Content extends LightningElement {
     @api
     set docsData(value) {
         this._docRendered = false;
-        this.docContent = (value && value.trim()) || "";
+        this.docContent = (value && normalizeHtmlEntities(value.trim())) || "";
     }
 
     get docsData() {
@@ -110,7 +111,7 @@ export default class Content extends LightningElement {
         const divEl = this.getCleanContainer();
 
         if (divEl) {
-            divEl.innerHTML = docContent || this.docContent;
+            divEl.innerHTML = normalizeHtmlEntities(docContent || this.docContent);
 
             // Query the code blocks and create a dx-code-block component that contains the code
             const codeBlockEls = divEl.querySelectorAll(".codeSection");

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

@@ -72,22 +72,21 @@ export class FetchContent {
         deliverable: string,
         contentId: string,
         options: ContentApiOptions
-    ): Promise<ContentData> {
-        console.log(options + deliverable);
-        return this.fetchResource<ContentData>(
+    ): Promise<String> {
+        return this.fetchResource<String>(
             `/cx-router/dsc/topic?projectId=sfdocs-asl_dev_guide&projectVersion=254-7-dev&locale=en-us&topic=${contentId}`
         );
     }
 
     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;
+        return json.response;
     }
 
     private normalizeToc(apiToc: Array<ApiNavItem>): {

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

@@ -543,7 +543,7 @@ export default class DocXmlContent extends LightningElementWithState<{
         );
 
         if (data) {
-            this.docContent = data.content;
+            this.docContent = JSON.parse(data).content;
             this.addMetatags();
 
             if (!this.pageReference.hash) {

package/src/modules/docUtils/utils/utils.ts

@@ -30,3 +30,23 @@ export function logCoveoPageView(
         });
     }
 }
+
+export function normalizeHtmlEntities(str: string): string {
+    if (typeof str !== 'string') {
+        return str;
+    }
+    
+    // First decode any double-encoded entities
+    const tempDiv = document.createElement('div');
+    tempDiv.innerHTML = str;
+    const decoded = tempDiv.textContent || tempDiv.innerText;
+    
+    // Then properly encode special characters
+    return decoded
+        .replace(/&/g, '&')
+        .replace(/</g, '&lt;')
+        .replace(/>/g, '&gt;')
+        .replace(/"/g, '&quot;')
+        .replace(/'/g, '&#039;')
+        .replace(/\u00A0/g, '&nbsp;'); // Handle non-breaking space
+}