@salesforcedevs/docs-components 0.56.2-seo-test8 → 0.56.2-seo-test11

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@salesforcedevs/docs-components",
-    "version": "0.56.2-seo-test8",
+    "version": "0.56.2-seo-test11",
     "description": "Docs Lightning web components for DSC",
     "license": "MIT",
     "main": "index.js",

package/src/modules/doc/amfReference/amfReference.ts

@@ -558,8 +558,8 @@ export default class AmfReference extends LightningElement {
                                 return typeALbl < typeBLbl
                                     ? -1
                                     : typeALbl > typeBLbl
-                                    ? 1
-                                    : 0;
+                                        ? 1
+                                        : 0;
                             });
                         }
                     // eslint-disable-next-line no-fallthrough
@@ -1046,7 +1046,6 @@ export default class AmfReference extends LightningElement {
                         referenceId,
                         "summary"
                     );
-                    this.updateNavTitleMetaTag(selectedItemMetaData.navTitle);
                 }
 
                 if (selectedItemMetaData) {
@@ -1077,18 +1076,6 @@ export default class AmfReference extends LightningElement {
                     invalidTopicReferenceUrl = previousRefUrlInSession;
                 }
             }
-            if (!invalidTopicReferenceUrl) {
-                const referenceUrl = window.location.href;
-                const referenceMeta =
-                    this.getMarkdownReferenceMeta(referenceUrl);
-                const selectedItemRefId =
-                    this.getReferenceIdFromUrl(referenceUrl);
-                const referenceDetails = this.getRefDetailsForGivenTopicMeta(
-                    selectedItemRefId,
-                    referenceMeta
-                );
-                this.updateNavTitleMetaTag(referenceDetails.topicTitle);
-            }
             this.loadMarkdownBasedReference(invalidTopicReferenceUrl);
         }
     }
@@ -1150,6 +1137,7 @@ export default class AmfReference extends LightningElement {
             }
         }
 
+        let isRedirecting = false
         if (referenceId) {
             const amfConfig = this.getAmfConfigWithId(referenceId);
             let redirectReferenceUrl = "";
@@ -1162,6 +1150,7 @@ export default class AmfReference extends LightningElement {
             if (redirectReferenceUrl) {
                 if (this.isParentReferencePath(referenceUrl)) {
                     // This is for CASE2 mentioned above, Where we need to navigate user to respective href
+                    isRedirecting = true
                     window.location.href = redirectReferenceUrl;
                 } else {
                     // This is for CASE 1,3 and 4 mentioned above, Where we need to update the browser history
@@ -1169,11 +1158,24 @@ export default class AmfReference extends LightningElement {
                 }
             }
         }
+        if (!isRedirecting) {
+            const currentReferenceUrl = window.location.href;
+            const referenceMeta =
+                this.getMarkdownReferenceMeta(currentReferenceUrl);
+            const selectedItemRefId =
+                this.getReferenceIdFromUrl(currentReferenceUrl);
+            const referenceDetails = this.getRefDetailsForGivenTopicMeta(
+                selectedItemRefId,
+                referenceMeta
+            );
+            if (referenceDetails) {
+                this.updateNavTitleMetaTag(referenceDetails.topicTitle);
+            }
 
-        this.versions = this.getVersions();
-
-        this.updateDocPhase();
-        this.selectedSidebarValue = window.location.pathname;
+            this.versions = this.getVersions();
+            this.updateDocPhase();
+            this.selectedSidebarValue = window.location.pathname;
+        }
     }
 
     /**

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

@@ -13,7 +13,6 @@ import {
 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);
@@ -100,7 +99,7 @@ export default class DocXmlContent extends LightningElementWithState<{
         shouldStopPropagation: true,
         target: window
     });
-    private _allLanguages: Array<Language> = DEFAULT_LANGUAGES;
+    private _allLanguages: Array<Language> = [];
 
     @track private pageReference: PageReference = {};
 
@@ -584,5 +583,20 @@ export default class DocXmlContent extends LightningElementWithState<{
                 metadescription.setAttribute("content", docDescription);
             }
         }
+
+        if (this.pageReference) {
+            const metadescription = document.querySelector(
+                'link[rel="canonical"]'
+            );
+            if (metadescription) {
+                metadescription.setAttribute(
+                    "href",
+                    window.location.protocol +
+                        "//" +
+                        window.location.host +
+                        this.pageReferenceToString(this.pageReference)
+                );
+            }
+        }
     }
 }