@shopgate/pwa-common-commerce 7.30.0-alpha.6 → 7.30.0-alpha.8

package/search/action-creators/receiveSearchResults.js

@@ -1,7 +1,16 @@
-import{RECEIVE_SEARCH_RESULTS}from"../constants";/**
+import { RECEIVE_SEARCH_RESULTS } from "../constants";
+
+/**
  * Creates the dispatched RECEIVE_SEARCH_RESULTS action object.
  * @param {string} searchPhrase The search phrase.
  * @param {number} offset The result offset.
  * @param {Object} results The search results.
  * @return {Object} The RECEIVE_SEARCH_RESULTS action.
- */var receiveSearchResults=function receiveSearchResults(searchPhrase,offset,results){return{type:RECEIVE_SEARCH_RESULTS,searchPhrase:searchPhrase,offset:offset,results:results};};export default receiveSearchResults;
+ */
+const receiveSearchResults = (searchPhrase, offset, results) => ({
+  type: RECEIVE_SEARCH_RESULTS,
+  searchPhrase,
+  offset,
+  results
+});
+export default receiveSearchResults;

package/search/action-creators/receiveSearchSuggestions.js

@@ -1,6 +1,14 @@
-import{RECEIVE_SEARCH_SUGGESTIONS}from"../constants";/**
+import { RECEIVE_SEARCH_SUGGESTIONS } from "../constants";
+
+/**
  * Creates the dispatched RECEIVE_SEARCH_SUGGESTIONS action object.
  * @param {string} searchPhrase The search phrase.
  * @param {Array} suggestions Array of strings. The suggestions for the search phrase.
  * @return {Object} The RECEIVE_SEARCH_SUGGESTIONS action.
- */var receiveSearchSuggestions=function receiveSearchSuggestions(searchPhrase,suggestions){return{type:RECEIVE_SEARCH_SUGGESTIONS,searchPhrase:searchPhrase,suggestions:suggestions};};export default receiveSearchSuggestions;
+ */
+const receiveSearchSuggestions = (searchPhrase, suggestions) => ({
+  type: RECEIVE_SEARCH_SUGGESTIONS,
+  searchPhrase,
+  suggestions
+});
+export default receiveSearchSuggestions;

package/search/action-creators/requestSearchResults.js

@@ -1,6 +1,14 @@
-import{REQUEST_SEARCH_RESULTS}from"../constants";/**
+import { REQUEST_SEARCH_RESULTS } from "../constants";
+
+/**
  * Creates the dispatched REQUEST_SEARCH_RESULTS action object.
  * @param {string} searchPhrase The search phrase.
  * @param {number} offset The result offset.
  * @return {Object} The REQUEST_SEARCH_RESULTS action.
- */var requestSearchResults=function requestSearchResults(searchPhrase,offset){return{type:REQUEST_SEARCH_RESULTS,searchPhrase:searchPhrase,offset:offset};};export default requestSearchResults;
+ */
+const requestSearchResults = (searchPhrase, offset) => ({
+  type: REQUEST_SEARCH_RESULTS,
+  searchPhrase,
+  offset
+});
+export default requestSearchResults;

package/search/action-creators/requestSearchSuggestions.js

@@ -1,5 +1,12 @@
-import{REQUEST_SEARCH_SUGGESTIONS}from"../constants";/**
+import { REQUEST_SEARCH_SUGGESTIONS } from "../constants";
+
+/**
  * Creates the dispatched REQUEST_SEARCH_SUGGESTIONS action object.
  * @param {string} searchPhrase The search phrase.
  * @return {Object} The REQUEST_SEARCH_SUGGESTIONS action.
- */var requestSearchSuggestions=function requestSearchSuggestions(searchPhrase){return{type:REQUEST_SEARCH_SUGGESTIONS,searchPhrase:searchPhrase};};export default requestSearchSuggestions;
+ */
+const requestSearchSuggestions = searchPhrase => ({
+  type: REQUEST_SEARCH_SUGGESTIONS,
+  searchPhrase
+});
+export default requestSearchSuggestions;

package/search/actions/fetchSearchResults.js

