Merge pull request #1 from DivanteLtd/master

Sync with upstream master

Author: ResuBaka

.gitignore

@@ -11,3 +11,6 @@ src/config.json
 config/local.json
 var/magento2-sample-data/
 .migrate
+*.iml
+/docker/elasticsearch/data/
+!/docker/elasticsearch/data/.gitkeep

.travis.yml

@@ -0,0 +1,23 @@
+sudo: required
+language: node_js
+
+cache:
+  yarn: true
+  directories:
+    - node_modules
+
+install:
+  - yarn
+
+jobs:
+  include:
+    - &build
+      stage: Build
+      script:
+      - yarn lint
+      - yarn build
+      node_js: '10'
+
+    - <<: *build
+      node_js: '8'
+

CHANGELOG.md

@@ -4,13 +4,70 @@ 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.10.0] - 2019.08.12
+
+### Added
+- Typescript support - @ResuBaka (#210, #242)
+- Multi Stock Inventory (Magento MSI) support - @aleron75, @dimasch (#226)
+- Import of magento 2 cms pages and blocks to the full import - @toh82 (#235)
+- Information about magento 2 cms pages and blocks import to the readme - @toh82 (#235)
+- Introduce orderNumber to order creation endpoint - @Flyingmana (#251)
+- Optional Redis Auth functionality. - @rain2o (#267)
+- Extensions have ability to modify Elasticsearch results. - @grimasod (#269)
+- Refactored Travis build config - @Tjitse-E (#273)
+- Multistore support for `magento1`-platform using `magento1-vsbridge` - @cewald (#276)
+
+### 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)
+- Moving of graphql files to the dist folder - @ResuBaka (#242)
+- Moving of schema files to the dist folder - @ResuBaka (#244)
+- Missing assetPath config for magento1 - @ResuBaka (#245)
+- New payload for magento1 stock check endpoint - @cewald (#261)
+- `yarn dev:inspect` command and extract nodemon config to nodemon.json - @Tjitse-E, @cewald (#272, #279)
+- Include Magento Currency Code in mage2vs import and productsdelta if available - @rain2o (#281)
+- Better handling of HTTP error codes provided by API client - @pkarw (#3151)
+
+## [1.9.6] - 2019.07.11
+- Dependencies update to avoid lodash security issues.
+
+## [1.9.5] - 2019.06.17
+- Dependencies update to avoid js-yaml security issues.
+
+## [1.9.4] - 2019.06.03
+- Extension schemas in `src/models` are not required anymore - @EmilsM, @lukeromanowicz (#259, #263)
+
+## [1.9.3] - 2019.05.27
+- Change min postal code length in user profile to 3 so it's sames as in orders - @lukeromanowicz (#253)
+
+## [1.9.2] - 2019.05.20
+- Fix failing o2m when parsing order schema - @lukeromanowicz (#248)
+
+## [1.9.1] - 2019.05.10
+- Mount ElasticSearch data to `docker/elasticsearch/data` directory - @dimasch, @lukeromanowicz (#237, #241)
+- Fix product schema and importer in migration process - @lukeromanowicz (#239)
+
+## [1.9.0] - 2019.05.06
+- Changed location of magento1 platform js client. Moved from `src/platform/magento1/module` to [magento1-vsbridge-client](https://github.com/DivanteLtd/magento1-vsbridge-client) - @mtarld (#195)
+- Update Babel from 6 to 7 - @lukeromanowicz (#202)
+- Support unicode characters in order requests - @lukeromanowicz (#201)
+- TravisCI configured for building and linting - @lukeromanowicz (#204)
+- Use Redis database from configuration in mage2vs - @Cyclonecode (#211)
+- Requests with invalid body result in HTTP code 400 instead of 500 - @AndreiBelokopytov (#220) 
+- `src/models/order.schema.json` was moved to `src/models/order.schema.js` to support regex transformation - @lukeromanowicz (#201)
+
+## [1.8.4] - 2019.04.17
+- Use encrypted token for user authentication - @pkarw (#215)
+
 ## [1.8.3] - 2019.03.05
 - Use store id from configuration in `mage2vs import` - @boehsermoe (#179)
 
 ## [1.8.2] - 2019.03.04
 - Magento 1 bridge client - @afirlejczyk (#190)
 - configurable ElasticSearch `apiVersion` - @Resubaka (#192)
 
-
 ## [1.8.1] - 2019.02.11
 - Fixed `apiVersion` property for ElasticSearch driver - now it's available thru `config/*.json` - @mdanilowicz (#185)

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
@@ -82,7 +82,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` 
@@ -103,13 +103,8 @@ After setting the `config.magento2.api` section using Yours Magento2 oauth crede
 
 ```json
   "magento2": {
-    "url": "http://magento2.demo-1.xyz.com",
     "imgUrl": "http://localhost:8080/media/catalog/product",
     "assetPath": "/../var/magento2-sample-data/pub/media",
-    "magentoUserName": "",
-    "magentoUserPassword": "",
-    "httpUserName": "",
-    "httpUserPassword": "",
     "api": {
       "url": "http://demo-magento2.vuestorefront.io/rest",
       "consumerKey": "byv3730rhoulpopcq64don8ukb8lf2gq",
@@ -131,6 +126,12 @@ You can run the following command to execute the full import:
 ```bash
  yarn mage2vs import --store-code=de
  ```
+
+ Import of CMS blocks and pages is also performed by the full import. If the CMS API extension ((SnowdogApps/magento2-cms-api)[https://github.com/SnowdogApps/magento2-cms-api]) was not installed in magento 2, it's recommended to skip the CMS import commands.
+
+```bash
+ yarn mage2vs import --skip-blocks --skip-pages
+ ```
 
 ## Executing delta indexer
 

babel.config.js

@@ -0,0 +1,11 @@
+module.exports = {
+  presets: [
+    [
+      '@babel/preset-env', {
+        targets: {
+          node: "8"
+        }
+      }
+    ]
+  ]
+};

config/custom-environment-variables.json

@@ -10,6 +10,7 @@
   "redis": {
     "host": "REDIS_HOST",
     "port": "REDIS_PORT",
-    "db": "REDIS_DB"
+    "db": "REDIS_DB",
+    "auth": "REDIS_AUTH"
   }
 }

config/default.json

@@ -35,13 +35,18 @@
   "redis": {
     "host": "localhost",
     "port": 6379,
-    "db": 0
+    "db": 0,
+    "auth": false
   },
   "kue": {},
   "availableStores": [
     "de",
     "it"
   ],
+  "msi": {
+    "enabled": false,
+    "defaultStockId": 1
+  },
   "storeViews": {
     "multistore": true,
     "mapStoreUrlsFor": [
@@ -50,19 +55,22 @@
     ],
     "de": {
       "storeCode": "de",
-      "disabled": true,
+      "disabled": false,
       "storeId": 3,
       "name": "German Store",
       "url": "/de",
       "elasticsearch": {
         "host": "localhost:8080/api/catalog",
         "index": "vue_storefront_catalog_de"
       },
+      "msi": {
+        "stockId": 2
+      },
       "tax": {
         "defaultCountry": "DE",
         "defaultRegion": "",
         "calculateServerSide": true,
-		"sourcePriceIncludesTax": false
+		    "sourcePriceIncludesTax": false
       },
       "i18n": {
         "fullCountryName": "Germany",
@@ -77,14 +85,17 @@
     },
     "it": {
       "storeCode": "it",
-      "disabled": true,
+      "disabled": false,
       "storeId": 4,
       "name": "Italian Store",
       "url": "/it",
       "elasticsearch": {
         "host": "localhost:8080/api/catalog",
         "index": "vue_storefront_catalog_it"
       },
+      "msi": {
+        "stockId": 2
+      },
       "tax": {
         "defaultCountry": "IT",
         "defaultRegion": "",
@@ -126,7 +137,8 @@
     "mailchimp-subscribe",
     "example-magento-api",
     "cms-data",
-    "mail-service"
+    "mail-service",
+    "example-processor"
   ],
   "extensions": {
     "mailchimp": {
@@ -144,16 +156,16 @@
       },
       "targetAddressWhitelist": ["contributors@vuestorefront.io"],
       "secretString": "__THIS_IS_SO_SECRET__"
+    },
+    "example-processor": {
+      "resultProcessors": {
+        "product": "my-product-processor"
+      }
     }
   },
   "magento2": {
-    "url": "http://demo-magento2.vuestorefront.io/",
     "imgUrl": "http://demo-magento2.vuestorefront.io/media/catalog/product",
     "assetPath": "/../var/magento2-sample-data/pub/media",
-    "magentoUserName": "",
-    "magentoUserPassword": "",
-    "httpUserName": "",
-    "httpUserPassword": "",
     "api": {
       "url": "http://demo-magento2.vuestorefront.io/rest",
       "consumerKey": "byv3730rhoulpopcq64don8ukb8lf2gq",
@@ -163,8 +175,8 @@
     }
   },
   "magento1": {
-    "url": "http://magento-demo.local",
     "imgUrl": "http://magento-demo.local/media/catalog/product",
+    "assetPath": "",
     "magentoUserName": "",
     "magentoUserPassword": "",
     "httpUserName": "",
@@ -178,7 +190,6 @@
     }
   },
   "imageable": {
-    "namespace": "",
     "maxListeners": 512,
     "imageSizeLimit": 1024,
     "whitelist": {
@@ -197,8 +208,7 @@
       "queue": 2,
       "process": 4
     },
-    "simd": true,
-    "keepDownloads": true
+    "simd": true
   },
   "entities": {
       "category": {

config/elastic.schema.attribute.json

@@ -10,9 +10,9 @@
             "properties": {
                 "value": {
                     "type": "text",
-                    "index": "not_analyzed"
+                    "index": true
                 }
             }
         }
     }
-}
+}

config/elastic.schema.product.extension.json

@@ -6,5 +6,5 @@
        "has_options": {"type": "integer"} ,
        "Size_options": {"type": "keyword"},
        "Color_options": {"type": "keyword"}
-    }
+   }
 }

config/elastic.schema.product.json

@@ -73,6 +73,9 @@
        "eco_collection": {"type": "integer"},
        "eco_collection_options": {"type": "integer"},
        "erin_recommends": {"type": "integer"},
-       "tax_class_id": {"type": "integer"}
+       "tax_class_id": {"type": "integer"},
+       "gender": {"type": "integer"},
+       "material": {"type": "integer"},
+       "category_gear": {"type": "integer"}
     }
 }