@salesforcedevs/docs-components 1.14.6-loader → 1.14.8-alpha100

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@salesforcedevs/docs-components",
-    "version": "1.14.6-loader",
+    "version": "1.14.8-alpha100",
     "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/htmlEntities";
 
 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/specificationContent/specificationContent.css

@@ -29,3 +29,8 @@ table {
 .icon {
     display: inline-block;
 }
+
+.loader {
+    pointer-events: none;
+    bottom: 30%;
+}

package/src/modules/doc/specificationContent/specificationContent.html

@@ -3,6 +3,7 @@
         <dx-spinner
             size="large"
             variant="brand"
+            class="loader"
             if:true={isLoading}
         ></dx-spinner>
         <dx-error-fallback lwc:if={showError}></dx-error-fallback>

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

@@ -38,9 +38,11 @@ export class FetchContent {
                 pdf_url,
                 deliverable
             } = await this.fetchResource<ApiDocData>(
-                `${this.apiDomain}/docs/get_document/${docId}`
+                `/cx-router/dsc/toc?projectId=sfdocs-asl_dev_guide&projectVersion=254-7-dev&locale=en-us`
             );
 
+            console.log(docId);
+
             const { normalizedToc, tocMap } = this.normalizeToc(toc);
             return {
                 availableLanguages:
@@ -70,26 +72,24 @@ export class FetchContent {
         deliverable: string,
         contentId: string,
         options: ContentApiOptions
-    ): Promise<ContentData> {
-        return this.fetchResource<ContentData>(
-            `${this.apiDomain}/docs/get_document_content/${deliverable}/${contentId}/${options.language}/${options.version}`
+    ): 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>
-    ): {
+    private normalizeToc(apiToc: Array<ApiNavItem>): {
         tocMap: { [key: string]: TreeNode };
         normalizedToc: Array<TreeNode>;
     } {

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/htmlEntities.ts

@@ -0,0 +1,25 @@
+/**
+ * Normalizes HTML entities in a string by first decoding any double-encoded entities
+ * and then properly encoding special characters
+ * @param str The string to normalize
+ * @returns The normalized string with properly encoded HTML entities
+ */
+export const 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
+};