From 706d3882e4cc0a3ea7adbc56b70f1e8ff899f5de Mon Sep 17 00:00:00 2001 From: Jay07GIT Date: Tue, 15 Oct 2024 20:39:09 +0530 Subject: [PATCH 1/2] rearranged the DNS change export csv column --- .../dns-change-detail.controller.js | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/modules/portal/public/lib/dns-change/dns-change-detail.controller.js b/modules/portal/public/lib/dns-change/dns-change-detail.controller.js index 7c2d5cf5f..cb6153a25 100644 --- a/modules/portal/public/lib/dns-change/dns-change-detail.controller.js +++ b/modules/portal/public/lib/dns-change/dns-change-detail.controller.js @@ -143,21 +143,24 @@ var csv = []; var changes = document.querySelectorAll("table tr"); $log.debug(batchId) - for (var i = 0; i < changes.length; i++) { - var row = [], cols = changes[i].querySelectorAll("td, th"); + var colOrder = [0, 4, 1, 6, 5, 2, 3, 7, 8]; - for (var j = 0; j < cols.length; j++) { - row.push('"' + cols[j].innerText + '"'); - } + for (var i = 0; i < changes.length; i++) { + var row = [], cols = changes[i].querySelectorAll("td, th"); + + for (var j = 0; j < colOrder.length; j++) { + var colIndex = colOrder[j]; + if (cols[colIndex]) { + row.push('"' + cols[colIndex].innerText + '"'); + } + } csv.push(row.join(",")); } var csvFile = new Blob([csv.join("\n")], { type: "text/csv" }); - // Create a link to download it + // link to export csv var downloadBatchChanges = document.createElement("a"); downloadBatchChanges.download = filename; - - // Create a URL for the link downloadBatchChanges.href = window.URL.createObjectURL(csvFile); document.body.appendChild(downloadBatchChanges); downloadBatchChanges.click(); From 65a59a81fbc86f87ee1d74e912a6b89dc7920d76 Mon Sep 17 00:00:00 2001 From: Jay07GIT Date: Tue, 15 Oct 2024 20:53:47 +0530 Subject: [PATCH 2/2] rerun tests --- .../portal/public/lib/dns-change/dns-change-detail.controller.js | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/portal/public/lib/dns-change/dns-change-detail.controller.js b/modules/portal/public/lib/dns-change/dns-change-detail.controller.js index cb6153a25..cc810625f 100644 --- a/modules/portal/public/lib/dns-change/dns-change-detail.controller.js +++ b/modules/portal/public/lib/dns-change/dns-change-detail.controller.js @@ -157,7 +157,6 @@ csv.push(row.join(",")); } var csvFile = new Blob([csv.join("\n")], { type: "text/csv" }); - // link to export csv var downloadBatchChanges = document.createElement("a"); downloadBatchChanges.download = filename;