@lancom/shared 0.0.330 → 0.0.332

package/components/editor/editor_print_area_options/editor-print-area-options.vue

@@ -55,7 +55,12 @@ export default {
   },
   computed: {
     options() {
-      const groupItemToOption = printArea => ({ printArea, label: printArea.name, size: printArea.printSize.alias });
+      const groupItemToOption = printArea => ({
+        printArea,
+        label: printArea.name,
+        size: printArea.printSize.alias,
+        sizeLabel: printArea.printSize.name
+      });
       const productsOptions = (this.product.printAreas || [])
         .map(printArea => {
           const mainOption = { ...groupItemToOption(printArea), sides: [printArea.side] };

package/components/editor/editor_print_area_options/editor_print_area_option/editor-print-area-option.scss

@@ -8,7 +8,7 @@
   }
   &__content {
     text-align: center;
-    padding: 8px 0;
+    padding: 8px 8px 8px 0;
     display: flex;
     align-items: center;
     &:hover {

package/components/editor/editor_print_area_options/editor_print_area_option/editor-print-area-option.vue

@@ -17,7 +17,7 @@
       </div>
       <div class="EditorPrintAreaOption__info">
         <div class="lc_caption">
-          {{ option.label }}
+          {{ option.label }}. {{ option.sizeLabel }}
         </div>
         <div class="lc_regular10">
           <price
@@ -46,8 +46,10 @@
             [productType]: true
           }">
         </div>
-        <div class="lc_caption">
-          {{ suboption.label }}
+        <div>
+          <div class="lc_caption">
+            {{ suboption.label }}. {{ suboption.sizeLabel }} 
+          </div>
         </div>
       </div>
     </div>

package/components/editor/editor_workspace/editor_workspace_side/editor-workspace-side.vue

@@ -1,9 +1,7 @@
 <template>
   <div
     class="EditorWorkspaceSide__wrapper"
-    :style="{
-      'background-color': backgroundColor
-    }"
+    :style="backgroundColor"
     :class="{
       'EditorWorkspaceSide__wrapper--zoom-in': isZoomed
     }"
@@ -86,6 +84,7 @@ import { COLORS_IMAGES_TYPES } from '@lancom/shared/assets/js/constants/colors';
 import FabricHelper from '@lancom/shared/assets/js/utils/fabric-helper';
 import { findParentByPredicate } from '@lancom/shared/assets/js/utils/dom';
 import Breakpoints from '@lancom/shared/assets/js/utils/breakpoints';
+import { getColorBackgroundStyle } from '@lancom/shared/assets/js/utils/colors';
 
 export default {
   name: 'EditorWorkspaceSide',
@@ -182,7 +181,7 @@ export default {
       return code === 'rect10';
     },
     backgroundColor() {
-      return this.backgroundImageLoaded && this.editableColor?.rgb;
+      return this.backgroundImageLoaded && getColorBackgroundStyle(this.editableColor);
     },
     isZoomed() {
       return !!this.zoomSize;

package/feeds/google-shopping.js

@@ -19,7 +19,7 @@ const COUNTRIES_SIZE_SYSTEMS = {
   GB: 'UK'
 };
 
-async function googleShoppingFeed(axios, config, availableStores, country, endSlug = '') {
+async function googleShoppingFeed(axios, config, availableStores, country, isEditor) {
   const { data } = await axios.get(`${config.LOCAL_API_URL}/feed/products?host=${config.HOST_NAME}&country=${country || ''}`);
   const spliceFirstImage = images => (images || []).splice(0, 1)[0];
   const getImages = images => (images || []).length > 0 ? images : null;
@@ -56,7 +56,8 @@ async function googleShoppingFeed(axios, config, availableStores, country, endSl
               const description = `${product.description || product.fabricInfoShort || product.name || ''}`
                 .replace(/ /g, ' ')
                 .replace(/·/, '·');
-              let link = `https://${config.HOST_NAME}/${product.brand.alias}/${product.productType.alias}/${product.alias}${endSlug || ''}?color=${sp.color.alias}`;
+                
+              let link = `https://${config.HOST_NAME}${generateProductLink(product, sp.color, isEditor)}`;
               if (sp.multipackQty) {
                 link = `${link}&multipack=${sp.SKU}`
               }
@@ -180,6 +181,34 @@ async function googleShoppingFeed(axios, config, availableStores, country, endSl
   }
 }
 
+function generateCategoryPath(cat) {
+  let category = cat;
+  const categories = [];
+  while (category) {
+    categories.unshift(category.alias);
+    category = category.parent;
+  }
+  let baseLink = '';
+  if (categories.length) {
+    baseLink = `${categories.join('/')}`;
+  }
+  return baseLink;
+}
+
+function generateProductLink(product, color, toEditor) {
+  const baseLink = `/${product.brand?.alias}/${product.productType?.alias}/${product.alias}`;
+  let link = toEditor ? `${baseLink}/editor` : baseLink;
+  if (product.useTaxonomyUrl) {
+    const categoryPath = generateCategoryPath(product.category);
+    if (categoryPath) {
+      const categoryBaseLink = `/c/${categoryPath}/${product.alias}/${product.SKU.toLowerCase()}`;
+      link = toEditor ? `${categoryBaseLink}.html` : `${categoryBaseLink}/info.html`;
+    }
+  }
+  return `${link}${color ? `?color=${color.alias || color}` : ''}`;
+}
+
+
 module.exports = {
   googleShoppingFeed,
   googleLocalShoppingFeed

package/mixins/product-view.js

@@ -63,6 +63,7 @@ export default (IS_PRODUCT_PRESET_PRINT_PRICING, isEditor = false) => ({
     }
 
     return {
+      isEditor,
       pageItem,
       breadcrumbs: []
     };
@@ -80,7 +81,7 @@ export default (IS_PRODUCT_PRESET_PRINT_PRICING, isEditor = false) => ({
       return this.mainProductImageSrc;
     },
     pageItemCanonical() {
-      return generateProductLink(this.product);
+      return generateProductLink(this.product, null, this.isEditor);
     },
     hasImages() {
       return this.images.length > 0;

package/package.json

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