@@ -1,4 +1,13 @@
-function _extends(){_extends=Object.assign||function(target){for(var i=1;i<arguments.length;i++){var source=arguments[i];for(var key in source){if(Object.prototype.hasOwnProperty.call(source,key)){target[key]=source[key];}}}return target;};return _extends.apply(this,arguments);}import{ITEMS_PER_LOAD}from'@shopgate/pwa-common/constants/DisplayOptions';import{mutable}from'@shopgate/pwa-common/helpers/redux';import{makeGetDefaultSortOrder}from'@shopgate/engage/filter/selectors';import fetchProducts from"../../product/actions/fetchProducts";import requestSearchResults from"../action-creators/requestSearchResults";import receiveSearchResults from"../action-creators/receiveSearchResults";import errorSearchResults from"../action-creators/errorSearchResults";var getDefaultSortOrder=makeGetDefaultSortOrder();/**
+import { ITEMS_PER_LOAD } from '@shopgate/pwa-common/constants/DisplayOptions';
+import { mutable } from '@shopgate/pwa-common/helpers/redux';
+import { makeGetDefaultSortOrder } from '@shopgate/engage/filter/selectors';
+import fetchProducts from "../../product/actions/fetchProducts";
+import requestSearchResults from "../action-creators/requestSearchResults";
+import receiveSearchResults from "../action-creators/receiveSearchResults";
+import errorSearchResults from "../action-creators/errorSearchResults";
+const getDefaultSortOrder = makeGetDefaultSortOrder();
+
+/**
  * Retrieves products for a certain search query.
  * @param {Object} params The params for the search products to request.
  * @param {string} params.searchPhrase Search phrase for the request
@@ -11,13 +20,62 @@ function _extends(){_extends=Object.assign||function(target){for(var i=1;i<argum
  * @param {boolean} [params.resolveCachedProducts=false] Whether to resolve with products even
  * when no actual request was done due to cached data.
  * @return {Function} The dispatched action.
- */var fetchSearchResults=function fetchSearchResults(params){return function(dispatch,getState){var defaultSortOrder=getDefaultSortOrder(getState(),{searchPhrase:params.searchPhrase});var _params$offset=params.offset,offset=_params$offset===void 0?0:_params$offset,searchPhrase=params.searchPhrase,_params$limit=params.limit,limit=_params$limit===void 0?ITEMS_PER_LOAD:_params$limit,_params$sort=params.sort,sort=_params$sort===void 0?defaultSortOrder:_params$sort,_params$filters=params.filters,filters=_params$filters===void 0?null:_params$filters,_params$params=params.params,searchParams=_params$params===void 0?null:_params$params,_params$cachedTime=params.cachedTime,cachedTime=_params$cachedTime===void 0?null:_params$cachedTime,_params$resolveCached=params.resolveCachedProducts,resolveCachedProducts=_params$resolveCached===void 0?false:_params$resolveCached;if(!searchPhrase){return;}var promise=dispatch(fetchProducts({cachedTime:cachedTime,params:_extends({searchPhrase:searchPhrase,offset:offset,limit:limit,sort:sort},searchParams),filters:filters,resolveCachedProducts:resolveCachedProducts,onBeforeDispatch:function onBeforeDispatch(){// Dispatch the request action before the related pipeline request is executed.
-dispatch(requestSearchResults(searchPhrase,offset));}}));/**
+ */
+const fetchSearchResults = params => (dispatch, getState) => {
+  const defaultSortOrder = getDefaultSortOrder(getState(), {
+    searchPhrase: params.searchPhrase
+  });
+  const {
+    offset = 0,
+    searchPhrase,
+    limit = ITEMS_PER_LOAD,
+    sort = defaultSortOrder,
+    filters = null,
+    params: searchParams = null,
+    cachedTime = null,
+    resolveCachedProducts = false
+  } = params;
+  if (!searchPhrase) {
+    return;
+  }
+  const promise = dispatch(fetchProducts({
+    cachedTime,
+    params: {
+      searchPhrase,
+      offset,
+      limit,
+      sort,
+      ...searchParams
+    },
+    filters,
+    resolveCachedProducts,
+    onBeforeDispatch: () => {
+      // Dispatch the request action before the related pipeline request is executed.
+      dispatch(requestSearchResults(searchPhrase, offset));
+    }
+  }));
+
+  /**
    * Whenever fetchProducts is able to deliver product data
    * - either via a request or from the cache -
    * it returns a promise which will be resolved with the response data.
-   */if(promise instanceof Promise){promise.then(function(response){// Inspect the response object to determine, if it represents a search result, or an error.
-if(response&&response.products&&Array.isArray(response.products)){// Dispatch the receive action when the response contains valid data.s
-dispatch(receiveSearchResults(searchPhrase,offset,response));}else{// If no valid data is delivered within the response the error action is dispatched.
-dispatch(errorSearchResults(searchPhrase,offset));}});}// eslint-disable-next-line consistent-return
-return promise;};};/** @mixes {MutableFunction} */export default mutable(fetchSearchResults);
+   */
+  if (promise instanceof Promise) {
+    promise.then(response => {
+      // Inspect the response object to determine, if it represents a search result, or an error.
+      if (response && response.products && Array.isArray(response.products)) {
+        // Dispatch the receive action when the response contains valid data.s
+        dispatch(receiveSearchResults(searchPhrase, offset, response));
+      } else {
+        // If no valid data is delivered within the response the error action is dispatched.
+        dispatch(errorSearchResults(searchPhrase, offset));
+      }
+    });
+  }
+
+  // eslint-disable-next-line consistent-return
+  return promise;
+};
+
+/** @mixes {MutableFunction} */
+export default mutable(fetchSearchResults);

package/search/actions/fetchSearchSuggestions.js

