@salesforcedevs/dx-components 0.10.1-alpha.101 → 0.10.1-alpha.105

package/package.json

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

package/src/modules/dx/sidebarSearch/sidebarSearch.ts

@@ -10,34 +10,23 @@ import {
     buildSearchBox,
     loadAdvancedSearchQueryActions,
     SearchEngine,
-    buildSearchStatus,
     SearchAppState
 } from "@coveo/headless";
 import { buildSearchEngine, getSidebarSearchParams } from "utils/coveo";
 import { RecentSearches } from "utils/recentSearches";
 import { toJson } from "utils/normalizers";
 import { Option, PopoverRequestCloseType } from "typings/custom";
-import preloadedState from './__tests__/preloadedState';
 
 const SESSION_KEY = "dx-sidebar-search-state";
 
 const DEFAULT_RESULT_COUNT = 20;
+const SEARCH_DEBOUNCE_DELAY = 780;
 
 const UserRecentSearches = new RecentSearches();
 
 const normalizeCoveoAdvancedQueryValue = (version: string): string =>
     version.split(".").join("\\.");
 
-function executeFirstSearch(engine: SearchEngine) {
-    return new Promise((resolve) => {
-        const searchStatus = buildSearchStatus(engine);
-        searchStatus.subscribe(
-            () => searchStatus.state.firstSearchExecuted && resolve(true)
-        );
-        engine.executeFirstSearch();
-    });
-}
-
 export default class SidebarSearch extends LightningElement {
     @api coveoOrganizationId!: string;
     @api coveoPublicAccessToken!: string;
@@ -53,6 +42,7 @@ export default class SidebarSearch extends LightningElement {
     @api
     public fetchMoreResults() {
         if (this.resultList) {
+            this.fetchingMoreResults = true;
             this.resultList.fetchMoreResults();
         }
     }
@@ -66,6 +56,7 @@ export default class SidebarSearch extends LightningElement {
     private searchBox: SearchBox | null = null;
     private value?: string = "";
     private engine: SearchEngine | null = null;
+    private fetchingMoreResults: boolean = false;
 
     private get hasCorrectCoveoConfig(): boolean {
         const coveoConfigurations = [
@@ -124,14 +115,8 @@ export default class SidebarSearch extends LightningElement {
             return;
         }
         const state = JSON.parse(stringified);
-        console.log(
-            { state },
-            state?.query?.q,
-            this.value,
-            state?.query?.q === this.value
-        );
+        console.log({ state }, state?.query?.q === this.value, this.value);
         if (state?.query?.q === this.value) {
-            console.log("assigning state");
             this.preloadedState = state;
         }
     }
@@ -141,7 +126,7 @@ export default class SidebarSearch extends LightningElement {
             organizationId: this.coveoOrganizationId,
             publicAccessToken: this.coveoPublicAccessToken,
             searchHub: this.coveoSearchHub,
-            preloadedState: preloadedState
+            preloadedState: this.preloadedState
         });
 
         if (!this.engine) {
@@ -157,21 +142,26 @@ export default class SidebarSearch extends LightningElement {
                 numberOfResults: DEFAULT_RESULT_COUNT
             }
         });
+
         this.searchBox = buildSearchBox(this.engine, {
             options: { numberOfSuggestions: 3 }
         });
+
         this.setAdvancedFilters(this.engine);
 
         this.resultList?.subscribe(this.onResultListChange);
 
-        // await executeFirstSearch(this.engine);
-
-        console.log({ resultList: this.resultList, engine: this.engine });
-
         if (!this.isValueEmpty) {
             this.dispatchHighlightedTermChange();
         }
-        this.dispatchOnLoading(false); // might not be needed
+
+        if (!this.preloadedState && !this.isValueEmpty) {
+            this.submitSearch();
+        }
+
+        if (!this.preloadedState && this.isValueEmpty) {
+            this.dispatchOnLoading(false);
+        }
     };
 
     private onResultListChange = () => {
@@ -200,11 +190,16 @@ export default class SidebarSearch extends LightningElement {
         }
 
         if (!isLoading) {
-            console.log('CHANGING RESULTS');
             this.dispatchOnChangeEvent(results);
         }
 
-        this.dispatchOnLoading(isLoading);
+        if (!this.fetchingMoreResults) {
+            this.dispatchOnLoading(isLoading);
+        }
+
+        if (!isLoading && this.fetchingMoreResults) {
+            this.fetchingMoreResults = false;
+        }
     };
 
     private setAdvancedFilters(engine: SearchEngine) {
@@ -312,7 +307,7 @@ export default class SidebarSearch extends LightningElement {
             this.updateRecentSearches();
             this.searchBox.submit();
         }
-    }, 360).bind(this);
+    }, SEARCH_DEBOUNCE_DELAY);
 
     private onClickRecentSearch(e: CustomEvent) {
         this.value = e.detail;
@@ -333,6 +328,10 @@ export default class SidebarSearch extends LightningElement {
     private onInputChange(e: CustomEvent) {
         this.value = e.detail;
 
+        if (!this.isValueEmpty) {
+            this.dispatchOnLoading(true);
+        }
+
         if (this.searchBox && !this.isValueEmpty) {
             this.submitSearch();
         }