From 6e50e10470c3fa3355c78cd2df804d98ace72fe1 Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Tue, 14 Sep 2021 09:04:10 +0530 Subject: [PATCH] ui: select newly created network in deploy vm (#5423) Form tries to find newly created network which belongs to the same account, created in last 30s and was not present in the networks list before opening create network dialog. Signed-off-by: Abhishek Kumar --- .../views/compute/wizard/NetworkSelection.vue | 35 +++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/ui/src/views/compute/wizard/NetworkSelection.vue b/ui/src/views/compute/wizard/NetworkSelection.vue index ea04cbebe7c..c2ce608b988 100644 --- a/ui/src/views/compute/wizard/NetworkSelection.vue +++ b/ui/src/views/compute/wizard/NetworkSelection.vue @@ -22,7 +22,7 @@ :placeholder="$t('label.search')" v-model="filter" @search="handleSearch" /> - + {{ $t('label.create.network') }} 0 && + this.networksBeforeCreate) { + var user = this.$store.getters.userInfo + for (var network of this.items) { + if (user.account !== network.account || + user.domainid !== network.domainid || + (new Date()).getTime() - Date.parse(network.created) > 30000) { + continue + } + var networkFoundInNewList = false + for (var oldNetwork of this.networksBeforeCreate) { + if (oldNetwork.id === network.id) { + networkFoundInNewList = true + break + } + } + if (!networkFoundInNewList) { + this.selectedRowKeys.push(network.id) + this.$emit('select-network-item', this.selectedRowKeys) + break + } + } + this.networksBeforeCreate = null + } } }, beforeCreate () { @@ -289,6 +316,10 @@ export default { resolve(error) }) }) + }, + onCreateNetworkClick () { + this.networksBeforeCreate = this.items + this.showCreateForm = true } } }