ui: Fix the bug cause by the empty alertlist

scality · Apr 20, 2021 · 849a7eb · 849a7eb
1 parent a9e953b
commit 849a7eb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/ui/src/containers/NodePageRSP.js b/ui/src/containers/NodePageRSP.js
@@ -126,7 +126,7 @@ const NodePageRSP = (props) => {
     instance: `${instanceIP}:${PORT_NODE_EXPORTER}`,
   });
 
-  const alertsNode = alertList && alertList.alerts || [];
+  const alertsNode = (alertList && alertList.alerts) || [];
 
   const isHealthTabActive = location.pathname.endsWith('/overview');
   const isAlertsTabActive = location.pathname.endsWith('/alerts');
@@ -151,7 +151,7 @@ const NodePageRSP = (props) => {
       title: (
         <span>
           {intl.translate('alerts')}
-          {alertsNode.length ? (
+          {alertsNode && alertsNode.length ? (
             <TextBadge variant={'infoPrimary'}>{alertsNode.length}</TextBadge>
           ) : null}
         </span>

diff --git a/ui/src/containers/VolumePageContent.js b/ui/src/containers/VolumePageContent.js
@@ -176,7 +176,7 @@ const VolumePageContent = (props) => {
       title: (
         <span>
           {intl.translate('alerts')}
-          {alertlist.length ? (
+          {alertlist && alertlist.length ? (
             <TextBadge variant={'infoPrimary'}>{alertlist.length}</TextBadge>
           ) : null}
         </span>