From 2034abbbd520ee2310564230e1ab4562e5902102 Mon Sep 17 00:00:00 2001
From: pkarw <pkarwatka@divante.pl>
Date: Sun, 13 Jan 2019 12:29:04 +0100
Subject: [PATCH 1/2] Upgrade note on `category.url_key` added

---
 docs/guide/upgrade-notes/README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/guide/upgrade-notes/README.md b/docs/guide/upgrade-notes/README.md
index 0796b0e5d5..f866de2468 100644
--- a/docs/guide/upgrade-notes/README.md
+++ b/docs/guide/upgrade-notes/README.md
@@ -20,6 +20,8 @@ With 1.7 the number of attribute descriptors that are loaded on the product page
 
 Dynamic Categories prefetching (#2076). Starting with Vue Storefront 1.7 we've added a configuration option `config.entities.category.categoriesDynamicPrefetch` (by default set to `true`). This option switches the way the category tree is being fetched. Previously we were fetching the full categories tree. In some cases it can generate even few MB of payload. Currently with this option in place we're pre-fetching the categories on demand while user is browsing the category tree
 
+**NOTE:** Since we're no longer generating `category.slug` client's side - we need to have `category.url_key` field unique. If Your Magento2 url_keys are unique it will work without any changes. If not - please do use [mage2vuestorefront](https://github.com/DivanteLtd/mage2vuestorefront) to re-import the categories. There is a new `categories` importer option `--generateUniqueUrlKeys` which is set to true by default.
+
 With the new modules architecture available from 1.6 we've [updated the payment modules guide](https://github.com/DivanteLtd/vue-storefront/pull/2135). If You've used the custom payment (and basically any other) extensions please make sure You've already ported them to [new modules architecture](https://docs.vuestorefront.io/guide/modules/introduction.html).
 
 

From 165e7ac89200450f335f9867379b82b67f544d65 Mon Sep 17 00:00:00 2001
From: pkarw <pkarwatka@divante.pl>
Date: Sun, 13 Jan 2019 13:25:30 +0100
Subject: [PATCH 2/2] Color mapping feature added

---
 config/default.json                                  | 10 +++++++++-
 src/themes/default/components/core/ColorSelector.vue |  8 +++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/config/default.json b/config/default.json
index d5b3dd21fe..5664a75013 100644
--- a/config/default.json
+++ b/config/default.json
@@ -181,7 +181,12 @@
           "slug",
           "errors",
           "info",
-          "erinn_recommends",
+          "erin_recommends",
+          "special_from_date",
+          "news_from_date",
+          "custom_design_from",
+          "originalPrice",
+          "originalPriceInclTax",
           "parentSku",
           "options",
           "product_option",
@@ -232,6 +237,9 @@
       "filterFieldMapping": {
         "category.name": "category.name.keyword"
       },
+      "colorMappings": {
+        "Melange graphite": "#eeeeee"
+      },
       "sortByAttributes": {
         "Latest": "updated_at",
         "Price: Low to high":"final_price",
diff --git a/src/themes/default/components/core/ColorSelector.vue b/src/themes/default/components/core/ColorSelector.vue
index 7faf443fa6..9069e5d798 100644
--- a/src/themes/default/components/core/ColorSelector.vue
+++ b/src/themes/default/components/core/ColorSelector.vue
@@ -13,11 +13,17 @@
 
 <script>
 import GenericSelector from '@vue-storefront/core/compatibility/components/GenericSelector'
-
+import rootStore from '@vue-storefront/store'
 export default {
   mixins: [GenericSelector],
   methods: {
     colorFrom (label) {
+      if (rootStore.state.config.products.colorMappings) {
+        if (typeof rootStore.state.config.products.colorMappings[label] !== 'undefined') {
+          label = rootStore.state.config.products.colorMappings[label]
+        }
+      }
+      if (label.indexOf('/') >= 0) label = label.replace('/', ',') // to be honest - this is a hack for colors like "ink/white"
       if (label && label.toString().indexOf(',') >= 0) {
         return 'background: linear-gradient(' + label + ')'
       } else {