From c24353edf271f07442fdb39153805c75769ff802 Mon Sep 17 00:00:00 2001 From: Roland Date: Sun, 2 Apr 2023 12:19:15 -0600 Subject: [PATCH] Showing 'now' when next_download time has been passed. --- app/src/components/admin/Downloads.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/app/src/components/admin/Downloads.js b/app/src/components/admin/Downloads.js index 9494e692..ee6814ca 100644 --- a/app/src/components/admin/Downloads.js +++ b/app/src/components/admin/Downloads.js @@ -155,6 +155,14 @@ class DownloadRow extends React.Component { /> ; + // Show "now" if we have passed the next_download. + let next = 'now'; + if (next_download) { + if (new Date() < new Date(next_download)) { + next = isoDatetimeToElapsedPopup(next_download); + } + } + return {link(textEllipsis(url, 50))} @@ -164,7 +172,7 @@ class DownloadRow extends React.Component { {last_successful_download ? isoDatetimeToElapsedPopup(last_successful_download) : null} {status === 'pending' ? : null} - {next_download ? isoDatetimeToElapsedPopup(next_download) : null} + {next} {error && errorModal} {deleteButton}