Merge branch 'master' into fix-api-base-url-generation

Author: giancarloromeo

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

@@ -483,6 +483,10 @@ qx.Class.define("osparc.dashboard.ResourceBrowserBase", {
     },
 
     _addTaskCard: function(task, cardTitle, cardIcon) {
+      if (!this._resourcesContainer) {
+        return null;
+      }
+
       if (task) {
         const taskPlaceholders = this._resourcesContainer.getCards().filter(card => osparc.dashboard.ResourceBrowserBase.isCardTaskPlaceholder(card));
         if (taskPlaceholders.find(taskPlaceholder => taskPlaceholder.getTask() === task)) {
@@ -505,6 +509,10 @@ qx.Class.define("osparc.dashboard.ResourceBrowserBase", {
     },
 
     _removeTaskCard: function(task) {
+      if (!this._resourcesContainer) {
+        return;
+      }
+
       if (task) {
         const taskPlaceholders = this._resourcesContainer.getCards().filter(card => osparc.dashboard.ResourceBrowserBase.isCardTaskPlaceholder(card));
         const taskCard = taskPlaceholders.find(taskPlaceholder => taskPlaceholder.getTask() === task);

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

@@ -356,27 +356,9 @@ qx.Class.define("osparc.dashboard.ResourceDetails", {
         }
       });
 
-      const resourceData = this.__resourceData;
-      if (!osparc.utils.Resources.isService(resourceData)) {
-        const title = osparc.product.Utils.getStudyAlias({firstUpperCase: true}) + this.tr(" Files...");
-        const iconSrc = "@FontAwesome5Solid/file/22";
-        const dataAccess = new qx.ui.basic.Atom().set({
-          label: title,
-          icon: iconSrc,
-          font: "text-14",
-          padding: 8,
-          paddingLeft: 12,
-          gap: 14,
-          cursor: "pointer",
-        });
-        dataAccess.addListener("tap", () => osparc.widget.StudyDataManager.popUpInWindow(resourceData["uuid"]));
-        this.addWidgetToTabs(dataAccess);
 
-        if (resourceData["resourceType"] === "study") {
-          const canShowData = osparc.study.Utils.canShowStudyData(resourceData);
-          dataAccess.setEnabled(canShowData);
-        }
-      }
+      this.__getActivityOverviewPopUp();
+      this.__getProjectFilesPopUp();
 
       if (selectedTabId) {
         const pageFound = tabsView.getChildren().find(page => page.tabId === selectedTabId);
@@ -814,6 +796,52 @@ qx.Class.define("osparc.dashboard.ResourceDetails", {
       page.addToHeader(toolbar);
       page.addToContent(createFunction);
       return page;
-    }
+    },
+
+    __getProjectFilesPopUp: function() {
+      const resourceData = this.__resourceData;
+      if (!osparc.utils.Resources.isService(resourceData)) {
+        const title = osparc.product.Utils.getStudyAlias({firstUpperCase: true}) + this.tr(" Files...");
+        const iconSrc = "@FontAwesome5Solid/file/22";
+        const dataAccess = new qx.ui.basic.Atom().set({
+          label: title,
+          icon: iconSrc,
+          font: "text-14",
+          padding: 8,
+          paddingLeft: 12,
+          gap: 14,
+          cursor: "pointer",
+        });
+        dataAccess.addListener("tap", () => osparc.widget.StudyDataManager.popUpInWindow(resourceData["uuid"]));
+        this.addWidgetToTabs(dataAccess);
+
+        if (resourceData["resourceType"] === "study") {
+          const canShowData = osparc.study.Utils.canShowStudyData(resourceData);
+          dataAccess.setEnabled(canShowData);
+        }
+      }
+    },
+
+    __getActivityOverviewPopUp: function() {
+      const resourceData = this.__resourceData;
+      if (
+        osparc.desktop.credits.Utils.areWalletsEnabled() &&
+        osparc.utils.Resources.isStudy(resourceData)
+      ) {
+        const title = this.tr("Activity Overview...");
+        const iconSrc = "@FontAwesome5Solid/tasks/22";
+        const dataAccess = new qx.ui.basic.Atom().set({
+          label: title,
+          icon: iconSrc,
+          font: "text-14",
+          padding: 8,
+          paddingLeft: 10,
+          gap: 12, // align with the rest of the tabs
+          cursor: "pointer",
+        });
+        dataAccess.addListener("tap", () => osparc.jobs.ActivityOverview.popUpInWindow(resourceData));
+        this.addWidgetToTabs(dataAccess);
+      }
+    },
   }
 });

services/static-webserver/client/source/class/osparc/data/Job.js

@@ -23,11 +23,12 @@ qx.Class.define("osparc.data.Job", {
 
     this.set({
       projectUuid: jobData["projectUuid"],
-      state: jobData["state"],
+      state: jobData["state"] || "UNKNOWN",
       submittedAt: jobData["submittedAt"] ? new Date(jobData["submittedAt"]) : null,
       startedAt: jobData["startedAt"] ? new Date(jobData["startedAt"]) : null,
       endedAt: jobData["endedAt"] ? new Date(jobData["endedAt"]) : null,
       info: jobData["info"] || null,
+      customMetadata: jobData["customMetadata"] || null,
     });
 
     if (jobData["info"] && jobData["info"]["project_name"]) {
@@ -76,11 +77,32 @@ qx.Class.define("osparc.data.Job", {
 
     info: {
       check: "Object",
-      nullable: false,
+      nullable: true,
+      init: null,
+    },
+
+    customMetadata: {
+      check: "Object",
+      nullable: true,
       init: null,
     },
   },
 
+  statics: {
+    STATUS_LABELS: {
+      "UNKNOWN": "Unknown",
+      "NOT_STARTED": "Not Started",
+      "PUBLISHED": "Published",
+      "PENDING": "Pending",
+      "RUNNING": "Running",
+      "SUCCESS": "Success",
+      "FAILED": "Failed",
+      "ABORTED": "Aborted",
+      "WAITING_FOR_RESOURCES": "Waiting for Resources",
+      "WAITING_FOR_CLUSTER": "Waiting for Cluster",
+    },
+  },
+
   members: {
     __subJobs: null,
 

services/static-webserver/client/source/class/osparc/data/Resources.js

@@ -334,13 +334,25 @@ qx.Class.define("osparc.data.Resources", {
           },
         }
       },
-      "jobs": {
+      "runPipeline": {
+        useCache: false,
+        endpoints: {
+          startPipeline: {
+            method: "POST",
+            url: statics.API + "/computations/{studyId}:start"
+          },
+          stopPipeline: {
+            method: "POST",
+            url: statics.API + "/computations/{studyId}:stop"
+          },
+        }
+      },
+      "jobsActive": {
         useCache: false, // handled in osparc.store.Jobs
         endpoints: {
           getPage: {
             method: "GET",
-            // url: statics.API + "/computations/-/iterations/latest?offset={offset}&limit={limit}&order_by={orderBy}"
-            url: statics.API + "/computations/-/iterations/latest?offset={offset}&limit={limit}&order_by=%7B%22field%22:%22submitted_at%22,%22direction%22:%22desc%22%7D"
+            url: statics.API + "/computations/-/iterations/latest?offset={offset}&limit={limit}&order_by=%7B%22field%22:%22submitted_at%22,%22direction%22:%22desc%22%7D&filter_only_running=true"
           },
         }
       },

services/static-webserver/client/source/class/osparc/data/SubJob.js

@@ -29,7 +29,7 @@ qx.Class.define("osparc.data.SubJob", {
       progress: subJobData["progress"],
       startedAt: subJobData["startedAt"] ? new Date(subJobData["startedAt"]) : null,
       endedAt: subJobData["endedAt"] ? new Date(subJobData["endedAt"]) : null,
-      osparcCredits: subJobData["osparcCredits"] || null,
+      osparcCredits: subJobData["osparcCredits"] === null ? null : -1*parseFloat(subJobData["osparcCredits"]),
       image: subJobData["image"] || {},
       logDownloadLink: subJobData["logDownloadLink"] || null,
     });

services/static-webserver/client/source/class/osparc/desktop/MainPage.js

@@ -69,7 +69,7 @@ qx.Class.define("osparc.desktop.MainPage", {
     preloadPromises.push(osparc.store.Tags.getInstance().fetchTags());
     preloadPromises.push(osparc.store.Products.getInstance().fetchUiConfig());
     preloadPromises.push(osparc.store.PollTasks.getInstance().fetchTasks());
-    preloadPromises.push(osparc.store.Jobs.getInstance().fetchJobs());
+    preloadPromises.push(osparc.store.Jobs.getInstance().fetchJobsActive());
     Promise.all(preloadPromises)
       .then(() => {
         const mainStack = this.__createMainStack();

services/static-webserver/client/source/class/osparc/desktop/StudyEditor.js

@@ -569,64 +569,64 @@ qx.Class.define("osparc.desktop.StudyEditor", {
         return;
       }
 
-      this.getStudy().setPipelineRunning(true);
       this.updateStudyDocument()
         .then(() => {
           this.__requestStartPipeline(this.getStudy().getUuid(), partialPipeline);
         })
         .catch(() => {
           this.getStudyLogger().error(null, "Run failed");
-          this.getStudy().setPipelineRunning(false);
         });
     },
 
     __requestStartPipeline: function(studyId, partialPipeline = [], forceRestart = false) {
-      const url = "/computations/" + encodeURIComponent(studyId) + ":start";
-      const req = new osparc.io.request.ApiRequest(url, "POST");
-      req.addListener("success", this.__onPipelineSubmitted, this);
-      req.addListener("error", () => {
-        this.getStudyLogger().error(null, "Error submitting pipeline");
-        this.getStudy().setPipelineRunning(false);
-      }, this);
-      req.addListener("fail", async e => {
-        if (e.getTarget().getStatus() == "409") {
-          this.getStudyLogger().error(null, "Pipeline is already running");
-        } else if (e.getTarget().getStatus() == "422") {
-          this.getStudyLogger().info(null, "The pipeline is up-to-date");
-          const msg = this.tr("The pipeline is up-to-date. Do you want to re-run it?");
-          const win = new osparc.ui.window.Confirmation(msg).set({
-            caption: this.tr("Re-run"),
-            confirmText: this.tr("Run"),
-            confirmAction: "create"
-          });
-          win.center();
-          win.open();
-          win.addListener("close", () => {
-            if (win.getConfirmed()) {
-              this.__requestStartPipeline(studyId, partialPipeline, true);
-            }
-          }, this);
-        } else if (e.getTarget().getStatus() == "402") {
-          const msg = await e.getTarget().getResponse().error.errors[0].message;
-          osparc.FlashMessenger.logAs(msg, "WARNING");
-        } else {
-          this.getStudyLogger().error(null, "Unsuccessful pipeline submission");
-        }
-        this.getStudy().setPipelineRunning(false);
-      }, this);
+      this.getStudy().setPipelineRunning(true);
 
-      const requestData = {
-        "subgraph": partialPipeline,
-        "force_restart": forceRestart
-      };
-      req.setRequestData(requestData);
-      req.send();
       if (partialPipeline.length) {
         this.getStudyLogger().info(null, "Starting partial pipeline");
       } else {
         this.getStudyLogger().info(null, "Starting pipeline");
       }
 
+      const params = {
+        url: {
+          "studyId": studyId
+        },
+        data: {
+          "subgraph": partialPipeline,
+          "force_restart": forceRestart,
+        }
+      };
+      osparc.data.Resources.fetch("runPipeline", "startPipeline", params)
+        .then(() => this.__onPipelineSubmitted())
+        .catch(err => {
+          let msg = err.message;
+          const errStatus = err.status;
+          if (errStatus == "409") {
+            this.getStudyLogger().error(null, "Pipeline is already running");
+          } else if (errStatus == "422") {
+            this.getStudyLogger().info(null, "The pipeline is up-to-date");
+            msg = this.tr("The pipeline is up-to-date. Do you want to re-run it?");
+            const win = new osparc.ui.window.Confirmation(msg).set({
+              caption: this.tr("Re-run"),
+              confirmText: this.tr("Run"),
+              confirmAction: "create"
+            });
+            win.center();
+            win.open();
+            win.addListener("close", () => {
+              if (win.getConfirmed()) {
+                this.__requestStartPipeline(studyId, partialPipeline, true);
+              }
+            }, this);
+          } else if (err.status == "402") {
+            osparc.FlashMessenger.logAs(msg, "WARNING");
+          } else {
+            osparc.FlashMessenger.logAs(msg, "WARNING");
+            this.getStudyLogger().error(null, "Unsuccessful pipeline submission");
+          }
+          this.getStudy().setPipelineRunning(false);
+        });
+
       return true;
     },
 
@@ -662,19 +662,20 @@ qx.Class.define("osparc.desktop.StudyEditor", {
         return;
       }
 
-      this.__requestStopPipeline(this.getStudy().getUuid());
+      this.__requestStopPipeline();
     },
 
-    __requestStopPipeline: function(studyId) {
-      const url = "/computations/" + encodeURIComponent(studyId) + ":stop";
-      const req = new osparc.io.request.ApiRequest(url, "POST");
-      req.addListener("success", () => this.getStudyLogger().debug(null, "Pipeline aborting"), this);
-      req.addListener("error", () => this.getStudyLogger().error(null, "Error stopping pipeline"), this);
-      req.addListener("fail", () => this.getStudyLogger().error(null, "Failed stopping pipeline"), this);
-      req.send();
-
+    __requestStopPipeline: function() {
       this.getStudyLogger().info(null, "Stopping pipeline");
-      return true;
+
+      const params = {
+        url: {
+          "studyId": this.getStudy().getUuid()
+        },
+      };
+      osparc.data.Resources.fetch("runPipeline", "stopPipeline", params)
+        .then(() => this.getStudyLogger().debug(null, "Stopping pipeline"), this)
+        .catch(() => this.getStudyLogger().error(null, "Error stopping pipeline"), this);
     },
     // ------------------ START/STOP PIPELINE ------------------
 

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

@@ -24,8 +24,8 @@ qx.Class.define("osparc.jobs.ActivityCenterWindow", {
     this.set({
       layout: new qx.ui.layout.VBox(),
       modal: true,
-      width: 1100,
-      height: 500,
+      width: this.self().WIDTH,
+      height: this.self().HEIGHT,
       showMaximize: false,
       showMinimize: false,
     });
@@ -34,6 +34,9 @@ qx.Class.define("osparc.jobs.ActivityCenterWindow", {
   },
 
   statics: {
+    WIDTH: 1000,
+    HEIGHT: 500,
+
     openWindow: function() {
       const runsWindow = new osparc.jobs.ActivityCenterWindow();
       runsWindow.center();