@things-factory/operato-wms 4.3.736 → 4.3.737

package/client/pages/inventory/inventory-adjustment.js

@@ -35,6 +35,114 @@ const toFloatOrUndefined = v => {
   return Number.isFinite(n) ? n : undefined
 }
 
+// Import UI may produce human headers (e.g. "packing type") instead of GraphQL input keys (e.g. "packingType").
+// GraphQL rejects unknown fields, so normalize/sanitize patches before submitting.
+const INVENTORY_PATCH_KEYS = new Set([
+  'id',
+  'name',
+  'bizplace',
+  'refInventory',
+  'bizplaceName',
+  'palletId',
+  'cartonId',
+  'batchId',
+  'batchIdRef',
+  'product',
+  'productDetail',
+  'sku',
+  'brand',
+  'productName',
+  'productDetailName',
+  'productDetailId',
+  'reusablePallet',
+  'reusablePalletId',
+  'location',
+  'locationName',
+  'warehouse',
+  'warehouseName',
+  'packingType',
+  'packingSize',
+  'otherRef',
+  'transactionType',
+  'details',
+  'zone',
+  'weight',
+  'uom',
+  'uomValue',
+  'qty',
+  'status',
+  'description',
+  'remark',
+  'expirationDate',
+  'manufactureDate',
+  'unitCost',
+  'adjustmentCode',
+  'adjustmentNote',
+  'inventoryItemChangesJson',
+  'serialNumbers',
+  'updatedAt',
+  'updater',
+  'cuFlag',
+  'transferQty',
+  'transferUomValue',
+  'obsolete'
+])
+
+const toCamelKey = key =>
+  String(key)
+    .trim()
+    .replace(/[_-]+/g, ' ')
+    .replace(/\s+([a-zA-Z0-9])/g, (_, c) => String(c).toUpperCase())
+    .replace(/^\w/, c => c.toLowerCase())
+
+const normalizeInventoryPatch = patch => {
+  if (!patch || typeof patch !== 'object') return patch
+
+  const headerKeyMap = {
+    'packing type': 'packingType',
+    'packing size': 'packingSize',
+    'uom value': 'uomValue',
+    'unit cost': 'unitCost',
+    'batch id': 'batchId',
+    'batch no': 'batchId',
+    'batch no.': 'batchId',
+    'batch id ref': 'batchIdRef',
+    'batch no ref': 'batchIdRef',
+    'batch no. ref': 'batchIdRef'
+  }
+
+  const normalized = {}
+
+  Object.entries(patch).forEach(([rawKey, value]) => {
+    const lower = String(rawKey).trim().toLowerCase()
+    let key = headerKeyMap[lower] || rawKey
+
+    if (!INVENTORY_PATCH_KEYS.has(key)) {
+      const camel = toCamelKey(rawKey)
+      if (INVENTORY_PATCH_KEYS.has(camel)) key = camel
+    }
+
+    if (!INVENTORY_PATCH_KEYS.has(key)) return
+
+    // prefer already-correct keys if both exist
+    if (normalized[key] === undefined) normalized[key] = value
+  })
+
+  // sanitize nested refs to what GraphQL expects
+  if (normalized.bizplace && normalized.bizplace.id) normalized.bizplace = { id: normalized.bizplace.id }
+  if (normalized.location && normalized.location.id) {
+    normalized.location = { id: normalized.location.id, name: normalized.location.name }
+  }
+  if (normalized.product && normalized.product.id) normalized.product = { id: normalized.product.id }
+  if (normalized.productDetail && normalized.productDetail.id)
+    normalized.productDetail = { id: normalized.productDetail.id }
+
+  // ScalarDate cannot parse empty string; treat blank as undefined.
+  if (normalized.manufactureDate === '') delete normalized.manufactureDate
+
+  return normalized
+}
+
 class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
   static get styles() {
     return [
@@ -1161,17 +1269,19 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
 
   async importHandler(patches) {
     try {
+      patches = patches.map(patch => normalizeInventoryPatch(patch))
+
       patches.map(itm => {
-        if (itm?.uomValue < 0 || itm?.uommValue?.toString() == NaN.toString()) {
+        if (toFloatOrUndefined(itm?.uomValue) < 0) {
           throw new Error(i18next.t('text.invalid_uom_value'))
         }
-        if (itm?.qty < 0) {
+        if (toFloatOrUndefined(itm?.qty) < 0) {
           throw new Error(i18next.t('text.invalid_qty'))
         }
         if (itm?.packingType?.trim() == '') {
           throw new Error(i18next.t('text.invalid_packing_type'))
         }
-        if (itm?.unitCost < 0) {
+        if (toFloatOrUndefined(itm?.unitCost) < 0) {
           throw new Error(i18next.t('text.invalid_unit_cost'))
         }
         if (new Date(itm?.manufactureDate) > new Date()) {
@@ -1211,9 +1321,9 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
             throw new Error(i18next.t('text.invalid_value_in_list'))
           }
         }
-        itm.qty = parseFloat(itm.qty)
-        itm.packingSize = parseFloat(itm.packingSize)
-        itm.uomValue = parseFloat(itm.uomValue)
+        itm.qty = toFloatOrUndefined(itm.qty)
+        itm.packingSize = toFloatOrUndefined(itm.packingSize)
+        itm.uomValue = toFloatOrUndefined(itm.uomValue)
         itm.transferQty = toFloatOrUndefined(itm.transferQty)
         itm.transferUomValue = toFloatOrUndefined(itm.transferUomValue)
 
@@ -1221,7 +1331,7 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
           itm.unitCost = null
         }
         if (itm.unitCost != null) {
-          itm.unitCost = parseFloat(itm.unitCost)
+          itm.unitCost = toFloatOrUndefined(itm.unitCost)
           if (isNaN(itm.unitCost)) {
             throw new Error(i18next.t('text.invalid_unit_cost'))
           }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/operato-wms",
-  "version": "4.3.736",
+  "version": "4.3.737",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -117,5 +117,5 @@
     "cypress-localstorage-commands": "^1.6.1",
     "eslint-plugin-cypress": "^2.12.1"
   },
-  "gitHead": "02dc436ab7770e7186c50311b0d3c844d847b2ab"
+  "gitHead": "e6f8a64149623c60ac264af2d2060bbe823e1d36"
 }