Merge pull request #3727 from DivanteLtd/hotfix/v1.10.4

Hotfix/v1.10.4

Author: andrzejewsky

CHANGELOG.md

@@ -4,6 +4,33 @@ 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.4] - 18.10.2019
+
+### Fixed
+- Added try/catch for fetching single product in cart synchronization - @gibkigonzo (#3632)
+- Removed infinite loop when changing checkbox in shipping details - @gibkigonzo (#3656)
+- Remove modifying config by reference in multistore - @gibkigonzo (#3617)
+- Fix displaying same country twice in the in the country switcher - @andrzejewsky (#3587)
+- Remove race condition while loading locale messages - @gibkigonzo (#3602)
+- Fixed special price that can break when you change pages (browser navigation for/back) or just go from category to product page - @resubaka (#3638)
+- Change sku to string when checking products equality - @gibkigonzo (#3606)
+- Fixed problem with losing browser history - @andrzejewsky (#3642)
+- Fixed resolving store code on SSR - @andrzejewsky (#3576)
+- Fixed styles for original price on Wishlist sidebar - @przspa (#3392)
+- Added debounce for updating quantity method in the cart - @andrzejewsky (#3191)
+- Improved scrolling in Safari on iOS devices (sidebars) - @phoenixdev-kl (#3551)
+- Improved cookie and offline badges (z-index, overflow) - @phoenixdev-kl (#3552)
+- Added config to set Cache-Control header for static assets based on mime type - @phoenix-bjoern (#3268)
+- Added catching of errors when ES is down - @qiqqq
+- `localizedRoute()` doesn't return urlDispatcher routes anymore. Use localizedDispatcherRoute instead - @lukeromanowicz (#3548)
+- Fixed hash in dynamically resolved urls causing resolving issues - @lukeromanowicz (#3515)
+- `localizedRoute()` now supports path (and prefers over fullPath) in LocalizedRoute objects - @lukeromanowicz (#3515)
+- Decreased the `localStorage` quota usage + error handling by introducing new config variables: `config.products.disablePersistentProductsCache` to not store products by SKU (by default it's on). Products are cached in ServiceWorker cache anyway so the `product/list` will populate the in-memory cache (`cache.setItem(..., memoryOnly = true)`); `config.seo.disableUrlRoutesPersistentCache` - to not store the url mappings; they're stored in in-memory cache anyway so no additional requests will be made to the backend for url mapping; however it might cause some issues with url routing in the offline mode (when the offline mode PWA installed on homescreen got reloaded, the in-memory cache will be cleared so there won't potentially be the url mappings; however the same like with `product/list` the ServiceWorker cache SHOULD populate url mappings anyway); `config.syncTasks.disablePersistentTaskQueue` to not store the network requests queue in service worker. Currently only the stock-check and user-data changes were using this queue. The only downside it introuces can be related to the offline mode and these tasks will not be re-executed after connectivity established, but just in a case when the page got reloaded while offline (yeah it might happen using ServiceWorker; `syncTasks` can't be re-populated in cache from SW) - @pkarw (#2985)
+- Fixed evaluate detailsLink in the cookie notification - @benjick (#3689)
+
+## Added
+- Added german translations - @schwerdt-ke (3076)
+
 ## [1.10.3] - 2019.09.18
 
 ### Fixed

config/default.json

@@ -20,7 +20,8 @@
       }
     },
     "seo": {
-      "useUrlDispatcher": true
+      "useUrlDispatcher": true,
+      "disableUrlRoutesPersistentCache": true
     },
     "console": {
       "showErrorOnProduction" : false,
@@ -46,7 +47,7 @@
       "csrTimeout": 5000,
       "ssrTimeout": 1000,
       "queryMethod": "GET",
-      "disableLocalStorageQueriesCache": true,
+      "disablePersistentQueriesCache": true,
       "searchScoring": {
         "attributes": {
           "attribute_code": {
@@ -262,6 +263,7 @@
       "applycoupon_endpoint": "/api/cart/apply-coupon?token={{token}}&cartId={{cartId}}&coupon={{coupon}}"
     },
     "products": {
+      "disablePersistentProductsCache": true,
       "useMagentoUrlKeys": true,
       "setFirstVarianAsDefaultInURL": false,
       "configurableChildrenStockPrefetchStatic": false,
@@ -340,7 +342,6 @@
         "wishlist": "LOCALSTORAGE",
         "categories": "LOCALSTORAGE",
         "attributes": "LOCALSTORAGE",
-        "products": "INDEXEDDB",
         "elasticCache": "LOCALSTORAGE",
         "claims": "LOCALSTORAGE",
         "syncTasks": "LOCALSTORAGE",
@@ -396,6 +397,9 @@
         }
       ]
     },
+    "syncTasks": {
+      "disablePersistentTaskQueue": true
+    },
     "i18n": {
       "defaultCountry": "US",
       "defaultLanguage": "EN",
@@ -409,6 +413,11 @@
       "fullLanguageName": "English",
       "bundleAllStoreviewLanguages": true
     },
+    "expireHeaders": {
+      "default": "30d",
+      "application/json": "24h",
+      "image/png": "7d"
+    },
     "newsletter": {
       "endpoint": "/api/ext/mailchimp-subscribe/subscribe"
     },

core/app.ts

@@ -70,7 +70,7 @@ const createApp = async (ssrContext, config, storeCode = null): Promise<{app: Vu
   store.state.__DEMO_MODE__ = (config.demomode === true)
   if (ssrContext) Vue.prototype.$ssrRequestContext = ssrContext
   if (!store.state.config) store.state.config = globalConfig //  @deprecated - we should avoid the `config`
-  const storeView = prepareStoreView(storeCode) // prepare the default storeView
+  const storeView = await prepareStoreView(storeCode) // prepare the default storeView
   store.state.storeView = storeView
 
   // to depreciate in near future

core/client-entry.ts

@@ -5,7 +5,8 @@ import { createApp } from '@vue-storefront/core/app'
 import rootStore from '@vue-storefront/core/store'
 import { registerSyncTaskProcessor } from '@vue-storefront/core/lib/sync/task'
 import i18n from '@vue-storefront/i18n'
-import { prepareStoreView, storeCodeFromRoute, currentStoreView, localizedRoute } from '@vue-storefront/core/lib/multistore'
+import storeCodeFromRoute from '@vue-storefront/core/lib/storeCodeFromRoute'
+import { prepareStoreView, currentStoreView, localizedRoute } from '@vue-storefront/core/lib/multistore'
 import { onNetworkStatusChange } from '@vue-storefront/core/modules/offline-order/helpers/onNetworkStatusChange'
 import '@vue-storefront/core/service-worker/registration' // register the service worker
 import { AsyncDataLoader } from './lib/async-data-loader'

core/compatibility/components/blocks/Microcart/Product.js

@@ -1,5 +1,6 @@
 import { MicrocartProduct } from '@vue-storefront/core/modules/cart/components/Product.ts'
 import i18n from '@vue-storefront/i18n'
+import debounce from 'lodash-es/debounce'
 import config from 'config'
 
 export default {
@@ -12,11 +13,13 @@ export default {
     // deprecated, will be moved to theme or removed in the near future #1742
     this.$bus.$on('cart-after-itemchanged', this.onProductChanged)
     this.$bus.$on('notification-after-itemremoved', this.onProductRemoved)
+    this.updateQuantity = debounce(this.updateQuantity, 5000)
   },
   beforeDestroy () {
     // deprecated, will be moved to theme or removed in the near future #1742
     this.$bus.$off('cart-after-itemchanged', this.onProductChanged)
     this.$bus.$off('notification-after-itemremoved', this.onProductRemoved)
+    this.updateQuantity.cancel()
   },
   methods: {
     removeItem () {

core/helpers/index.ts

@@ -165,8 +165,13 @@ export const onlineHelper = Vue.observable({
   isOnline: isServer || navigator.onLine
 })
 
+export const routerHelper = Vue.observable({
+  popStateDetected: false
+})
+
 !isServer && window.addEventListener('online', () => { onlineHelper.isOnline = true })
 !isServer && window.addEventListener('offline', () => { onlineHelper.isOnline = false })
+!isServer && window.addEventListener('popstate', () => { routerHelper.popStateDetected = true })
 
 export const processURLAddress = (url: string = '') => {
   if (url.startsWith('/')) return `${config.api.url}${url}`

core/i18n/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue-storefront/i18n",
-  "version": "1.10.3",
+  "version": "1.10.4",
   "description": "Vue Storefront i18n",
   "license": "MIT",
   "main": "index.ts",

core/i18n/resource/i18n/de-DE.csv

@@ -4,13 +4,15 @@
 "Out of stock!","Nicht auf Lager!"
 " is out of the stock!"," ist nicht auf Lager!"
 "Some of the ordered products are not available!","Einige der bestellten Produkte sind nicht auf Lager!"
+"Please wait ...","Bitte warten ..."
 "Stock check in progress, please wait while available stock quantities are checked","Bestandskontrolle läuft. Bitte warte einen Moment bis die verfügbare Bestandsmenge geprüft worden ist"
 "There is no Internet connection. You can still place your order. We will notify you if any of ordered products is not available because we cannot check it right now.","Es besteht aktuell keine Verbindung zum Internet. Du kannst deine Bestellung dennoch aufgeben. Falls eines der bestellten Produkte bei Wiederaufbau der Verbindung nicht mehr verfügbar sein sollte, werden wir dich umgehend benachrichtigen."
 "No such configuration for the product. Please do choose another combination of attributes.","Diese Konfiguration ist für dieses Produkt nicht möglich. Bitte wähle eine andere Kombination von Eigenschaften."
 "The system is not sure about the stock quantity (volatile). Product has been added to the cart for pre-reservation.","Das System konnte den genauen Lagerbestand nicht ermitteln, da dieser sehr volatil ist. Das Produkt wurde zur Vorreservierung in den Warenkorb gelegt."
 "This feature is not implemented yet! Please take a look at https://github.com/DivanteLtd/vue-storefront/issues for our Roadmap!","Diese Funktion wurde noch nicht implementiert. Für weitere Details schau dir bitte auf https://github.com/DivanteLtd/vue-storefront/issues unsere Roadmap an!"
 "The product is out of stock and cannot be added to the cart!","Das Produkt ist nicht auf Lager und kann daher nicht zum Warenkorb hinzugefügt werden!"
 "Product has been added to the cart!","Produkt wurde zum Warenkorb hinzugefügt!"
+"Product quantity has been updated!","Die Anzahl wurde upgedated!"
 "Internal validation error. Please check if all required fields are filled in. Please contact us on {email}","Interner Validierungsfehler. Bitte überprüfe, ob alle erforderlichen Felder ausgefüllt sind. Bei Problemen kontaktiere uns bitte über {email}"
 "Address provided in checkout contains invalid data. Please check if all required fields are filled in and also contact us on {email} to resolve this issue for future. Your order has been canceled.","Die angegebene Adresse ist nicht gültig. Bitte überprüfe, ob alle notwenigen Felder ausgefüllt sind und kontaktiere uns per {email} um den Fehler für die Zukunft zu beheben. Deine Bestellung wurde abgebrochen."
 "Product {productName} has been added to the compare!","Das Produkt {productName} wurde zur Vergleichsliste hinzugefügt!"
@@ -71,3 +73,5 @@
 "You need to be logged in to see this page","Sie müssen angemeldet sein, um diese Seite anzuzeigen"
 "Quantity must be above 0","Die Menge muss größer als 0 sein"
 "Error: Error while adding products","Error: Fehler beim hinzufügen der Produkte"
+"Unexpected authorization error. Check your Network conection.","Unerwarteter Fehler bei der Authentifizierung. Bitte überprüfen Sie Ihre Internetverbindung."
+"Columns","Spalten"

core/i18n/resource/i18n/jp-JP.csv

@@ -154,7 +154,6 @@
 "We will send you the invoice to given e-mail address","頂いたメールアドレスに請求書を送ります"
 "Wishlist","お気に入りリスト"
 "You are offline","オフラインです"
-"You are offline, some of the functionalities are limited","現在オフラインですので、使えない機能があります"
 "You can also use","またこれらを使うことができます"
 "You can log to your account using e-mail and password defined earlier. On your account you can <b>edit your profile data,</b> check <b>history of transactions,</b> edit <b>subscription to newsletter.</b>","登録されたメールアドレスとパスワードを使ってログインできます。アカウント内では<b>プロフィール</b>の編集<b>注文の履歴</b>の確認<b>ニュースレター</b>への購読が行えます。"
 "You have been successfully subscribed to our newsletter!","ニュースレターへの購読が完了しました！"

core/lib/multistore.ts

@@ -6,54 +6,19 @@ import queryString from 'query-string'
 import { RouterManager } from '@vue-storefront/core/lib/router-manager'
 import VueRouter, { RouteConfig, RawLocation } from 'vue-router'
 import config from 'config'
-
-export interface LocalizedRoute {
-  path?: string,
-  name?: string,
-  hash?: string,
-  params?: object,
-  fullPath?: string,
-  host?: string
-}
-
-export interface StoreView {
-  storeCode: string,
-  disabled?: boolean,
-  storeId: any,
-  name?: string,
-  url?: string,
-  elasticsearch: {
-    host: string,
-    index: string
-  },
-  tax: {
-    sourcePriceIncludesTax: boolean,
-    defaultCountry: string,
-    defaultRegion: null | string,
-    calculateServerSide: boolean
-  },
-  i18n: {
-    fullCountryName: string,
-    fullLanguageName: string,
-    defaultLanguage: string,
-    defaultCountry: string,
-    defaultLocale: string,
-    currencyCode: string,
-    currencySign: string,
-    dateFormat: string
-  }
-}
+import { LocalizedRoute, StoreView } from './types'
+import storeCodeFromRoute from './storeCodeFromRoute'
 
 export function currentStoreView (): StoreView {
   // TODO: Change to getter all along our code
   return rootStore.state.storeView
 }
 
-export function prepareStoreView (storeCode: string): StoreView {
+export async function prepareStoreView (storeCode: string): Promise<StoreView> {
   let storeView = { // current, default store
-    tax: config.tax,
-    i18n: config.i18n,
-    elasticsearch: config.elasticsearch,
+    tax: Object.assign({}, config.tax),
+    i18n: Object.assign({}, config.i18n),
+    elasticsearch: Object.assign({}, config.elasticsearch),
     storeCode: '',
     storeId: config.defaultStoreCode && config.defaultStoreCode !== '' ? config.storeViews[config.defaultStoreCode].storeId : 1
   }
@@ -69,7 +34,7 @@ export function prepareStoreView (storeCode: string): StoreView {
   }
   if (storeViewHasChanged) {
     rootStore.state.storeView = storeView
-    loadLanguageAsync(storeView.i18n.defaultLocale)
+    await loadLanguageAsync(storeView.i18n.defaultLocale)
   }
   if (storeViewHasChanged || Vue.prototype.$db.currentStoreCode !== storeCode) {
     if (typeof Vue.prototype.$db === 'undefined') {
@@ -81,46 +46,6 @@ export function prepareStoreView (storeCode: string): StoreView {
   return storeView
 }
 
-export function storeCodeFromRoute (matchedRouteOrUrl: LocalizedRoute | RawLocation | string): string {
-  if (matchedRouteOrUrl) {
-    for (let storeCode of config.storeViews.mapStoreUrlsFor) {
-      const store = config.storeViews[storeCode]
-
-      // handle resolving by path
-      const matchingPath = typeof matchedRouteOrUrl === 'object' ? matchedRouteOrUrl.path : matchedRouteOrUrl
-      let normalizedPath = matchingPath // assume that matching string is a path
-      if (matchingPath.length > 0 && matchingPath[0] !== '/') {
-        normalizedPath = '/' + matchingPath
-      }
-
-      if (normalizedPath.startsWith(`${store.url}/`) || normalizedPath === store.url) {
-        return storeCode
-      }
-
-      // handle resolving by domain+path
-      let url = ''
-
-      if (typeof matchedRouteOrUrl === 'object') {
-        if (matchedRouteOrUrl['host']) {
-          url = matchedRouteOrUrl['host'] + normalizedPath
-        } else {
-          return '' // this route does not have url so there is nothing to do here
-        }
-      } else {
-        url = matchedRouteOrUrl as string
-      }
-
-      if (url.startsWith(`${store.url}/`) || url === store.url) {
-        return storeCode
-      }
-    }
-
-    return ''
-  } else {
-    return ''
-  }
-}
-
 export function removeStoreCodeFromRoute (matchedRouteOrUrl: LocalizedRoute | string): LocalizedRoute | string {
   const storeCodeInRoute = storeCodeFromRoute(matchedRouteOrUrl)
   if (storeCodeInRoute !== '') {
@@ -141,22 +66,29 @@ export function adjustMultistoreApiUrl (url: string): string {
 }
 
 export function localizedDispatcherRoute (routeObj: LocalizedRoute | string, storeCode: string): LocalizedRoute | string {
-  if (!storeCode) {
-    storeCode = currentStoreView().storeCode
+  const { storeCode: currentStoreCode, appendStoreCode } = currentStoreView()
+  if (!storeCode || !config.storeViews[storeCode]) {
+    storeCode = currentStoreCode
   }
-  const appendStoreCodePrefix = config.storeViews[storeCode] ? config.storeViews[storeCode].appendStoreCode : false
+  const appendStoreCodePrefix = storeCode && appendStoreCode
 
   if (typeof routeObj === 'string') {
     if (routeObj[0] !== '/') routeObj = `/${routeObj}`
     return appendStoreCodePrefix ? `/${storeCode}${routeObj}` : routeObj
   }
 
-  if (routeObj && routeObj.fullPath) { // case of using dispatcher
-    const routeCodePrefix = config.defaultStoreCode !== storeCode && appendStoreCodePrefix ? `/${storeCode}` : ''
-    const qrStr = queryString.stringify(routeObj.params)
+  if (routeObj) {
+    if ((routeObj as LocalizedRoute).fullPath && !(routeObj as LocalizedRoute).path) { // support both path and fullPath
+      routeObj['path'] = (routeObj as LocalizedRoute).fullPath
+    }
+
+    if (routeObj.path) { // case of using dispatcher
+      const routeCodePrefix = appendStoreCodePrefix ? `/${storeCode}` : ''
+      const qrStr = queryString.stringify(routeObj.params);
 
-    const normalizedPath = routeObj.fullPath[0] !== '/' ? `/${routeObj.fullPath}` : routeObj.fullPath
-    return `${routeCodePrefix}${normalizedPath}${qrStr ? `?${qrStr}` : ''}`
+      const normalizedPath = routeObj.path[0] !== '/' ? `/${routeObj.path}` : routeObj.path
+      return `${routeCodePrefix}${normalizedPath}${qrStr ? `?${qrStr}` : ''}`
+    }
   }
 
   return routeObj
@@ -166,8 +98,14 @@ export function localizedRoute (routeObj: LocalizedRoute | string | RouteConfig
   if (!storeCode) {
     storeCode = currentStoreView().storeCode
   }
-  if (routeObj && (routeObj as LocalizedRoute).fullPath && config.seo.useUrlDispatcher) {
-    return localizedDispatcherRoute(Object.assign({}, routeObj, { params: null }) as LocalizedRoute, storeCode)
+  if (!routeObj) {
+    return routeObj
+  }
+
+  if ((typeof routeObj === 'object') && (routeObj as LocalizedRoute)) {
+    if ((routeObj as LocalizedRoute).fullPath && !(routeObj as LocalizedRoute).path) { // support both path and fullPath
+      routeObj['path'] = (routeObj as LocalizedRoute).fullPath
+    }
   }
 
   if (storeCode && routeObj && config.defaultStoreCode !== storeCode && config.storeViews[storeCode].appendStoreCode) {