Skip to content

Commit bfe0315

Browse files
committed
MK8S-197 - Display the alert status in Alert page
1 parent 45201b8 commit bfe0315

File tree

1 file changed

+12
-7
lines changed

1 file changed

+12
-7
lines changed

ui/src/containers/AlertPage.tsx

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,8 @@ const getAlertStatus = (numbersOfCritical, numbersOfWarning) =>
9494
numbersOfCritical > 0
9595
? STATUS_CRITICAL
9696
: numbersOfWarning > 0
97-
? STATUS_WARNING
98-
: STATUS_HEALTH;
97+
? STATUS_WARNING
98+
: STATUS_HEALTH;
9999

100100
function AlertPageHeader({
101101
activeAlerts,
@@ -118,7 +118,7 @@ function AlertPageHeader({
118118
<Title>
119119
<AlertStatusIcon>
120120
<StatusWrapper status={alertStatus}>
121-
<StatusIcon status={alertStatus} name="Alert" entity='Alerts' />
121+
<StatusIcon status={alertStatus} name="Alert" entity="Alerts" />
122122
</StatusWrapper>
123123
</AlertStatusIcon>
124124
<>
@@ -165,7 +165,7 @@ function AlertPageHeader({
165165

166166
const ActiveAlertTab = React.memo(
167167
// @ts-expect-error - FIXME when you are working on it
168-
({ columns, data }) => {
168+
({ columns, data, status }) => {
169169
const sortTypes = React.useMemo(() => {
170170
return {
171171
severity: (row1, row2) => {
@@ -197,6 +197,7 @@ const ActiveAlertTab = React.memo(
197197
data={data}
198198
defaultSortingKey={DEFAULT_SORTING_KEY}
199199
sortTypes={sortTypes}
200+
status={status}
200201
entityName={{
201202
en: {
202203
singular: 'active alert',
@@ -222,7 +223,7 @@ const ActiveAlertTab = React.memo(
222223
(a, b) => {
223224
// compare the alert only on id and severity
224225
// @ts-expect-error - FIXME when you are working on it
225-
return isEqual(a.columns, b.columns) && isEqualAlert(a.data, b.data);
226+
return isEqual(a.columns, b.columns) && isEqualAlert(a.data, b.data) && a.status === b.status;
226227
},
227228
);
228229
export default function AlertPage() {
@@ -295,8 +296,12 @@ export default function AlertPage() {
295296
/>
296297
</AppContainer.OverallSummary>
297298
<AppContainer.MainContent>
298-
{/* @ts-expect-error - FIXME when you are working on it */}
299-
<ActiveAlertTab data={leafAlerts} columns={columns} />
299+
<ActiveAlertTab
300+
/* @ts-expect-error - FIXME when you are working on it */
301+
data={leafAlerts}
302+
columns={columns}
303+
status={alerts.status}
304+
/>
300305
</AppContainer.MainContent>
301306
</AppContainer>
302307
);

0 commit comments

Comments
 (0)