jobsActive

Author: odeimaiz

services/static-webserver/client/source/class/osparc/jobs/JobsButton.js

@@ -27,14 +27,14 @@ qx.Class.define("osparc.jobs.JobsButton", {
       width: 30,
       alignX: "center",
       cursor: "pointer",
-      visibility: "excluded",
       toolTipText: this.tr("Activity Center"),
     });
 
     this.addListener("tap", () => osparc.jobs.ActivityCenterWindow.openWindow(), this);
 
     const jobsStore = osparc.store.Jobs.getInstance();
-    jobsStore.addListener("changeJobs", () => this.__updateJobsButton(), this);
+    jobsStore.addListener("changeJobsActive", () => this.__updateJobsButton(), this);
+    this.__updateJobsButton();
   },
 
   members: {
@@ -76,9 +76,8 @@ qx.Class.define("osparc.jobs.JobsButton", {
       const number = this.getChildControl("number");
 
       const jobsStore = osparc.store.Jobs.getInstance();
-      const nJobs = jobsStore.getJobs().length > 20 ? "20+" : jobsStore.getJobs().length;
+      const nJobs = jobsStore.getJobsActive().length > osparc.store.Jobs.SERVER_MAX_LIMIT ? (osparc.store.Jobs.SERVER_MAX_LIMIT + "+") : jobsStore.getJobsActive().length;
       number.setValue(nJobs.toString());
-      nJobs ? this.show() : this.exclude();
     },
   }
 });

services/static-webserver/client/source/class/osparc/store/Jobs.js

@@ -20,13 +20,6 @@ qx.Class.define("osparc.store.Jobs", {
   type: "singleton",
 
   properties: {
-    jobs: {
-      check: "Array",
-      init: [],
-      nullable: true,
-      event: "changeJobs"
-    },
-
     jobsActive: {
       check: "Array",
       init: [],
@@ -61,16 +54,16 @@ qx.Class.define("osparc.store.Jobs", {
       };
       return osparc.data.Resources.fetch("jobsActive", "getPage", params, options)
         .then(jobsResp => {
-          const jobs = [];
+          const jobsActive = [];
           if ("data" in jobsResp) {
-            jobsResp["data"].forEach(jobData => {
-              jobs.push(this.addJob(jobData));
+            jobsResp["data"].forEach(jobActiveData => {
+              jobsActive.push(this.__addJobActive(jobActiveData));
             });
           }
           if (resolveWResponse) {
             return jobsResp;
           }
-          return jobs;
+          return jobsActive;
         })
         .catch(err => console.error(err));
     },
@@ -92,16 +85,16 @@ qx.Class.define("osparc.store.Jobs", {
         .catch(err => console.error(err));
     },
 
-    addJob: function(jobData) {
-      const jobs = this.getJobs();
-      const jobFound = jobs.find(job => job.getProjectUuid() === jobData["projectUuid"]);
+    __addJobActive: function(jobData) {
+      const jobsActive = this.getJobsActive();
+      const jobFound = jobsActive.find(job => job.getProjectUuid() === jobData["projectUuid"]);
       if (jobFound) {
         jobFound.updateJob(jobData);
         return jobFound;
       }
       const job = new osparc.data.Job(jobData);
-      jobs.push(job);
-      this.fireDataEvent("changeJobs");
+      jobsActive.push(job);
+      this.fireDataEvent("changeJobsActive");
       return job;
     },