@things-factory/warehouse-ui 4.0.7 → 4.0.12

package/client/constants/location.js

@@ -1,14 +1,41 @@
+export const LOCATION_STATUS = {
+  EMPTY: {
+    name: 'EMPTY',
+    value: 'EMPTY'
+  },
+  OCCUPIED: {
+    name: 'OCCUPIED',
+    value: 'OCCUPIED'
+  },
+  FULL: {
+    name: 'FULL',
+    value: 'FULL'
+  }
+}
+
 export const LOCATION_TYPE = {
+  BIN: {
+    name: 'BIN',
+    value: 'BIN'
+  },
   BUFFER: {
-    name: 'buffer_location',
+    name: 'BUFFER',
     value: 'BUFFER'
   },
-  SHELF: {
-    name: 'shelf_location',
-    value: 'SHELF'
-  },
   FLOOR: {
-    name: 'floor_location',
+    name: 'FLOOR',
     value: 'FLOOR'
+  },
+  QUARANTINE: {
+    name: 'QUARANTINE',
+    value: 'QUARANTINE'
+  },
+  RESERVE: {
+    name: 'RESERVE',
+    value: 'RESERVE'
+  },
+  SHELF: {
+    name: 'SHELF',
+    value: 'SHELF'
   }
 }

package/client/pages/location-list.js

@@ -1,17 +1,21 @@
-import { DirectPrinter } from '@things-factory/barcode-base'
 import '@things-factory/form-ui'
 import '@things-factory/grist-ui'
+import './generate-location-list'
+
+import gql from 'graphql-tag'
+import { css, html } from 'lit-element'
+import { connect } from 'pwa-helpers/connect-mixin'
+
+import { DirectPrinter } from '@things-factory/barcode-base'
 import { i18next, localize } from '@things-factory/i18n-base'
 import { openImportPopUp } from '@things-factory/import-ui'
 import { openPopup } from '@things-factory/layout-base'
 import { client, CustomAlert, PageView, store } from '@things-factory/shell'
+import { CommonButtonStyles, ScrollbarStyles } from '@things-factory/styles'
 import { gqlBuilder, isMobileDevice } from '@things-factory/utils'
-import { ScrollbarStyles, CommonButtonStyles } from '@things-factory/styles'
-import gql from 'graphql-tag'
-import { css, html } from 'lit-element'
-import { connect } from 'pwa-helpers/connect-mixin'
+
+import { LOCATION_STATUS, LOCATION_TYPE } from '../constants'
 import { LOCATION_LABEL_SETTING_KEY } from './constants'
-import './generate-location-list'
 
 class LocationList extends connect(store)(localize(i18next)(PageView)) {
   static get styles() {
@@ -129,8 +133,19 @@ class LocationList extends connect(store)(localize(i18next)(PageView)) {
       {
         label: i18next.t('field.type'),
         name: 'type',
-        type: 'text',
-        props: { searchOper: 'i_like' }
+        type: 'select',
+        options: [
+          { value: '' },
+          ...Object.values(LOCATION_TYPE)
+            .map(type => {
+              return {
+                name: type.name,
+                value: type.value
+              }
+            })
+            .sort((a, b) => (a.name > b.name ? 1 : -1))
+        ],
+        props: { searchOper: 'eq' }
       },
       {
         label: i18next.t('field.zone'),
@@ -159,8 +174,19 @@ class LocationList extends connect(store)(localize(i18next)(PageView)) {
       {
         label: i18next.t('field.status'),
         name: 'status',
-        type: 'text',
-        props: { searchOper: 'i_like' }
+        type: 'select',
+        options: [
+          { value: '' },
+          ...Object.values(LOCATION_STATUS)
+            .map(status => {
+              return {
+                name: status.name,
+                value: status.value
+              }
+            })
+            .sort((a, b) => (a.name > b.name ? 1 : -1))
+        ],
+        props: { searchOper: 'eq' }
       }
     ]
 
@@ -181,10 +207,18 @@ class LocationList extends connect(store)(localize(i18next)(PageView)) {
           width: 150
         },
         {
-          type: 'string',
+          type: 'select',
           name: 'type',
           header: i18next.t('field.type'),
-          record: { editable: true, align: 'center' },
+          record: {
+            editable: true,
+            options: [
+              '',
+              ...Object.values(LOCATION_TYPE)
+                .map(type => type.value)
+                .sort()
+            ]
+          },
           imex: { header: i18next.t('field.type'), key: 'type', width: 50, type: 'string' },
           sortable: true,
           width: 150
@@ -226,10 +260,18 @@ class LocationList extends connect(store)(localize(i18next)(PageView)) {
           width: 80
         },
         {
-          type: 'string',
+          type: 'select',
           name: 'status',
           header: i18next.t('field.status'),
-          record: { editable: true, align: 'center' },
+          record: {
+            editable: true,
+            options: [
+              '',
+              ...Object.values(LOCATION_STATUS)
+                .map(status => status.value)
+                .sort()
+            ]
+          },
           imex: { header: i18next.t('field.status'), key: 'status', width: 50, type: 'string' },
           sortable: true,
           width: 80

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/warehouse-ui",
-  "version": "4.0.7",
+  "version": "4.0.12",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -24,15 +24,15 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
   },
   "dependencies": {
-    "@things-factory/barcode-base": "^4.0.7",
-    "@things-factory/code-base": "^4.0.7",
-    "@things-factory/form-ui": "^4.0.7",
-    "@things-factory/grist-ui": "^4.0.7",
-    "@things-factory/i18n-base": "^4.0.7",
-    "@things-factory/import-ui": "^4.0.7",
-    "@things-factory/layout-base": "^4.0.7",
-    "@things-factory/shell": "^4.0.7",
-    "@things-factory/warehouse-base": "^4.0.7"
+    "@things-factory/barcode-base": "^4.0.12",
+    "@things-factory/code-base": "^4.0.12",
+    "@things-factory/form-ui": "^4.0.12",
+    "@things-factory/grist-ui": "^4.0.12",
+    "@things-factory/i18n-base": "^4.0.12",
+    "@things-factory/import-ui": "^4.0.12",
+    "@things-factory/layout-base": "^4.0.12",
+    "@things-factory/shell": "^4.0.12",
+    "@things-factory/warehouse-base": "^4.0.12"
   },
-  "gitHead": "035fa60359aefa9b9111f807fc7e8db6a15a4a6e"
+  "gitHead": "29d59ff95fcb473cb43c6f798cd04f3ec3a779a0"
 }