@things-factory/biz-ui 4.3.798 → 4.3.819

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

@@ -38,6 +38,8 @@ export class ContactPointList extends localize(i18next)(PageView) {
         data-grist {
           overflow-y: auto;
           flex: 1;
+          --grid-record-emphasized-background-color: #ffdbdb;
+          --grid-record-emphasized-color: #703f3f;
         }
       `
     ]
@@ -153,7 +155,8 @@ export class ContactPointList extends localize(i18next)(PageView) {
       rows: {
         selectable: {
           multiple: true
-        }
+        },
+        classifier: record => ({ emphasized: record.error || false })
       },
       columns: [
         { type: 'gutter', gutterName: 'dirty' },
@@ -172,12 +175,12 @@ export class ContactPointList extends localize(i18next)(PageView) {
           name: 'name',
           record: { editable: true },
           imex: {
-            header: '*' + i18next.t('field.contact_point_customer_name'),
+            header: i18next.t('field.contact_point_customer_name'),
             key: 'name',
             width: 40,
             type: 'string'
           },
-          header: `*${i18next.t('field.contact_point_customer_name')}`,
+          header: i18next.t('field.contact_point_customer_name'),
           width: 250
         },
         {
@@ -212,12 +215,12 @@ 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'
           },
-          header: i18next.t('field.contact_point_other_company_name'),
+          header: '*' + i18next.t('field.contact_point_other_company_name'),
           width: 200
         },
         {
@@ -253,8 +256,8 @@ export class ContactPointList extends localize(i18next)(PageView) {
           type: 'string',
           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'),
+          imex: { header: i18next.t('field.contact_point_phone'), key: 'phone', width: 40, type: 'string' },
+          header: i18next.t('field.contact_point_phone'),
           width: 120
         },
         {
@@ -300,32 +303,32 @@ export class ContactPointList extends localize(i18next)(PageView) {
           type: 'string',
           name: 'postCode',
           record: { editable: true },
-          imex: { header: i18next.t('field.contact_point_postal_code'), key: 'postCode', width: 40, type: 'string' },
-          header: i18next.t('field.contact_point_postal_code'),
+          imex: { header: '*' + i18next.t('field.contact_point_postal_code'), key: 'postCode', width: 40, type: 'string' },
+          header: '*' + i18next.t('field.contact_point_postal_code'),
           width: 150
         },
         {
           type: 'string',
           name: 'city',
           record: { editable: true },
-          imex: { header: i18next.t('field.contact_point_city'), key: 'city', width: 40, type: 'string' },
-          header: i18next.t('field.contact_point_city'),
+          imex: { header: '*' + i18next.t('field.contact_point_city'), key: 'city', width: 40, type: 'string' },
+          header: '*' + i18next.t('field.contact_point_city'),
           width: 150
         },
         {
           type: 'string',
           name: 'state',
           record: { editable: true },
-          imex: { header: i18next.t('field.contact_point_state'), key: 'state', width: 40, type: 'string' },
-          header: i18next.t('field.contact_point_state'),
+          imex: { header: '*' + i18next.t('field.contact_point_state'), key: 'state', width: 40, type: 'string' },
+          header: '*' + i18next.t('field.contact_point_state'),
           width: 150
         },
         {
           type: 'string',
           name: 'country',
           record: { editable: true },
-          imex: { header: i18next.t('field.country'), key: 'country', width: 40, type: 'string' },
-          header: i18next.t('field.country'),
+          imex: { header: '*' + i18next.t('field.country'), key: 'country', width: 40, type: 'string' },
+          header: '*' + i18next.t('field.country'),
           width: 150
         },
         {
@@ -716,7 +719,7 @@ export class ContactPointList extends localize(i18next)(PageView) {
         return this.showToast(i18next.t('text.nothing_changed'))
       }
 
-      this._validate()
+      this._validate(patches)
 
       const normalizedPatches = patches.map(patch => ({
         ...patch,
@@ -744,51 +747,79 @@ export class ContactPointList extends localize(i18next)(PageView) {
     }
   }
 
-  _validate() {
+  _validate(patches) {
     let errors = []
+    const errorIds = new Set()
+    const recordsMap = new Map(this.dataGrist._data.records.map(r => [r.id, r]))
 
-    let data = this.dataGrist._data.records.map(itm => {
-      itm.error = false
+    for (const patch of patches) {
+      const itm = patch.cuFlag === '+' ? patch : { ...recordsMap.get(patch.id), ...patch }
+      let hasError = false
 
-      if (isEmpty(itm.name) || '') {
-        itm.error = true
-        if (!errors.find(err => err.type == 'customerName'))
-          errors.push({ type: 'customerName', value: 'customer name is required' })
+      if (isEmpty(itm.type) || '') {
+        hasError = true
+        if (!errors.find(err => err.type == 'type'))
+          errors.push({ type: 'type', value: 'Type is required' })
+      }
+
+      if (isEmpty(itm.companyName) || '') {
+        hasError = true
+        if (!errors.find(err => err.type == 'companyName'))
+          errors.push({ type: 'companyName', value: 'Company name is required' })
+      }
+
+      if (isEmpty(itm.address) || '') {
+        hasError = true
+        if (!errors.find(err => err.type == 'address'))
+          errors.push({ type: 'address', value: 'Shipping address is required' })
+      }
+
+      if (isEmpty(itm.country) || '') {
+        hasError = true
+        if (!errors.find(err => err.type == 'country'))
+          errors.push({ type: 'country', value: 'Country is required' })
+      }
+
+      if (isEmpty(itm.state) || '') {
+        hasError = true
+        if (!errors.find(err => err.type == 'state'))
+          errors.push({ type: 'state', value: 'State is required' })
+      }
+
+      if (isEmpty(itm.city) || '') {
+        hasError = true
+        if (!errors.find(err => err.type == 'city'))
+          errors.push({ type: 'city', value: 'City is required' })
+      }
+
+      if (isEmpty(itm.postCode) || '') {
+        hasError = true
+        if (!errors.find(err => err.type == 'postCode'))
+          errors.push({ type: 'postCode', value: 'Postal code is required' })
       }
 
-      // Validate releaseShelfLife: must be non-negative integer
       const releaseShelfLifeValidation = this._validateReleaseShelfLife(itm.releaseShelfLife, true)
       if (!releaseShelfLifeValidation.valid) {
-        itm.error = true
-        if (!errors.find(err => err.type == 'releaseShelfLife')) {
-          errors.push({
-            type: 'releaseShelfLife',
-            value: releaseShelfLifeValidation.error
-          })
-        }
+        hasError = true
+        if (!errors.find(err => err.type == 'releaseShelfLife'))
+          errors.push({ type: 'releaseShelfLife', value: releaseShelfLifeValidation.error })
       }
 
-      // Validate businessRestDay: must be valid day(s)
       const businessRestDayValidation = this._validateBusinessRestDay(itm.businessRestDay, true)
       if (!businessRestDayValidation.valid) {
-        itm.error = true
-        if (!errors.find(err => err.type == 'businessRestDay')) {
-          errors.push({
-            type: 'businessRestDay',
-            value: businessRestDayValidation.error
-          })
-        }
+        hasError = true
+        if (!errors.find(err => err.type == 'businessRestDay'))
+          errors.push({ type: 'businessRestDay', value: businessRestDayValidation.error })
       }
 
-      return itm
-    })
+      if (hasError && patch.id) errorIds.add(patch.id)
+    }
 
     if (errors.length > 0) {
-      this._data = {
-        ...this.dataGrist.dirtyData,
-        records: data
-      }
-
+      this.dataGrist._data.records.forEach(r => {
+        r.error = errorIds.has(r.id)
+      })
+      this.dataGrist.refresh()
       throw new Error(errors.map(itm => itm.value).join(', '))
     }
   }
@@ -835,33 +866,45 @@ export class ContactPointList extends localize(i18next)(PageView) {
     let errors = []
 
     data = data.map(item => {
-      if (_.isEmpty(item.name) || '') {
-        if (!errors.find(error => error.type == 'name')) {
-          errors.push({ type: 'name', value: 'Name is required' })
+      if (_.isEmpty(item.type) || '') {
+        if (!errors.find(error => error.type == 'type')) {
+          errors.push({ type: 'type', value: 'Type is required' })
         }
       }
 
-      if (_.isEmpty(item.phone) || '') {
-        if (!errors.find(error => error.type == 'phone')) {
-          errors.push({ type: 'phone', value: 'Phone is required' })
+      if (_.isEmpty(item.bizplace?.id) || '') {
+        if (!errors.find(error => error.type == 'companyName')) {
+          errors.push({ type: 'companyName', value: 'Company name is required' })
         }
       }
 
       if (_.isEmpty(item.address) || '') {
         if (!errors.find(error => error.type == 'address')) {
-          errors.push({ type: 'address', value: 'Address is required' })
+          errors.push({ type: 'address', value: 'Shipping address is required' })
         }
       }
 
-      if (_.isEmpty(item.bizplace?.id) || '') {
-        if (!errors.find(error => error.type == 'companyName')) {
-          errors.push({ type: 'companyName', value: 'Company name is required' })
+      if (_.isEmpty(item.country) || '') {
+        if (!errors.find(error => error.type == 'country')) {
+          errors.push({ type: 'country', value: 'Country is required' })
         }
       }
 
-      if (_.isEmpty(item.type) || '') {
-        if (!errors.find(error => error.type == 'type')) {
-          errors.push({ type: 'type', value: 'Type is required' })
+      if (_.isEmpty(item.state) || '') {
+        if (!errors.find(error => error.type == 'state')) {
+          errors.push({ type: 'state', value: 'State is required' })
+        }
+      }
+
+      if (_.isEmpty(item.city) || '') {
+        if (!errors.find(error => error.type == 'city')) {
+          errors.push({ type: 'city', value: 'City is required' })
+        }
+      }
+
+      if (_.isEmpty(item.postCode) || '') {
+        if (!errors.find(error => error.type == 'postCode')) {
+          errors.push({ type: 'postCode', value: 'Postal code is required' })
         }
       }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/biz-ui",
-  "version": "4.3.798",
+  "version": "4.3.819",
   "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.798",
-    "@things-factory/code-base": "^4.3.767",
-    "@things-factory/form-ui": "^4.3.767",
-    "@things-factory/grist-ui": "^4.3.770",
-    "@things-factory/i18n-base": "^4.3.767",
-    "@things-factory/import-ui": "^4.3.790",
-    "@things-factory/layout-base": "^4.3.767",
-    "@things-factory/shell": "^4.3.767"
+    "@things-factory/biz-base": "^4.3.819",
+    "@things-factory/code-base": "^4.3.815",
+    "@things-factory/form-ui": "^4.3.815",
+    "@things-factory/grist-ui": "^4.3.815",
+    "@things-factory/i18n-base": "^4.3.815",
+    "@things-factory/import-ui": "^4.3.815",
+    "@things-factory/layout-base": "^4.3.815",
+    "@things-factory/shell": "^4.3.815"
   },
-  "gitHead": "d9c29bdfadad409e12de40cadabd329080f7501d"
+  "gitHead": "c6a6478dad09702aeafad6a491bf9936ade6a1fe"
 }