Release/v1.11

.gitignore

@@ -11,7 +11,6 @@ src/config.json
 config/local.json
 config/certs/*.pem
 var/magento2-sample-data/
-var/*
 .migrate
 *.iml
 /docker/elasticsearch/data/

CHANGELOG.md

@@ -4,7 +4,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [1.11.0-rc.1] - UNRELEASED
+## [1.11.0-rc.2] - unreleased
+
+### Fixed
+
+- Fixed some smaller issues with graphql so that it is now working again with the fronted - #350
+
+
+## [1.11.0-rc.1] - 2019.10.03
 
 ### Added
 - Experimental Elastic 7 support - @pkarw (#342)
@@ -32,6 +39,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 - Error responses for mailchimp - @andrzejewsky (#3337)
 - Replaced function arguments to object destructuring in `calculateProductTax` - @andrzejewsky (#3337)
+- Refactor `taxcalc.js` similar to frontend - @gibkigonzo (#356)
 
 ## [1.10.0] - 2019.08.12
 
@@ -49,6 +57,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 - Sharp dependency has been updated. *It might require reinstalling yarn dependencies* - @lukeromanowicz
+- Replaced index property value `not_analyzed` with `true` for `options` field in attribute schema - @adityasharma7 (#334)
 
 ### Fixed
 - Missing `res` and `req` parameters are now passed to ProductProcessor - @jahvi (#218)

README.md

@@ -19,7 +19,7 @@ Besides a big improvement for the shopping experience, we also want to create a
 - Docker and Docker Compose
 
 Already included in `vue-storefront-api` Docker image (required locally, if you do not use containerization):
-- Node.js 8.x or higher
+- Node.js 10.x or higher
 - Yarn
 
 ## Installation
@@ -144,7 +144,7 @@ This backend is using ElasticSearch data formats popularized by [ElasticSuite fo
 Please use data migration mechanism provided to manipulate Redis, ElasticSearch or kue. Details: https://github.com/DivanteLtd/vue-storefront-api/tree/master/doc 
 
 ## Adding custom modules with own dependencies (Yarn only)
-When adding custom [Extensions to the API](https://github.com/DivanteLtd/vue-storefront/blob/master/doc/Extending%20vue-storefront-api.md) you might want to define some dependencies inside them. Thanks to [Yarn workspaces](https://yarnpkg.com/lang/en/docs/workspaces/) dependecies defined inside your custom module will be intaled when you execute `yarn` at project root level, so it's way esier and faster than installing all modules dependcies separetly.
+When adding custom [Extensions to the API](https://github.com/DivanteLtd/vue-storefront/blob/master/doc/Extending%20vue-storefront-api.md) you might want to define some dependencies inside them. Thanks to [Yarn workspaces](https://yarnpkg.com/lang/en/docs/workspaces/) dependencies defined inside your custom module will be installed when you execute `yarn` at project root level, so it's way easier and faster than installing all modules dependencies separately.
 
 To do this, define the `package.json` with your dependencies in your custom module:
 - `src/api/extensions/{your-custom-extension}/package.json` 

config/default.json

@@ -63,6 +63,7 @@
       "storeCode": "de",
       "disabled": false,
       "storeId": 3,
+      "websiteId": 1,
       "name": "German Store",
       "url": "/de",
       "elasticsearch": {
@@ -97,6 +98,7 @@
       "storeCode": "it",
       "disabled": false,
       "storeId": 4,
+      "websiteId": 1,
       "name": "Italian Store",
       "url": "/it",
       "elasticsearch": {

config/elastic.schema.attribute.json

@@ -14,4 +14,4 @@
             }
         }
     }
-}
+}

config/elastic.schema.category.json

@@ -6,13 +6,13 @@
        "is_active": {"type": "boolean"},
        "product_count": {"type": "integer"},
        "parent_id": {"type": "integer"},
-       "position": {"type": "long"},
-       "created_at": { 
-           "type": "date",           
+       "position": {"type": "integer"},
+       "created_at": {
+           "type": "date",
            "format": "yyyy-MM-dd HH:mm:ss||yyyy-MM-dd||epoch_millis"
         },
-       "updated_at": { 
-           "type": "date",           
+       "updated_at": {
+           "type": "date",
            "format": "yyyy-MM-dd HH:mm:ss||yyyy-MM-dd||epoch_millis"
         }
     }

scripts/db.js

@@ -24,6 +24,10 @@ program
 
       console.log(`** Putting the mappings on top of ${tempIndex}`)
       es.putMappings(common.db, tempIndex, (err) => {
+        if (err) {
+          console.error(err.meta ? err.meta : err)
+        }
+
         console.log(`** We will reindex ${originalIndex} with the current schema`)
         es.reIndex(common.db, originalIndex, tempIndex, (err) => {
           if (err) {

src/api/user.js

@@ -119,12 +119,14 @@ export default ({config, db}) => {
    */
   userApi.post('/reset-password', (req, res) => {
     const userProxy = _getProxy(req)
+    const storeCode = req.query.storeCode
+    const websiteId = config.storeViews[storeCode].websiteId
 
     if (!req.body.email) {
       return apiStatus(res, 'Invalid e-mail provided!', 500)
     }
 
-    userProxy.resetPassword({ email: req.body.email, template: 'email_reset', websiteId: 1 }).then((result) => {
+    userProxy.resetPassword({ email: req.body.email, template: 'email_reset', websiteId }).then((result) => {
       apiStatus(res, result, 200);
     }).catch(err => {
       apiError(res, err);
@@ -150,10 +152,10 @@ export default ({config, db}) => {
   userApi.get('/order-history', (req, res) => {
     const userProxy = _getProxy(req)
     userProxy.orderHistory(
-			req.query.token,
-			req.query.pageSize || 20,
-			req.query.currentPage || 1
-		).then((result) => {
+      req.query.token,
+      req.query.pageSize || 20,
+      req.query.currentPage || 1
+    ).then((result) => {
       apiStatus(res, result, 200);
     }).catch(err => {
       apiError(res, err);

src/db.js

@@ -1,6 +1,6 @@
 import config from 'config'
-import * as redis from '../src/lib/redis'
-import * as elastic from '../src/lib/elastic'
+import * as redis from './lib/redis'
+import * as elastic from './lib/elastic'
 
 export default callback => {
   // connect to a database if needed, then pass it to `callback`:

src/graphql/elasticsearch/attribute/resolver.js

@@ -16,9 +16,6 @@ async function listAttributes (attributes, context, rootValue, _sourceIncludes)
     body: query,
     _sourceIncludes
   };
-  if (parseInt(config.elasticsearch.apiVersion) < 6) {
-    esQuery.type = config.elasticsearch.indexTypes[3]
-  }
 
   const response = await client.search(adjustQuery(esQuery, 'attribute', config));
 

src/graphql/elasticsearch/catalog/schema.graphqls

@@ -41,7 +41,7 @@ input FilterTypeInput @doc(description: "FilterTypeInput specifies which action
     gte: String @doc(description: "Greater than or equal to")
     gteq: String @doc(description: "Greater than or equal to")
     in: [JSON] @doc(description: "In. The value can contain a set of comma-separated values")
-    like: String @doc(description: "Like. The specified value can contain % (percent signs) to allow matching of 0 or more characters")
+    like: [String] @doc(description: "Like. The specified value can contain % (percent signs) to allow matching of 0 or more characters")
     lt: String @doc(description: "Less than")
     lte: String @doc(description: "Less than or equal to")
     lteq: String @doc(description: "Less than or equal to")
@@ -151,6 +151,7 @@ input ProductFilterInput @doc(description: "ProductFilterInput defines the filte
     stock: ProductFilterInput @doc(description: "The product stock. Customers use this stock to identify the product.")
     is_in_stock: FilterTypeInput @doc(description: "Is product in stock")
     keyword: FilterTypeInput @doc(description: "keyword filter input")
+    url_path: FilterTypeInput @doc(description: "The url path assigned to the product")
 }
 
 type LayerFilter {
@@ -182,4 +183,4 @@ type SortFields @doc(description: "SortFields contains a default value for sort
 enum SortEnum {
     ASC
     DESC
-}
+}

src/graphql/elasticsearch/category/schema.graphqls

@@ -59,4 +59,5 @@ input CategorySortInput {
     display_mode: SortEnum @doc(description: "Category display mode")
     is_anchor: SortEnum @doc(description: "Is filter avalaible in category")
     page_layout: SortEnum @doc(description: "Category page layout")
-}
+    _score: SortEnum @doc(description: "Category page layout")
+}

src/graphql/elasticsearch/cms/schema.graphqls

@@ -17,6 +17,7 @@ input CmsInput @doc(description: "ProductFilterInput defines the filters to be u
     id: FilterTypeInput @doc(description: "Id of the CMS entity")
     identifier: FilterTypeInput @doc(description: "Identifiers of the CMS entity")
     store_id: FilterTypeInput @doc(description: "Store Id of the CMS entity")
+    url_path: FilterTypeInput @doc(description: "The url path assigned to the cms_page")
 }
 
 type CmsPage @doc(description: "CMS pages information") {
@@ -32,6 +33,7 @@ type CmsPages @doc(description: "CMS page defines all CMS page information") {
     meta_description: String @doc(description: "CMS page meta description")
     meta_keywords: String @doc(description: "CMS page meta keywords")
     store_id: Int @doc(description: "Store Id of CMS page")
+    url_path: String @doc(description: "CMS page meta keywords")
 }
 
 type CmsBlocks @doc(description: "CMS blocks information") {
@@ -40,6 +42,7 @@ type CmsBlocks @doc(description: "CMS blocks information") {
 
 type CmsBlock @doc(description: "CMS block defines all CMS block information") {
     identifier: String @doc(description: "CMS block identifier")
+    id: Int @doc(description: "CMS block identifier")
     title: String @doc(description: "CMS block title")
     content: String @doc(description: "CMS block content")
     creation_time: String @doc(description: "Timestamp indicating when the CMS block was created")
@@ -60,4 +63,4 @@ type CmsHierarchy {
     request_url: String @doc(description: "Request URL of CMS hierarchy node")
     xpath: String @doc(description: "XPATH of CMS hierarchy node")
     store_id: Int @doc(description: "Store Id of CMS hierarchy node")
-}
+}

src/graphql/elasticsearch/queryBuilder.js

@@ -18,6 +18,16 @@ function processNestedFieldFilter (attribute, value) {
   return processedFilter;
 }
 
+/**
+ *
+ * @param {Object} object
+ * @param {String} scope
+ * @returns {boolean}
+ */
+function checkIfObjectHasScope ({ object, scope }) {
+  return object.scope === scope || (Array.isArray(object.scope) && object.scope.find(scrope => scrope === scope));
+}
+
 function applyFilters (filter, query, type) {
   if (filter.length === 0) {
     return query
@@ -46,7 +56,7 @@ function applyFilters (filter, query, type) {
 
     // apply default filters
     appliedFilters.forEach((filter) => {
-      if (filter.scope === 'default' && Object.keys(filter.value).length) {
+      if (checkIfObjectHasScope({ object: filter, scope: 'default' }) && Object.keys(filter.value).length) {
         if (rangeOperators.every(rangeOperator => Object.prototype.hasOwnProperty.call(filter.value, rangeOperator))) {
           // process range filters
           query = query.filter('range', filter.attribute, filter.value);
@@ -67,7 +77,7 @@ function applyFilters (filter, query, type) {
     let attrFilterBuilder = (filterQr, attrPostfix = '') => {
       appliedFilters.forEach((catalogfilter) => {
         const valueKeys = Object.keys(catalogfilter.value);
-        if (catalogfilter.scope === 'catalog' && valueKeys.length) {
+        if (checkIfObjectHasScope({ object: catalogfilter, scope: 'catalog' }) && valueKeys.length) {
           const isRange = valueKeys.filter(value => rangeOperators.indexOf(value) !== -1)
           if (isRange.length) {
             let rangeAttribute = catalogfilter.attribute

src/lib/elastic.js

@@ -138,7 +138,6 @@ function reIndex (db, fromIndexName, toIndexName, next) {
   }).then(res => {
     next()
   }).catch(err => {
-    console.error(err)
     next(err)
   })
 }
@@ -215,58 +214,40 @@ function putMappings (db, indexName, next) {
   let pageSchema = loadSchema('cms_page', '5.6');
   let blockSchema = loadSchema('cms_block', '5.6');
 
-  db.indices.putMapping({
-    index: indexName,
-    type: 'product',
-    body: productSchema
-  }).then(res1 => {
-    console.dir(res1, { depth: null, colors: true })
-
+  Promise.all([
+    db.indices.putMapping({
+      index: indexName,
+      type: 'product',
+      body: productSchema
+    }),
     db.indices.putMapping({
       index: indexName,
       type: 'taxrule',
       body: taxruleSchema
-    }).then(res2 => {
-      console.dir(res2, { depth: null, colors: true })
-
-      db.indices.putMapping({
-        index: indexName,
-        type: 'attribute',
-        body: attributeSchema
-      }).then(res3 => {
-        console.dir(res3, { depth: null, colors: true })
-        db.indices.putMapping({
-          index: indexName,
-          type: 'cms_page',
-          body: pageSchema
-        }).then(res4 => {
-          console.dir(res4, { depth: null, colors: true })
-          db.indices.putMapping({
-            index: indexName,
-            type: 'cms_block',
-            body: blockSchema
-          }).then(res5 => {
-            console.dir(res5, { depth: null, colors: true })
-            db.indices.putMapping({
-              index: indexName,
-              type: 'category',
-              body: categorySchema
-            }).then(res6 => {
-              console.dir(res6, { depth: null, colors: true })
-              next()
-            })
-          })
-        })
-      }).catch(err3 => {
-        throw new Error(err3)
-      })
-    }).catch(err2 => {
-      throw new Error(err2)
+    }),
+    db.indices.putMapping({
+      index: indexName,
+      type: 'attribute',
+      body: attributeSchema
+    }),
+    db.indices.putMapping({
+      index: indexName,
+      type: 'cms_page',
+      body: pageSchema
+    }),
+    db.indices.putMapping({
+      index: indexName,
+      type: 'cms_block',
+      body: blockSchema
+    }),
+    db.indices.putMapping({
+      index: indexName,
+      type: 'category',
+      body: categorySchema
     })
-  }).catch(err1 => {
-    console.error(err1)
-    next(err1)
-  })
+  ]).then(values => values.forEach(res => console.dir(res.body, { depth: null, colors: true })))
+    .then(next)
+    .catch(next)
 }
 
 module.exports = {