Changed to arrow function

Author: webdevstar

src/admin/client/modules/products/actions.js

@@ -194,15 +194,17 @@ export function fetchProducts() {
 
       return api.products.list(filter)
         .then(({status, json}) => {
-          json = json.sort((a,b) => (a.position - b.position ));
+          let products = json.data;
 
-          json.forEach((element, index, theArray) => {
+          products = product.sort((a,b) => (a.position - b.position ));
+
+          products.forEach((element, index, theArray) => {
             if(theArray[index].name === '') {
               theArray[index].name = `<${messages.draft}>`;
             }
           })
 
-          dispatch(receiveProducts(json))
+          dispatch(receiveProducts(products))
         })
         .catch(error => {
             dispatch(receiveProductsError(error));
@@ -242,15 +244,17 @@ export function fetchMoreProducts() {
 
     return api.products.list(filter)
       .then(({status, json}) => {
-        json = json.sort((a,b) => (a.position - b.position ));
+        let products = json.data;
+
+        products = products.sort((a,b) => (a.position - b.position ));
 
-        json.forEach((element, index, theArray) => {
+        products.forEach((element, index, theArray) => {
           if(theArray[index].name === '') {
             theArray[index].name = `<${messages.draft}>`;
           }
         })
 
-        dispatch(receiveProductsMore(json))
+        dispatch(receiveProductsMore(products))
       })
       .catch(error => {
           dispatch(receiveProductsError(error));

src/api/server/services/products/products.js

@@ -21,7 +21,7 @@ class ProductsService {
         const limit = parse.getNumberIfPositive(params.limit) || 1000000;
         const offset = parse.getNumberIfPositive(params.offset) || 0;
         const projectQuery = this.getProjectQuery(fieldsArray);
-        const sortQuery = this.getSortQuery(params);
+        const sortQuery = this.getSortQuery(params); // todo: validate every sort field
         const matchQuery = this.getMatchQuery(params, categories);
         const matchTextQuery = this.getMatchTextQuery(params);
         const thumbnail_width = parse.getNumberIfPositive(params.thumbnail_width);
@@ -43,15 +43,30 @@ class ProductsService {
         if(matchTextQuery) {
           aggregationCount.push({ $match: matchTextQuery });
         }
+        aggregationCount.push({ $project: projectQuery });
         aggregationCount.push({ $match: matchQuery });
-        aggregationCount.push({$group: {_id: null, count: { $sum: 1 }}});
+        aggregationCount.push({$group: {_id: null, count: { $sum: 1 }, min_price: { $min: "$price" }, max_price: { $max: "$price" }}});
 
         return mongo.db.collection('products').aggregate(aggregationPipeline).toArray()
           .then(items => items.map(item => this.changeProperties(categories, item, thumbnail_width))).then(items => {
             return mongo.db.collection('products').aggregate(aggregationCount).toArray().then(countItems => {
+              let total_count = 0;
+              let min_price = 0;
+              let max_price = 0;
+
+              if(countItems && countItems.length === 1) {
+                total_count = countItems[0].count;
+                min_price = countItems[0].min_price || 0;
+                max_price = countItems[0].max_price || 0;
+              }
+
               return {
-                total_count: countItems[0].count,
-                has_more: (offset + items.length) < countItems[0].count,
+                price: {
+                  min: min_price,
+                  max: max_price
+                },
+                total_count: total_count,
+                has_more: (offset + items.length) < total_count,
                 data: items
               }
             })

src/index.js

@@ -41,12 +41,18 @@ const staticOptions = {
 
 app.set('trust proxy', 1) // trust first proxy
 app.use(express.static(STATIC_ROOT_DIRECTORY, staticOptions))
+app.get('/*.ico', (req, res) => {
+  res.status(404).end();
+});
+app.get('/assets/*', (req, res) => {
+  res.status(404).end();
+});
 app.use(helmet())
 app.use(responseTime())
 app.use(bodyParser.urlencoded({extended: true}));
 app.use(bodyParser.json());
 app.use('/api', apiRouter);
-app.get('/admin/*', function(req, res) {
+app.get('/admin/*', (req, res) => {
   res.sendFile(ADMIN_INDEX_PATH)
 });
 app.use(cookieParser(settings.security.cookieKey));

src/store/server/ajax.js

@@ -21,7 +21,7 @@ const fillCartItems = (cartResponse) => {
   if(cart && cart.items && cart.items.length > 0) {
     const productIds = cart.items.map(item => item.product_id);
     return api.products.list({ ids: productIds, fields: 'images,enabled,stock_quantity' }).then(({status, json}) => {
-      const newCartItem = cart.items.map(cartItem => fillCartItemWithProductData(json, cartItem))
+      const newCartItem = cart.items.map(cartItem => fillCartItemWithProductData(json.data, cartItem))
       cartResponse.json.items = newCartItem;
       return cartResponse;
     })

src/store/shared/actionTypes.js

@@ -48,3 +48,4 @@ export const SITEMAP_RECEIVE = 'SITEMAP_RECEIVE'
 
 export const SET_CURRENT_CATEGORY = 'SET_CURRENT_CATEGORY'
 export const SET_PRODUCTS_FILTER = 'SET_PRODUCTS_FILTER'
+export const SET_PRODUCTS_PRICE_RANGE = 'SET_PRODUCTS_PRICE_RANGE'

src/store/shared/actions.js

@@ -21,8 +21,13 @@ export const fetchProducts = () => (dispatch, getState) => {
   dispatch(requestProducts());
 
   let filter = app.productsFilter;
+  filter.offset = 0;
+
   return api.ajax.products.list(filter).then(({status, json}) => {
     dispatch(receiveProducts(json))
+    if(!app.products_min_price && !app.products_max_price) {
+      dispatch(setProductsPriceRange(json.price.min, json.price.max));
+    }
   }).catch(error => {});
 }
 
@@ -32,13 +37,13 @@ const receiveProducts = (products) => ({type: t.PRODUCTS_RECEIVE, products})
 
 export const fetchMoreProducts = () => (dispatch, getState) => {
   const {app} = getState();
-  if (app.loadingProducts || app.products.length === 0) {
+  if (app.loadingProducts || app.loadingMoreProducts || app.products.length === 0 || !app.products_has_more) {
     return Promise.resolve();
   } else {
     dispatch(requestMoreProducts());
 
     let filter = app.productsFilter;
-    filter.limit = 15;
+    //filter.limit = 15;
     filter.offset = app.products.length;
 
     return api.ajax.products.list(filter).then(({status, json}) => {
@@ -154,7 +159,10 @@ export const setCategory = category_id => (dispatch, getState) => {
   const category = app.categories.find(c => c.id === category_id);
   if (category) {
     dispatch(setCurrentCategory(category));
+    dispatch(setProductsPriceRange(null, null));
+    dispatch(clearProductsFilter());
     dispatch(setProductsFilter({category_id: category_id}));
+    dispatch(receiveProduct(null));
   }
 }
 
@@ -170,17 +178,31 @@ export const setSort = sort => (dispatch, getState) => {
   dispatch(fetchProducts());
 }
 
+export const setPriceFromAndTo = (price_from, price_to) => (dispatch, getState) => {
+  if(price_to > 0) {
+    dispatch(setProductsFilter({price_from: price_from, price_to: price_to}));
+    dispatch(fetchProducts());
+  }
+}
+
 export const setPriceFrom = price_from => (dispatch, getState) => {
   dispatch(setProductsFilter({price_from: price_from}));
   dispatch(fetchProducts());
 }
 
 export const setPriceTo = price_to => (dispatch, getState) => {
-  dispatch(setProductsFilter({price_to: price_to}));
-  dispatch(fetchProducts());
+  if(price_to > 0) {
+    dispatch(setProductsFilter({price_to: price_to}));
+    dispatch(fetchProducts());
+  }
 }
 
-const setProductsFilter = filter => ({type: t.SET_PRODUCTS_FILTER, filter})
+const setProductsPriceRange = (min, max) => ({type: t.SET_PRODUCTS_PRICE_RANGE, min, max})
+
+const setProductsFilter = filter => ({type: t.SET_PRODUCTS_FILTER, filter: filter})
+
+const EMPTY_FILTER = { on_sale: null, search: '', price_from: 0, price_to: 0 };
+const clearProductsFilter = () => ({type: t.SET_PRODUCTS_FILTER, filter: EMPTY_FILTER});
 
 export const updateCartShippingCountry = country => (dispatch, getState) => {
   return [
@@ -305,6 +327,10 @@ export const getInitialState = (req, checkoutFields, currentPage, settings) => {
       productDetails: null,
       categories: [],
       products: [],
+      products_total_count: 0,
+      products_has_more: false,
+      products_min_price: 0,
+      products_max_price: 0,
       paymentMethods: [],
       shippingMethods: [],
       loadingProducts: false,
@@ -316,8 +342,8 @@ export const getInitialState = (req, checkoutFields, currentPage, settings) => {
         on_sale: null,
         search: '',
         category_id: null,
-        price_from: null,
-        price_to: null,
+        price_from: 0,
+        price_to: 0,
         limit: 30,
         sort: settings.default_product_sorting,
         fields: 'path,id,name,category_id,category_name,sku,images,enabled,discontinued,stock_status,stock_quantity,price,on_sale,regular_price'
@@ -335,7 +361,15 @@ export const getInitialState = (req, checkoutFields, currentPage, settings) => {
   return getCommonData(req, currentPage, initialState.app.productsFilter).then(commonData => {
     initialState.app.categories = commonData.categories;
     initialState.app.productDetails = commonData.product;
-    initialState.app.products = commonData.products;
+    if(commonData.products) {
+      initialState.app.products = commonData.products.data;
+      initialState.app.products_total_count = commonData.products.total_count;
+      initialState.app.products_has_more = commonData.products.has_more;
+      if(commonData.products.price) {
+        initialState.app.products_min_price = commonData.products.price.min;
+        initialState.app.products_max_price = commonData.products.price.max;
+      }
+    }
     initialState.app.categoryDetails = commonData.categoryDetails;
     initialState.app.cart = commonData.cart;
     initialState.app.pageDetails = commonData.page;

src/store/shared/containerProps.js

@@ -1,4 +1,4 @@
-import {addCartItem, deleteCartItem, updateCartItemQuantiry, fetchMoreProducts, setSearch, setSort, setPriceFrom, setPriceTo} from './actions'
+import {addCartItem, deleteCartItem, updateCartItemQuantiry, fetchMoreProducts, setSearch, setSort, setPriceFromAndTo, setPriceFrom, setPriceTo} from './actions'
 
 export const mapStateToProps = (state, ownProps) => {
   return {
@@ -26,6 +26,9 @@ export const mapDispatchToProps = (dispatch, ownProps) => {
     setSort: (sort) => {
       dispatch(setSort(sort));
     },
+    setPriceFromAndTo: (price_from, price_to) => {
+      dispatch(setPriceFromAndTo(price_from, price_to));
+    },
     setPriceFrom: (price_from) => {
       dispatch(setPriceFrom(price_from));
     },

src/store/shared/reducers.js

@@ -14,7 +14,12 @@ const appReducer = (state = initialState, action) => {
       return Object.assign({}, state, {loadingProducts: true})
 
     case t.PRODUCTS_RECEIVE:
-      return Object.assign({}, state, {loadingProducts: false, products: action.products})
+      return Object.assign({}, state, {
+        loadingProducts: false,
+        products: action.products.data,
+        products_total_count: action.products.total_count,
+        products_has_more: action.products.has_more
+      })
 
     case t.MORE_PRODUCTS_REQUEST:
       return Object.assign({}, state, {loadingMoreProducts: true})
@@ -24,8 +29,10 @@ const appReducer = (state = initialState, action) => {
         loadingMoreProducts: false,
         products: [
           ...state.products,
-          ...action.products
-        ]
+          ...action.products.data
+        ],
+        products_total_count: action.products.total_count,
+        products_has_more: action.products.has_more
       })
 
     case t.PAGE_RECEIVE:
@@ -73,6 +80,12 @@ const appReducer = (state = initialState, action) => {
         productsFilter: Object.assign({}, state.productsFilter, action.filter)
       })
 
+    case t.SET_PRODUCTS_PRICE_RANGE:
+      return Object.assign({}, state, {
+        products_min_price: action.min || 0,
+        products_max_price: action.max || 0
+      })
+
     case LOCATION_CHANGE:
     case t.PRODUCT_REQUEST:
     case t.PAGE_REQUEST:

src/store/shared/routes.js

@@ -40,8 +40,8 @@ function getComponent(nextState, cb) {
   getSitemap(nextState.location.pathname, state, dispatch).then(({currentPage, currentPageAlreadyInState}) => {
     if (currentPage) {
       if (currentPage.type === PRODUCT_CATEGORY) {
-        dispatch(setCategory(currentPage.resource))
         if(!currentPageAlreadyInState){
+          dispatch(setCategory(currentPage.resource))
           dispatch(fetchProducts());
         }
         cb(null, props => <CategoryContainer {...props}/>);