Merge remote-tracking branch '@vue-storefront/release/v1.12.0-rc.1' into release/v1.12.0

Author: tkostuch

CHANGELOG.md

@@ -83,6 +83,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Move default theme to separate repository https://github.com/DivanteLtd/vsf-default - @gibkigonzo (#4255)
 - add two numbers after dot to price by default, calculate default price for bundle or grouped main product, update typing, add fallback to attribute options - @gibkigonzo (#4476)
 - udpate yarn and filter shipping methods for instant checkout - @gibkigonzo (#4480)
+- add attribute metadata search query, add parentId - @gibkigonzo (#4491)
 
 ## [1.11.4] - 2020.05.26
 

core/lib/search/adapter/api-search-query/searchAdapter.ts

@@ -117,6 +117,7 @@ export class SearchAdapter {
         start: start,
         perPage: size,
         aggregations: resp.aggregations,
+        attributeMetadata: resp.attribute_metadata,
         suggestions: resp.suggest
       }
     } else {

core/modules/catalog/helpers/prepare/index.ts

@@ -1,6 +1,7 @@
 import setDefaultQty from './setDefaultQty';
 import setDefaultObjects from './setDefaultObjects';
 import setParentSku from './setParentSku';
+import setParentId from './setParentId';
 import setCustomAttributesForChild from './setCustomAttributesForChild';
 import setDefaultProductOptions from './setDefaultProductOptions';
 
@@ -12,6 +13,7 @@ function preConfigureProduct (product) {
   setDefaultQty(product)
   setDefaultObjects(product)
   setParentSku(product)
+  setParentId(product)
   setCustomAttributesForChild(product)
   setDefaultProductOptions(product)
 

core/modules/catalog/helpers/prepare/setParentId.ts

@@ -0,0 +1,10 @@
+import Product from '@vue-storefront/core/modules/catalog/types/Product';
+
+/**
+ * set parent id, this is needed, because in configuration process we will override id by configurable_children.id
+ */
+export default function setParentId (product: Product) {
+  if (!product.parentId) {
+    product.parentId = product.id
+  }
+}

core/modules/catalog/store/product/getters.ts

@@ -7,9 +7,12 @@ const getters: GetterTree<ProductState, RootState> = {
   getCurrentProduct: state => state.current,
   getCurrentProductConfiguration: state => state.current_configuration,
   getCurrentProductOptions: state => state.current_options,
-  getOriginalProduct: state => {
-    Logger.warn('`product/getOriginalProduct` deprecated, will be not used from 1.12')()
-    return state.original
+  getOriginalProduct: (state, getters) => {
+    if (!getters.getCurrentProduct) return null
+    return state.original || {
+      ...getters.getCurrentProduct,
+      id: getters.getCurrentProduct.parentId || getters.getCurrentProduct.id
+    }
   },
   getParentProduct: state => state.parent,
   getProductsSearchResult: state => state.list,

core/modules/catalog/types/Product.ts

@@ -71,7 +71,8 @@ export default interface Product {
   _score?: number,
   qty?: number,
   tier_prices?: any[],
-  links?: any
+  links?: any,
+  parentId?: number | string
 }
 
 export interface ProductLink {

package.json

@@ -103,7 +103,7 @@
     "@babel/core": "^7.9.0",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
     "@babel/polyfill": "^7.8.3",
-    "@babel/preset-env": "^7.8.6",
+    "@babel/preset-env": "^7.9.0",
     "@types/jest": "^25.1.3",
     "@types/node": "^13.7.7",
     "@typescript-eslint/eslint-plugin": "^1.7.1-alpha.17",