setAnnouncementsData

Author: odeimaiz

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

@@ -100,24 +100,27 @@ qx.Class.define("osparc.announcement.AnnouncementUIFactory", {
     },
 
     hasLoginAnnouncement: function() {
-      const announcement = this.getAnnouncement();
-      return this.self().isValid(announcement, "login");
+      return this.__announcements && this.__announcements.some(announcement => this.self().isValid(announcement, "login"));
     },
 
     __hasRibbonAnnouncement: function() {
-      const announcement = this.getAnnouncement();
-      return this.self().isValid(announcement, "ribbon");
+      return this.__announcements && this.__announcements.some(announcement => this.self().isValid(announcement, "ribbon"));
     },
 
     hasUserMenuAnnouncement: function() {
-      const announcement = this.getAnnouncement();
-      return this.self().isValid(announcement, "user-menu") && announcement.getLink();
+      return this.__announcements && this.__announcements.some(announcement => this.self().isValid(announcement, "ribbon") && announcement.getLink());
     },
 
-    createLoginAnnouncement: function() {
-      const announcement = this.getAnnouncement();
-      const loginAnnouncement = this.self().createLoginAnnouncement(announcement.getTitle(), announcement.getDescription());
-      return loginAnnouncement;
+    createLoginAnnouncements: function() {
+      const loginAnnouncements = [];
+      this.__announcements.forEach(announcement => {
+        if (this.self().isValid(announcement, "login")) {
+          loginAnnouncements.push(this.self().createLoginAnnouncement(announcement.getTitle(), announcement.getDescription()));
+        }
+      });
+      const layout = new qx.ui.container.Composite(new qx.ui.layout.VBox(10));
+      loginAnnouncements.forEach(loginAnnouncement => layout.add(loginAnnouncement));
+      return layout;
     },
 
     __addRibbonAnnouncement: function() {

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

@@ -29,7 +29,7 @@ qx.Class.define("osparc.announcement.Tracker", {
     checkAnnouncements: async function() {
       osparc.data.Resources.get("announcements")
         .then(announcements => {
-          osparc.announcement.AnnouncementUIFactory.getInstance().setAnnouncements((announcements && announcements.length) ? announcements : []);
+          osparc.announcement.AnnouncementUIFactory.getInstance().setAnnouncementsData((announcements && announcements.length) ? announcements : []);
         })
         .catch(err => console.error(err));
     },

services/static-webserver/client/source/class/osparc/auth/ui/LoginView.js

@@ -42,11 +42,11 @@ qx.Class.define("osparc.auth.ui.LoginView", {
     _buildPage: function() {
       const announcementUIFactory = osparc.announcement.AnnouncementUIFactory.getInstance();
       if (announcementUIFactory.hasLoginAnnouncement()) {
-        this.addAt(announcementUIFactory.createLoginAnnouncement(), 0);
+        this.addAt(announcementUIFactory.createLoginAnnouncements(), 0);
       } else {
         announcementUIFactory.addListenerOnce("changeAnnouncement", e => {
           if (announcementUIFactory.hasLoginAnnouncement()) {
-            this.addAt(announcementUIFactory.createLoginAnnouncement(), 0);
+            this.addAt(announcementUIFactory.createLoginAnnouncements(), 0);
           }
         });
       }