From 9835310f89f8e66dc18357208de9ad635ee722b1 Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Fri, 24 May 2024 11:31:59 +0530 Subject: [PATCH 1/2] ui: fix columns for exportacls csv Fixes #8862 Signed-off-by: Abhishek Kumar --- ui/src/views/network/AclListRulesTab.vue | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ui/src/views/network/AclListRulesTab.vue b/ui/src/views/network/AclListRulesTab.vue index 4207a4629823..7eb3577bbf62 100644 --- a/ui/src/views/network/AclListRulesTab.vue +++ b/ui/src/views/network/AclListRulesTab.vue @@ -321,6 +321,12 @@ export default { } keys = Object.keys(data[0]) + for (var i = 1; i < data.length; ++i) { + const rowKeys = Object.keys(data[i]) + if (rowKeys.length > keys.length) { + keys = rowKeys + } + } result = '' result += keys.join(columnDelimiter) From 7d8bacd27c1c5a4321c14f429acb637cecec728e Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Fri, 24 May 2024 13:41:18 +0530 Subject: [PATCH 2/2] fix Signed-off-by: Abhishek Kumar --- ui/src/views/network/AclListRulesTab.vue | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ui/src/views/network/AclListRulesTab.vue b/ui/src/views/network/AclListRulesTab.vue index 7eb3577bbf62..d3927c3b32d2 100644 --- a/ui/src/views/network/AclListRulesTab.vue +++ b/ui/src/views/network/AclListRulesTab.vue @@ -323,9 +323,7 @@ export default { keys = Object.keys(data[0]) for (var i = 1; i < data.length; ++i) { const rowKeys = Object.keys(data[i]) - if (rowKeys.length > keys.length) { - keys = rowKeys - } + keys = keys.concat(rowKeys.filter(k => !keys.includes(k))) } result = ''