@@ -1,5 +1,39 @@
-import PipelineRequest from'@shopgate/pwa-core/classes/PipelineRequest';import{mutable}from'@shopgate/pwa-common/helpers/redux';import{SHOPGATE_CATALOG_GET_SEARCH_SUGGESTIONS}from"../constants/Pipelines";import requestSearchSuggestions from"../action-creators/requestSearchSuggestions";import receiveSearchSuggestions from"../action-creators/receiveSearchSuggestions";import{getSuggestionsState}from"../selectors";import removeHighlightingPlaceholders from"../helpers/removeHighlightingPlaceholders";/**
+import PipelineRequest from '@shopgate/pwa-core/classes/PipelineRequest';
+import { mutable } from '@shopgate/pwa-common/helpers/redux';
+import { SHOPGATE_CATALOG_GET_SEARCH_SUGGESTIONS } from "../constants/Pipelines";
+import requestSearchSuggestions from "../action-creators/requestSearchSuggestions";
+import receiveSearchSuggestions from "../action-creators/receiveSearchSuggestions";
+import { getSuggestionsState } from "../selectors";
+import removeHighlightingPlaceholders from "../helpers/removeHighlightingPlaceholders";
+
+/**
  * Get suggestions from cache or pipeline.
  * @param {string} searchPhrase The search phrase.
  * @returns {Function} A redux thunk.
- */function fetchSearchSuggestions(searchPhrase){return function(dispatch,getState){if(searchPhrase.length<3){return Promise.resolve(null);}var cached=getSuggestionsState(getState())[searchPhrase];if(cached&&(cached.isFetching||cached.expires>=Date.now())){return Promise.resolve(null);}dispatch(requestSearchSuggestions(searchPhrase));var request=new PipelineRequest(SHOPGATE_CATALOG_GET_SEARCH_SUGGESTIONS).setInput({searchPhrase:searchPhrase}).dispatch();request.then(function(result){var suggestions=result.suggestions;var suggestionsWithoutPlaceholders=removeHighlightingPlaceholders(suggestions);dispatch(receiveSearchSuggestions(searchPhrase,suggestionsWithoutPlaceholders));});return request;};}/** @mixes {MutableFunction} */export default mutable(fetchSearchSuggestions);
+ */
+function fetchSearchSuggestions(searchPhrase) {
+  return (dispatch, getState) => {
+    if (searchPhrase.length < 3) {
+      return Promise.resolve(null);
+    }
+    const cached = getSuggestionsState(getState())[searchPhrase];
+    if (cached && (cached.isFetching || cached.expires >= Date.now())) {
+      return Promise.resolve(null);
+    }
+    dispatch(requestSearchSuggestions(searchPhrase));
+    const request = new PipelineRequest(SHOPGATE_CATALOG_GET_SEARCH_SUGGESTIONS).setInput({
+      searchPhrase
+    }).dispatch();
+    request.then(result => {
+      const {
+        suggestions
+      } = result;
+      const suggestionsWithoutPlaceholders = removeHighlightingPlaceholders(suggestions);
+      dispatch(receiveSearchSuggestions(searchPhrase, suggestionsWithoutPlaceholders));
+    });
+    return request;
+  };
+}
+
+/** @mixes {MutableFunction} */
+export default mutable(fetchSearchSuggestions);

package/search/constants/Pipelines.js

@@ -1 +1 @@
-export var SHOPGATE_CATALOG_GET_SEARCH_SUGGESTIONS='shopgate.catalog.getSearchSuggestions';
+export const SHOPGATE_CATALOG_GET_SEARCH_SUGGESTIONS = 'shopgate.catalog.getSearchSuggestions';

package/search/constants/Portals.js

@@ -1,3 +1,10 @@
 // FEATURES
-var SEARCH='search';// CONTENTS
-var SUGGESTIONS='suggestions';var SUGGESTION_ITEM='suggestion-item';var SUGGESTION_ITEM_CONTENT='suggestion-item-content';export var SEARCH_SUGGESTIONS="".concat(SEARCH,".").concat(SUGGESTIONS);export var SEARCH_SUGGESTION_ITEM="".concat(SEARCH,".").concat(SUGGESTION_ITEM);export var SEARCH_SUGGESTION_ITEM_CONTENT="".concat(SEARCH,".").concat(SUGGESTION_ITEM_CONTENT);
+const SEARCH = 'search';
+
+// CONTENTS
+const SUGGESTIONS = 'suggestions';
+const SUGGESTION_ITEM = 'suggestion-item';
+const SUGGESTION_ITEM_CONTENT = 'suggestion-item-content';
+export const SEARCH_SUGGESTIONS = `${SEARCH}.${SUGGESTIONS}`;
+export const SEARCH_SUGGESTION_ITEM = `${SEARCH}.${SUGGESTION_ITEM}`;
+export const SEARCH_SUGGESTION_ITEM_CONTENT = `${SEARCH}.${SUGGESTION_ITEM_CONTENT}`;

package/search/constants/index.js

@@ -1,2 +1,10 @@
-export var SEARCH_PATH='/search';export var SEARCH_PATTERN=SEARCH_PATH;export var SEARCH_FILTER_PATTERN="".concat(SEARCH_PATH,"/filter");export var SEARCH_SUGGESTIONS_LIFETIME=86400000;// 24 hours in milliseconds
-export var REQUEST_SEARCH_RESULTS='REQUEST_SEARCH_RESULTS';export var RECEIVE_SEARCH_RESULTS='RECEIVE_SEARCH_RESULTS';export var ERROR_SEARCH_RESULTS='ERROR_SEARCH_RESULTS';export var REQUEST_SEARCH_SUGGESTIONS='REQUEST_SEARCH_SUGGESTIONS';export var RECEIVE_SEARCH_SUGGESTIONS='RECEIVE_SEARCH_SUGGESTIONS';
+export const SEARCH_PATH = '/search';
+export const SEARCH_PATTERN = SEARCH_PATH;
+export const SEARCH_FILTER_PATTERN = `${SEARCH_PATH}/filter`;
+export const SEARCH_SUGGESTIONS_LIFETIME = 86400000; // 24 hours in milliseconds
+
+export const REQUEST_SEARCH_RESULTS = 'REQUEST_SEARCH_RESULTS';
+export const RECEIVE_SEARCH_RESULTS = 'RECEIVE_SEARCH_RESULTS';
+export const ERROR_SEARCH_RESULTS = 'ERROR_SEARCH_RESULTS';
+export const REQUEST_SEARCH_SUGGESTIONS = 'REQUEST_SEARCH_SUGGESTIONS';
+export const RECEIVE_SEARCH_SUGGESTIONS = 'RECEIVE_SEARCH_SUGGESTIONS';

