@things-factory/integration-accounting 10.1.255 → 10.1.257

package/client/pages/account-xero.ts

@@ -1,6 +1,7 @@
 import gql from 'graphql-tag'
 import { css, html } from 'lit'
 import { client, PageView, store } from '@things-factory/shell'
+import { MutationController, QueryController } from '@operato/graphql'
 
 import LOGO from '../../assets/images/xero-logo.png'
 
@@ -121,11 +122,65 @@ class AccountXero extends PageView {
   static get properties() {
     return {
       id: String,
-      account: Object,
       code: String,
-      accountId: String,
-      accessInfo: Object,
-      connectionInfo: Object
+      accountId: String
+    }
+  }
+
+  /* The account the address names (ADR-0190). */
+  read = new QueryController(
+    this,
+    gql`
+      query account($id: String!) {
+        account(id: $id) ${ACCOUNT_RESULT}
+      }
+    `,
+    { variables: () => (this.id ? { id: this.id } : undefined) }
+  )
+
+  get account() {
+    return this.read.data?.account
+  }
+
+  deactivating = new MutationController(
+    this,
+    gql`
+      mutation deactivateXeroAccount($id: String!) {
+        deactivateXeroAccount(id: $id) {
+          status
+        }
+      }
+    `,
+    { refetch: () => [this.read] }
+  )
+
+  refreshing = new MutationController(
+    this,
+    gql`
+      mutation refreshXeroAccessToken($id: String!) {
+        refreshXeroAccessToken(id: $id) {
+          id
+        }
+      }
+    `,
+    { refetch: () => [this.read] }
+  )
+
+  get accessInfo() {
+    return this.parsed('accessInfo')
+  }
+
+  get connectionInfo() {
+    return this.parsed('accountInfo')
+  }
+
+  parsed(field) {
+    if (this.account?.status != 'active') return {}
+    try {
+      return JSON.parse(this.account[field])
+    } catch (e) {
+      console.error(e)
+      return {}
     }
   }
 
@@ -185,44 +240,10 @@ class AccountXero extends PageView {
     `
   }
 
-  updated(changed) {
-    if (changed.has('account')) {
-      var active = this.account && this.account.status == 'active'
-
-      try {
-        this.accessInfo = active ? JSON.parse(this.account.accessInfo) : {}
-      } catch (e) {
-        console.error(e)
-        this.accessInfo = {}
-      }
-
-      try {
-        this.connectionInfo = active ? JSON.parse(this.account.accountInfo) : {}
-      } catch (e) {
-        console.error(e)
-        this.connectionInfo = {}
-      }
-    }
-  }
-
   async pageUpdated(changes, after, before) {
-    /* refresh always page revisited */
     if (this.lifecycle.resourceId) {
       this.id = this.lifecycle.resourceId
 
-      const response = await client.query({
-        query: gql`
-          query account($id: String!) {
-            account(id: $id) ${ACCOUNT_RESULT}
-          }
-        `,
-        variables: {
-          id: this.id
-        }
-      })
-
-      this.account = response.data.account
-
       if (location.pathname.endsWith('connect-callback')) {
         let { status, message } = changes.params
 
@@ -264,19 +285,9 @@ class AccountXero extends PageView {
   async deactivate() {
     const { id, name } = this.account
 
-    var response = await client.mutate({
-      mutation: gql`
-        mutation deactivateXeroAccount($id: String!) {
-          deactivateXeroAccount(id: $id) ${ACCOUNT_RESULT}
-        }
-      `,
-      variables: {
-        id
-      }
-    })
-
-    this.account = response.data.deactivateXeroAccount
-    var { status } = this.account
+    const deactivated = await this.deactivating.run({ id })
+    if (!deactivated) return
+    const { status } = deactivated.deactivateXeroAccount
 
     document.dispatchEvent(
       new CustomEvent('notify', {
@@ -291,26 +302,14 @@ class AccountXero extends PageView {
   async refreshToken() {
     const { id, name } = this.account
 
-    var response = await client.mutate({
-      mutation: gql`
-        mutation refreshXeroAccessToken($id: String!) {
-          refreshXeroAccessToken(id: $id) ${ACCOUNT_RESULT}
-        }
-      `,
-      variables: {
-        id
-      }
-    })
-
-    if (!response.errors) {
-      this.account = response.data.refreshXeroAccessToken
-    }
+    /* A failure is reported by the client. */
+    if (!(await this.refreshing.run({ id }))) return
 
     document.dispatchEvent(
       new CustomEvent('notify', {
         detail: {
           level: 'info',
-          message: `${response.errors ? 'fail' : 'success'} to refresh : ${name}`
+          message: `success to refresh : ${name}`
         }
       })
     )

package/client/pages/create-account-popup.ts

@@ -94,8 +94,8 @@ class CreateAccountPopup extends localize(i18next)(LitElement) {
 
   async _createAccount() {
     try {
-      const response = await client.query({
-        query: gql`
+      const response = await client.mutate({
+        mutation: gql`
           mutation {
             createAccount(${gqlBuilder.buildArgs({
               account: this._getAccountInfo()