@usereactify/search 4.2.1 → 4.2.4

package/CHANGELOG.md

@@ -2,6 +2,32 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [4.2.4](https://bitbucket.org/usereactify/reactify-search-ui/compare/v4.2.3...v4.2.4) (2022-06-23)
+
+
+### Bug Fixes
+
+* add missing spread operator ([acc51cb](https://bitbucket.org/usereactify/reactify-search-ui/commit/acc51cb5c414831e3d0e919185d076895903d837))
+
+### [4.2.3](https://bitbucket.org/usereactify/reactify-search-ui/compare/v4.2.2...v4.2.3) (2022-06-23)
+
+
+### Bug Fixes
+
+* include sorting by collection position when using global curation ([141c463](https://bitbucket.org/usereactify/reactify-search-ui/commit/141c46351711c3cff65275e47fdf8e9ed64b0ad8))
+
+### [4.2.2](https://bitbucket.org/usereactify/reactify-search-ui/compare/v4.2.1...v4.2.2) (2022-06-21)
+
+
+### Features
+
+* merge global boosting rules with curation when empty ([248cbdd](https://bitbucket.org/usereactify/reactify-search-ui/commit/248cbdda01864c0d536f5e971f81e331de4c827d))
+
+
+### Bug Fixes
+
+* pass on nocache url param to config endpoint to bust caching on worker side ([51b9dcf](https://bitbucket.org/usereactify/reactify-search-ui/commit/51b9dcf0b8145691a2dd00aedbe951f71bbc04b3))
+
 ### [4.2.1](https://bitbucket.org/usereactify/reactify-search-ui/compare/v4.2.0...v4.2.1) (2022-06-14)
 
 ## [4.2.0](https://bitbucket.org/usereactify/reactify-search-ui/compare/v4.1.0...v4.2.0) (2022-06-14)

package/dist/hooks/useLiveConfig.js

@@ -54,10 +54,15 @@ const useLiveConfig = (shopifyPermanentDomain, configId) => {
             if (configId) {
                 searchParams.set("id", configId);
             }
+            const skipCache = new URLSearchParams(window.location.href.split("?")[1]).get("nocache") !== null;
+            if (skipCache) {
+                searchParams.set("nocache", "true");
+            }
             const json = yield fetch(`https://config.search.reactify.app/?${searchParams.toString()}`).then((response) => response.json());
             setConfig(json.body);
             window.sessionStorage.setItem("reactify-search:config", JSON.stringify({
                 expiresAt: new Date().getTime() + CACHE_EXPIRY,
+                noCache: skipCache,
                 config: json.body,
             }));
         }))();

package/dist/provider.js

@@ -275,5 +275,20 @@ const useCuration = (config, collection, searchQuery) => react_1.default.useMemo
                 normalisedHandleOrSearchTerm === normalisedCollectionHandle);
         return false;
     });
-    return curation ? curation : globalCuration ? globalCuration : undefined;
+    const addGlobalBoosting = (curation) => {
+        const curationIsCollection = curation.type === "collection";
+        if (!curationIsCollection)
+            return curation;
+        const curationHasRules = !!curation.boosting.groupings.length ||
+            !!curation.boosting.sortings.length;
+        if (curationHasRules || !globalCuration)
+            return curation;
+        const curationWithGlobalBoosting = Object.assign(Object.assign({}, curation), { boosting: globalCuration.boosting });
+        return curationWithGlobalBoosting;
+    };
+    return curation
+        ? addGlobalBoosting(curation)
+        : globalCuration
+            ? globalCuration
+            : undefined;
 }, [config, collection, searchQuery]);

package/dist/sensor/SensorSort.js

@@ -70,7 +70,10 @@ const buildSort = (args) => {
     }
     const sorts = [];
     // show pins first
-    if (!globalCuration)
+    if (globalCuration && collection) {
+        sorts.push(...mapCollectionPositionSortClause(collection));
+    }
+    else {
         sorts.push({
             "curations.position": {
                 unmapped_type: "long",
@@ -89,6 +92,7 @@ const buildSort = (args) => {
                 },
             },
         });
+    }
     if (0 < curation.boosting.groupings.length) {
         const groupings = curation.boosting.groupings.sort((a, b) => a.position > b.position ? 1 : -1);
         for (const grouping of groupings) {
@@ -115,16 +119,15 @@ const buildSort = (args) => {
             }
         }
     }
-    // finally, sort by elastic score or index order
-    // using index order ensures a consistent output order for queries which don't really
-    // use a relevance score like collections
-    if ("collection" === curation.type)
+    // finally, for collections, if no other sorting is defined, sort by index order to provide
+    // a consistent order
+    if ("collection" === curation.type && sorts.length === 0) {
         sorts.push("_doc");
-    else
+    }
+    // finally, for search, sort by score
+    if ("search" === curation.type) {
         sorts.push("_score");
-    // @todo ideally, once pins are extinguished and there are no boost rules, the rest of the
-    // result should be ordered by the shopify collection position rather than the index order,
-    // but this will need some proper testing to ensure it does not break curations
+    }
     return sorts;
 };
 /**

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@usereactify/search",
   "description": "React UI library for Reactify Search",
-  "version": "4.2.1",
+  "version": "4.2.4",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -15,6 +15,7 @@
     "release": "standard-version",
     "release:patch": "standard-version --release-as patch",
     "release:beta": "standard-version --release-as minor --prerelease beta",
+    "release:local": "yalc publish",
     "build": "rimraf dist && tsc",
     "prettier": "prettier --write .",
     "storybook": "start-storybook -p 6006",