Merge pull request #368 from DivanteLtd/release/v1.11-rc1

Release/v1.11

Author: andrzejewsky

.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));