changeJobsActive

Author: odeimaiz

services/static-webserver/client/source/class/osparc/dashboard/ResourceDetails.js

@@ -337,6 +337,7 @@ qx.Class.define("osparc.dashboard.ResourceDetails", {
       [
         this.__getInfoPage,
         this.__getBillingPage,
+        this.__getActivityOverviewPage,
         this.__getServicesUpdatePage,
         this.__getServicesBootOptionsPage,
         this.__getConversationsPage,
@@ -494,6 +495,31 @@ qx.Class.define("osparc.dashboard.ResourceDetails", {
       return null;
     },
 
+    __getActivityOverviewPage: function() {
+      const resourceData = this.__resourceData;
+      if (
+        !osparc.desktop.credits.Utils.areWalletsEnabled() ||
+        !osparc.utils.Resources.isStudy(resourceData)
+      ) {
+        return null;
+      }
+
+      const id = "ActivityOverview";
+      const title = this.tr("Activity Overview");
+      const iconSrc = "@FontAwesome5Solid/tasks/22";
+      const page = this.__billingSettings = new osparc.dashboard.resources.pages.BasePage(title, iconSrc, id);
+      this.__addOpenButton(page);
+
+      const lazyLoadContent = () => {
+        const activityOverview = new osparc.jobs.ActivityOverview(resourceData);
+        const billingScroll = new qx.ui.container.Scroll(activityOverview);
+        page.addToContent(billingScroll);
+      }
+      page.addListenerOnce("appear", lazyLoadContent, this);
+
+      return page;
+    },
+
     __getPreviewPage: function() {
       const resourceData = this.__resourceData;
       if (

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

@@ -0,0 +1,39 @@
+/* ************************************************************************
+
+   osparc - the simcore frontend
+
+   https://osparc.io
+
+   Copyright:
+     2025 IT'IS Foundation, https://itis.swiss
+
+   License:
+     MIT: https://opensource.org/licenses/MIT
+
+   Authors:
+     * Odei Maiz (odeimaiz)
+
+************************************************************************ */
+
+qx.Class.define("osparc.jobs.ActivityOverview", {
+  extend: qx.ui.core.Widget,
+
+  construct: function(projectData) {
+    this.base(arguments);
+
+    this._setLayout(new qx.ui.layout.VBox(15));
+
+    this.__buildLayout(projectData);
+  },
+
+  members: {
+    __buildLayout: function(projectData) {
+      const subRunsTable = new osparc.jobs.SubRunsTable(projectData["uuid"]);
+      this._add(subRunsTable);
+
+      this.addListener("close", () => {
+        subRunsTable.stopInterval();
+      });
+    },
+  }
+});

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

@@ -33,8 +33,8 @@ qx.Class.define("osparc.jobs.JobsButton", {
     this.addListener("tap", () => osparc.jobs.ActivityCenterWindow.openWindow(), this);
 
     const jobsStore = osparc.store.Jobs.getInstance();
-    jobsStore.addListener("changeJobsActive", () => this.__updateJobsButton(), this);
-    this.__updateJobsButton();
+    jobsStore.addListener("changeJobsActive", e => this.__updateJobsButton(e.getData()), this);
+    jobsStore.fetchJobsActive();
   },
 
   members: {
@@ -71,12 +71,11 @@ qx.Class.define("osparc.jobs.JobsButton", {
       return control || this.base(arguments, id);
     },
 
-    __updateJobsButton: function() {
+    __updateJobsButton: function(nActiveJobs) {
       this.getChildControl("icon");
       const number = this.getChildControl("number");
 
-      const jobsStore = osparc.store.Jobs.getInstance();
-      const nJobs = jobsStore.getJobsActive().length > osparc.store.Jobs.SERVER_MAX_LIMIT ? (osparc.store.Jobs.SERVER_MAX_LIMIT + "+") : jobsStore.getJobsActive().length;
+      const nJobs = nActiveJobs > osparc.store.Jobs.SERVER_MAX_LIMIT ? (osparc.store.Jobs.SERVER_MAX_LIMIT + "+") : nActiveJobs;
       number.setValue(nJobs.toString());
     },
   }

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

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