refactor

Author: odeimaiz

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

@@ -63,14 +63,9 @@ qx.Class.define("osparc.announcement.AnnouncementUIFactory", {
       }
 
       return loginAnnouncement;
-    }
-  },
-
-  members: {
-    __ribbonAnnouncement: null,
+    },
 
-    __isValid: function(widgetType) {
-      const announcement = this.getAnnouncement();
+    isValid: function(announcement, widgetType) {
       if (announcement) {
         const now = new Date();
         const validPeriod = now > announcement.getStart() && now < announcement.getEnd();
@@ -80,6 +75,19 @@ qx.Class.define("osparc.announcement.AnnouncementUIFactory", {
       }
       return false;
     },
+  },
+
+  members: {
+    __announcements: null,
+    __ribbonAnnouncement: null,
+
+    setAnnouncementsData: function(announcementsData) {
+      this.__announcements = [];
+      announcementsData.forEach(announcementData => {
+        const announcement = new osparc.announcement.Announcement(announcementData);
+        this.__announcements.push(announcement);
+      });
+    },
 
     __applyAnnouncement: function() {
       if (this.__ribbonAnnouncement) {
@@ -92,15 +100,18 @@ qx.Class.define("osparc.announcement.AnnouncementUIFactory", {
     },
 
     hasLoginAnnouncement: function() {
-      return this.__isValid("login");
+      const announcement = this.getAnnouncement();
+      return this.self().isValid(announcement, "login");
     },
 
     __hasRibbonAnnouncement: function() {
-      return this.__isValid("ribbon");
+      const announcement = this.getAnnouncement();
+      return this.self().isValid(announcement, "ribbon");
     },
 
     hasUserMenuAnnouncement: function() {
-      return this.__isValid("user-menu") && this.getAnnouncement().getLink();
+      const announcement = this.getAnnouncement();
+      return this.self().isValid(announcement, "user-menu") && announcement.getLink();
     },
 
     createLoginAnnouncement: function() {

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

@@ -25,21 +25,13 @@ qx.Class.define("osparc.announcement.Tracker", {
 
   members: {
     __checkInterval: null,
-    __announcements: null,
 
     checkAnnouncements: async function() {
-      return new Promise(resolve => {
-        osparc.data.Resources.get("announcements")
-          .then(announcements => {
-            if (announcements && announcements.length) {
-              this.__setAnnouncements(announcements);
-            } else {
-              this.__setAnnouncements(null);
-            }
-            resolve();
-          })
-          .catch(err => console.error(err));
-      });
+      osparc.data.Resources.get("announcements")
+        .then(announcements => {
+          osparc.announcement.AnnouncementUIFactory.getInstance().setAnnouncements((announcements && announcements.length) ? announcements : []);
+        })
+        .catch(err => console.error(err));
     },
 
     startTracker: function() {
@@ -52,15 +44,5 @@ qx.Class.define("osparc.announcement.Tracker", {
         clearInterval(this.__checkInterval);
       }
     },
-
-    __setAnnouncements: function(announcementsData) {
-      this.__announcements = {};
-      if (announcementsData) {
-        announcementsData.forEach(announcementData => {
-          const announcement = new osparc.announcement.Announcement(announcementData);
-          osparc.announcement.AnnouncementUIFactory.getInstance().setAnnouncement(announcement);
-        });
-      }
-    }
   }
 });