Merge branch '4.22'

ui/src/components/view/DomainDeleteConfirm.vue

@@ -59,7 +59,7 @@
 </template>
 
 <script>
-import { api } from '@/api'
+import { getAPI } from '@/api'
 
 export default {
   name: 'DomainDeleteConfirm',
@@ -104,7 +104,7 @@ export default {
     async fetchDomainImpact () {
       this.loading = true
       try {
-        const accResp = await api('listAccounts', {
+        const accResp = await getAPI('listAccounts', {
           domainid: this.domain.id,
           listall: true
         })
@@ -115,7 +115,7 @@ export default {
             ? accResp.listaccountsresponse.account
             : []
 
-        const vmResp = await api('listVirtualMachines', {
+        const vmResp = await getAPI('listVirtualMachines', {
           domainid: this.domain.id,
           listall: true
         })

ui/src/views/iam/DomainView.vue

@@ -334,7 +334,7 @@ export default {
       const domain = this.deleteDomainResource
       const params = { id: domain.id, cleanup: true }
 
-      api('deleteDomain', params).then(json => {
+      callAPI('deleteDomain', params).then(json => {
         const jobId = json.deletedomainresponse.jobid
 
         this.$pollJob({

ui/src/views/image/UpdateTemplate.vue

@@ -260,7 +260,7 @@ export default {
       userdatapolicy: null,
       userdatapolicylist: {},
       architectureTypes: {},
-      originalOstypeid: null
+      originalOstypeid: null,
       detailsFields: [],
       details: {}
     }
@@ -511,7 +511,7 @@ export default {
       params.id = this.resource.id
       params.templatefilter = 'all'
 
-      api('listTemplates', params).then(response => {
+      getAPI('listTemplates', params).then(response => {
         if (response?.listtemplatesresponse?.template?.length > 0) {
           this.details = response.listtemplatesresponse.template[0].details
           if (this.details) {