Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 23 additions & 16 deletions ui/src/views/iam/AddAccount.vue
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@
<tooltip-label :title="$t('label.domainid')" :tooltip="apiParams.domainid.description"/>
</template>
<a-select
:loading="domainLoading"
:loading="domain.loading"
v-model:value="form.domainid"
:placeholder="apiParams.domainid.description"
showSearch
Expand Down Expand Up @@ -207,7 +207,7 @@ export default {
this.fetchTimeZone = debounce(this.fetchTimeZone, 800)
return {
loading: false,
domainLoading: false,
domain: { loading: false },
domainsList: [],
roleLoading: false,
roles: [],
Expand Down Expand Up @@ -282,21 +282,28 @@ export default {
}
},
fetchDomains () {
this.domainLoading = true
api('listDomains', {
listAll: true,
showicon: true,
details: 'min'
}).then(response => {
this.domainsList = response.listdomainsresponse.domain || []
this.form.domain = this.domainsList[0].id || ''
}).catch(error => {
this.$notification.error({
message: `${this.$t('label.error')} ${error.response.status}`,
description: error.response.data.errorresponse.errortext
})
this.domain.loading = true
this.loadMore('listDomains', 1, this.domain)
},
loadMore (apiToCall, page, sema) {
console.log('sema.loading ' + sema.loading)
const params = {}
params.listAll = true
params.details = 'min'
params.pagesize = 100
params.page = page
var count
api(apiToCall, params).then(json => {
const listDomains = json.listdomainsresponse.domain
count = json.listdomainsresponse.count
this.domainsList = this.domainsList.concat(listDomains)
}).finally(() => {
this.domainLoading = false
if (count <= this.domainsList.length) {
sema.loading = false
} else {
this.loadMore(apiToCall, page + 1, sema)
}
this.form.domainid = 0
})
},
fetchRoles () {
Expand Down
21 changes: 16 additions & 5 deletions ui/src/views/network/CreateIsolatedNetworkForm.vue
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
:filterOption="(input, option) => {
return option.children[0].children.toLowerCase().indexOf(input.toLowerCase()) >= 0
}"
:loading="domainLoading"
:loading="domain.loading"
:placeholder="apiParams.domainid.description"
@change="val => { handleDomainChange(domains[val]) }">
<a-select-option v-for="(opt, optIndex) in domains" :key="optIndex">
Expand Down Expand Up @@ -345,7 +345,7 @@ export default {
return {
actionLoading: false,
domains: [],
domainLoading: false,
domain: { loading: false },
selectedDomain: {},
accountVisible: isAdminOrDomainAdmin(),
accounts: [],
Expand Down Expand Up @@ -459,15 +459,26 @@ export default {
this.updateVPCCheckAndFetchNetworkOfferingData()
},
fetchDomainData () {
this.domain.loading = true
this.loadMore('listDomains', 1, this.domain)
},
loadMore (apiToCall, page, sema) {
const params = {}
params.listAll = true
params.details = 'min'
this.domainLoading = true
api('listDomains', params).then(json => {
params.pagesize = 100
params.page = page
var count
api(apiToCall, params).then(json => {
const listDomains = json.listdomainsresponse.domain
count = json.listdomainsresponse.count
this.domains = this.domains.concat(listDomains)
}).finally(() => {
this.domainLoading = false
if (count <= this.domains.length) {
sema.loading = false
} else {
this.loadMore(apiToCall, page + 1, sema)
}
this.form.domainid = 0
this.handleDomainChange(this.domains[0])
})
Expand Down