Skip to content

Show hours in artifact expiry instead of "expired" for sub-day expiries #9468

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fqueze wants to merge 1 commit into
base: master
Choose a base branch
from
+6 −3
Open

Show hours in artifact expiry instead of "expired" for sub-day expiries #9468

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions ui/helpers/display.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,12 @@ export const formatByteSize = function formatByteSize(bytes) {

export const formatExpires = function formatExpires(expires) {
if (!expires) return '';
const days = Math.floor((new Date(expires).getTime() - Date.now()) / 86400000);
if (Number.isNaN(days)) return '';
if (days <= 0) return 'expired';
const ms = new Date(expires).getTime() - Date.now();
if (Number.isNaN(ms)) return '';
if (ms <= 0) return 'expired';
const hours = Math.floor(ms / 3600000);
if (hours < 24) return `${hours}h`;
const days = Math.floor(hours / 24);
if (days < 60) return `${days}d`;
return `${Math.floor(days / 30)}mo`;
};
Expand Down