@salesforcedevs/docs-components 0.55.3 → 0.55.5

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@salesforcedevs/docs-components",
-    "version": "0.55.3",
+    "version": "0.55.5",
     "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": "dd93f0c0ca98a79366972c0f6c063a2292a427a9"
+    "gitHead": "0adec410bc1b08455553d508e88596b30568019e"
 }

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/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

@@ -180,6 +180,19 @@ 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