Skip to content
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

Jump to bottom

Fix a bug in js formatDuration method #33486

Merged
merged 1 commit into from
Aug 18, 2023
Merged

Fix a bug in js formatDuration method #33486

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion airflow/www/static/js/cluster-activity/nav/FilterBar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ const FilterBar = () => {
</Box>
<Flex alignItems="center">
<Text whiteSpace="nowrap">
over the last{" "}
for a period of{" "}
{formatDuration(getDuration(formattedStartDate, formattedEndDate))}
</Text>
</Flex>
Expand Down
3 changes: 2 additions & 1 deletion airflow/www/static/js/datetime_utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,8 @@ export const getDuration = (startDate, endDate) =>

export const formatDuration = (dur) => {
const duration = moment.duration(dur);
const days = duration.days();
const totalDays = duration.asDays();
const days = Math.floor(totalDays);
// .as('milliseconds') is necessary for .format() to work correctly
return `${days > 0 ? `${days}d` : ""}${moment
.utc(duration.as("milliseconds"))
Expand Down