@things-factory/biz-ui 4.3.131 → 4.3.139

package/client/pages/contact-point-list.js

@@ -4,6 +4,7 @@ import _ from 'lodash'
 
 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'
@@ -87,11 +88,11 @@ export class ContactPointList extends localize(i18next)(PageView) {
 
                 return patch
               })
-              this._validateImport(patches)
+              await this._validateImport(patches)
               await this._saveContactPoints(patches)
               history.back()
             } catch (e) {
-              this.showToast(e)
+              this.showToast(e.message)
             }
           })
         }
@@ -138,6 +139,7 @@ export class ContactPointList extends localize(i18next)(PageView) {
     ]
 
     this.config = {
+      pagination: { limit: 50, pages: [50, 100, 200, 500] },
       rows: {
         selectable: {
           multiple: true
@@ -157,7 +159,7 @@ export class ContactPointList extends localize(i18next)(PageView) {
             width: 40,
             type: 'string'
           },
-          header: i18next.t('field.contact_point_customer_name'),
+          header: `*${i18next.t('field.contact_point_customer_name')}`,
           width: 250
         },
         {
@@ -192,7 +194,7 @@ export class ContactPointList extends localize(i18next)(PageView) {
           name: 'companyName',
           record: { editable: true },
           imex: {
-            header: '*' + i18next.t('field.contact_point_other_company_name'),
+            header: i18next.t('field.contact_point_other_company_name'),
             key: 'companyName',
             width: 40,
             type: 'string'
@@ -217,7 +219,7 @@ export class ContactPointList extends localize(i18next)(PageView) {
           type: 'string',
           name: 'email',
           record: { editable: true },
-          imex: { header: '*' + i18next.t('field.contact_point_email'), key: 'email', width: 40, type: 'string' },
+          imex: { header: i18next.t('field.contact_point_email'), key: 'email', width: 40, type: 'string' },
           header: i18next.t('field.contact_point_email'),
           width: 120
         },
@@ -234,7 +236,7 @@ export class ContactPointList extends localize(i18next)(PageView) {
           name: 'phone',
           record: { editable: true },
           imex: { header: '*' + i18next.t('field.contact_point_phone'), key: 'phone', width: 40, type: 'string' },
-          header: i18next.t('field.contact_point_phone'),
+          header: '*' + i18next.t('field.contact_point_phone'),
           width: 120
         },
         {
@@ -242,7 +244,7 @@ export class ContactPointList extends localize(i18next)(PageView) {
           name: 'accountNo',
           record: { editable: true },
           imex: {
-            header: '*' + i18next.t('field.contact_point_account_no'),
+            header: i18next.t('field.contact_point_account_no'),
             key: 'accountNo',
             width: 40,
             type: 'string'
@@ -254,8 +256,13 @@ export class ContactPointList extends localize(i18next)(PageView) {
           type: 'string',
           name: 'address',
           record: { editable: true },
-          imex: { header: i18next.t('field.contact_point_company_address'), key: 'address', width: 40, type: 'string' },
-          header: i18next.t('field.contact_point_company_address'),
+          imex: {
+            header: '*' + i18next.t('field.contact_point_company_address'),
+            key: 'address',
+            width: 40,
+            type: 'string'
+          },
+          header: '*' + i18next.t('field.contact_point_company_address'),
           width: 300
         },
         {
@@ -300,7 +307,7 @@ export class ContactPointList extends localize(i18next)(PageView) {
           name: 'billingAddress',
           record: { editable: true },
           imex: {
-            header: '*' + i18next.t('field.contact_point_billing_address'),
+            header: i18next.t('field.contact_point_billing_address'),
             key: 'billingAddress',
             width: 40,
             type: 'string'
@@ -311,7 +318,7 @@ export class ContactPointList extends localize(i18next)(PageView) {
         {
           name: 'type',
           record: { editable: true },
-          header: i18next.t('field.contact_point_type'),
+          header: '*' + i18next.t('field.contact_point_type'),
           type: 'code',
           imex: {
             header: '*' + i18next.t('field.contact_point_type'),
@@ -431,6 +438,8 @@ export class ContactPointList extends localize(i18next)(PageView) {
         return this.showToast(i18next.t('text.nothing_changed'))
       }
 
+      this._validate()
+
       const response = await client.mutate({
         mutation: gql`
           mutation updateMultipleContactPoint($patches: [ContactPointPatch!]!) {
@@ -448,7 +457,31 @@ export class ContactPointList extends localize(i18next)(PageView) {
         this.dataGrist.fetch()
       }
     } catch (error) {
-      this.showToast(error)
+      this.showToast(error.message)
+    }
+  }
+
+  _validate() {
+    let errors = []
+
+    let data = this.dataGrist._data.records.map(itm => {
+      itm.error = false
+
+      if (isEmpty(itm.name) || '') {
+        itm.error = true
+        if (!errors.find(err => err.type == 'customerName'))
+          errors.push({ type: 'customerName', value: 'customer name is required' })
+      }
+      return itm
+    })
+
+    if (errors.length > 0) {
+      this._data = {
+        ...this.dataGrist.dirtyData,
+        records: data
+      }
+
+      throw new Error(errors.map(itm => itm.value).join(', '))
     }
   }
 
@@ -489,7 +522,8 @@ export class ContactPointList extends localize(i18next)(PageView) {
     }
   }
 
-  _validateImport(data) {
+  async _validateImport(data) {
+    const contactTypes = await getCodeByName('CONTACT_TYPES')
     let errors = []
 
     data = data.map(item => {
@@ -523,6 +557,11 @@ export class ContactPointList extends localize(i18next)(PageView) {
         }
       }
 
+      let foundContactTypes = contactTypes.find(exist => exist.name == item.type)
+      if (!foundContactTypes) {
+        throw new Error(i18next.t('text.contact_type_does_not_exist'))
+      }
+
       return item
     })
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/biz-ui",
-  "version": "4.3.131",
+  "version": "4.3.139",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -23,14 +23,14 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
   },
   "dependencies": {
-    "@things-factory/biz-base": "^4.3.131",
-    "@things-factory/code-base": "^4.3.131",
+    "@things-factory/biz-base": "^4.3.138",
+    "@things-factory/code-base": "^4.3.138",
     "@things-factory/form-ui": "^4.3.131",
-    "@things-factory/grist-ui": "^4.3.131",
+    "@things-factory/grist-ui": "^4.3.138",
     "@things-factory/i18n-base": "^4.3.131",
-    "@things-factory/import-ui": "^4.3.131",
+    "@things-factory/import-ui": "^4.3.138",
     "@things-factory/layout-base": "^4.3.131",
     "@things-factory/shell": "^4.3.131"
   },
-  "gitHead": "3ae054257c32ac18b023913a313f784459581ea3"
+  "gitHead": "82a27c0caaf2f2c98cd094b92fc603bf768d2513"
 }