@things-factory/sales-ui 4.0.26 → 4.0.30

package/client/pages/purchase-order/purchase-order-approval-detail.js

@@ -12,7 +12,7 @@ import { i18next, localize } from '@things-factory/i18n-base'
 import { fetchSettingRule } from '@things-factory/setting-ui'
 import { client, CustomAlert, gqlContext, navigate, PageView, store } from '@things-factory/shell'
 import { CommonButtonStyles } from '@things-factory/styles'
-import { flattenObject, gqlBuilder, isMobileDevice } from '@things-factory/utils'
+import { flattenObject, isMobileDevice } from '@things-factory/utils'
 
 import { PURCHASE_ORDER_STATUS } from '../../constants'
 
@@ -798,10 +798,8 @@ class PurchaseOrderApprovalDetail extends connect(store)(localize(i18next)(PageV
 
     const response = await client.query({
       query: gql`
-        query {
-          purchaseOrder(${gqlBuilder.buildArgs({
-            name: this._poNo
-          })}) {
+        query purchaseOrder($name: String!) {
+          purchaseOrder(name: $name) {
             id
             name
             remark
@@ -865,13 +863,13 @@ class PurchaseOrderApprovalDetail extends connect(store)(localize(i18next)(PageV
               name
               description
             }
-            supplier{
+            supplier {
               id
               name
               companyName
               description
             }
-            bufferLocation{
+            bufferLocation {
               id
               name
               description
@@ -890,7 +888,10 @@ class PurchaseOrderApprovalDetail extends connect(store)(localize(i18next)(PageV
             }
           }
         }
-      `
+      `,
+      variables: {
+        name: this._poNo
+      }
     })
 
     if (!response.errors) {

package/client/pages/purchase-order/purchase-order-approval-list.js

@@ -4,7 +4,7 @@ import '@things-factory/grist-ui'
 import { i18next, localize } from '@things-factory/i18n-base'
 import { client, navigate, PageView } from '@things-factory/shell'
 import { ScrollbarStyles, CommonButtonStyles } 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 } from 'lit-element'
 // import { ORDER_STATUS } from '../../constants'
@@ -235,12 +235,8 @@ class PurchaseOrderApprovalList extends localize(i18next)(PageView) {
   async fetchHandler({ page, limit, sorters = [{ name: 'createdAt', desc: true }] }) {
     const response = await client.query({
       query: gql`
-        query {
-          purchaseOrders(${gqlBuilder.buildArgs({
-            filters: this.searchForm.queryFilters,
-            pagination: { page, limit },
-            sortings: sorters
-          })}) {
+        query purchaseOrders($filters: [Filter!], $pagination: Pagination, $sortings: [Sorting!]) {
+          purchaseOrders(filters: $filters, pagination: $pagination, sortings: $sortings) {
             items {
               id
               name
@@ -256,8 +252,8 @@ class PurchaseOrderApprovalList extends localize(i18next)(PageView) {
               container
               ownTransport
               importCargo
-              currency              
-              arrivalNotice{
+              currency
+              arrivalNotice {
                 id
                 name
                 description
@@ -267,7 +263,7 @@ class PurchaseOrderApprovalList extends localize(i18next)(PageView) {
                 name
                 description
               }
-              supplier{
+              supplier {
                 id
                 name
                 description
@@ -288,7 +284,12 @@ class PurchaseOrderApprovalList extends localize(i18next)(PageView) {
             total
           }
         }
-      `
+      `,
+      variables: {
+        filters: this.searchForm.queryFilters,
+        pagination: { page, limit },
+        sortings: sorters
+      }
     })
 
     if (!response.errors) {
@@ -302,12 +303,8 @@ class PurchaseOrderApprovalList extends localize(i18next)(PageView) {
   async _fetchContactPoints() {
     const response = await client.query({
       query: gql`
-        query {
-          contactPoints(${gqlBuilder.buildArgs({
-            filters: [{ name: 'type', operator: 'eq', value: 'SUPPLIER' }],
-            pagination: { page: 0, limit: 999999 },
-            sortings: [{ name: 'name' }]
-          })}) {
+        query contactPoints($filters: [Filter!], $pagination: Pagination, $sortings: [Sorting!]) {
+          contactPoints(filters: $filters, pagination: $pagination, sortings: $sortings) {
             items {
               id
               name
@@ -315,7 +312,12 @@ class PurchaseOrderApprovalList extends localize(i18next)(PageView) {
             }
           }
         }
-      `
+      `,
+      variables: {
+        filters: [{ name: 'type', operator: 'eq', value: 'SUPPLIER' }],
+        pagination: { page: 0, limit: 999999 },
+        sortings: [{ name: 'name' }]
+      }
     })
 
     return response.data.contactPoints.items || []

package/client/pages/purchase-order/purchase-order-detail.js

@@ -13,7 +13,7 @@ import { openPopup } from '@things-factory/layout-base'
 import { fetchSettingRule } from '@things-factory/setting-ui'
 import { client, CustomAlert, navigate, PageView, store } from '@things-factory/shell'
 import { CommonButtonStyles } from '@things-factory/styles'
-import { flattenObject, gqlBuilder, isMobileDevice } from '@things-factory/utils'
+import { flattenObject, isMobileDevice } from '@things-factory/utils'
 
 import { PURCHASE_ORDER_STATUS } from '../../constants'
 
@@ -940,17 +940,23 @@ class PurchaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
         }
       }
 
-      const response = await client.query({
-        query: gql`
-            mutation ($attachments: Upload) {
-              upsertPurchaseOrder(${gqlBuilder.buildArgs(args)}, file:$attachments) {
-                id
-                name
-              }
+      const response = await client.mutate({
+        mutation: gql`
+          mutation upsertPurchaseOrder($purchaseOrder: PurchaseOrderPatch!, $attachments: Upload) {
+            upsertPurchaseOrder(purchaseOrder: $purchaseOrder, file: $attachments) {
+              id
+              name
             }
-          `,
+          }
+        `,
         variables: {
-          attachments
+          attachments,
+          purchaseOrder: {
+            ...purchaseOrder,
+            status,
+            ownTransport: this._purchaseOrderData?.importCargo ? true : this._purchaseOrderData?.ownTransport,
+            supplier: { id: purchaseOrder?.supplier?.id }
+          }
         },
         context: {
           hasUpload: true
@@ -984,10 +990,8 @@ class PurchaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
     this._status = ''
     const response = await client.query({
       query: gql`
-        query {
-          purchaseOrder(${gqlBuilder.buildArgs({
-            name: this._poNo
-          })}) {
+        query purchaseOrder($name: String!) {
+          purchaseOrder(name: $name) {
             id
             name
             remark
@@ -1051,13 +1055,13 @@ class PurchaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
               name
               description
             }
-            supplier{
+            supplier {
               id
               name
               companyName
               description
             }
-            bufferLocation{
+            bufferLocation {
               id
               name
               description
@@ -1076,7 +1080,10 @@ class PurchaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
             }
           }
         }
-      `
+      `,
+      variables: {
+        name: this._poNo
+      }
     })
 
     if (!response.errors) {

package/client/pages/purchase-order/purchase-order-list.js

@@ -4,7 +4,7 @@ import '@things-factory/grist-ui'
 import { i18next, localize } from '@things-factory/i18n-base'
 import { client, navigate, PageView } from '@things-factory/shell'
 import { ScrollbarStyles, CommonButtonStyles } 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 } from 'lit-element'
 // import { ORDER_STATUS } from '../../constants'
@@ -242,12 +242,8 @@ class PurchaseOrderList extends localize(i18next)(PageView) {
   async fetchHandler({ page, limit, sorters = [{ name: 'createdAt', desc: true }] }) {
     const response = await client.query({
       query: gql`
-        query {
-          purchaseOrders(${gqlBuilder.buildArgs({
-            filters: this.searchForm.queryFilters,
-            pagination: { page, limit },
-            sortings: sorters
-          })}) {
+        query purchaseOrders($filters: [Filter!], $pagination: Pagination, $sortings: [Sorting!]) {
+          purchaseOrders(filters: $filters, pagination: $pagination, sortings: $sortings) {
             items {
               id
               name
@@ -263,8 +259,8 @@ class PurchaseOrderList extends localize(i18next)(PageView) {
               container
               ownTransport
               importCargo
-              currency              
-              arrivalNotice{
+              currency
+              arrivalNotice {
                 id
                 name
                 description
@@ -274,7 +270,7 @@ class PurchaseOrderList extends localize(i18next)(PageView) {
                 name
                 description
               }
-              supplier{
+              supplier {
                 id
                 name
                 description
@@ -295,7 +291,12 @@ class PurchaseOrderList extends localize(i18next)(PageView) {
             total
           }
         }
-      `
+      `,
+      variables: {
+        filters: this.searchForm.queryFilters,
+        pagination: { page, limit },
+        sortings: sorters
+      }
     })
 
     if (!response.errors) {
@@ -317,12 +318,8 @@ class PurchaseOrderList extends localize(i18next)(PageView) {
   async _fetchContactPoints() {
     const response = await client.query({
       query: gql`
-        query {
-          contactPoints(${gqlBuilder.buildArgs({
-            filters: [{ name: 'type', operator: 'eq', value: 'SUPPLIER' }],
-            pagination: { page: 0, limit: 999999 },
-            sortings: [{ name: 'name' }]
-          })}) {
+        query contactPoints($filters: [Filter!], $pagination: Pagination, $sortings: [Sorting!]) {
+          contactPoints(filters: $filters, pagination: $pagination, sortings: $sortings) {
             items {
               id
               name
@@ -330,7 +327,12 @@ class PurchaseOrderList extends localize(i18next)(PageView) {
             }
           }
         }
-      `
+      `,
+      variables: {
+        filters: [{ name: 'type', operator: 'eq', value: 'SUPPLIER' }],
+        pagination: { page: 0, limit: 999999 },
+        sortings: [{ name: 'name' }]
+      }
     })
 
     return response.data.contactPoints.items || []

package/client/pages/vas-list.js

@@ -299,7 +299,7 @@ class VasList extends localize(i18next)(PageView) {
 
       const response = await client.mutate({
         mutation: gql`
-          mutation updateMultipleVas($patches: [VasPatch!]) {
+          mutation updateMultipleVas($patches: [VasPatch!]!) {
             updateMultipleVas(patches: $patches) {
               name
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/sales-ui",
-  "version": "4.0.26",
+  "version": "4.0.30",
   "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/code-base": "^4.0.26",
-    "@things-factory/form-ui": "^4.0.26",
-    "@things-factory/grist-ui": "^4.0.26",
-    "@things-factory/i18n-base": "^4.0.26",
-    "@things-factory/import-ui": "^4.0.26",
-    "@things-factory/sales-base": "^4.0.26",
-    "@things-factory/setting-ui": "^4.0.26",
-    "@things-factory/shell": "^4.0.26",
-    "@things-factory/warehouse-ui": "^4.0.26"
+    "@things-factory/code-base": "^4.0.30",
+    "@things-factory/form-ui": "^4.0.30",
+    "@things-factory/grist-ui": "^4.0.30",
+    "@things-factory/i18n-base": "^4.0.30",
+    "@things-factory/import-ui": "^4.0.30",
+    "@things-factory/sales-base": "^4.0.30",
+    "@things-factory/setting-ui": "^4.0.30",
+    "@things-factory/shell": "^4.0.30",
+    "@things-factory/warehouse-ui": "^4.0.30"
   },
-  "gitHead": "c4b39c74b9ce2472f30c26eb36ec62054c1ecf82"
+  "gitHead": "4ab590326e3fc60d113fb438e90eefee708f1f19"
 }