@things-factory/product-ui 4.3.107 → 4.3.108

package/client/pages/product-bundle-link-popup.js

@@ -298,6 +298,7 @@ class ProductBundleLinkPopup extends localize(i18next)(LitElement) {
         records:
           items.map(itm => {
             return {
+              id: itm.id,
               productSku: itm.product.sku,
               productName: itm.product.name,
               productDescription: itm.product.description,

package/client/pages/product-bundle-list.js

@@ -4,6 +4,7 @@ import '@things-factory/grist-ui'
 
 import gql from 'graphql-tag'
 import { css, html } from 'lit'
+import isEmpty from 'lodash-es/isEmpty'
 
 import { getCodeByName } from '@things-factory/code-base'
 import { i18next, localize } from '@things-factory/i18n-base'
@@ -107,7 +108,7 @@ class ProductBundleList extends localize(i18next)(PageView) {
       ]
 
       this.productGristConfig = {
-        pagination: { limit: 50, pages: [20, 50, 100, 500, 999] },
+        pagination: { limit: 50, pages: [50, 100, 200, 500] },
         list: { fields: ['sku', 'name', 'description', 'type', 'packingType'] },
         rows: {
           selectable: { multiple: true }
@@ -125,7 +126,7 @@ class ProductBundleList extends localize(i18next)(PageView) {
           {
             type: 'string',
             name: 'sku',
-            header: i18next.t('field.sku'),
+            header: `*${i18next.t('field.sku')}`,
             sortable: false,
             record: { editable: true },
             width: 150
@@ -141,7 +142,7 @@ class ProductBundleList extends localize(i18next)(PageView) {
           {
             type: 'string',
             name: 'name',
-            header: i18next.t('field.name'),
+            header: `*${i18next.t('field.name')}`,
             sortable: false,
             record: { editable: true },
             width: 200
@@ -182,7 +183,7 @@ class ProductBundleList extends localize(i18next)(PageView) {
           {
             type: 'select',
             name: 'packingType',
-            header: i18next.t('field.packing_type'),
+            header: `*${i18next.t('field.packing_type')}`,
             record: {
               editable: true,
               options: ['', ...Object.keys(packingType).map(key => packingType[key].name)]
@@ -274,34 +275,71 @@ class ProductBundleList extends localize(i18next)(PageView) {
   }
 
   async _saveProductBundles(patches) {
-    if (patches && patches.length) {
-      const response = await client.mutate({
-        mutation: gql`
-          mutation updateMultipleProductBundle($patches: [ProductBundlePatch!]!) {
-            updateMultipleProductBundle(patches: $patches) {
-              sku
-              refCode
-              name
-              description
-              type
-              packingType
-              status
+    try {
+      if (patches && patches.length) {
+        this._validate()
+        const response = await client.mutate({
+          mutation: gql`
+            mutation updateMultipleProductBundle($patches: [ProductBundlePatch!]!) {
+              updateMultipleProductBundle(patches: $patches) {
+                sku
+                refCode
+                name
+                description
+                type
+                packingType
+                status
+              }
             }
-          }
-        `,
-        variables: { patches },
-        context: gqlContext()
-      })
+          `,
+          variables: { patches },
+          context: gqlContext()
+        })
 
-      if (!response.errors) {
-        this.dataGrist.fetch()
-        this._showToast(i18next.t('text.data_updated_successfully'))
+        if (!response.errors) {
+          this.dataGrist.fetch()
+          this._showToast(i18next.t('text.data_updated_successfully'))
+        }
+      } else {
+        CustomAlert({
+          title: i18next.t('text.nothing_changed'),
+          text: i18next.t('text.there_is_nothing_to_save')
+        })
       }
-    } else {
-      CustomAlert({
-        title: i18next.t('text.nothing_changed'),
-        text: i18next.t('text.there_is_nothing_to_save')
-      })
+    } catch (e) {
+      this._showToast(e.message)
+    }
+  }
+
+  _validate() {
+    let errors = []
+
+    let data = this.dataGrist._data.records.map(itm => {
+      itm.error = false
+
+      if (isEmpty(itm.sku) || '') {
+        itm.error = true
+        if (!errors.find(err => err.type == 'sku')) errors.push({ type: 'sku', value: 'SKU is required' })
+      }
+      if (isEmpty(itm.name) || '') {
+        itm.error = true
+        if (!errors.find(err => err.type == 'name')) errors.push({ type: 'name', value: 'name is required' })
+      }
+      if (isEmpty(itm.packingType) || '') {
+        itm.error = true
+        if (!errors.find(err => err.type == 'packingType'))
+          errors.push({ type: 'packingType', value: 'packing type is required' })
+      }
+      return itm
+    })
+
+    if (errors.length > 0) {
+      this._data = {
+        ...this.dataGrist.dirtyData,
+        records: data
+      }
+
+      throw new Error(errors.map(itm => itm.value).join(', '))
     }
   }
 

package/client/pages/product-details-popup.js

@@ -184,7 +184,7 @@ export class ProductDetailsPopup extends localize(i18next)(LitElement) {
         {
           type: 'select',
           name: 'packingType',
-          header: i18next.t('field.packing_type'),
+          header: `*${i18next.t('field.packing_type')}`,
           record: {
             editable: true,
             options: ['', ...Object.keys(packingType).map(key => packingType[key].name)]
@@ -198,14 +198,14 @@ export class ProductDetailsPopup extends localize(i18next)(LitElement) {
             editable: true,
             options: ['', ...Object.keys(uom).map(key => uom[key].name)]
           },
-          header: `${i18next.t('field.uom')}`,
+          header: `*${i18next.t('field.uom')}`,
           width: 80
         },
         {
           type: 'float',
           name: 'uomValue',
           record: { editable: true, options: { min: 0 } },
-          header: `${i18next.t('field.uom_value')}`,
+          header: `*${i18next.t('field.uom_value')}`,
           width: 100
         },
         {

package/client/pages/product-list.js

@@ -884,7 +884,7 @@ class ProductList extends localize(i18next)(PageView) {
         this.dataGrist.fetch()
       }
     } catch (error) {
-      this.showToast(error)
+      this.showToast(error.message)
     }
   }
 
@@ -926,7 +926,7 @@ class ProductList extends localize(i18next)(PageView) {
         this.dataGrist.fetch()
       }
     } catch (error) {
-      this.showToast(error)
+      this.showToast(error.message)
     }
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/product-ui",
-  "version": "4.3.107",
+  "version": "4.3.108",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -24,13 +24,13 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
   },
   "dependencies": {
-    "@things-factory/form-ui": "^4.3.107",
-    "@things-factory/grist-ui": "^4.3.107",
-    "@things-factory/i18n-base": "^4.3.107",
-    "@things-factory/import-ui": "^4.3.107",
-    "@things-factory/layout-base": "^4.3.107",
-    "@things-factory/product-base": "^4.3.107",
-    "@things-factory/shell": "^4.3.107"
+    "@things-factory/form-ui": "^4.3.108",
+    "@things-factory/grist-ui": "^4.3.108",
+    "@things-factory/i18n-base": "^4.3.108",
+    "@things-factory/import-ui": "^4.3.108",
+    "@things-factory/layout-base": "^4.3.108",
+    "@things-factory/product-base": "^4.3.108",
+    "@things-factory/shell": "^4.3.108"
   },
-  "gitHead": "6f972d110c7b502f370d3887062bb6b38d1ddbc9"
+  "gitHead": "8aa8811dd0ebb1f4c1d9bc50fc221766d855c553"
 }