solve issue #486

ifpen · Jan 13, 2025 · dd125aa · dd125aa
1 parent e5844a5
commit dd125aa
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 171 deletions.
diff --git a/front-end/source/angular/modules/libs/notification/notification-xdash.js b/front-end/source/angular/modules/libs/notification/notification-xdash.js
diff --git a/front-end/source/angular/modules/libs/notification/notification.js b/front-end/source/angular/modules/libs/notification/notification.js
@@ -7,18 +7,24 @@ export function XdashNotifications() {
   var $body = angular.element(document.body);
   var $rootScope = $body.scope().$root;
   $rootScope.PnotifyStatus = false;
+  var enablePnotify = true;
 
   function Pnotify(notificationObject) {
-    let notice = new PNotify({
-      title: notificationObject.title,
-      text: notificationObject.text,
-      type: notificationObject.type,
-      delay: 1800,
-      styling: 'bootstrap3',
-    });
-    $('.ui-pnotify-container').on('click', function () {
-      notice.remove();
-    });
+    if ( $rootScope.navBarNotification==false ) {
+      enablePnotify = false;
+    }
+    if (enablePnotify) {
+      let notice = new PNotify({
+        title: notificationObject.title,
+        text: notificationObject.text,
+        type: notificationObject.type,
+        delay: 1800,
+        styling: 'bootstrap3',
+      });
+      $('.ui-pnotify-container').on('click', function () {
+        notice.remove();
+      });
+    }
   }
 
   const self = {

diff --git a/front-end/source/kernel/runtime/xdash-load-runtime.js b/front-end/source/kernel/runtime/xdash-load-runtime.js
@@ -30,7 +30,6 @@ angularModule.run([
   '$rootScope',
   function ($rootScope) {
     $rootScope.urlBase = urlBase; // TODO
-    $rootScope.navBarNotification = window.dashboardConfig?.navBarNotification === 'true'; //AEF: visible if show notifications is checked // TODO
     $rootScope.notificationFilterDataValue = '';
     $rootScope.listNotifications = [];
     $rootScope.nbNotifications = 0;

diff --git a/front-end/source/kernel/runtime/xdash-runtime-main.js b/front-end/source/kernel/runtime/xdash-runtime-main.js
@@ -205,6 +205,8 @@ export function loadDashboard(jsonContent) {
   try {
     const dataJson = processJsonContent(jsonContent);
     window.dashboardConfig = getDashboardConfig();
+    const $rootScope = angular.element(document.body).scope().$root;
+    $rootScope.navBarNotification = window.dashboardConfig?.navBarNotification == true;
 
     if (jsonContent.pages?.pageNames?.length) {
       initPageRuntime(jsonContent.pages);