diff --git a/src/layout/SidebarContent.js b/src/layout/SidebarContent.js index 3e172703..17052946 100644 --- a/src/layout/SidebarContent.js +++ b/src/layout/SidebarContent.js @@ -9,6 +9,7 @@ import SimpleBar from 'simplebar-react'; import { SIGNIN_REDIRECT } from 'config'; import { newItemsCountAlertSelector } from 'store/alerts.slice'; +import { configSelector } from 'store/common.slice'; import { dataLayerNewItemsCountSelector, dataLayerIsNewAlertSelector, @@ -28,6 +29,7 @@ import { // import { withRouter } from 'react-router-dom' const SidebarContent = props => { + const config = useSelector(configSelector); const newAlertsCount = useSelector(newItemsCountAlertSelector); const newEventsCount = useSelector(newEventCountSelector); const isNewNotification = useSelector(isNewNotificationSelector); @@ -135,11 +137,12 @@ const SidebarContent = props => { {props.t('Dashboard')} - {getDashboardNotificationCount() > 0 && ( - - {getDashboardNotificationCount()} - - )} + {config?.display_menu_notifications && + getDashboardNotificationCount() > 0 && ( + + {getDashboardNotificationCount()} + + )}
  • @@ -148,7 +151,7 @@ const SidebarContent = props => { {props.t('fire-alerts')} - {newAlertsCount > 0 && ( + {config?.display_menu_notifications && newAlertsCount > 0 && ( {newAlertsCount} @@ -159,7 +162,7 @@ const SidebarContent = props => { {props.t('Events')} - {newEventsCount > 0 && ( + {config?.display_menu_notifications && newEventsCount > 0 && ( {newEventsCount} @@ -172,7 +175,9 @@ const SidebarContent = props => { {props.t('Data Layers')} - {isNewMapRequestAlert && !isMapRequestPageActive ? ( + {config?.display_menu_notifications && + isNewMapRequestAlert && + !isMapRequestPageActive ? ( {newMapRequestCount} @@ -201,7 +206,7 @@ const SidebarContent = props => { {props.t('Recommendations')} - {isNewNotification && ( + {config?.display_menu_notifications && isNewNotification && ( {newNotificationsCount} diff --git a/src/pages/Dashboard/Components/Notifications.js b/src/pages/Dashboard/Components/Notifications.js index 75d32093..ced3a97c 100644 --- a/src/pages/Dashboard/Components/Notifications.js +++ b/src/pages/Dashboard/Components/Notifications.js @@ -53,7 +53,7 @@ const NotificationsBar = ({

    {t('Area of Interest')} : {nameOfAOI}

    - {config?.display_dashboard_notificatios ? ( + {config?.display_dashboard_notifications ? ( <>