createUserMenuAnnouncements

Author: odeimaiz

services/static-webserver/client/source/class/osparc/announcement/AnnouncementUIFactory.js

@@ -140,13 +140,17 @@ qx.Class.define("osparc.announcement.AnnouncementUIFactory", {
       osparc.notification.RibbonNotifications.getInstance().addNotification(ribbonAnnouncement);
     },
 
-    createUserMenuAnnouncement: function() {
-      const announcement = this.getAnnouncement();
-
-      const link = announcement.getLink();
-      const userMenuAnnouncement = new qx.ui.menu.Button(announcement.getTitle() + "...");
-      userMenuAnnouncement.addListener("execute", () => window.open(link));
-      return userMenuAnnouncement;
+    createUserMenuAnnouncements: function() {
+      const userMenuAnnouncements = [];
+      this.__announcements.forEach(announcement => {
+        if (this.self().isValid(announcement, "user-menu")) {
+          const link = announcement.getLink();
+          const userMenuAnnouncement = new qx.ui.menu.Button(announcement.getTitle() + "...");
+          userMenuAnnouncement.addListener("execute", () => window.open(link));
+          userMenuAnnouncements.push(userMenuAnnouncement);
+        }
+      });
+      return userMenuAnnouncements;
     }
   }
 });

services/static-webserver/client/source/class/osparc/navigation/UserMenu.js

@@ -171,7 +171,7 @@ qx.Class.define("osparc.navigation.UserMenu", {
 
       const announcementUIFactory = osparc.announcement.AnnouncementUIFactory.getInstance();
       if (announcementUIFactory.hasUserMenuAnnouncement()) {
-        this.add(announcementUIFactory.createUserMenuAnnouncement());
+        announcementUIFactory.createUserMenuAnnouncements().forEach(announcement => this.add(announcement));
       }
       this.getChildControl("about");
       if (osparc.product.Utils.showAboutProduct()) {
@@ -227,7 +227,7 @@ qx.Class.define("osparc.navigation.UserMenu", {
 
       const announcementUIFactory = osparc.announcement.AnnouncementUIFactory.getInstance();
       if (announcementUIFactory.hasUserMenuAnnouncement()) {
-        this.add(announcementUIFactory.createUserMenuAnnouncement());
+        announcementUIFactory.createUserMenuAnnouncements().forEach(announcement => this.add(announcement));
       }
       this.getChildControl("about");
       if (!osparc.product.Utils.isProduct("osparc")) {