From a9b5d04bda08478f863a024244634bc9eedec76b Mon Sep 17 00:00:00 2001 From: jpaul Date: Tue, 28 Nov 2023 14:22:17 +0100 Subject: [PATCH] adjust timestamp to iso time --- dist/cleanup/index.js | 9 ++++----- dist/main/index.js | 9 ++++----- src/features/reports.ts | 7 ------- src/utils.ts | 5 ++++- 4 files changed, 12 insertions(+), 18 deletions(-) diff --git a/dist/cleanup/index.js b/dist/cleanup/index.js index 6ba6719..019e6d1 100644 --- a/dist/cleanup/index.js +++ b/dist/cleanup/index.js @@ -81869,7 +81869,6 @@ function generateReports() { // Prepare data const timestamps = []; const shas = []; - // core.info("pushEvents: " + pushEvents[0].created_at) for (let i = 0; i < pushEvents.length; i++) { timestamps.push(pushEvents[i].created_at); shas.push(pushEvents[i].payload.commits[pushEvents[i].payload.commits.length - 1].sha); @@ -81877,11 +81876,8 @@ function generateReports() { const imageData = yield (0, utils_1.getImageData)(shas); const commitDates = (0, utils_1.formatTimestamps)(timestamps); const mermaidDiagramm = createHistoryDiagramm(shas, imageData, commitDates); - core.info(mermaidDiagramm); core.summary.addRaw(mermaidDiagramm); yield core.summary.write(); - // Extract data for plotting - core.info(JSON.stringify(commitDates)); } if (arePRBaseComparisonEnabled()) { const prMetrics = JSON.parse(yield (0, utils_1.getPrBaseBranchMetrics)()); @@ -82596,7 +82592,10 @@ function formatTimestamps(timestamps) { const formattedTimestamps = []; for (let i = 0; i < timestamps.length; i++) { let commitTime = luxon_1.DateTime.fromISO(timestamps[i]); - formattedTimestamps.push(commitTime.toISODate()); + let commitTimeUtc = commitTime.setZone('UTC'); + let commitTimeLocal = commitTimeUtc.setZone('Europe/Berlin'); + let formatter = 'dd/MM/YYYY'; + formattedTimestamps.push(commitTimeLocal.toFormat(formatter)); } return (formattedTimestamps); } diff --git a/dist/main/index.js b/dist/main/index.js index 0720636..3022279 100644 --- a/dist/main/index.js +++ b/dist/main/index.js @@ -81968,7 +81968,6 @@ function generateReports() { // Prepare data const timestamps = []; const shas = []; - // core.info("pushEvents: " + pushEvents[0].created_at) for (let i = 0; i < pushEvents.length; i++) { timestamps.push(pushEvents[i].created_at); shas.push(pushEvents[i].payload.commits[pushEvents[i].payload.commits.length - 1].sha); @@ -81976,11 +81975,8 @@ function generateReports() { const imageData = yield (0, utils_1.getImageData)(shas); const commitDates = (0, utils_1.formatTimestamps)(timestamps); const mermaidDiagramm = createHistoryDiagramm(shas, imageData, commitDates); - core.info(mermaidDiagramm); core.summary.addRaw(mermaidDiagramm); yield core.summary.write(); - // Extract data for plotting - core.info(JSON.stringify(commitDates)); } if (arePRBaseComparisonEnabled()) { const prMetrics = JSON.parse(yield (0, utils_1.getPrBaseBranchMetrics)()); @@ -83672,7 +83668,10 @@ function formatTimestamps(timestamps) { const formattedTimestamps = []; for (let i = 0; i < timestamps.length; i++) { let commitTime = luxon_1.DateTime.fromISO(timestamps[i]); - formattedTimestamps.push(commitTime.toISODate()); + let commitTimeUtc = commitTime.setZone('UTC'); + let commitTimeLocal = commitTimeUtc.setZone('Europe/Berlin'); + let formatter = 'dd/MM/YYYY'; + formattedTimestamps.push(commitTimeLocal.toFormat(formatter)); } return (formattedTimestamps); } diff --git a/src/features/reports.ts b/src/features/reports.ts index cc04478..f64ae5f 100644 --- a/src/features/reports.ts +++ b/src/features/reports.ts @@ -154,7 +154,6 @@ export async function generateReports(): Promise { // Prepare data const timestamps = [] const shas = [] - // core.info("pushEvents: " + pushEvents[0].created_at) for (let i=0; i < pushEvents.length; i++) { timestamps.push(pushEvents[i].created_at) shas.push(pushEvents[i].payload.commits[pushEvents[i].payload.commits.length - 1].sha) @@ -163,14 +162,8 @@ export async function generateReports(): Promise { const imageData = await getImageData(shas) const commitDates = formatTimestamps(timestamps) const mermaidDiagramm = createHistoryDiagramm(shas, imageData, commitDates) - core.info(mermaidDiagramm) core.summary.addRaw(mermaidDiagramm) await core.summary.write() - - // Extract data for plotting - core.info(JSON.stringify(commitDates)) - - } if (arePRBaseComparisonEnabled()) { diff --git a/src/utils.ts b/src/utils.ts index 1c511fa..e8d458b 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -380,7 +380,10 @@ export function formatTimestamps(timestamps: string[]) { const formattedTimestamps = [] for (let i=0; i