From c43f85f1b347e10e74feaa026329840b13487580 Mon Sep 17 00:00:00 2001 From: Siarhei Iukou Date: Tue, 21 May 2024 06:26:58 +0300 Subject: [PATCH 1/2] EPMRPP-89534 || Migrate service API dates from ms to microseconds UI issues --- .../charts/failedCasesTrendChart/config/utils.js | 2 +- .../charts/investigatedTrendChart/config/utils.js | 2 +- .../charts/launchStatisticsChart/config/utils.js | 2 +- .../charts/launchesComparisonChart/config/utils.js | 2 +- .../nonPassedTestCasesTrendChart/config/utils.js | 2 +- .../testCasesGrowthTrendChart/config/utils.js | 2 +- .../tables/projectActivity/projectActivity.jsx | 2 +- app/src/pages/inside/common/itemInfo/itemInfo.jsx | 13 +++++++------ 8 files changed, 14 insertions(+), 13 deletions(-) diff --git a/app/src/components/widgets/singleLevelWidgets/charts/failedCasesTrendChart/config/utils.js b/app/src/components/widgets/singleLevelWidgets/charts/failedCasesTrendChart/config/utils.js index 736af975ee..12aa6acdb1 100644 --- a/app/src/components/widgets/singleLevelWidgets/charts/failedCasesTrendChart/config/utils.js +++ b/app/src/components/widgets/singleLevelWidgets/charts/failedCasesTrendChart/config/utils.js @@ -47,7 +47,7 @@ export const calculateTooltipParams = (data, color, customProps) => { return { itemName: `${name} #${number}`, - startTime: Number(startTime), + startTime: new Date(startTime).getTime(), itemCases: `${value} ${formatMessage(messages.cases)}`, color: color(id), issueStatNameProps: { itemName: formatMessage(statusLocalization[FAILED]) }, diff --git a/app/src/components/widgets/singleLevelWidgets/charts/investigatedTrendChart/config/utils.js b/app/src/components/widgets/singleLevelWidgets/charts/investigatedTrendChart/config/utils.js index bc6b473bc1..1cb39b905a 100644 --- a/app/src/components/widgets/singleLevelWidgets/charts/investigatedTrendChart/config/utils.js +++ b/app/src/components/widgets/singleLevelWidgets/charts/investigatedTrendChart/config/utils.js @@ -31,7 +31,7 @@ export const calculateTooltipParams = (data, color, customProps) => { return { itemName: isTimeline ? date : `${name} #${number}`, - startTime: isTimeline ? null : Number(startTime), + startTime: isTimeline ? null : new Date(startTime).getTime(), itemCases: `${Number(value).toFixed(2)}%`, color: color(id), issueStatNameProps: { itemName: messages[id] ? formatMessage(messages[id]) : id }, diff --git a/app/src/components/widgets/singleLevelWidgets/charts/launchStatisticsChart/config/utils.js b/app/src/components/widgets/singleLevelWidgets/charts/launchStatisticsChart/config/utils.js index e32645b08a..3ad998c5cd 100644 --- a/app/src/components/widgets/singleLevelWidgets/charts/launchStatisticsChart/config/utils.js +++ b/app/src/components/widgets/singleLevelWidgets/charts/launchStatisticsChart/config/utils.js @@ -76,7 +76,7 @@ export const calculateTooltipParams = (data, color, customProps) => { return { itemName: isTimeline ? date : `${name} #${number}`, - startTime: isTimeline ? null : Number(startTime), + startTime: isTimeline ? null : new Date(startTime).getTime(), itemCases: `${value} ${formatMessage(messages.cases)}`, color: color(id), issueStatNameProps: { itemName: id, defectTypes, formatMessage }, diff --git a/app/src/components/widgets/singleLevelWidgets/charts/launchesComparisonChart/config/utils.js b/app/src/components/widgets/singleLevelWidgets/charts/launchesComparisonChart/config/utils.js index ae3e39734e..4f72179add 100644 --- a/app/src/components/widgets/singleLevelWidgets/charts/launchesComparisonChart/config/utils.js +++ b/app/src/components/widgets/singleLevelWidgets/charts/launchesComparisonChart/config/utils.js @@ -21,7 +21,7 @@ export const calculateTooltipParams = (data, color, customProps) => { return { itemName: `${name} #${number}`, - startTime: Number(startTime), + startTime: new Date(startTime).getTime(), itemCases: `${value}%`, color: color(id), issueStatNameProps: { itemName: id, defectTypes, noTotal: true, formatMessage }, diff --git a/app/src/components/widgets/singleLevelWidgets/charts/nonPassedTestCasesTrendChart/config/utils.js b/app/src/components/widgets/singleLevelWidgets/charts/nonPassedTestCasesTrendChart/config/utils.js index 49af120ffa..001463cce7 100644 --- a/app/src/components/widgets/singleLevelWidgets/charts/nonPassedTestCasesTrendChart/config/utils.js +++ b/app/src/components/widgets/singleLevelWidgets/charts/nonPassedTestCasesTrendChart/config/utils.js @@ -23,7 +23,7 @@ export const calculateTooltipParams = (data, color, customProps) => { return { itemName: `${name} #${number}`, - startTime: Number(startTime), + startTime: new Date(startTime).getTime(), itemCases: `${Number(value).toFixed(2)}%`, color: color(id), issueStatNameProps: { itemName: formatMessage(messages.failedSkippedTotal) }, diff --git a/app/src/components/widgets/singleLevelWidgets/charts/testCasesGrowthTrendChart/config/utils.js b/app/src/components/widgets/singleLevelWidgets/charts/testCasesGrowthTrendChart/config/utils.js index e1ee1f75dd..18cc87d11e 100644 --- a/app/src/components/widgets/singleLevelWidgets/charts/testCasesGrowthTrendChart/config/utils.js +++ b/app/src/components/widgets/singleLevelWidgets/charts/testCasesGrowthTrendChart/config/utils.js @@ -50,7 +50,7 @@ export const calculateTooltipParams = (data, color, customProps) => { return { itemName: isTimeline ? date : `${name} #${number}`, - startTime: isTimeline ? '' : dateFormat(Number(startTime)), + startTime: isTimeline ? '' : dateFormat(new Date(startTime).getTime()), growth, growthClass, total, diff --git a/app/src/components/widgets/singleLevelWidgets/tables/projectActivity/projectActivity.jsx b/app/src/components/widgets/singleLevelWidgets/tables/projectActivity/projectActivity.jsx index 6c192c8b4e..3d1afeefa9 100644 --- a/app/src/components/widgets/singleLevelWidgets/tables/projectActivity/projectActivity.jsx +++ b/app/src/components/widgets/singleLevelWidgets/tables/projectActivity/projectActivity.jsx @@ -223,7 +223,7 @@ export class ProjectActivity extends Component { {ActivityComponent} diff --git a/app/src/pages/inside/common/itemInfo/itemInfo.jsx b/app/src/pages/inside/common/itemInfo/itemInfo.jsx index 2b830ced08..72848fca76 100644 --- a/app/src/pages/inside/common/itemInfo/itemInfo.jsx +++ b/app/src/pages/inside/common/itemInfo/itemInfo.jsx @@ -147,6 +147,9 @@ export class ItemInfo extends Component { hideDescription, } = this.props; + const startTime = new Date(value.startTime).getTime(); + const endTime = new Date(value.endTime).getTime(); + const autoAnalysisLabel = value.analysing?.find( (item) => item === ANALYZER_TYPES.AUTO_ANALYZER || item === ANALYZER_TYPES.CLUSTER_ANALYSER, ); @@ -213,23 +216,21 @@ export class ItemInfo extends Component { withPreloader /> ))} - {value.startTime && ( + {startTime && ( )} - {value.startTime && ( -
{fromNowFormat(value.startTime)}
- )} + {startTime &&
{fromNowFormat(startTime)}
} {value.hasRetries && (
{Parser(RetryIcon)} From 2900a1d59567e2d968cfde06415e9531588e7dfb Mon Sep 17 00:00:00 2001 From: Siarhei Iukou Date: Tue, 21 May 2024 11:59:57 +0300 Subject: [PATCH 2/2] EPMRPP-89534 || Code Review fix - 1 --- app/src/pages/inside/common/itemInfo/itemInfo.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/pages/inside/common/itemInfo/itemInfo.jsx b/app/src/pages/inside/common/itemInfo/itemInfo.jsx index 72848fca76..f228e60624 100644 --- a/app/src/pages/inside/common/itemInfo/itemInfo.jsx +++ b/app/src/pages/inside/common/itemInfo/itemInfo.jsx @@ -216,7 +216,7 @@ export class ItemInfo extends Component { withPreloader /> ))} - {startTime && ( + {!!startTime && ( )} - {startTime &&
{fromNowFormat(startTime)}
} + {!!startTime &&
{fromNowFormat(startTime)}
} {value.hasRetries && (
{Parser(RetryIcon)}