Skip to content

Commit 4e7ddc1

Browse files
committed
[PLAT-12246] - fix : Time format is not correct in task detail page
Summary: 1. Used ybFormatDate helper for consistency. 2. Do not show any banners while universe in upgrade-precheck failed state. Test Plan: Tested manually Reviewers: kkannan, asathyan Reviewed By: asathyan Subscribers: ui, yugaware Differential Revision: https://phorge.dev.yugabyte.com/D31698
1 parent dc508d0 commit 4e7ddc1

File tree

4 files changed

+17
-8
lines changed

4 files changed

+17
-8
lines changed

managed/ui/src/components/tasks/TaskDetail/TaskDetail.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import { RbacValidator } from '../../../redesign/features/rbac/common/RbacApiPer
1919
import { ApiPermissionMap } from '../../../redesign/features/rbac/ApiAndUserPermMapping';
2020
import { calculateDuration } from '../../backupv2/common/BackupUtils';
2121
import { SoftwareUpgradeTaskType } from '../../universes/helpers/universeHelpers';
22+
import { ybFormatDate } from '../../../redesign/helpers/DateUtils';
2223

2324
class TaskDetail extends Component {
2425
constructor(props) {
@@ -259,7 +260,9 @@ class TaskDetail extends Component {
259260
<Col xs={2}>
260261
{currentTaskData?.details?.versionNumbers?.ybSoftwareVersion ?? '-'}
261262
</Col>
262-
<Col xs={3}>{currentTaskData.createTime}</Col>
263+
<Col xs={3}>
264+
{currentTaskData?.createTime ? ybFormatDate(currentTaskData?.createTime) : '-'}
265+
</Col>
263266
<Col xs={2}>
264267
{currentTaskData?.createTime && currentTaskData?.completionTime
265268
? calculateDuration(

managed/ui/src/components/tasks/TaskDetail/TaskDetail.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979

8080
.task-container {
8181
width: 100%;
82-
max-width: 980px;
82+
max-width: 1080px;
8383
margin: 0 auto;
8484
padding: 0px !important;
8585

managed/ui/src/components/universes/UniverseOverview/UniverseOverviewNew.js

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,9 @@ import { RuntimeConfigKey } from '../../../redesign/helpers/constants';
4242
import {
4343
SoftwareUpgradeState,
4444
getcurrentUniverseFailedTask,
45-
SoftwareUpgradeTaskType
45+
SoftwareUpgradeTaskType,
46+
getUniverseStatus,
47+
UniverseState
4648
} from '../helpers/universeHelpers';
4749

4850
class DatabasePanel extends PureComponent {
@@ -848,9 +850,12 @@ export default class UniverseOverviewNew extends Component {
848850
const primaryCluster = getPrimaryCluster(clusters);
849851
const userIntent = primaryCluster && primaryCluster?.userIntent;
850852
const dedicatedNodes = userIntent?.dedicatedNodes;
851-
const dbVersionValue = userIntent?.ybSoftwareVersion;
852853
const failedTask = getcurrentUniverseFailedTask(universeInfo, tasks.customerTaskList);
853854
const ybSoftwareUpgradeState = universeDetails?.softwareUpgradeState;
855+
const universeStatus = getUniverseStatus(universeInfo);
856+
const isUpgradePreCheckFailed =
857+
universeStatus.state === UniverseState.GOOD &&
858+
failedTask?.type === SoftwareUpgradeTaskType.SOFTWARE_UPGRADE;
854859

855860
const isRollBackFeatureEnabled =
856861
runtimeConfigs?.data?.configEntries?.find(
@@ -871,7 +876,8 @@ export default class UniverseOverviewNew extends Component {
871876
[
872877
SoftwareUpgradeTaskType.ROLLBACK_UPGRADE,
873878
SoftwareUpgradeTaskType.SOFTWARE_UPGRADE
874-
].includes(failedTask?.type) && (
879+
].includes(failedTask?.type) &&
880+
!isUpgradePreCheckFailed && (
875881
<Row className="p-16">
876882
<FailedBanner universeData={universeInfo} taskDetail={failedTask} />
877883
</Row>

managed/ui/src/redesign/features/universe/universe-overview/DBVersionWidget.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { FC, useState, useEffect, useMemo, useCallback } from 'react';
1+
import { FC, useState } from 'react';
22
import _ from 'lodash';
33
import { useSelector } from 'react-redux';
44
import { useTranslation } from 'react-i18next';
@@ -60,7 +60,7 @@ export const DBVersionWidget: FC<DBVersionWidgetProps> = ({
6060
&nbsp;
6161
{isRollBackFeatureEnabled &&
6262
higherVersionCount > 0 &&
63-
upgradeState === SoftwareUpgradeState.READY &&
63+
universeStatus.state === UniverseState.GOOD &&
6464
!isUniversePaused &&
6565
_.isEmpty(universePendingTask) && (
6666
<>
@@ -81,7 +81,7 @@ export const DBVersionWidget: FC<DBVersionWidgetProps> = ({
8181
</YBTooltip>
8282
)}
8383
{[SoftwareUpgradeState.FINALIZE_FAILED, SoftwareUpgradeState.UPGRADE_FAILED].includes(
84-
upgradeState
84+
upgradeState && universeStatus.state !== UniverseState.GOOD
8585
) && (
8686
<YBTooltip
8787
title={

0 commit comments

Comments
 (0)