Skip to content

NO-JIRA: Display incidents' last update time #624

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

Merged
merged 1 commit into from
Nov 3, 2025
Merged

NO-JIRA: Display incidents' last update time #624

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
22 changes: 20 additions & 2 deletions web/src/components/Incidents/AlertsChart/AlertsChart.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,12 @@ import {
import {
Card,
CardBody,
CardHeader,
CardTitle,
EmptyState,
EmptyStateBody,
Flex,
FlexItem,
getResizeObserver,
} from '@patternfly/react-core';
import {
Expand All @@ -30,7 +33,7 @@ import {
generateAlertsDateArray,
getCurrentTime,
} from '../utils';
import { dateTimeFormatter } from '../../console/utils/datetime';
import { dateTimeFormatter, timeFormatter } from '../../console/utils/datetime';
import { useTranslation } from 'react-i18next';
import { AlertsChartBar } from '../model';
import { setAlertsAreLoading } from '../../../store/actions';
Expand Down Expand Up @@ -114,7 +117,22 @@ const AlertsChart = ({ theme }: { theme: 'light' | 'dark' }) => {
data-test={DataTestIDs.AlertsChart.Card}
>
<div ref={containerRef} data-test={DataTestIDs.AlertsChart.ChartContainer}>
<CardTitle data-test={DataTestIDs.AlertsChart.Title}>{t('Alerts Timeline')}</CardTitle>
<CardHeader>
<Flex spaceItems={{ default: 'spaceItemsMd' }}>
<FlexItem>
<CardTitle data-test={DataTestIDs.AlertsChart.Title}>
{t('Alerts Timeline')}
</CardTitle>
</FlexItem>
{incidentsLastRefreshTime && (
<FlexItem>
<span className="pf-v6-u-text-color-subtle">
{t('Last updated at')} {timeFormatter.format(new Date(incidentsLastRefreshTime))}
</span>
</FlexItem>
)}
</Flex>
</CardHeader>
{!selectedIncidentIsVisible || isEmpty(incidentsActiveFilters.groupId) ? (
<EmptyState
variant="lg"
Expand Down
26 changes: 22 additions & 4 deletions web/src/components/Incidents/IncidentsChart/IncidentsChart.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,10 @@ import {
Bullseye,
Card,
CardBody,
CardHeader,
CardTitle,
Flex,
FlexItem,
getResizeObserver,
Spinner,
} from '@patternfly/react-core';
Expand All @@ -31,7 +34,7 @@ import {
createIncidentsChartBars,
generateDateArray,
} from '../utils';
import { dateTimeFormatter } from '../../console/utils/datetime';
import { dateTimeFormatter, timeFormatter } from '../../console/utils/datetime';
import { useTranslation } from 'react-i18next';
import { DataTestIDs } from '../../data-test';

Expand All @@ -58,13 +61,15 @@ const IncidentsChart = ({
selectedGroupId,
onIncidentClick,
currentTime,
lastRefreshTime,
}: {
incidentsData: Array<Incident>;
chartDays: number;
theme: 'light' | 'dark';
selectedGroupId: string;
onIncidentClick: (groupId: string) => void;
currentTime: number;
lastRefreshTime: number | null;
}) => {
const [isLoading, setIsLoading] = useState(true);
const [chartContainerHeight, setChartContainerHeight] = useState<number>();
Expand Down Expand Up @@ -131,9 +136,22 @@ const IncidentsChart = ({
style={{ position: 'relative' }}
data-test={DataTestIDs.IncidentsChart.ChartContainer}
>
<CardTitle data-test={DataTestIDs.IncidentsChart.Title}>
{t('Incidents Timeline')}
</CardTitle>
<CardHeader>
<Flex spaceItems={{ default: 'spaceItemsMd' }}>
<FlexItem>
<CardTitle data-test={DataTestIDs.IncidentsChart.Title}>
{t('Incidents Timeline')}
</CardTitle>
</FlexItem>
{lastRefreshTime && (
<FlexItem>
<span className="pf-v6-u-text-color-subtle">
{t('Last updated at')} {timeFormatter.format(new Date(lastRefreshTime))}
</span>
</FlexItem>
)}
</Flex>
</CardHeader>
{isLoading ? (
<Bullseye>
<Spinner
Expand Down
1 change: 1 addition & 0 deletions web/src/components/Incidents/IncidentsPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -609,6 +609,7 @@ const IncidentsPage = () => {
selectedGroupId={selectedGroupId}
onIncidentClick={handleIncidentChartClick}
currentTime={incidentsLastRefreshTime}
lastRefreshTime={incidentsLastRefreshTime}
/>
</StackItem>
<StackItem>
Expand Down