package/search/helpers/index.js

@@ -1,5 +1,8 @@
-import{SEARCH_PATH}from"../constants";/**
+import { SEARCH_PATH } from "../constants";
+
+/**
  * Generate product route for navigation.
  * @param {string} query search term
  * @returns {string}
- */export var getSearchRoute=function getSearchRoute(query){return"".concat(SEARCH_PATH,"?s=").concat(encodeURIComponent(query));};
+ */
+export const getSearchRoute = query => `${SEARCH_PATH}?s=${encodeURIComponent(query)}`;

package/search/helpers/removeHighlightingPlaceholders.js

@@ -1,3 +1,4 @@
+import "core-js/modules/es.string.replace.js";
 /**
  * Pipeline call adds $start$ and $end$ placeholders for higlighting purposes.
  *
@@ -6,4 +7,6 @@
  *
  * @param {Array} suggestions An array of strings.
  * @returns {Array}
- */var removeHighlightingPlaceholers=function removeHighlightingPlaceholers(suggestions){return suggestions.map(function(item){return item.replace(/\$start\$|\$end\$/g,'');});};export default removeHighlightingPlaceholers;
+ */
+const removeHighlightingPlaceholers = suggestions => suggestions.map(item => item.replace(/\$start\$|\$end\$/g, ''));
+export default removeHighlightingPlaceholers;

package/search/helpers/spec.js

@@ -1 +1,19 @@
-import removeHighlightingPlaceholders from"./removeHighlightingPlaceholders";describe('search/helpers',function(){describe('removeHighlightingPlaceholers test',function(){it('should not change string without placeholders',function(){var result=removeHighlightingPlaceholders(['foo','bar']);expect(result[0]).toBe('foo');});it('should remove $start$ and $end$',function(){var testArray=['$start$foo$end$','$start$$end$','$end$$start$','$start$foo$end$'];var result=removeHighlightingPlaceholders(testArray);result.forEach(function(item,key){expect(item.indexOf('start')).toBe(-1);expect(item.indexOf('end')).toBe(-1);expect(item.indexOf('$')).toBe(-1);expect(item.length).toBe(Math.max(testArray[key].length-12,0));});});});});
+import removeHighlightingPlaceholders from "./removeHighlightingPlaceholders";
+describe('search/helpers', () => {
+  describe('removeHighlightingPlaceholers test', () => {
+    it('should not change string without placeholders', () => {
+      const result = removeHighlightingPlaceholders(['foo', 'bar']);
+      expect(result[0]).toBe('foo');
+    });
+    it('should remove $start$ and $end$', () => {
+      const testArray = ['$start$foo$end$', '$start$$end$', '$end$$start$', '$start$foo$end$'];
+      const result = removeHighlightingPlaceholders(testArray);
+      result.forEach((item, key) => {
+        expect(item.indexOf('start')).toBe(-1);
+        expect(item.indexOf('end')).toBe(-1);
+        expect(item.indexOf('$')).toBe(-1);
+        expect(item.length).toBe(Math.max(testArray[key].length - 12, 0));
+      });
+    });
+  });
+});

package/search/index.js

@@ -1,6 +1,18 @@
 // ACTIONS
-export{default as fetchSearchResults}from"./actions/fetchSearchResults";export{default as fetchSearchSuggestions}from"./actions/fetchSearchSuggestions";// CONSTANTS
-export*from"./constants/index";export*from"./constants/Pipelines";export*from"./constants/Portals";// HELPERS
-export{default as removeHighlightingPlaceholers}from"./helpers/removeHighlightingPlaceholders";export*from"./helpers";// SELECTORS
-export*from"./selectors";// STREAMS
-export*from"./streams";
+export { default as fetchSearchResults } from "./actions/fetchSearchResults";
+export { default as fetchSearchSuggestions } from "./actions/fetchSearchSuggestions";
+
+// CONSTANTS
+export * from "./constants/index";
+export * from "./constants/Pipelines";
+export * from "./constants/Portals";
+
+// HELPERS
+export { default as removeHighlightingPlaceholers } from "./helpers/removeHighlightingPlaceholders";
+export * from "./helpers";
+
+// SELECTORS
+export * from "./selectors";
+
+// STREAMS
+export * from "./streams";

package/search/reducers/index.js

