This is an automated email from the ASF dual-hosted git repository.
husseinawala pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/main by this push:
new eed09daad3 Fix a bug in formatDuration method (#33486)
eed09daad3 is described below
commit eed09daad3278706da29c8f172899e67ecadc40a
Author: Hussein Awala <[email protected]>
AuthorDate: Fri Aug 18 08:46:59 2023 +0200
Fix a bug in formatDuration method (#33486)
---
airflow/www/static/js/cluster-activity/nav/FilterBar.tsx | 2 +-
airflow/www/static/js/datetime_utils.js | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/airflow/www/static/js/cluster-activity/nav/FilterBar.tsx
b/airflow/www/static/js/cluster-activity/nav/FilterBar.tsx
index 6cae7854f1..b4f840cb5f 100644
--- a/airflow/www/static/js/cluster-activity/nav/FilterBar.tsx
+++ b/airflow/www/static/js/cluster-activity/nav/FilterBar.tsx
@@ -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>
diff --git a/airflow/www/static/js/datetime_utils.js
b/airflow/www/static/js/datetime_utils.js
index c23f8d665e..5eb1f1defb 100644
--- a/airflow/www/static/js/datetime_utils.js
+++ b/airflow/www/static/js/datetime_utils.js
@@ -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"))
