@things-factory/warehouse-ui 4.3.656 → 4.3.660

package/client/component/buffer-location-selector.js

@@ -81,7 +81,8 @@ export class BufferLocationSelector extends localize(i18next)(LitElement) {
     return {
       _searchFields: Array,
       config: Object,
-      _warehouseName: String
+      _warehouseName: String,
+      enableDirectInbound: Boolean
     }
   }
 
@@ -90,7 +91,7 @@ export class BufferLocationSelector extends localize(i18next)(LitElement) {
       <search-form
         id="search-form"
         .fields=${this._searchFields}
-        @submit=${() => this.warehouseGrist.fetch()}
+        @submit=${() => (this.enableDirectInbound ? this.locationGrist.fetch() : this.warehouseGrist.fetch())}
       ></search-form>
 
       <div class="grist-container">
@@ -134,24 +135,42 @@ export class BufferLocationSelector extends localize(i18next)(LitElement) {
   }
 
   async firstUpdated() {
-    this._searchFields = [
-      {
-        name: 'name',
-        label: i18next.t('field.name'),
-        type: 'text',
-        props: {
-          searchOper: 'i_like'
-        }
-      },
-      {
-        name: 'description',
-        label: i18next.t('field.description'),
-        type: 'text',
-        props: {
-          searchOper: 'i_like'
-        }
-      }
-    ]
+    this._searchFields = !this.enableDirectInbound
+      ? [
+          {
+            name: 'name',
+            label: i18next.t('field.name'),
+            type: 'text',
+            props: {
+              searchOper: 'i_like'
+            }
+          },
+          {
+            name: 'description',
+            label: i18next.t('field.description'),
+            type: 'text',
+            props: {
+              searchOper: 'i_like'
+            }
+          }
+        ]
+      : [
+          {
+            name: 'name',
+            label: i18next.t('field.location'),
+            type: 'text',
+            props: {
+              searchOper: 'i_like'
+            }
+          },
+          {
+            label: i18next.t('field.location_type'),
+            name: 'type',
+            type: 'select',
+            options: [{ value: '' }, ...Object.values(LOCATION_TYPE).filter(type => type.value != 'BIN')],
+            props: { searchOper: 'eq' }
+          }
+        ]
 
     this.warehouseConfig = {
       pagination: { infinite: true },
@@ -194,7 +213,8 @@ export class BufferLocationSelector extends localize(i18next)(LitElement) {
         selectable: {
           multiple: false
         },
-        appendable: false
+        appendable: false,
+        handlers: { dblclick: this._dblClickHandler.bind(this) }
       },
       columns: [
         { type: 'gutter', gutterName: 'sequence' },
@@ -205,6 +225,12 @@ export class BufferLocationSelector extends localize(i18next)(LitElement) {
           header: i18next.t('field.name'),
           width: 180
         },
+        {
+          type: 'string',
+          name: 'type',
+          header: i18next.t('field.location_type'),
+          width: 180
+        },
         {
           type: 'string',
           name: 'description',
@@ -290,6 +316,24 @@ export class BufferLocationSelector extends localize(i18next)(LitElement) {
   async fetchLocations({ page, limit, sorters = [] }) {
     if (!this._warehouseId) return
 
+    let filters = []
+    filters = this.searchForm?.queryFilters
+    if (this.enableDirectInbound) {
+      filters.push(
+        {
+          name: 'type',
+          operator: 'noteq',
+          value: LOCATION_TYPE.BIN.value
+        },
+        { name: 'warehouse_id', operator: 'eq', value: this._warehouseId }
+      )
+    } else {
+      filters.push({
+        name: 'type',
+        operator: 'eq',
+        value: LOCATION_TYPE.BUFFER.value
+      })
+    }
     const response = await client.query({
       query: gql`
         query locations($filters: [Filter!], $pagination: Pagination, $sortings: [Sorting!]) {
@@ -297,30 +341,24 @@ export class BufferLocationSelector extends localize(i18next)(LitElement) {
             items {
               id
               name
+              type
               description
               zone
               row
               column
               shelf
               status
+              warehouse {
+                id
+                name
+              }
             }
             total
           }
         }
       `,
       variables: {
-        filters: [
-          {
-            name: 'warehouse_id',
-            operator: 'eq',
-            value: this._warehouseId
-          },
-          {
-            name: 'type',
-            operator: 'eq',
-            value: LOCATION_TYPE.BUFFER.value
-          }
-        ],
+        filters: filters,
         pagination: { page, limit },
         sortings: sorters
       }
@@ -334,10 +372,20 @@ export class BufferLocationSelector extends localize(i18next)(LitElement) {
     }
   }
 
+  _dblClickHandler(columns, data, column, record, rowIndex, target) {
+    console.log('DEBUG: Double-clicked location record: ', record)
+    this.dispatchEvent(new CustomEvent('selected', { detail: { ...record, locationName: record.name } }))
+    history.back()
+  }
+
   _selectLocation() {
     const selectedLocation = this.locationGrist.selected[0]
     if (selectedLocation) {
-      this.dispatchEvent(new CustomEvent('selected', { detail: this.locationGrist.selected[0] }))
+      this.dispatchEvent(
+        new CustomEvent('selected', {
+          detail: { ...this.locationGrist.selected[0], locationName: this.locationGrist.selected[0].name }
+        })
+      )
       history.back()
     } else {
       document.dispatchEvent(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/warehouse-ui",
-  "version": "4.3.656",
+  "version": "4.3.660",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -28,10 +28,10 @@
     "@things-factory/form-ui": "^4.3.591",
     "@things-factory/grist-ui": "^4.3.642",
     "@things-factory/i18n-base": "^4.3.591",
-    "@things-factory/import-ui": "^4.3.642",
+    "@things-factory/import-ui": "^4.3.660",
     "@things-factory/layout-base": "^4.3.591",
     "@things-factory/shell": "^4.3.591",
-    "@things-factory/warehouse-base": "^4.3.656"
+    "@things-factory/warehouse-base": "^4.3.660"
   },
-  "gitHead": "784dc56acc60bf6b4d5a5e8df3aa325a541b4a7d"
+  "gitHead": "d5c870cd06b2fcacea68ba21baadd244e4532b99"
 }