@lancom/shared 0.0.379 → 0.0.381

package/components/common/postcode_select/postcode-select.vue

@@ -117,6 +117,9 @@ export default {
       type: Boolean,
       default: false
     },
+    postcodesRange: {
+      type: String
+    },
     disabled: {
       type: Boolean,
       default: false
@@ -168,12 +171,13 @@ export default {
     }
   },
   methods: {
-    async handleSearch(query) {
+    async handleSearch(query = '') {
       if (query.trim().length > 1) {
         this.isLoading = true;
         const country = this.codeCountry || this.country;
         const countryName = country ? (['GB','UK'].includes(country.isoCode) ? 'UK' : (country.name || country)) : 'Australia';
         const params = {
+          postcode: this.postcodesRange,
           query: query.trim(),
           country: countryName
         };

package/layouts/products.vue

@@ -105,6 +105,16 @@
         const page = +this.$route.query.page;
         return `${this.breadcrumbs[this.breadcrumbs.length - 1]?.to}${page > 1 ? `?page=${page}` : ''}`;
       },
+      pageItemType() {
+        return 'product';
+      },
+      pageItemImage() {
+        const images = this.products.reduce((images, product) => {
+          const image = getProductLargeCover(product, 'front') || getProductMediumCover(product, 'front');
+          return image ? [...images, image] : images;
+        }, []);
+        return images.slice(0, 1);
+      },
       currentBrand() {
         return this.findByRouteParam(this.brands, 'brand');
       },

package/mixins/meta-info.js

@@ -51,6 +51,10 @@ const metaInfo = {
       hid: 'og:title',
       property: 'og:title',
       content: pageTitle
+    }, {
+      hid: 'og:type',
+      property: 'og:type',
+      content: this.pageItemType || 'website'
     }];
 
     const canonical = this.getCanonical();
@@ -91,23 +95,26 @@ const metaInfo = {
       });
     }
 
-    const pageImage = this.pageItemImage || this.pageItem?.image || (this.pageItem?.images && this.pageItem?.images[0]) || image;
+    const pageImage = this.pageItemImage || this.pageItem?.image || (this.pageItem?.images?.length > 0 && this.pageItem?.images) || image;
     if (pageImage) {
-      const pageImageUrl = staticLink(typeof pageImage === 'string' ? pageImage : (pageImage.medium || pageImage.large));
-      metaTags.push({
-        hid: 'og:image',
-        property: 'og:image',
-        content: pageImageUrl
-      });
-      
-      link.push({
-        hid: 'preloadImage',
-        rel: 'preload',
-        fetchpriority: 'high',
-        as: 'image',
-        type: 'image/webp',
-        href: pageImageUrl
-      });
+      const pageImages = Array.isArray(pageImage) ? pageImage : [pageImage];
+      for (const image of pageImages) {
+        const pageImageUrl = staticLink(typeof image === 'string' ? image : (image.medium || image.large));
+        metaTags.push({
+          hid: 'og:image',
+          property: 'og:image',
+          content: pageImageUrl
+        });
+        
+        link.push({
+          hid: 'preloadImage',
+          rel: 'preload',
+          fetchpriority: 'high',
+          as: 'image',
+          type: 'image/webp',
+          href: pageImageUrl
+        });
+      }
     }
 
     const pageTags = pageItemMeta?.tags?.length > 0 ? pageItemMeta.tags : meta.tags;

package/mixins/product-view.js

@@ -62,7 +62,10 @@ export default (IS_PRODUCT_PRESET_PRINT_PRICING, isEditor = false) => ({
     const pageItem = store.getters['product/product'];
     const loadError = store.getters['product/loadError'];
 
-    if (loadError) {
+    // console.log('loadError: ', loadError);
+    if (loadError?.redirectLink) {
+      return redirect(301, loadError?.redirectLink);
+    } else if (loadError) {
       error(loadError);
     }
 
@@ -91,6 +94,9 @@ export default (IS_PRODUCT_PRESET_PRINT_PRICING, isEditor = false) => ({
     stockCountryId() {
       return this.stockCountry?._id || null;
     },
+    pageItemType() {
+      return 'product';
+    },
     pageItemImage() {
       return this.mainProductImageSrc;
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lancom/shared",
-  "version": "0.0.379",
+  "version": "0.0.381",
   "description": "lancom common scripts",
   "author": "e.tokovenko <e.tokovenko@gmail.com>",
   "repository": {

package/pages/faq/_group/index.vue

@@ -39,6 +39,11 @@ export default {
       openedGroup: this.$route.params.group,
       openedEntity: this.$route.query.id
     };
+  },
+  computed: {
+    pageItemType() {
+      return 'article';
+    }
   }
 };
 </script>

package/pages/faq/index.vue

@@ -30,6 +30,11 @@ export default {
       openedGroup: this.$route.query.group,
       openedEntity: this.$route.query.id
     };
+  },
+  computed: {
+    pageItemType() {
+      return 'article';
+    }
   }
 };
 </script>

package/pages/news/_alias.vue

@@ -59,6 +59,9 @@ export default {
         to: '/news',
         text: 'Blog'
       }, item].filter(i => !!i);
+    },
+    pageItemType() {
+      return 'article';
     }
   },
   getRoute() {

package/pages/news/index.vue

@@ -41,6 +41,11 @@ export default {
         text: 'Blog'
       }]
     };
+  },
+  computed: {
+    pageItemType() {
+      return 'article';
+    }
   }
 };
 </script>

package/pages/news/tag/_tag.vue

@@ -49,6 +49,9 @@ export default {
       }, {
         text: this.pageItem.title
       }];
+    },
+    pageItemType() {
+      return 'article';
     }
   }
 };

package/store/product.js

@@ -172,12 +172,14 @@ export const actions = {
         commit('setIsPrintPricing', true);
       }
     } catch (e) {
-      console.log(e);
+      // console.log(e);
       const { status, data } = e?.response || {};
+      // console.log('data: ', data);
       const statusCode = status || 500;
       commit('setLoadError', {
         statusCode,
-        message: data?.error || 'Product not found'
+        message: data?.error || 'Product not found',
+        redirectLink: data?.redirectLink || null
       });
     }
   },
@@ -265,7 +267,7 @@ export const actions = {
         printType: selectedPrintType?._id
       }
     });
-    console.log('layer: ', layer);
+    // console.log('layer: ', layer);
     if (preselect) {
       commit('setSelectedLayer', layer);
     }

package/store/products.js

@@ -69,11 +69,13 @@ export const actions = {
       return { products };
     } catch (e) {
       const { status, data } = e?.response || {};
+      // console.log(e.response.data)
       const statusCode = status || 500;
       // console.log('statusCode: ', statusCode, data?.error || 'Post not found');
       commit('setLoadError', {
         statusCode,
-        error: data?.error || 'Post not found'
+        error: data?.error || 'Post not found',
+        redirectLink: data?.redirectLink || null
       });
       throw e;
     }