@@ -1,6 +1,42 @@
-function _defineProperty(obj,key,value){if(key in obj){Object.defineProperty(obj,key,{value:value,enumerable:true,configurable:true,writable:true});}else{obj[key]=value;}return obj;}function _extends(){_extends=Object.assign||function(target){for(var i=1;i<arguments.length;i++){var source=arguments[i];for(var key in source){if(Object.prototype.hasOwnProperty.call(source,key)){target[key]=source[key];}}}return target;};return _extends.apply(this,arguments);}import{REQUEST_SEARCH_SUGGESTIONS,RECEIVE_SEARCH_SUGGESTIONS,SEARCH_SUGGESTIONS_LIFETIME}from"../constants";var initialState={suggestions:{}};/**
+import { REQUEST_SEARCH_SUGGESTIONS, RECEIVE_SEARCH_SUGGESTIONS, SEARCH_SUGGESTIONS_LIFETIME } from "../constants";
+const initialState = {
+  suggestions: {}
+};
+
+/**
  * The search suggestions reducer.
  * @param {Object} [state={}] The current search suggestions state.
  * @param {Object} action The action object.
  * @return {Object} The updated search suggestions data.
- */var search=function search(){var state=arguments.length>0&&arguments[0]!==undefined?arguments[0]:initialState;var action=arguments.length>1?arguments[1]:undefined;switch(action.type){case REQUEST_SEARCH_SUGGESTIONS:return _extends({},state,{suggestions:_extends({},state.suggestions,_defineProperty({},action.searchPhrase,{isFetching:true,suggestions:[],expires:0}))});case RECEIVE_SEARCH_SUGGESTIONS:return _extends({},state,{suggestions:_extends({},state.suggestions,_defineProperty({},action.searchPhrase,{isFetching:false,suggestions:action.suggestions,expires:Date.now()+SEARCH_SUGGESTIONS_LIFETIME}))});default:return state;}};export default search;
+ */
+const search = (state = initialState, action) => {
+  switch (action.type) {
+    case REQUEST_SEARCH_SUGGESTIONS:
+      return {
+        ...state,
+        suggestions: {
+          ...state.suggestions,
+          [action.searchPhrase]: {
+            isFetching: true,
+            suggestions: [],
+            expires: 0
+          }
+        }
+      };
+    case RECEIVE_SEARCH_SUGGESTIONS:
+      return {
+        ...state,
+        suggestions: {
+          ...state.suggestions,
+          [action.searchPhrase]: {
+            isFetching: false,
+            suggestions: action.suggestions,
+            expires: Date.now() + SEARCH_SUGGESTIONS_LIFETIME
+          }
+        }
+      };
+    default:
+      return state;
+  }
+};
+export default search;

package/search/selectors/index.js

@@ -1,14 +1,33 @@
-import{createSelector}from'reselect';/**
+import { createSelector } from 'reselect';
+
+/**
  * @param {Object} state The appllication state.
  * @return {Object}
- */export var getSuggestionsState=function getSuggestionsState(state){return state.search.suggestions;};/**
+ */
+export const getSuggestionsState = state => state.search.suggestions;
+
+/**
  * Retrieves the search suggestions for a passed search phrase.
  * @param {Object} state The application state.
  * @param {Object} props The component props.
  * @returns {Object|null} The suggestions
- */export var getSuggestions=createSelector(getSuggestionsState,function(state,props){return props.searchPhrase;},function(suggestions,phrase){if(!phrase||!suggestions[phrase]){return null;}return suggestions[phrase].suggestions;});/**
+ */
+export const getSuggestions = createSelector(getSuggestionsState, (state, props) => props.searchPhrase, (suggestions, phrase) => {
+  if (!phrase || !suggestions[phrase]) {
+    return null;
+  }
+  return suggestions[phrase].suggestions;
+});
+
+/**
  * Detects if suggestions for a passed search phrase are currently fetching.
  * @param {Object} state The application state.
  * @param {Object} props The component props.
  * @returns {boolean}
- */export var getSuggestionsFetchingState=createSelector(getSuggestionsState,function(state,props){return props.searchPhrase;},function(suggestions,phrase){if(!phrase||!suggestions[phrase]){return false;}return suggestions[phrase].isFetching;});
+ */
+export const getSuggestionsFetchingState = createSelector(getSuggestionsState, (state, props) => props.searchPhrase, (suggestions, phrase) => {
+  if (!phrase || !suggestions[phrase]) {
+    return false;
+  }
+  return suggestions[phrase].isFetching;
+});

package/search/streams/index.js

