Merge branch 'develop' into bugfix/3923

Author: pkarw

CHANGELOG.md

@@ -44,6 +44,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fixed edit shipping address in my account - @gibkigonzo (#3921)
 - Fetch cms_block content in serverPrefetch method - @gibkigonzo (#3910)
 - Fixed saving invalidated user token -  @andrzejewsky (#3923)
+- Keep category products objects on ssr - @gibkigonzo (#3924)
 
 ### Changed / Improved
 - Changed pre commit hook to use NODE_ENV production to check for debugger statements - @resubaka (#3686)

core/modules/catalog-next/store/category/getters.ts

@@ -16,10 +16,13 @@ import { _prepareCategoryPathIds, getSearchOptionsFromRouteParams } from '../../
 import { removeStoreCodeFromRoute } from '@vue-storefront/core/lib/multistore'
 import cloneDeep from 'lodash-es/cloneDeep'
 
-function mapCategoryProducts (productsSkus, productsData) {
-  return productsSkus.map(prodSku => {
-    const product = productsData.find(prodData => prodData.sku === prodSku)
-    return cloneDeep(product)
+function mapCategoryProducts (productsFromState, productsData) {
+  return productsFromState.map(prodState => {
+    if (typeof prodState === 'string') {
+      const product = productsData.find(prodData => prodData.sku === prodState)
+      return cloneDeep(product)
+    }
+    return prodState
   })
 }
 

core/modules/catalog-next/store/category/mutations.ts

@@ -1,3 +1,4 @@
+import { isServer } from '@vue-storefront/core/helpers';
 import { nonReactiveState } from './index';
 import Vue from 'vue'
 import { MutationTree } from 'vuex'
@@ -9,11 +10,11 @@ import cloneDeep from 'lodash-es/cloneDeep'
 const mutations: MutationTree<CategoryState> = {
   [types.CATEGORY_SET_PRODUCTS] (state, products = []) {
     nonReactiveState.products = cloneDeep(products)
-    state.products = products.map(prod => prod.sku)
+    state.products = isServer ? products : products.map(prod => prod.sku)
   },
   [types.CATEGORY_ADD_PRODUCTS] (state, products = []) {
     nonReactiveState.products.push(...cloneDeep(products))
-    state.products.push(...products.map(prod => prod.sku))
+    state.products.push(...(isServer ? products : products.map(prod => prod.sku)))
   },
   [types.CATEGORY_ADD_CATEGORY] (state, category: Category) {
     if (category) {