Skip to content

Commit 686b387

Browse files
committed
Add filter on restart required
1 parent b2fdde7 commit 686b387

File tree

3 files changed

+19
-3
lines changed

3 files changed

+19
-3
lines changed

ui/src/components/view/ListView.vue

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,12 @@
8989
<span v-else>
9090
<router-link :to="{ path: $route.path + '/' + record.id }" v-if="record.id">{{ text }}</router-link>
9191
<router-link :to="{ path: $route.path + '/' + record.name }" v-else>{{ text }}</router-link>
92+
<span v-if="['guestnetwork','vpc'].includes($route.path.split('/')[1]) && record.restartrequired">
93+
<a-tooltip>
94+
<template #title>{{ $t('label.restartrequired') }}</template>
95+
<warning-outlined />
96+
</a-tooltip>
97+
</span>
9298
</span>
9399
</span>
94100
</template>

ui/src/components/view/SearchView.vue

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ export default {
292292
}
293293
if (['zoneid', 'domainid', 'imagestoreid', 'storageid', 'state', 'account', 'hypervisor', 'level',
294294
'clusterid', 'podid', 'groupid', 'entitytype', 'accounttype', 'systemvmtype', 'scope', 'provider',
295-
'type', 'scope', 'managementserverid', 'serviceofferingid', 'diskofferingid'].includes(item)
295+
'type', 'scope', 'managementserverid', 'serviceofferingid', 'diskofferingid', 'restartrequired'].includes(item)
296296
) {
297297
type = 'list'
298298
} else if (item === 'tags') {
@@ -382,6 +382,16 @@ export default {
382382
this.fields[providerIndex].loading = false
383383
}
384384
385+
if (arrayField.includes('restartrequired')) {
386+
const restartRequiredIndex = this.fields.findIndex(item => item.name === 'restartrequired')
387+
this.fields[restartRequiredIndex].loading = true
388+
this.fields[restartRequiredIndex].opts = [
389+
{ id: 'true', name: 'label.yes' },
390+
{ id: 'false', name: 'label.no' }
391+
]
392+
this.fields[restartRequiredIndex].loading = false
393+
}
394+
385395
if (arrayField.includes('resourcetype')) {
386396
const resourceTypeIndex = this.fields.findIndex(item => item.name === 'resourcetype')
387397
this.fields[resourceTypeIndex].loading = true

ui/src/config/section/network.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ export default {
5454
return fields
5555
},
5656
filters: ['all', 'account', 'domainpath', 'shared'],
57-
searchFilters: ['keyword', 'zoneid', 'domainid', 'account', 'type', 'tags'],
57+
searchFilters: ['keyword', 'zoneid', 'domainid', 'account', 'type', 'restartrequired', 'tags'],
5858
related: [{
5959
name: 'vm',
6060
title: 'label.instances',
@@ -212,7 +212,7 @@ export default {
212212
return fields
213213
},
214214
details: ['name', 'id', 'displaytext', 'cidr', 'networkdomain', 'ip6routes', 'ispersistent', 'redundantvpcrouter', 'restartrequired', 'zonename', 'account', 'domain', 'dns1', 'dns2', 'ip6dns1', 'ip6dns2', 'publicmtu'],
215-
searchFilters: ['name', 'zoneid', 'domainid', 'account', 'tags'],
215+
searchFilters: ['name', 'zoneid', 'domainid', 'account', 'restartrequired', 'tags'],
216216
related: [{
217217
name: 'vm',
218218
title: 'label.instances',

0 commit comments

Comments
 (0)