@@ -1,7 +1,55 @@
-import{ACTION_REPLACE}from'@virtuous/conductor';import{main$}from'@shopgate/pwa-common/streams/main';import{routeWillEnter$,routeDidEnter$,routeWillLeave$,routeDidUpdate$}from'@shopgate/pwa-common/streams/router';import{HISTORY_POP_ACTION}from'@shopgate/pwa-common/constants/ActionTypes';import{filtersDidUpdate$}from'@shopgate/pwa-common-commerce/filter/streams';import{SEARCH_PATH}from'@shopgate/pwa-common-commerce/search/constants';import{getCurrentRoute}from'@shopgate/pwa-common/selectors/router';import{preferredLocationDidUpdate$,preferredLocationDidUpdateGlobalNotOnSearch$,preferredLocationDidUpdateGlobalOnSearch$}from'@shopgate/engage/locations/locations.streams';import{CATEGORY_ALL_PATTERN}from'@shopgate/pwa-common-commerce/category/constants';import{filterWillLeave$}from"../../filter/streams";import{REQUEST_SEARCH_RESULTS,RECEIVE_SEARCH_RESULTS,ERROR_SEARCH_RESULTS,SEARCH_PATTERN}from"../constants";/**
+import { ACTION_REPLACE } from '@virtuous/conductor';
+import { main$ } from '@shopgate/pwa-common/streams/main';
+import { routeWillEnter$, routeDidEnter$, routeWillLeave$, routeDidUpdate$ } from '@shopgate/pwa-common/streams/router';
+import { HISTORY_POP_ACTION } from '@shopgate/pwa-common/constants/ActionTypes';
+import { filtersDidUpdate$ } from '@shopgate/pwa-common-commerce/filter/streams';
+import { SEARCH_PATH } from '@shopgate/pwa-common-commerce/search/constants';
+import { getCurrentRoute } from '@shopgate/pwa-common/selectors/router';
+import { preferredLocationDidUpdate$, preferredLocationDidUpdateGlobalNotOnSearch$, preferredLocationDidUpdateGlobalOnSearch$ } from '@shopgate/engage/locations/locations.streams';
+import { CATEGORY_ALL_PATTERN } from '@shopgate/pwa-common-commerce/category/constants';
+import { filterWillLeave$ } from "../../filter/streams";
+import { REQUEST_SEARCH_RESULTS, RECEIVE_SEARCH_RESULTS, ERROR_SEARCH_RESULTS, SEARCH_PATTERN } from "../constants";
+
+/**
  * Gets triggered when search results are requested.
  * @type {Observable}
- */export var searchRequesting$=main$.filter(function(_ref){var action=_ref.action;return action.type===REQUEST_SEARCH_RESULTS;});/**
+ */
+export const searchRequesting$ = main$.filter(({
+  action
+}) => action.type === REQUEST_SEARCH_RESULTS);
+
+/**
  * Gets triggered when search results are received.
  * @type {Observable}
- */export var searchReceived$=main$.filter(function(_ref2){var action=_ref2.action;return action.type===RECEIVE_SEARCH_RESULTS||action.type===ERROR_SEARCH_RESULTS;});export var searchWillEnter$=routeWillEnter$.filter(function(_ref3){var action=_ref3.action;return action.route.pattern===SEARCH_PATTERN;});export var searchDidEnter$=routeDidEnter$.filter(function(_ref4){var action=_ref4.action;return action.route.pattern===SEARCH_PATTERN;});export var searchWillLeave$=routeWillLeave$.filter(function(_ref5){var action=_ref5.action;return action.route.pattern===SEARCH_PATTERN;});export var searchWillUpdate$=routeWillEnter$.filter(function(_ref6){var action=_ref6.action;return action.route.pattern===SEARCH_PATTERN&&action.historyAction===ACTION_REPLACE;});export var searchDidBackEntered$=searchDidEnter$.filter(function(_ref7){var action=_ref7.action;return action.historyAction===HISTORY_POP_ACTION;});export var searchFiltersDidUpdate$=filtersDidUpdate$.filter(function(_ref8){var getState=_ref8.getState;var _getCurrentRoute=getCurrentRoute(getState()),pattern=_getCurrentRoute.pattern;return pattern===SEARCH_PATH||pattern===CATEGORY_ALL_PATTERN;});export var searchProductsNeedUpdate$=preferredLocationDidUpdate$.merge(preferredLocationDidUpdateGlobalNotOnSearch$).switchMap(function(){return searchDidBackEntered$.first();}).merge(searchFiltersDidUpdate$).merge(preferredLocationDidUpdateGlobalOnSearch$);export var searchDidUpdate$=routeDidUpdate$.filter(function(_ref9){var _action$route;var action=_ref9.action;return(action===null||action===void 0?void 0:(_action$route=action.route)===null||_action$route===void 0?void 0:_action$route.pattern)===SEARCH_PATTERN;});export var searchFiltersDidUpdateFromFilterPage$=searchDidUpdate$.switchMap(function(){return filterWillLeave$.first();}).switchMap(function(){return searchWillEnter$.first();});
+ */
+export const searchReceived$ = main$.filter(({
+  action
+}) => action.type === RECEIVE_SEARCH_RESULTS || action.type === ERROR_SEARCH_RESULTS);
+export const searchWillEnter$ = routeWillEnter$.filter(({
+  action
+}) => action.route.pattern === SEARCH_PATTERN);
+export const searchDidEnter$ = routeDidEnter$.filter(({
+  action
+}) => action.route.pattern === SEARCH_PATTERN);
+export const searchWillLeave$ = routeWillLeave$.filter(({
+  action
+}) => action.route.pattern === SEARCH_PATTERN);
+export const searchWillUpdate$ = routeWillEnter$.filter(({
+  action
+}) => action.route.pattern === SEARCH_PATTERN && action.historyAction === ACTION_REPLACE);
+export const searchDidBackEntered$ = searchDidEnter$.filter(({
+  action
+}) => action.historyAction === HISTORY_POP_ACTION);
+export const searchFiltersDidUpdate$ = filtersDidUpdate$.filter(({
+  getState
+}) => {
+  const {
+    pattern
+  } = getCurrentRoute(getState());
+  return pattern === SEARCH_PATH || pattern === CATEGORY_ALL_PATTERN;
+});
+export const searchProductsNeedUpdate$ = preferredLocationDidUpdate$.merge(preferredLocationDidUpdateGlobalNotOnSearch$).switchMap(() => searchDidBackEntered$.first()).merge(searchFiltersDidUpdate$).merge(preferredLocationDidUpdateGlobalOnSearch$);
+export const searchDidUpdate$ = routeDidUpdate$.filter(({
+  action
+}) => action?.route?.pattern === SEARCH_PATTERN);
+export const searchFiltersDidUpdateFromFilterPage$ = searchDidUpdate$.switchMap(() => filterWillLeave$.first()).switchMap(() => searchWillEnter$.first());

package/search/subscriptions/index.js

