@things-factory/warehouse-ui 4.0.25 → 4.0.29

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

@@ -3,7 +3,7 @@ import '@things-factory/grist-ui'
 import { i18next, localize } from '@things-factory/i18n-base'
 import { client } from '@things-factory/shell'
 import { ScrollbarStyles } from '@things-factory/styles'
-import { gqlBuilder, isMobileDevice } from '@things-factory/utils'
+import { isMobileDevice } from '@things-factory/utils'
 import gql from 'graphql-tag'
 import { css, html, LitElement } from 'lit-element'
 import { LOCATION_TYPE } from '../constants'
@@ -251,12 +251,8 @@ export class BufferLocationSelector extends localize(i18next)(LitElement) {
   async fetchWarehouses({ page, limit, sorters = [] }) {
     const response = await client.query({
       query: gql`
-        query {
-          warehouses(${gqlBuilder.buildArgs({
-            filters: this.searchForm.queryFilters,
-            pagination: { page, limit },
-            sortings: sorters
-          })}) {
+        query warehouses($filters: [Filter!], $pagination: Pagination, $sortings: [Sorting!]) {
+          warehouses(filters: $filters, pagination: $pagination, sortings: $sortings) {
             items {
               id
               name
@@ -266,7 +262,12 @@ export class BufferLocationSelector extends localize(i18next)(LitElement) {
             total
           }
         }
-      `
+      `,
+      variables: {
+        filters: this.searchForm.queryFilters,
+        pagination: { page, limit },
+        sortings: sorters
+      }
     })
 
     if (!response.errors) {
@@ -282,23 +283,8 @@ export class BufferLocationSelector extends localize(i18next)(LitElement) {
 
     const response = await client.query({
       query: gql`
-        query {
-          locations(${gqlBuilder.buildArgs({
-            filters: [
-              {
-                name: 'warehouse_id',
-                operator: 'eq',
-                value: this._warehouseId
-              },
-              {
-                name: 'type',
-                operator: 'eq',
-                value: LOCATION_TYPE.BUFFER.value
-              }
-            ],
-            pagination: { page, limit },
-            sortings: sorters
-          })}) {
+        query locations($filters: [Filter!], $pagination: Pagination, $sortings: [Sorting!]) {
+          locations(filters: $filters, pagination: $pagination, sortings: $sortings) {
             items {
               id
               name
@@ -311,7 +297,23 @@ export class BufferLocationSelector extends localize(i18next)(LitElement) {
             total
           }
         }
-      `
+      `,
+      variables: {
+        filters: [
+          {
+            name: 'warehouse_id',
+            operator: 'eq',
+            value: this._warehouseId
+          },
+          {
+            name: 'type',
+            operator: 'eq',
+            value: LOCATION_TYPE.BUFFER.value
+          }
+        ],
+        pagination: { page, limit },
+        sortings: sorters
+      }
     })
 
     if (!response.errors) {

package/client/pages/generate-location-list.js

@@ -4,7 +4,7 @@ import { MultiColumnFormStyles } from '@things-factory/form-ui'
 import '@things-factory/grist-ui'
 import { i18next, localize } from '@things-factory/i18n-base'
 import { client, CustomAlert } from '@things-factory/shell'
-import { gqlBuilder, sleep, isMobileDevice } from '@things-factory/utils'
+import { sleep, isMobileDevice } from '@things-factory/utils'
 import { ScrollbarStyles } from '@things-factory/styles'
 import gql from 'graphql-tag'
 import { css, html, LitElement } from 'lit-element'
@@ -163,10 +163,9 @@ export class GenerateLocationList extends localize(i18next)(LitElement) {
             ${(this._formatsFromCode || []).map(
               format =>
                 html`
-                  <option value="${format && format.name}"
-                    >${format && format.name}
-                    ${format && format.description ? ` ${format && format.description}` : ''}</option
-                  >
+                  <option value="${format && format.name}"></option>
+                    ${format && format.name} ${format && format.description ? ` ${format && format.description}` : ''}
+                  </option>
                 `
             )}
           </select>
@@ -746,14 +745,15 @@ export class GenerateLocationList extends localize(i18next)(LitElement) {
           const patches = chunkPatches[x]
           const response = await client.query({
             query: gql`
-              mutation {
-                updateMultipleLocation(${gqlBuilder.buildArgs({
-                  patches
-                })}) {
+              mutation updateMultipleLocation($patches: [LocationPatch!]) {
+                updateMultipleLocation(patches $patches) {
                   name
                 }
               }
-              `
+              `,
+            variables: {
+              patches
+            }
           })
         }
 

package/client/pages/location-list.js

@@ -12,7 +12,7 @@ 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 { isMobileDevice } from '@things-factory/utils'
 
 import { LOCATION_STATUS, LOCATION_TYPE } from '../constants'
 import { LOCATION_LABEL_SETTING_KEY } from './constants'
@@ -308,12 +308,8 @@ class LocationList extends connect(store)(localize(i18next)(PageView)) {
 
     const response = await client.query({
       query: gql`
-        query {
-          locations(${gqlBuilder.buildArgs({
-            filters: [...filters, ...this.searchForm.queryFilters],
-            pagination: { page, limit },
-            sortings: sorters
-          })}) {
+        query locations($filters: [Filter!], $pagination: Pagination, $sortings: [Sorting!]) {
+          locations(filters: $filters, pagination: $pagination, sortings: $sortings) {
             items {
               id
               name
@@ -324,7 +320,7 @@ class LocationList extends connect(store)(localize(i18next)(PageView)) {
               shelf
               status
               updatedAt
-              updater{
+              updater {
                 name
                 description
               }
@@ -332,7 +328,12 @@ class LocationList extends connect(store)(localize(i18next)(PageView)) {
             total
           }
         }
-      `
+      `,
+      variables: {
+        filters: [...filters, ...this.searchForm.queryFilters],
+        pagination: { page, limit },
+        sortings: sorters
+      }
     })
 
     return {
@@ -348,16 +349,15 @@ class LocationList extends connect(store)(localize(i18next)(PageView)) {
         return patch
       })
 
-      const response = await client.query({
-        query: gql`
-            mutation {
-              updateMultipleLocation(${gqlBuilder.buildArgs({
-                patches
-              })}) {
-                name
-              }
+      const response = await client.mutate({
+        mutation: gql`
+          mutation updateMultipleLocation($patches: [LocationPatch!]!) {
+            updateMultipleLocation(patches: $patches) {
+              name
             }
-          `
+          }
+        `,
+        variables: { patches }
       })
 
       if (!response.errors) {
@@ -385,12 +385,13 @@ class LocationList extends connect(store)(localize(i18next)(PageView)) {
 
       if (!anwer.value) return
 
-      const response = await client.query({
-        query: gql`
-          mutation {
-            deleteLocations(${gqlBuilder.buildArgs({ ids })})
+      const response = await client.mutate({
+        mutation: gql`
+          mutation deleteLocations($ids: [String!]!) {
+            deleteLocations(ids: $ids)
           }
-        `
+        `,
+        variables: { ids }
       })
 
       if (!response.errors) {
@@ -416,12 +417,13 @@ class LocationList extends connect(store)(localize(i18next)(PageView)) {
 
     if (!answer.value) return
 
-    const response = await client.query({
-      query: gql`
-        mutation {
-          deleteAllLocations(${gqlBuilder.buildArgs({ warehouseId: this._warehouseId })})
+    const response = await client.mutate({
+      mutation: gql`
+        mutation deleteAllLocations($warehouseId: String!) {
+          deleteAllLocations(warehouseId: $warehouseId)
         }
-      `
+      `,
+      variables: { warehouseId: this._warehouseId }
     })
 
     if (!response.errors) {

package/client/pages/warehouse-list.js

@@ -4,7 +4,7 @@ import '@things-factory/grist-ui'
 import { i18next, localize } from '@things-factory/i18n-base'
 import { openImportPopUp } from '@things-factory/import-ui'
 import { client, CustomAlert, navigate, PageView } from '@things-factory/shell'
-import { gqlBuilder, isMobileDevice } from '@things-factory/utils'
+import { isMobileDevice } from '@things-factory/utils'
 import { ScrollbarStyles, CommonButtonStyles } from '@things-factory/styles'
 import gql from 'graphql-tag'
 import { css, html } from 'lit-element'
@@ -205,19 +205,15 @@ class WarehouseList extends localize(i18next)(PageView) {
   async fetchHandler({ page, limit, sorters = [{ name: 'name' }] }) {
     const response = await client.query({
       query: gql`
-        query {
-          warehouses(${gqlBuilder.buildArgs({
-            filters: this.searchForm.queryFilters,
-            pagination: { page, limit },
-            sortings: sorters
-          })}) {  
+        query warehouses($filters: [Filter!], $pagination: Pagination, $sortings: [Sorting!]) {
+          warehouses(filters: $filters, pagination: $pagination, sortings: $sortings) {
             items {
               id
               name
               type
               description
               updatedAt
-              updater{
+              updater {
                 name
                 description
               }
@@ -225,7 +221,12 @@ class WarehouseList extends localize(i18next)(PageView) {
             total
           }
         }
-      `
+      `,
+      variables: {
+        filters: this.searchForm.queryFilters,
+        pagination: { page, limit },
+        sortings: sorters
+      }
     })
 
     return {
@@ -236,16 +237,15 @@ class WarehouseList extends localize(i18next)(PageView) {
 
   async _saveWarehouse(patches) {
     if (patches && patches.length) {
-      const response = await client.query({
-        query: gql`
-            mutation {
-              updateMultipleWarehouse(${gqlBuilder.buildArgs({
-                patches
-              })}) {
-                name
-              }
+      const response = await client.mutate({
+        mutation: gql`
+          mutation updateMultipleWarehouse($patches: [WarehousePatch!]!) {
+            updateMultipleWarehouse(patches: $patches) {
+              name
             }
-          `
+          }
+        `,
+        variables: { patches }
       })
 
       if (!response.errors) {
@@ -273,12 +273,13 @@ class WarehouseList extends localize(i18next)(PageView) {
 
       if (!anwer.value) return
 
-      const response = await client.query({
-        query: gql`
-          mutation {
-            deleteWarehouses(${gqlBuilder.buildArgs({ ids })})
+      const response = await client.mutate({
+        mutation: gql`
+          mutation deleteWarehouses($ids: [String!]!) {
+            deleteWarehouses(ids: $ids)
           }
-        `
+        `,
+        variables: { ids }
       })
 
       if (!response.errors) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/warehouse-ui",
-  "version": "4.0.25",
+  "version": "4.0.29",
   "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.25",
-    "@things-factory/code-base": "^4.0.25",
-    "@things-factory/form-ui": "^4.0.25",
-    "@things-factory/grist-ui": "^4.0.25",
-    "@things-factory/i18n-base": "^4.0.25",
-    "@things-factory/import-ui": "^4.0.25",
-    "@things-factory/layout-base": "^4.0.25",
-    "@things-factory/shell": "^4.0.25",
-    "@things-factory/warehouse-base": "^4.0.25"
+    "@things-factory/barcode-base": "^4.0.28",
+    "@things-factory/code-base": "^4.0.28",
+    "@things-factory/form-ui": "^4.0.28",
+    "@things-factory/grist-ui": "^4.0.28",
+    "@things-factory/i18n-base": "^4.0.28",
+    "@things-factory/import-ui": "^4.0.28",
+    "@things-factory/layout-base": "^4.0.28",
+    "@things-factory/shell": "^4.0.28",
+    "@things-factory/warehouse-base": "^4.0.29"
   },
-  "gitHead": "9c44141d651dab7b4a9c0f0b6fecb8d6937d116f"
+  "gitHead": "1dd19ce97afe62e2b05e27c3b7781b9468cbd778"
 }