From 6353a767eff23e7c734959edbcb8f146e7bf03f6 Mon Sep 17 00:00:00 2001 From: Ilank <63646693+ilan7empest@users.noreply.github.com> Date: Sat, 28 Dec 2024 13:08:53 +0200 Subject: [PATCH] Fix [Alerts history] Trigger criteria time period is "Null", expected N/A (#2979) --- src/common/Pagination/pagination.scss | 6 ++++-- src/components/DetailsInfo/detailsInfo.util.js | 6 +++--- src/elements/AlertsTableRow/AlertsTableRow.scss | 9 --------- 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/src/common/Pagination/pagination.scss b/src/common/Pagination/pagination.scss index a39d10b79..63d11ebe0 100644 --- a/src/common/Pagination/pagination.scss +++ b/src/common/Pagination/pagination.scss @@ -6,9 +6,11 @@ justify-content: space-between; align-items: center; padding: 10px 4px 4px; + z-index: 1; - .pagination-items-count, .pagination-items-selector { - width: 140px + .pagination-items-count, + .pagination-items-selector { + width: 140px; } .pagination-items-selector { diff --git a/src/components/DetailsInfo/detailsInfo.util.js b/src/components/DetailsInfo/detailsInfo.util.js index ff4aa8e9d..5fac3fce6 100644 --- a/src/components/DetailsInfo/detailsInfo.util.js +++ b/src/components/DetailsInfo/detailsInfo.util.js @@ -48,12 +48,12 @@ export const generateTriggerInfoContent = criteria => { { label: 'Trigger criteria count', id: 'triggerCriteriaCount', - value: criteria?.count + value: criteria?.count || 'N/A' }, { label: 'Trigger criteria time period', id: 'triggerCriteriaTimePeriod', - value: criteria?.period + value: criteria?.period || 'N/A' } ] } @@ -248,7 +248,7 @@ export const generateAlertsDetailsInfo = selectedItem => { AlertsDetailsInfo.triggerCriteriaDetailsInfo = triggerCriteriaContent.map(trigger => { return (