From eae31eac373940562ca4c5c954ba02087440d094 Mon Sep 17 00:00:00 2001 From: Shekar Siri Date: Mon, 9 May 2022 19:34:59 +0200 Subject: [PATCH] feat(ui) - audit - date --- frontend/app/mstore/auditStore.ts | 10 +++++++--- frontend/app/utils.js | 10 +--------- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/frontend/app/mstore/auditStore.ts b/frontend/app/mstore/auditStore.ts index de7bd4433..efc34d65d 100644 --- a/frontend/app/mstore/auditStore.ts +++ b/frontend/app/mstore/auditStore.ts @@ -4,6 +4,8 @@ import Audit from './types/audit' import Period, { LAST_7_DAYS } from 'Types/app/period'; import { toast } from 'react-toastify'; import { exportCSVFile } from 'App/utils'; +import { formatDateTimeDefault } from 'App/date'; +import { DateTime, Duration } from 'luxon'; // TODO export default class AuditStore { list: any[] = []; @@ -60,11 +62,13 @@ export default class AuditStore { { label: 'Method', key: 'method' }, { label: 'Action', key: 'action' }, { label: 'Endpoint', key: 'endpoint' }, - // { label: 'Status', key: 'status' }, { label: 'Created At', key: 'createdAt' }, ] - // console.log('data', data) - exportCSVFile(headers, data.sessions, `audit-${new Date().toLocaleDateString()}.csv`); + data = data.sessions.map(item => ({ + ...item, + createdAt: DateTime.fromMillis(item.createdAt).toFormat('LLL dd yyyy hh:mm a') + })) + exportCSVFile(headers, data, `audit-${new Date().toLocaleDateString()}`); resolve(data) }).catch(error => { reject(error) diff --git a/frontend/app/utils.js b/frontend/app/utils.js index be25b585e..029e24599 100644 --- a/frontend/app/utils.js +++ b/frontend/app/utils.js @@ -279,10 +279,7 @@ export const convertToCSV = (headers, objArray) => { acc[curr.key] = curr; return acc; }, {}); - console.log('headersMap', headersMap) - // csv header line - // comma seprated header line from array str += headers.map(h => h.label).join(',') + '\r\n'; for (var i = 0; i < array.length; i++) { @@ -299,10 +296,6 @@ export const convertToCSV = (headers, objArray) => { } export const exportCSVFile = (headers, items, fileTitle) => { - // if (headers) { - // items.unshift(headers); - // } - var jsonObject = JSON.stringify(items); var csv = convertToCSV(headers, jsonObject); var exportedFilenmae = fileTitle + '.csv' || 'export.csv'; @@ -312,8 +305,7 @@ export const exportCSVFile = (headers, items, fileTitle) => { navigator.msSaveBlob(blob, exportedFilenmae); } else { var link = document.createElement("a"); - if (link.download !== undefined) { // feature detection - // Browsers that support HTML5 download attribute + if (link.download !== undefined) { var url = URL.createObjectURL(blob); link.setAttribute("href", url); link.setAttribute("download", exportedFilenmae);