From 6a6a0b44ddf98aafc8871a8d443e3f5536329e34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bernardo=20De=20Marco=20Gon=C3=A7alves?= Date: Fri, 7 Feb 2025 21:51:52 -0300 Subject: [PATCH 1/2] fix group actions validation --- ui/src/config/section/network.js | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/ui/src/config/section/network.js b/ui/src/config/section/network.js index f0415a783a5f..179f230c1d19 100644 --- a/ui/src/config/section/network.js +++ b/ui/src/config/section/network.js @@ -840,10 +840,13 @@ export default { message: 'message.action.release.ip', docHelp: 'adminguide/networking_and_traffic.html#releasing-an-ip-address-alloted-to-a-vpc', dataView: true, - show: (record) => { return record.state === 'Allocated' && !record.issourcenat }, + show: (record) => { return record.state === 'Allocated' && !record.issourcenat && !record.issystem }, groupAction: true, popup: true, - groupMap: (selection) => { return selection.map(x => { return { id: x } }) } + groupMap: (selection) => { return selection.map(x => { return { id: x } }) }, + groupShow: (selectedIps) => { + return selectedIps.every((ip) => ip.state === 'Allocated' && !ip.issourcenat && !ip.issystem) + } }, { api: 'reserveIpAddress', @@ -863,7 +866,10 @@ export default { show: (record) => { return record.state === 'Reserved' }, groupAction: true, popup: true, - groupMap: (selection) => { return selection.map(x => { return { id: x } }) } + groupMap: (selection) => { return selection.map(x => { return { id: x } }) }, + groupShow: (selectedIps) => { + return selectedIps.every((ip) => ip.state === 'Reserved') + } } ] }, From 489c3ad9fbc3ccf26f7a40e1a0e33e86ae080622 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bernardo=20De=20Marco=20Gon=C3=A7alves?= Date: Fri, 7 Feb 2025 21:52:10 -0300 Subject: [PATCH 2/2] format allocated datetime and add system label --- ui/src/components/view/ListView.vue | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ui/src/components/view/ListView.vue b/ui/src/components/view/ListView.vue index 0c19ea8edab9..8f4e58e93c73 100644 --- a/ui/src/components/view/ListView.vue +++ b/ui/src/components/view/ListView.vue @@ -149,6 +149,10 @@   static-nat + +   + system + -