Skip to content

Commit 6e50e10

Browse files
authored
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 <abhishek.mrt22@gmail.com>
1 parent 470ceb4 commit 6e50e10

File tree

1 file changed

+33
-2
lines changed

1 file changed

+33
-2
lines changed

ui/src/views/compute/wizard/NetworkSelection.vue

Lines changed: 33 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
:placeholder="$t('label.search')"
2323
v-model="filter"
2424
@search="handleSearch" />
25-
<a-button type="primary" @click="showCreateForm = true" style="float: right; margin-right: 5px; z-index: 8">
25+
<a-button type="primary" @click="onCreateNetworkClick" style="float: right; margin-right: 5px; z-index: 8">
2626
{{ $t('label.create.network') }}
2727
</a-button>
2828
<a-table
@@ -139,7 +139,8 @@ export default {
139139
page: 1,
140140
pageSize: 10,
141141
keyword: null
142-
}
142+
},
143+
networksBeforeCreate: null
143144
}
144145
},
145146
computed: {
@@ -222,6 +223,32 @@ export default {
222223
}
223224
}
224225
}
226+
},
227+
items () {
228+
if (this.items && this.items.length > 0 &&
229+
this.networksBeforeCreate) {
230+
var user = this.$store.getters.userInfo
231+
for (var network of this.items) {
232+
if (user.account !== network.account ||
233+
user.domainid !== network.domainid ||
234+
(new Date()).getTime() - Date.parse(network.created) > 30000) {
235+
continue
236+
}
237+
var networkFoundInNewList = false
238+
for (var oldNetwork of this.networksBeforeCreate) {
239+
if (oldNetwork.id === network.id) {
240+
networkFoundInNewList = true
241+
break
242+
}
243+
}
244+
if (!networkFoundInNewList) {
245+
this.selectedRowKeys.push(network.id)
246+
this.$emit('select-network-item', this.selectedRowKeys)
247+
break
248+
}
249+
}
250+
this.networksBeforeCreate = null
251+
}
225252
}
226253
},
227254
beforeCreate () {
@@ -289,6 +316,10 @@ export default {
289316
resolve(error)
290317
})
291318
})
319+
},
320+
onCreateNetworkClick () {
321+
this.networksBeforeCreate = this.items
322+
this.showCreateForm = true
292323
}
293324
}
294325
}

0 commit comments

Comments
 (0)