@things-factory/biz-ui 4.3.701 → 4.3.705

package/client/components/contact-points-popup.js

@@ -105,7 +105,7 @@ class ContactPointsPopup extends localize(i18next)(LitElement) {
   firstUpdated() {
     this.config = {
       list: {
-        fields: ['companyName', 'accountNo', 'email', 'name', 'description']
+        fields: ['companyName', 'accountNo', 'email', 'name', 'description', 'country', 'releaseShelfLife']
       },
       pagination: { pages: [10, 20, 50, 100] },
       rows: {
@@ -154,6 +154,18 @@ class ContactPointsPopup extends localize(i18next)(LitElement) {
           header: i18next.t('field.billing_address'),
           width: 350
         },
+        {
+          type: 'string',
+          name: 'country',
+          header: i18next.t('field.country'),
+          width: 350
+        },
+        {
+          type: 'number',
+          name: 'releaseShelfLife',
+          header: i18next.t('field.release_shelf_life'),
+          width: 350
+        },
         {
           type: 'string',
           name: 'phone',
@@ -234,8 +246,10 @@ class ContactPointsPopup extends localize(i18next)(LitElement) {
               address
               address2
               postCode
+              country
               city
               state
+              releaseShelfLife
               billingAddress
             }
             total

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

@@ -51,6 +51,7 @@ export class ContactPointList extends localize(i18next)(PageView) {
         .config=${this.config}
         .data=${this.data}
         .fetchHandler="${this.fetchHandler.bind(this)}"
+        @field-change=${this._onFieldChange.bind(this)}
       ></data-grist>
     `
   }
@@ -81,12 +82,20 @@ export class ContactPointList extends localize(i18next)(PageView) {
             rows: this.config.rows,
             columns: [...this.config.columns.filter(column => column.imex !== undefined)]
           }
-          openImportPopUp(records, config, async patches => {
+          // Normalize records to handle Excel object values (e.g., hyperlinks for email) and numeric fields
+          const normalizedRecords = records.map(record => {
+            let normalized = this._normalizeStringFields(record)
+            normalized = this._normalizeNumericFields(normalized)
+            return normalized
+          })
+          openImportPopUp(normalizedRecords, config, async patches => {
             try {
               patches = patches.map(patch => {
                 if (!patch?.id) delete patch.id
-
-                return patch
+                // Normalize both string fields (for hyperlinks) and numeric fields (for GraphQL types)
+                let normalized = this._normalizeStringFields(patch)
+                normalized = this._normalizeNumericFields(normalized)
+                return normalized
               })
               await this._validateImport(patches)
               await this._saveContactPoints(patches)
@@ -302,6 +311,14 @@ export class ContactPointList extends localize(i18next)(PageView) {
           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'),
+          width: 150
+        },
         {
           type: 'string',
           name: 'billingAddress',
@@ -315,6 +332,25 @@ export class ContactPointList extends localize(i18next)(PageView) {
           header: i18next.t('field.contact_point_billing_address'),
           width: 300
         },
+        {
+          type: 'number',
+          name: 'releaseShelfLife',
+          record: {
+            editable: true,
+            validation: (after, before, record, column) => {
+              const validation = this._validateReleaseShelfLife(after, true)
+              return validation.valid
+            }
+          },
+          header: i18next.t('field.release_shelf_life'),
+          imex: {
+            header: i18next.t('field.release_shelf_life'),
+            key: 'releaseShelfLife',
+            width: 40,
+            type: 'number'
+          },
+          width: 150
+        },
         {
           name: 'type',
           record: { editable: true },
@@ -357,6 +393,131 @@ export class ContactPointList extends localize(i18next)(PageView) {
     }
   }
 
+  /**
+   * Validates releaseShelfLife value
+   * @param {any} value - The value to validate
+   * @param {boolean} allowEmpty - Whether to allow empty/null/undefined values (default: true)
+   * @returns {{valid: boolean, error?: string}} - Validation result with optional error message
+   */
+  _validateReleaseShelfLife(value, allowEmpty = true) {
+    // Allow empty/null values if allowed
+    if (allowEmpty && (value === null || value === undefined || value === '')) {
+      return { valid: true }
+    }
+
+    // If not allowed and empty, return error
+    if (!allowEmpty && (value === null || value === undefined || value === '')) {
+      return { valid: false, error: i18next.t('field.release_shelf_life') + ' is required' }
+    }
+
+    const numValue = Number(value)
+
+    // Check if it's a valid number
+    if (isNaN(numValue)) {
+      return { valid: false, error: i18next.t('field.release_shelf_life') + ' must be a valid number' }
+    }
+
+    // Check if it's negative
+    if (numValue < 0) {
+      return { valid: false, error: i18next.t('field.release_shelf_life') + ' cannot be negative' }
+    }
+
+    // Check if it's an integer (no decimals)
+    if (!Number.isInteger(numValue)) {
+      return { valid: false, error: i18next.t('field.release_shelf_life') + ' must be an integer (no decimal values)' }
+    }
+
+    return { valid: true }
+  }
+
+  _onFieldChange(e) {
+    const { after, before, column, record, row } = e.detail
+
+    // Handle releaseShelfLife validation (redundant with column validation, but kept for user feedback)
+    if (column.name === 'releaseShelfLife') {
+      const validation = this._validateReleaseShelfLife(after, true)
+      if (!validation.valid) {
+        // Revert to previous value
+        this.dataGrist._data.records[row][column.name] = before
+        this.data = {
+          ...this.dataGrist._data
+        }
+        // Show error message
+        this.showToast(validation.error)
+      }
+    }
+  }
+
+  _normalizeStringFields(record) {
+    // Normalize object values to strings (e.g., Excel hyperlinks for email fields)
+    // ExcelJS may return email cells as objects like { text: 'email@example.com', hyperlink: 'mailto:...' }
+    const normalized = { ...record }
+    const stringFields = [
+      'email',
+      'name',
+      'companyName',
+      'description',
+      'fax',
+      'phone',
+      'accountNo',
+      'address',
+      'address2',
+      'postCode',
+      'city',
+      'state',
+      'country',
+      'billingAddress',
+      'type'
+    ]
+    stringFields.forEach(field => {
+      if (normalized[field] && typeof normalized[field] === 'object' && !Array.isArray(normalized[field])) {
+        // Handle ExcelJS hyperlink objects
+        if (normalized[field].text !== undefined) {
+          normalized[field] = normalized[field].text
+        } else {
+          // Fallback: try to stringify or use empty string
+          normalized[field] = normalized[field].toString ? normalized[field].toString() : ''
+        }
+      }
+    })
+    return normalized
+  }
+
+  _normalizeNumericFields(record) {
+    // Normalize numeric fields - convert string numbers to integers/floats
+    // GraphQL requires integers to be actual numbers, not strings
+    const normalized = { ...record }
+
+    // releaseShelfLife must be an integer
+    // Explicitly check for 0 as a valid value (both number 0 and string "0")
+    const releaseShelfLifeValue = normalized.releaseShelfLife
+
+    if (releaseShelfLifeValue === 0 || releaseShelfLifeValue === '0') {
+      // 0 is a valid value, ensure it's stored as integer 0
+      normalized.releaseShelfLife = 0
+    } else if (releaseShelfLifeValue !== null && releaseShelfLifeValue !== undefined && releaseShelfLifeValue !== '') {
+      if (typeof releaseShelfLifeValue === 'string') {
+        const numValue = Number(releaseShelfLifeValue)
+        if (!isNaN(numValue)) {
+          normalized.releaseShelfLife = Number.isInteger(numValue) ? numValue : Math.floor(numValue)
+        } else {
+          // Invalid number string, set to default 0
+          normalized.releaseShelfLife = 0
+        }
+      } else if (typeof releaseShelfLifeValue === 'number') {
+        // Ensure it's an integer
+        normalized.releaseShelfLife = Number.isInteger(releaseShelfLifeValue)
+          ? releaseShelfLifeValue
+          : Math.floor(releaseShelfLifeValue)
+      }
+    } else {
+      // Empty/null values should default to 0
+      normalized.releaseShelfLife = 0
+    }
+
+    return normalized
+  }
+
   async fetchPartnersBizplaces() {
     const response = await client.query({
       query: gql`
@@ -402,9 +563,11 @@ export class ContactPointList extends localize(i18next)(PageView) {
               state
               city
               postCode
+              country
               billingAddress
               description
               type
+              releaseShelfLife
               updatedAt
               bizplace {
                 id
@@ -472,6 +635,19 @@ export class ContactPointList extends localize(i18next)(PageView) {
         if (!errors.find(err => err.type == 'customerName'))
           errors.push({ type: 'customerName', value: 'customer name 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
+          })
+        }
+      }
+
       return itm
     })
 
@@ -562,6 +738,14 @@ export class ContactPointList extends localize(i18next)(PageView) {
         throw new Error(i18next.t('text.contact_type_does_not_exist'))
       }
 
+      // Validate releaseShelfLife: must be non-negative integer
+      const releaseShelfLifeValidation = this._validateReleaseShelfLife(item.releaseShelfLife, true)
+      if (!releaseShelfLifeValidation.valid) {
+        if (!errors.find(error => error.type == 'releaseShelfLife')) {
+          errors.push({ type: 'releaseShelfLife', value: releaseShelfLifeValidation.error })
+        }
+      }
+
       return item
     })
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/biz-ui",
-  "version": "4.3.701",
+  "version": "4.3.705",
   "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.701",
-    "@things-factory/code-base": "^4.3.695",
-    "@things-factory/form-ui": "^4.3.695",
-    "@things-factory/grist-ui": "^4.3.695",
-    "@things-factory/i18n-base": "^4.3.695",
-    "@things-factory/import-ui": "^4.3.695",
-    "@things-factory/layout-base": "^4.3.695",
-    "@things-factory/shell": "^4.3.695"
+    "@things-factory/biz-base": "^4.3.705",
+    "@things-factory/code-base": "^4.3.705",
+    "@things-factory/form-ui": "^4.3.705",
+    "@things-factory/grist-ui": "^4.3.705",
+    "@things-factory/i18n-base": "^4.3.705",
+    "@things-factory/import-ui": "^4.3.705",
+    "@things-factory/layout-base": "^4.3.705",
+    "@things-factory/shell": "^4.3.705"
   },
-  "gitHead": "2cb46fe9d95770899e069846c590a3b24c847d9c"
+  "gitHead": "37ae3b066444a1094389a59b38414e5c2b75db20"
 }

package/translations/en.json

@@ -5,12 +5,13 @@
   "field.billing_address": "billing address",
   "field.company_name": "company name",
   "field.other_company": "other company",
+  "field.release_shelf_life": "release shelf life",
   "title.contact_points": "contact points",
   "title.select_supplier": "select supplier",
   "text.bizplace_is_not_selected": "customer is not selected",
   "label.account_no": "account no",
   "text.invalid_form": "invalid form",
-  
+
   "field.contact_point_customer_name": "Customer Name",
   "field.contact_point_company_name": "Company Name",
   "field.contact_point_other_company_name": "Other Company",

package/translations/ja.json

@@ -5,6 +5,7 @@
   "field.billing_address": "[jp]billing address",
   "field.company_name": "[jp]company name",
   "field.other_company": "[jp]other company",
+  "field.release_shelf_life": "[jp]release shelf life",
   "title.contact_points": "[jp]contact points",
   "title.select_supplier": "[jp]select supplier",
   "text.bizplace_is_not_selected": "[jp]customer is not selected",

package/translations/ko.json

@@ -5,6 +5,7 @@
   "field.billing_address": "[ko]billing address",
   "field.company_name": "[ko]company name",
   "field.other_company": "[ko]other company",
+  "field.release_shelf_life": "[ko]release shelf life",
   "title.contact_points": "[ko]contact points",
   "title.select_supplier": "[ko]select supplier",
   "text.bizplace_is_not_selected": "[ko]customer is not selected",

package/translations/ms.json

@@ -5,6 +5,7 @@
   "field.billing_address": "[ms]billing address",
   "field.company_name": "[ms]company name",
   "field.other_company": "[ms]other company",
+  "field.release_shelf_life": "[ms]release shelf life",
   "title.contact_points": "[ms]contact points",
   "title.select_supplier": "[ms]select supplier",
   "text.bizplace_is_not_selected": "[ms]customer is not selected",

package/translations/zh.json

@@ -5,6 +5,7 @@
   "field.billing_address": "[zh]billing address",
   "field.company_name": "[zh]company name",
   "field.other_company": "[zh]other company",
+  "field.release_shelf_life": "[zh]release shelf life",
   "title.contact_points": "[zh]contact points",
   "title.select_supplier": "[zh]select supplier",
   "text.bizplace_is_not_selected": "[zh]customer is not selected",