@searchspring/snap-controller 0.61.5 → 0.63.0

package/dist/esm/Search/SearchController.js

@@ -24,7 +24,6 @@ export class SearchController extends AbstractController {
     constructor(config, { client, store, urlManager, eventManager, profiler, logger, tracker }, context) {
         super(config, { client, store, urlManager, eventManager, profiler, logger, tracker }, context);
         this.type = ControllerTypes.search;
-        this.previousResults = [];
         this.track = {
             product: {
                 click: (e, result) => {
@@ -67,15 +66,16 @@ export class SearchController extends AbstractController {
             },
         };
         this.search = async () => {
-            if (!this.initialized) {
-                await this.init();
-            }
-            const params = this.params;
-            if (this.params.search?.query?.string && this.params.search?.query?.string.length) {
-                // save it to the history store
-                this.store.history.save(this.params.search.query.string);
-            }
             try {
+                if (!this.initialized) {
+                    await this.init();
+                }
+                const params = this.params;
+                if (this.params.search?.query?.string && this.params.search?.query?.string.length) {
+                    // save it to the history store
+                    this.store.history.save(this.params.search.query.string);
+                }
+                this.store.loading = true;
                 try {
                     await this.eventManager.fire('beforeSearch', {
                         controller: this,
@@ -112,7 +112,7 @@ export class SearchController extends AbstractController {
                         return;
                     }
                     // infinite backfill is enabled AND we have not yet fetched any results
-                    if (this.config.settings?.infinite.backfill && !this.previousResults.length) {
+                    if (this.config.settings?.infinite.backfill && !this.store.loaded) {
                         // create requests for all missing pages (using Arrray(page).fill() to populate an array to map)
                         const backfillRequests = Array(params.pagination.page)
                             .fill('backfill')
@@ -148,12 +148,10 @@ export class SearchController extends AbstractController {
                     else {
                         // infinite with no backfills.
                         [meta, response] = await this.client.search(params);
-                        // append new results to previous results
-                        response.results = [...this.previousResults, ...(response.results || [])];
                     }
                 }
                 else {
-                    // standard request (not using infinite scroll)
+                    // normal request for next page
                     [meta, response] = await this.client.search(params);
                 }
                 // MockClient will overwrite the client search() method and use SearchData to return mock data which already contains meta data
@@ -183,10 +181,6 @@ export class SearchController extends AbstractController {
                 }
                 afterSearchProfile.stop();
                 this.log.profile(afterSearchProfile);
-                // store previous results for infinite usage
-                if (this.config.settings?.infinite) {
-                    this.previousResults = JSON.parse(JSON.stringify(response.results));
-                }
                 // update the store
                 this.store.update(response);
                 const afterStoreProfile = this.profiler.create({ type: 'event', name: 'afterStore', context: params }).start();
@@ -250,9 +244,11 @@ export class SearchController extends AbstractController {
                         this.log.error(err);
                         this.handleError(err);
                     }
-                    this.store.loading = false;
                 }
             }
+            finally {
+                this.store.loading = false;
+            }
         };
         // deep merge config with defaults
         this.config = deepmerge(defaultConfig, this.config);
@@ -267,11 +263,6 @@ export class SearchController extends AbstractController {
         });
         // set last params to undefined for compare in search
         this.storage.set('lastStringyParams', undefined);
-        // add 'beforeSearch' middleware
-        this.eventManager.on('beforeSearch', async (search, next) => {
-            search.controller.store.loading = true;
-            await next();
-        });
         // add 'afterSearch' middleware
         this.eventManager.on('afterSearch', async (search, next) => {
             const config = search.controller.config;
@@ -285,8 +276,7 @@ export class SearchController extends AbstractController {
             if (config?.settings?.redirects?.singleResult &&
                 search?.response?.search?.query &&
                 search?.response?.pagination?.totalResults === 1 &&
-                !nonBackgroundFilters?.length &&
-                !search.controller.previousResults.length) {
+                !nonBackgroundFilters?.length) {
                 window.location.replace(search?.response.results[0].mappings.core.url);
                 return false;
             }
@@ -306,7 +296,6 @@ export class SearchController extends AbstractController {
                 this.storage.set('scrollMap', {});
             }
             await this.eventManager.fire('restorePosition', { controller: this, element: elementPosition });
-            search.controller.store.loading = false;
         });
         // restore position
         if (this.config.settings?.restorePosition?.enabled) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@searchspring/snap-controller",
-	"version": "0.61.5",
+	"version": "0.63.0",
 	"description": "Snap Controllers",
 	"main": "dist/cjs/index.js",
 	"module": "dist/esm/index.js",
@@ -20,22 +20,22 @@
 		"test:watch": "jest --watch"
 	},
 	"dependencies": {
-		"@searchspring/snap-toolbox": "^0.61.5",
+		"@searchspring/snap-toolbox": "^0.63.0",
 		"css.escape": "1.5.1",
 		"deepmerge": "4.3.1"
 	},
 	"devDependencies": {
-		"@searchspring/snap-client": "^0.61.5",
-		"@searchspring/snap-event-manager": "^0.61.5",
-		"@searchspring/snap-logger": "^0.61.5",
-		"@searchspring/snap-profiler": "^0.61.5",
-		"@searchspring/snap-store-mobx": "^0.61.5",
-		"@searchspring/snap-tracker": "^0.61.5",
-		"@searchspring/snap-url-manager": "^0.61.5"
+		"@searchspring/snap-client": "^0.63.0",
+		"@searchspring/snap-event-manager": "^0.63.0",
+		"@searchspring/snap-logger": "^0.63.0",
+		"@searchspring/snap-profiler": "^0.63.0",
+		"@searchspring/snap-store-mobx": "^0.63.0",
+		"@searchspring/snap-tracker": "^0.63.0",
+		"@searchspring/snap-url-manager": "^0.63.0"
 	},
 	"sideEffects": false,
 	"files": [
 		"dist/**/*"
 	],
-	"gitHead": "bae1305742558d1736e535d77a76da7b845bc046"
+	"gitHead": "46278e19380f22e90fdff4afc01359be27feb5a8"
 }