@things-factory/product-ui 4.3.113-alpha.0 → 4.3.122

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

@@ -298,7 +298,6 @@ 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,7 +4,6 @@ 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'
@@ -108,7 +107,7 @@ class ProductBundleList extends localize(i18next)(PageView) {
       ]
 
       this.productGristConfig = {
-        pagination: { limit: 50, pages: [50, 100, 200, 500] },
+        pagination: { limit: 50, pages: [20, 50, 100, 500, 999] },
         list: { fields: ['sku', 'name', 'description', 'type', 'packingType'] },
         rows: {
           selectable: { multiple: true }
@@ -126,7 +125,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
@@ -142,7 +141,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
@@ -183,7 +182,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)]
@@ -275,71 +274,34 @@ class ProductBundleList extends localize(i18next)(PageView) {
   }
 
   async _saveProductBundles(patches) {
-    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
-              }
+    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
             }
-          `,
-          variables: { patches },
-          context: gqlContext()
-        })
-
-        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')
-        })
-      }
-    } 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
-    })
+          }
+        `,
+        variables: { patches },
+        context: gqlContext()
+      })
 
-    if (errors.length > 0) {
-      this._data = {
-        ...this.dataGrist.dirtyData,
-        records: data
+      if (!response.errors) {
+        this.dataGrist.fetch()
+        this._showToast(i18next.t('text.data_updated_successfully'))
       }
-
-      throw new Error(errors.map(itm => itm.value).join(', '))
+    } else {
+      CustomAlert({
+        title: i18next.t('text.nothing_changed'),
+        text: i18next.t('text.there_is_nothing_to_save')
+      })
     }
   }
 

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.message)
+      this.showToast(error)
     }
   }
 
@@ -926,7 +926,7 @@ class ProductList extends localize(i18next)(PageView) {
         this.dataGrist.fetch()
       }
     } catch (error) {
-      this.showToast(error.message)
+      this.showToast(error)
     }
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/product-ui",
-  "version": "4.3.113-alpha.0",
+  "version": "4.3.122",
   "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.113-alpha.0",
-    "@things-factory/grist-ui": "^4.3.113-alpha.0",
-    "@things-factory/i18n-base": "^4.3.113-alpha.0",
-    "@things-factory/import-ui": "^4.3.113-alpha.0",
-    "@things-factory/layout-base": "^4.3.113-alpha.0",
-    "@things-factory/product-base": "^4.3.113-alpha.0",
-    "@things-factory/shell": "^4.3.113-alpha.0"
+    "@things-factory/form-ui": "^4.3.122",
+    "@things-factory/grist-ui": "^4.3.122",
+    "@things-factory/i18n-base": "^4.3.122",
+    "@things-factory/import-ui": "^4.3.122",
+    "@things-factory/layout-base": "^4.3.122",
+    "@things-factory/product-base": "^4.3.122",
+    "@things-factory/shell": "^4.3.122"
   },
-  "gitHead": "3dd2e6f58cc2828ab5e2658d3fa47120165c802b"
+  "gitHead": "3edd80e6ca68480b22ee0e25eba34d13ab0e49f1"
 }