Merge pull request #1696 from pkarw/develop

Minor fixes

Author: pkarw

core/client-entry.ts

@@ -94,7 +94,7 @@ router.onReady(() => {
       })
       if (c.asyncData) {
         c.asyncData({ store, route: to }).then(result => { // always execute the asyncData() from the top most component first
-          console.log('Top-most asyncData executed')
+          console.debug('Top-most asyncData executed')
           _ssrHydrateSubcomponents(components, next, to)
         }).catch(next)
       } else {

core/i18n/resource/i18n/en-US.csv

@@ -354,4 +354,5 @@
 "Allow notification about the order","Allow notification about the order"
 "Extension developers would like to thank you for placing an order!","Extension developers would like to thank you for placing an order!"
 "most you may purchase","most you may purchase"
-"have as many","have as many"
+"have as many","have as many"
+"Compare products","Compare products"

core/server-entry.ts

@@ -64,7 +64,7 @@ export default context => {
         })
         if (Component.asyncData) {
           Component.asyncData({ store, route: router.currentRoute }).then((result) => { // always execute the asyncData() from the top most component first
-            console.log('Top-most asyncData executed')
+            console.debug('Top-most asyncData executed')
             _ssrHydrateSubcomponents(components, store, router, resolve, reject, app, context)
           }).catch((err) => {
             _commonErrorHandler(err, reject)

core/store/lib/search.ts

@@ -58,7 +58,11 @@ function search (elasticQuery) {
     },
     body: JSON.stringify(elasticQuery.body)
   }).then(resp => { return resp.json() }).catch(err => {
-    throw new Error(err)
+    if (err.message.indexOf('fetch') >= 0 || !isOnline()) {
+      console.error('Offline mode ' + err.message)
+    } else {
+      throw new Error(err)
+    }
   })
 }
 /**
@@ -69,7 +73,11 @@ function search (elasticQuery) {
  */
 function _handleEsResult (resp, start = 0, size = 50): ESResponse {
   if (resp == null) {
-    throw new Error('Invalid ES result - null not exepcted')
+    if (isOnline()) {
+      throw new Error('Invalid ES result - null not exepcted')
+    } else {
+      return null // empty result but not exception raised - we're in offline mode
+    }
   }
   if (resp.hasOwnProperty('hits')) {
     return {
@@ -166,13 +174,16 @@ export function quickSearchByQuery ({ query, start = 0, size = 50, entityType =
 
     search(esQuery).then((resp) => { // we're always trying to populate cache - when online
       const res = _handleEsResult(resp, start, size)
-      cache.setItem(cacheKey, res).catch((err) => { console.error('Cannot store cache for ' + cacheKey + ', ' + err) })
-      if (!servedFromCache) { // if navigator onLine == false means ES is unreachable and probably this will return false; sometimes returned false faster than indexedDb cache returns result ...
-        console.debug('Result from ES for ' + cacheKey + ' (' + entityType + '),  ms=' + (new Date().getTime() - benchmarkTime.getTime()))
-        res.cache = false
-        res.noresults = false
-        res.offline = false
-        resolve(res)
+
+      if (res) { // otherwise it can be just a offline mode
+        cache.setItem(cacheKey, res).catch((err) => { console.error('Cannot store cache for ' + cacheKey + ', ' + err) })
+        if (!servedFromCache) { // if navigator onLine == false means ES is unreachable and probably this will return false; sometimes returned false faster than indexedDb cache returns result ...
+          console.debug('Result from ES for ' + cacheKey + ' (' + entityType + '),  ms=' + (new Date().getTime() - benchmarkTime.getTime()))
+          res.cache = false
+          res.noresults = false
+          res.offline = false
+          resolve(res)
+        }
       }
     }).catch(err => {
       reject(err)

core/store/modules/user/actions.ts

@@ -196,7 +196,7 @@ const actions: ActionTree<UserState, RootState> = {
             context.commit(types.USER_INFO_LOADED, res)
             context.dispatch('setUserGroup', res)
             Vue.prototype.$bus.$emit('user-after-loggedin', res)
-            context.dispatch('cart/userAfterLoggedin')
+            rootStore.dispatch('cart/userAfterLoggedin')
 
             resolve(res)
             resolvedFromCache = true
@@ -222,7 +222,7 @@ const actions: ActionTree<UserState, RootState> = {
             }
             if (!resolvedFromCache && resp.resultCode === 200) {
               Vue.prototype.$bus.$emit('user-after-loggedin', resp.result)
-              context.dispatch('cart/userAfterLoggedin')
+              rootStore.dispatch('cart/userAfterLoggedin')
               resolve(resp)
             } else {
               resolve(null)