@salesforcedevs/dx-components 1.3.206-alpha.22 → 1.3.206-alpha.23

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@salesforcedevs/dx-components",
-    "version": "1.3.206-alpha.22",
+    "version": "1.3.206-alpha.23",
     "description": "DX Lightning web components",
     "license": "MIT",
     "engines": {

package/src/modules/dx/searchResults/searchResults.ts

@@ -57,10 +57,10 @@ const resultsTemplatesInnerHtml = `
                 <% } %>
             </div>
             <p class="dx-result-title">
-                <a
+                <span
                     class="CoveoResultLink"
-                    data-field="@clickableuri"
-                ></a>
+                    data-field="@uri"
+                ></span>
             </p>
             <p class="dx-result-excerpt CoveoExcerpt"></p>
         </div>
@@ -91,6 +91,14 @@ const resultsTemplatesInnerHtml = `
     </script>
 `;
 
+const isInternalDomain = (domain: string) =>
+    domain === "developer.salesforce.com" ||
+    domain === "developer-website-s.herokuapp.com";
+
+const isTrailheadDomain = (domain: string) =>
+    domain === "trailhead.salesforce.com" ||
+    domain === "dev.trailhead.salesforce.com";
+
 const buildTemplateHelperBadge = (value: keyof typeof CONTENT_TYPE_LABELS) => {
     const style = getContentTypeColorVariables(value);
     const label = CONTENT_TYPE_LABELS[value];
@@ -110,22 +118,31 @@ const buildTemplateHelperBadge = (value: keyof typeof CONTENT_TYPE_LABELS) => {
         `;
 };
 
-const processParts = (parts: string[]) => {
-    return parts.map((part) => {
-        // Remove special characters & .htm/.xml extension
-        part = part
-            .replace(/_/g, " ")
-            .replace(/-/g, " ")
-            .replace(/.html*/g, " ")
-            .replace(/.xml/g, " ");
-
-        // Capitalize first letter of each word
-        part = part.replace(/\w\S*/g, (w) => {
-            return w.replace(/^\w/, (c) => c.toUpperCase());
-        });
+const processParts = (parts: string[], internalFlag = false) => {
+    return parts
+        .filter((part) => {
+            // remove /docs/ as a breadcrumb item
+            if (internalFlag) {
+                return part !== "docs";
+            }
+            return part;
+        })
+        .map((part) => {
+            // Remove special characters & .htm/.xml extension
+            part = part
+                .replace(/_/g, " ")
+                .replace(/-/g, " ")
+                .replace(/.html*/g, " ")
+                .replace(/.xml/g, " ")
+                .replace(/b2c/g, "B2C");
+
+            // Capitalize first letter of each word
+            part = part.replace(/\w\S*/g, (w) => {
+                return w.replace(/^\w/, (c) => c.toUpperCase());
+            });
 
-        return `<span class="breadcrumb-item">${decodeURI(part)}</span>`;
-    });
+            return `<span class="breadcrumb-item">${decodeURI(part)}</span>`;
+        });
 };
 
 const buildTemplateHelperUriBreadcrumbs = (value: string) => {
@@ -141,22 +158,16 @@ const buildTemplateHelperUriBreadcrumbs = (value: string) => {
     let parts = url.pathname.split("/").filter((part) => part !== "");
 
     // Remove language prefix from trailhead URLs
-    if (
-        url.hostname === "trailhead.salesforce.com" ||
-        url.hostname === "dev.trailhead.salesforce.com"
-    ) {
+    if (isTrailheadDomain(url.hostname)) {
         parts = parts
             .slice(1)
             .filter((part) => part !== "content" && part !== "learn");
     }
 
-    const breadcrumbs = processParts(parts);
+    const breadcrumbs = processParts(parts, isInternalDomain(url.hostname));
 
     // if url.hostname is developer.salesforce.com or developer-website-s.herokuapp.com, remove the first breadcrumb item
-    if (
-        url.hostname !== "developer.salesforce.com" &&
-        url.hostname !== "developer-website-s.herokuapp.com"
-    ) {
+    if (!isInternalDomain(url.hostname)) {
         breadcrumbs.unshift(
             `<span class="breadcrumb-item">${url.hostname}</span>`
         );