Merge branch 'master' into functions_draft

Author: wvangeit

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

@@ -69,13 +69,17 @@ qx.Class.define("osparc.dashboard.Dashboard", {
     appearance: {
       init: "dashboard",
       refine: true
-    }
+    },
   },
 
   statics: {
     PADDING: 15
   },
 
+  events: {
+    "preResourcesLoaded": "qx.event.type.Event",
+  },
+
   members: {
     __studyBrowser: null,
     __templateBrowser: null,
@@ -181,12 +185,15 @@ qx.Class.define("osparc.dashboard.Dashboard", {
         this.add(tabPage);
       }, this);
 
+      let preResourcesLoaded = false;
       const preResourcePromises = [];
       const groupsStore = osparc.store.Groups.getInstance();
       preResourcePromises.push(groupsStore.fetchGroupsAndMembers());
       preResourcePromises.push(osparc.store.Services.getServicesLatest(false));
       Promise.all(preResourcePromises)
         .then(() => {
+          preResourcesLoaded = true;
+          this.fireEvent("preResourcesLoaded");
           if (this.__studyBrowser) {
             this.__studyBrowser.initResources();
           }
@@ -196,15 +203,24 @@ qx.Class.define("osparc.dashboard.Dashboard", {
           if (this.__dataBrowser) {
             this.__dataBrowser.initResources();
           }
-
-          this.addListener("changeSelection", e => {
-            const selectedTab = e.getData()[0];
-            if (selectedTab && selectedTab.resourceBrowser) {
-              selectedTab.resourceBrowser.initResources();
-            }
-          }, this);
         })
         .catch(err => console.error(err));
+
+      this.addListener("changeSelection", e => {
+        const selectedTab = e.getData()[0];
+        if (selectedTab && selectedTab.resourceBrowser) {
+          // avoid changing the selection when the PreResources are not yet loaded
+          if (preResourcesLoaded) {
+            selectedTab.resourceBrowser.initResources();
+          } else {
+            const initTab = () => {
+              selectedTab.resourceBrowser.initResources()
+              this.removeListener("preResourcesLoaded", initTab);
+            };
+            this.addListener("preResourcesLoaded", initTab, this);
+          }
+        }
+      }, this);
     },
 
     __createStudyBrowser: function() {

services/static-webserver/client/source/class/osparc/dashboard/FoldersTree.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/ResourceBrowserBase.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/dashboard/ResourceDetails.js

@@ -45,33 +45,25 @@ qx.Class.define("osparc.dashboard.SearchBarFilter", {
     HEIGHT: 36,
 
     getSharedWithOptions: function(resourceType) {
-      if (resourceType === "service") {
-        resourceType = "app";
-      }
+      const resourceAlias = osparc.product.Utils.resourceTypeToAlias(resourceType, {
+        firstUpperCase: true,
+        plural: true
+      });
       return [{
         id: "show-all",
-        label: qx.locale.Manager.tr("All") + " " + osparc.product.Utils.resourceTypeToAlias(resourceType, {
-          firstUpperCase: true,
-          plural: true
-        }),
+        label: qx.locale.Manager.tr("All") + " " + resourceAlias,
         icon: "@FontAwesome5Solid/home/20"
       }, {
         id: "my-resources",
-        label: qx.locale.Manager.tr("My") + " " + osparc.product.Utils.resourceTypeToAlias(resourceType, {
-          firstUpperCase: true,
-          plural: true
-        }),
+        label: qx.locale.Manager.tr("My") + " " + resourceAlias,
         icon: "@FontAwesome5Solid/user/20"
       }, {
         id: "shared-with-me",
         label: qx.locale.Manager.tr("Shared with Me"),
         icon: "@FontAwesome5Solid/users/20"
       }, {
         id: "shared-with-everyone",
-        label: qx.locale.Manager.tr("Public") + " " + osparc.product.Utils.resourceTypeToAlias(resourceType, {
-          firstUpperCase: true,
-          plural: true
-        }),
+        label: qx.locale.Manager.tr("Public") + " " + resourceAlias,
         icon: "@FontAwesome5Solid/globe/20"
       }];
     }

services/static-webserver/client/source/class/osparc/dashboard/SearchBarFilter.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/Job.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/Resources.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/data/SubJob.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();