@@ -1,7 +1,134 @@
-import _regeneratorRuntime from"@babel/runtime/regenerator";function _extends(){_extends=Object.assign||function(target){for(var i=1;i<arguments.length;i++){var source=arguments[i];for(var key in source){if(Object.prototype.hasOwnProperty.call(source,key)){target[key]=source[key];}}}return target;};return _extends.apply(this,arguments);}function asyncGeneratorStep(gen,resolve,reject,_next,_throw,key,arg){try{var info=gen[key](arg);var value=info.value;}catch(error){reject(error);return;}if(info.done){resolve(value);}else{Promise.resolve(value).then(_next,_throw);}}function _asyncToGenerator(fn){return function(){var self=this,args=arguments;return new Promise(function(resolve,reject){var gen=fn.apply(self,args);function _next(value){asyncGeneratorStep(gen,resolve,reject,_next,_throw,"next",value);}function _throw(err){asyncGeneratorStep(gen,resolve,reject,_next,_throw,"throw",err);}_next(undefined);});};}import{LoadingProvider}from'@shopgate/pwa-common/providers';import{ACTION_PUSH,ACTION_REPLACE}from'@virtuous/conductor';import{buildFetchSearchResultsParams,getProductsResult}from'@shopgate/engage/product';import{hex2bin,router}from'@shopgate/engage/core';import{CATEGORY_ALL_PATTERN,fetchCategory,getShowAllProductsFilters}from'@shopgate/engage/category';import{getCurrentRoute}from'@shopgate/pwa-common/selectors/router';import expireProductsByHash from'@shopgate/pwa-common-commerce/product/action-creators/expireProductsByHash';import fetchSearchResults from'@shopgate/pwa-common-commerce/search/actions/fetchSearchResults';import fetchFilters from'@shopgate/pwa-common-commerce/filter/actions/fetchFilters';import{buildFilterParamsForFetchFiltersRequest}from'@shopgate/engage/filter/helpers';import{categoryAllWillEnter$,categoryAllFiltersDidUpdateFromFilterPage$}from'@shopgate/pwa-common-commerce/category/streams';import{searchWillEnter$,searchFiltersDidUpdateFromFilterPage$,searchRequesting$,searchReceived$,searchProductsNeedUpdate$}from"../streams";import{SEARCH_PATTERN}from"../constants";var searchBasedRouteWillEnter$=searchWillEnter$.merge(categoryAllWillEnter$);var searchBasedFiltersDidUpdateFromFilterPage$=searchFiltersDidUpdateFromFilterPage$.merge(categoryAllFiltersDidUpdateFromFilterPage$);/**
+import { LoadingProvider } from '@shopgate/pwa-common/providers';
+import { ACTION_PUSH, ACTION_REPLACE } from '@virtuous/conductor';
+import { buildFetchSearchResultsParams, getProductsResult } from '@shopgate/engage/product';
+import { hex2bin, router } from '@shopgate/engage/core';
+import { CATEGORY_ALL_PATTERN, fetchCategory, getShowAllProductsFilters } from '@shopgate/engage/category';
+import { getCurrentRoute } from '@shopgate/pwa-common/selectors/router';
+import expireProductsByHash from '@shopgate/pwa-common-commerce/product/action-creators/expireProductsByHash';
+import fetchSearchResults from '@shopgate/pwa-common-commerce/search/actions/fetchSearchResults';
+import fetchFilters from '@shopgate/pwa-common-commerce/filter/actions/fetchFilters';
+import { buildFilterParamsForFetchFiltersRequest } from '@shopgate/engage/filter/helpers';
+import { categoryAllWillEnter$, categoryAllFiltersDidUpdateFromFilterPage$ } from '@shopgate/pwa-common-commerce/category/streams';
+import { searchWillEnter$, searchFiltersDidUpdateFromFilterPage$, searchRequesting$, searchReceived$, searchProductsNeedUpdate$ } from "../streams";
+import { SEARCH_PATTERN } from "../constants";
+const searchBasedRouteWillEnter$ = searchWillEnter$.merge(categoryAllWillEnter$);
+const searchBasedFiltersDidUpdateFromFilterPage$ = searchFiltersDidUpdateFromFilterPage$.merge(categoryAllFiltersDidUpdateFromFilterPage$);
+
+/**
  * Search subscriptions.
  * @param {Function} subscribe The subscribe function.
- */export default function search(subscribe){subscribe(searchRequesting$,function(){LoadingProvider.setLoading(SEARCH_PATTERN);});subscribe(searchReceived$,function(){LoadingProvider.unsetLoading(SEARCH_PATTERN);});subscribe(searchBasedRouteWillEnter$,/*#__PURE__*/function(){var _ref2=_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(_ref){var _action$route;var action,dispatch,getState,filters,searchPhrase,sort,category,_getProductsResult,hash,expired;return _regeneratorRuntime.wrap(function _callee$(_context){while(1)switch(_context.prev=_context.next){case 0:action=_ref.action,dispatch=_ref.dispatch,getState=_ref.getState;if([ACTION_PUSH,ACTION_REPLACE].includes(action===null||action===void 0?void 0:action.historyAction)){_context.next=3;break;}return _context.abrupt("return");case 3:filters=action.route.state.filters;searchPhrase=action.route.query.s;sort=action.route.query.sort;if(!(action.route.pattern===CATEGORY_ALL_PATTERN)){_context.next=14;break;}searchPhrase='*';if(filters){_context.next=14;break;}_context.next=11;return dispatch(fetchCategory(hex2bin(action.route.params.categoryId)));case 11:category=_context.sent;filters=getShowAllProductsFilters(category);router.update(action.route.id,{filters:filters,categoryName:category.name});case 14:_getProductsResult=getProductsResult(getState(),_extends({searchPhrase:searchPhrase,routeId:action===null||action===void 0?void 0:(_action$route=action.route)===null||_action$route===void 0?void 0:_action$route.id},buildFetchSearchResultsParams())),hash=_getProductsResult.hash,expired=_getProductsResult.expired;if(expired){dispatch(expireProductsByHash(hash));}dispatch(fetchSearchResults(_extends({filters:filters,searchPhrase:searchPhrase,sort:sort},buildFetchSearchResultsParams())));dispatch(fetchFilters({filters:buildFilterParamsForFetchFiltersRequest(filters)}));case 18:case"end":return _context.stop();}},_callee);}));return function(_x){return _ref2.apply(this,arguments);};}());// No logic related to "show all products" necessary here, since stream only emits when
-// location based shopping is active. That's currently only supported when new services are
-// used, but the new services don't support "show all products".
-subscribe(searchProductsNeedUpdate$,function(_ref3){var dispatch=_ref3.dispatch,getState=_ref3.getState;var _getCurrentRoute=getCurrentRoute(getState()),query=_getCurrentRoute.query,filters=_getCurrentRoute.state.filters,pattern=_getCurrentRoute.pattern;var sort=query.sort;var searchPhrase=query.s;if(pattern===CATEGORY_ALL_PATTERN){searchPhrase='*';}dispatch(fetchSearchResults(_extends({filters:filters,searchPhrase:searchPhrase,sort:sort},buildFetchSearchResultsParams())));});subscribe(searchBasedFiltersDidUpdateFromFilterPage$,function(_ref4){var dispatch=_ref4.dispatch,action=_ref4.action;var filters=action.route.state.filters;var pattern=action.route.pattern;var sort=action.route.query.sort;var searchPhrase=action.route.query.s;if(pattern===CATEGORY_ALL_PATTERN){searchPhrase='*';}dispatch(fetchSearchResults(_extends({filters:filters,searchPhrase:searchPhrase,sort:sort},buildFetchSearchResultsParams())));});}
+ */
+export default function search(subscribe) {
+  subscribe(searchRequesting$, () => {
+    LoadingProvider.setLoading(SEARCH_PATTERN);
+  });
+  subscribe(searchReceived$, () => {
+    LoadingProvider.unsetLoading(SEARCH_PATTERN);
+  });
+  subscribe(searchBasedRouteWillEnter$, async ({
+    action,
+    dispatch,
+    getState
+  }) => {
+    if (![ACTION_PUSH, ACTION_REPLACE].includes(action?.historyAction)) {
+      return;
+    }
+    let {
+      filters
+    } = action.route.state;
+    let {
+      s: searchPhrase
+    } = action.route.query;
+    const {
+      sort
+    } = action.route.query;
+    if (action.route.pattern === CATEGORY_ALL_PATTERN) {
+      searchPhrase = '*';
+      if (!filters) {
+        const category = await dispatch(fetchCategory(hex2bin(action.route.params.categoryId)));
+        filters = getShowAllProductsFilters(category);
+        router.update(action.route.id, {
+          filters,
+          categoryName: category.name
+        });
+      }
+    }
+    const {
+      hash,
+      expired
+    } = getProductsResult(getState(), {
+      searchPhrase,
+      routeId: action?.route?.id,
+      ...buildFetchSearchResultsParams()
+    });
+    if (expired) {
+      dispatch(expireProductsByHash(hash));
+    }
+    dispatch(fetchSearchResults({
+      filters,
+      searchPhrase,
+      sort,
+      ...buildFetchSearchResultsParams()
+    }));
+    dispatch(fetchFilters({
+      filters: buildFilterParamsForFetchFiltersRequest(filters)
+    }));
+  });
+
+  // No logic related to "show all products" necessary here, since stream only emits when
+  // location based shopping is active. That's currently only supported when new services are
+  // used, but the new services don't support "show all products".
+  subscribe(searchProductsNeedUpdate$, ({
+    dispatch,
+    getState
+  }) => {
+    const {
+      query,
+      state: {
+        filters
+      },
+      pattern
+    } = getCurrentRoute(getState());
+    const {
+      sort
+    } = query;
+    let {
+      s: searchPhrase
+    } = query;
+    if (pattern === CATEGORY_ALL_PATTERN) {
+      searchPhrase = '*';
+    }
+    dispatch(fetchSearchResults({
+      filters,
+      searchPhrase,
+      sort,
+      ...buildFetchSearchResultsParams()
+    }));
+  });
+  subscribe(searchBasedFiltersDidUpdateFromFilterPage$, ({
+    dispatch,
+    action
+  }) => {
+    const {
+      filters
+    } = action.route.state;
+    const {
+      pattern
+    } = action.route;
+    const {
+      sort
+    } = action.route.query;
+    let {
+      s: searchPhrase
+    } = action.route.query;
+    if (pattern === CATEGORY_ALL_PATTERN) {
+      searchPhrase = '*';
+    }
+    dispatch(fetchSearchResults({
+      filters,
+      searchPhrase,
+      sort,
+      ...buildFetchSearchResultsParams()
+    }));
+  });
+}