@salesforcedevs/docs-components 0.55.5-couch-db-scope-search → 0.55.7

package/LICENSE

@@ -0,0 +1,12 @@
+Copyright (c) 2020, Salesforce.com, Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+* Neither the name of Salesforce.com nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@salesforcedevs/docs-components",
-    "version": "0.55.5-couch-db-scope-search",
+    "version": "0.55.7",
     "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": "4629fdd9ca18a13480044ad43515b91945d16aad"
+    "gitHead": "91a0fb158be75ba597dc240fce61784cd0cb74af"
 }

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

@@ -1,9 +1,7 @@
 export type CoveoAdvancedQueryXMLConfig = {
-    objecttype?: string;
-    sflocale__c?: string;
-    sfrelease__c?: string;
-    sfdelivarable__c?: string;
-    source?: string;
+    locale?: string;
+    version?: string;
+    topicid?: string;
 };
 
 export type PageReference = {

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

@@ -1,5 +1,5 @@
 import { api, track } from "lwc";
-import { toJson } from "dxUtils/normalizers";
+import { normalizeBoolean, toJson } from "dxUtils/normalizers";
 import { FetchContent } from "./utils";
 import {
     CoveoAdvancedQueryXMLConfig,
@@ -35,6 +35,15 @@ export default class DocXmlContent extends LightningElementWithState<{
         this._labels = toJson(value);
     }
 
+    @api
+    get enableCoveo() {
+        return this._enableCoveo;
+    }
+
+    set enableCoveo(value) {
+        this._enableCoveo = normalizeBoolean(value);
+    }
+
     private _labels: Labels = null;
     private availableLanguages: Array<DocLanguage> = [];
     private availableVersions: Array<DocVersion> = [];
@@ -51,6 +60,8 @@ export default class DocXmlContent extends LightningElementWithState<{
     private _pathName = "";
     private _pageHeader?: Header;
     private listenerAttached = false;
+    private _enableCoveo?: boolean = false;
+
     private searchSyncer = new SearchSyncer({
         callbacks: {
             onSearchChange: (nextSearchString: string): void => {
@@ -184,8 +195,9 @@ export default class DocXmlContent extends LightningElementWithState<{
         // 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.enableCoveo &&
+            this.coveoOrganizationId &&
+            this.coveoPublicAccessToken &&
             (!this.version?.releaseVersion ||
                 (this.version?.releaseVersion &&
                     parseInt(this.version.releaseVersion.replace("v", ""), 10) >
@@ -195,15 +207,9 @@ export default class DocXmlContent extends LightningElementWithState<{
 
     private get coveoAdvancedQueryConfig(): CoveoAdvancedQueryXMLConfig {
         return {
-            // Temporary fix for empty results on apexref page
-            ...(this.deliverable === "apexref"
-                ? { source: "Sitemap - Developer Docs Atlas - Apexref" }
-                : {
-                      objecttype: "HTDeveloperDocumentsC",
-                      sflocale__c: this.languageId,
-                      sfrelease__c: this.releaseVersionId,
-                      sfdelivarable__c: this.deliverable
-                  })
+            locale: this.languageId,
+            version: this.releaseVersionId,
+            topicid: this.deliverable
         };
     }