Merge branch 'master' into introduce-vip-models-pricing-6-part

matusdrobuliak66 · web-flow · commit 5dd8efaf6d1d · 2024-12-16T14:44:57.000+01:00
diff --git a/services/static-webserver/client/source/class/osparc/dashboard/CardBase.js b/services/static-webserver/client/source/class/osparc/dashboard/CardBase.js
@@ -85,7 +85,7 @@ qx.Class.define("osparc.dashboard.CardBase", {
 
     filterText: function(checks, text) {
       if (text) {
-        const includesSome = checks.some(check => check.toLowerCase().trim().includes(text.toLowerCase()));
+        const includesSome = checks.some(check => check && check.toLowerCase().trim().includes(text.toLowerCase()));
         return !includesSome;
       }
       return false;
diff --git a/services/static-webserver/client/source/class/osparc/data/Resources.js b/services/static-webserver/client/source/class/osparc/data/Resources.js
@@ -418,11 +418,11 @@ qx.Class.define("osparc.data.Resources", {
           },
           getWithWallet: {
             method: "GET",
-            url: statics.API + "/services/-/resource-usages?wallet_id={walletId}&offset={offset}&limit={limit}&filters={filters}&order_by={orderBy}"
+            url: statics.API + "/services/-/resource-usages?wallet_id={walletId}&offset={offset}&limit={limit}"
           },
-          getWithWallet2: {
+          getWithWalletFiltered: {
             method: "GET",
-            url: statics.API + "/services/-/resource-usages?wallet_id={walletId}&offset={offset}&limit={limit}"
+            url: statics.API + "/services/-/resource-usages?wallet_id={walletId}&offset={offset}&limit={limit}&filters={filters}&order_by={orderBy}"
           },
           getUsagePerService: {
             method: "GET",
diff --git a/services/static-webserver/client/source/class/osparc/data/model/IframeHandler.js b/services/static-webserver/client/source/class/osparc/data/model/IframeHandler.js
@@ -378,7 +378,7 @@ qx.Class.define("osparc.data.model.IframeHandler", {
       const node = this.getNode();
       if (node.getServiceUrl() !== null) {
         // restart button pushed
-        if (this.getIFrame().getSource().includes(node.getServiceUrl())) {
+        if (this.getIFrame() && this.getIFrame().getSource().includes(node.getServiceUrl())) {
           this.__loadIframe();
         }
 
diff --git a/services/static-webserver/client/source/class/osparc/data/model/Service.js b/services/static-webserver/client/source/class/osparc/data/model/Service.js
@@ -43,7 +43,8 @@ qx.Class.define("osparc.data.model.Service", {
       bootOptions: serviceData.bootOptions,
       classifiers: serviceData.classifiers || [],
       quality: serviceData.quality || null,
-      hits: serviceData.hits || 0
+      xType: serviceData.xType || null,
+      hits: serviceData.hits || 0,
     });
   },
 
@@ -147,6 +148,13 @@ qx.Class.define("osparc.data.model.Service", {
     },
 
     // ------ ignore for serializing ------
+    xType: {
+      check: "String",
+      nullable: true,
+      init: null,
+      event: "changeXType",
+    },
+
     hits: {
       check: "Number",
       init: 0,
@@ -158,7 +166,8 @@ qx.Class.define("osparc.data.model.Service", {
 
   statics: {
     IgnoreSerializationProps: [
-      "hits"
+      "xType",
+      "hits",
     ]
   },
 
diff --git a/services/static-webserver/client/source/class/osparc/desktop/WorkbenchView.js b/services/static-webserver/client/source/class/osparc/desktop/WorkbenchView.js
@@ -356,9 +356,6 @@ qx.Class.define("osparc.desktop.WorkbenchView", {
         this.__workbenchUI.openServiceCatalog({
           x: 50,
           y: 50
-        }, {
-          x: 50,
-          y: 50
         });
       });
       homeAndNodesTree.add(addNewNodeBtn);
diff --git a/services/static-webserver/client/source/class/osparc/desktop/credits/CurrentUsage.js b/services/static-webserver/client/source/class/osparc/desktop/credits/CurrentUsage.js
@@ -66,7 +66,7 @@ qx.Class.define("osparc.desktop.credits.CurrentUsage", {
             limit: 10
           }
         };
-        osparc.data.Resources.fetch("resourceUsage", "getWithWallet2", params)
+        osparc.data.Resources.fetch("resourceUsage", "getWithWallet", params)
           .then(data => {
             const currentTasks = data.filter(d => (d.project_id === currentStudy.getUuid()) && d.service_run_status === "RUNNING");
             let cost = 0;
diff --git a/services/static-webserver/client/source/class/osparc/desktop/credits/UsageTable.js b/services/static-webserver/client/source/class/osparc/desktop/credits/UsageTable.js
@@ -114,7 +114,13 @@ qx.Class.define("osparc.desktop.credits.UsageTable", {
         column: 7,
         label: qx.locale.Manager.tr("User"),
         width: 140
-      }
+      },
+      TAGS: {
+        id: "tags",
+        column: 7,
+        label: qx.locale.Manager.tr("Tags"),
+        width: 140
+      },
     }
   }
 });
diff --git a/services/static-webserver/client/source/class/osparc/desktop/credits/UsageTableModel.js b/services/static-webserver/client/source/class/osparc/desktop/credits/UsageTableModel.js
@@ -60,7 +60,8 @@ qx.Class.define("osparc.desktop.credits.UsageTableModel", {
       // 4: (not used) SORTING BY DURATION
       5: "service_run_status",
       6: "credit_cost",
-      7: "user_email"
+      7: "user_email",
+      8: "projects_tags",
     }
   },
 
@@ -76,7 +77,7 @@ qx.Class.define("osparc.desktop.credits.UsageTableModel", {
 
     // overridden
     _loadRowCount() {
-      const endpoint = this.getWalletId() == null ? "get" : "getWithWallet"
+      const endpoint = this.getWalletId() == null ? "get" : "getWithWalletFiltered"
       const params = {
         url: {
           walletId: this.getWalletId(),
@@ -109,7 +110,7 @@ qx.Class.define("osparc.desktop.credits.UsageTableModel", {
       const lastRow = Math.min(qxLastRow, this._rowCount - 1)
       // Returns a request promise with given offset and limit
       const getFetchPromise = (offset, limit=this.self().SERVER_MAX_LIMIT) => {
-        const endpoint = this.getWalletId() == null ? "get" : "getWithWallet"
+        const endpoint = this.getWalletId() == null ? "get" : "getWithWalletFiltered"
         return osparc.data.Resources.fetch("resourceUsage", endpoint, {
           url: {
             walletId: this.getWalletId(),
@@ -149,7 +150,8 @@ qx.Class.define("osparc.desktop.credits.UsageTableModel", {
                 [usageCols.DURATION.id]: duration,
                 [usageCols.STATUS.id]: qx.lang.String.firstUp(rawRow["service_run_status"].toLowerCase()),
                 [usageCols.COST.id]: rawRow["credit_cost"] ? parseFloat(rawRow["credit_cost"]).toFixed(2) : "",
-                [usageCols.USER.id]: rawRow["user_email"]
+                [usageCols.USER.id]: rawRow["user_email"],
+                [usageCols.TAGS.id]: rawRow["project_tags"],
               })
             })
             return data
diff --git a/services/static-webserver/client/source/class/osparc/filter/NodeTypeFilter.js b/services/static-webserver/client/source/class/osparc/filter/NodeTypeFilter.js
@@ -27,7 +27,7 @@ qx.Class.define("osparc.filter.NodeTypeFilter", {
    * @extends osparc.filter.TagsFilter
    */
   construct: function(filterId, filterGroupId) {
-    this.base(arguments, this.tr("Service types"), filterId, filterGroupId);
+    this.base(arguments, this.tr("Type"), filterId, filterGroupId);
     this._setLayout(new qx.ui.layout.HBox());
 
     this.__buildMenu();
diff --git a/services/static-webserver/client/source/class/osparc/filter/group/ServiceFilterGroup.js b/services/static-webserver/client/source/class/osparc/filter/group/ServiceFilterGroup.js
@@ -27,7 +27,7 @@ qx.Class.define("osparc.filter.group.ServiceFilterGroup", {
    */
   construct: function(filterGroupId) {
     this.base(arguments);
-    this._setLayout(new qx.ui.layout.HBox(5));
+    this._setLayout(new qx.ui.layout.HBox(10));
     this.__filterGroupId = filterGroupId;
     const textFilter = this.__textFilter = new osparc.filter.TextFilter("text", filterGroupId);
     osparc.utils.Utils.setIdToWidget(textFilter, "serviceFiltersTextFld");
diff --git a/services/static-webserver/client/source/class/osparc/service/ServiceList.js b/services/static-webserver/client/source/class/osparc/service/ServiceList.js
@@ -29,7 +29,7 @@ qx.Class.define("osparc.service.ServiceList", {
    */
   construct: function(filterGroupId) {
     this.base(arguments);
-    this._setLayout(new qx.ui.layout.Flow(5, 5));
+    this._setLayout(new qx.ui.layout.VBox(5));
     if (filterGroupId) {
       this.__filterGroup = filterGroupId;
     }
diff --git a/services/static-webserver/client/source/class/osparc/service/ServiceListItem.js b/services/static-webserver/client/source/class/osparc/service/ServiceListItem.js
@@ -26,7 +26,8 @@ qx.Class.define("osparc.service.ServiceListItem", {
       height: this.self().ITEM_HEIGHT,
       paddingTop: 0,
       paddingBottom: 0,
-      allowGrowX: true
+      allowGrowX: true,
+      focusable: true,
     });
 
     this.setResourceType("service");
@@ -60,33 +61,6 @@ qx.Class.define("osparc.service.ServiceListItem", {
     __versionsBox: null,
     __infoBtn: null,
 
-    _createChildControlImpl: function(id) {
-      let control;
-      switch (id) {
-        case "extended-layout":
-          control = new qx.ui.container.Composite(new qx.ui.layout.VBox(10));
-          this._add(control, {
-            row: 1,
-            column: 0,
-            colSpan: osparc.dashboard.ListButtonBase.POS.HITS
-          });
-          break;
-        case "version-layout": {
-          control = new qx.ui.container.Composite(new qx.ui.layout.HBox(10));
-          this.getChildControl("extended-layout").add(control);
-          const versionLabel = new qx.ui.basic.Label(this.tr("Version"));
-          control.add(versionLabel);
-          const selectBox = this.__versionsBox = new qx.ui.form.SelectBox();
-          control.add(selectBox);
-          const infoBtn = this.__infoBtn = new qx.ui.form.Button(null, "@MaterialIcons/info_outline/16");
-          infoBtn.addListener("execute", () => this.__showServiceDetails(), this);
-          control.add(infoBtn);
-          break;
-        }
-      }
-      return control || this.base(arguments, id);
-    },
-
     __applyService: function(service) {
       // BASE
       if (service.getThumbnail()) {
@@ -123,44 +97,6 @@ qx.Class.define("osparc.service.ServiceListItem", {
       });
     },
 
-    __itemSelected: function(selected) {
-      this.setHeight(selected ? 70 : 35);
-      const extendedLayout = this.getChildControl("extended-layout");
-      const versionLayout = this.getChildControl("version-layout");
-      extendedLayout.setVisibility(selected ? "visible" : "excluded");
-      versionLayout.setVisibility(selected ? "visible" : "excluded");
-      this.__populateVersions();
-    },
-
-    __populateVersions: function() {
-      const serviceKey = this.getService().getKey();
-      const selectBox = this.__versionsBox;
-      selectBox.removeAll();
-      const versions = osparc.service.Utils.getVersions(serviceKey);
-      const latest = new qx.ui.form.ListItem(this.self().LATEST);
-      latest.version = this.self().LATEST;
-      selectBox.add(latest);
-      versions.forEach(version => {
-        const listItem = osparc.service.Utils.versionToListItem(serviceKey, version);
-        selectBox.add(listItem);
-      });
-      osparc.utils.Utils.growSelectBox(selectBox, 200);
-      selectBox.setSelection([latest]);
-    },
-
-    __showServiceDetails: function() {
-      const key = this.getService().getKey();
-      let version = this.__versionsBox.getSelection()[0].version;
-      if (version === this.self().LATEST) {
-        version = this.__versionsBox.getChildrenContainer().getSelectables()[1].version;
-      }
-      osparc.store.Services.getService(key, version)
-        .then(serviceMetadata => {
-          const serviceDetails = new osparc.info.ServiceLarge(serviceMetadata);
-          osparc.info.ServiceLarge.popUpInWindow(serviceDetails);
-        });
-    },
-
     _filterText: function(text) {
       const checks = [
         this.getService().getName(),
diff --git a/services/static-webserver/client/source/class/osparc/vipMarket/VipMarket.js b/services/static-webserver/client/source/class/osparc/vipMarket/VipMarket.js
@@ -296,7 +296,7 @@ qx.Class.define("osparc.vipMarket.VipMarket", {
                     const found = this.__anatomicalModels.find(model => model["modelId"] === modelId);
                     if (found) {
                       found["purchases"].push(purchaseData);
-                      this.__populateModels();
+                      this.__populateModels(modelId);
                       anatomicModelDetails.setAnatomicalModelsData(found);
                     }
                   })
@@ -317,7 +317,7 @@ qx.Class.define("osparc.vipMarket.VipMarket", {
         .catch(err => console.error(err));
     },
 
-    __populateModels: function() {
+    __populateModels: function(selectModelId) {
       const models = this.__anatomicalModels;
 
       this.__anatomicalModelsModel.removeAll();
@@ -358,6 +358,18 @@ qx.Class.define("osparc.vipMarket.VipMarket", {
         sortModel(sortBy);
         models.forEach(model => this.__anatomicalModelsModel.append(qx.data.marshal.Json.createModel(model)));
       }, this);
+
+      // select model after timeout, there is something that changes the selection to empty after populating the list
+      setTimeout(() => {
+        const modelsUIList = this.getChildControl("models-list");
+        if (selectModelId) {
+          const entryFound = modelsUIList.getSelectables().find(entry => "getModelId" in entry && entry.getModelId() === selectModelId);
+          modelsUIList.setSelection([entryFound]);
+        } else if (modelsUIList.getSelectables().length) {
+          // select first
+          modelsUIList.setSelection([modelsUIList.getSelectables()[0]]);
+        }
+      }, 100);
     },
 
     __sendImportModelMessage: function(modelId) {
diff --git a/services/static-webserver/client/source/class/osparc/workbench/ServiceCatalog.js b/services/static-webserver/client/source/class/osparc/workbench/ServiceCatalog.js
@@ -54,18 +54,18 @@ qx.Class.define("osparc.workbench.ServiceCatalog", {
 
     this.__sortBy = osparc.service.SortServicesButtons.DefaultSorting;
 
-    let catalogLayout = new qx.ui.layout.VBox();
+    const catalogLayout = new qx.ui.layout.VBox();
     this.setLayout(catalogLayout);
 
-    let filterLayout = this.__createFilterLayout();
+    const filterLayout = this.__createFilterLayout();
     this.add(filterLayout);
 
-    let list = this.__createListLayout();
+    const list = this.__createListLayout();
     this.add(list, {
       flex: 1
     });
 
-    let btnLayout = this.__createButtonsLayout();
+    const btnLayout = this.__createButtonsLayout();
     this.add(btnLayout);
 
     this.__createEvents();
@@ -103,9 +103,11 @@ qx.Class.define("osparc.workbench.ServiceCatalog", {
       });
 
       const filters = new osparc.filter.group.ServiceFilterGroup("serviceCatalog").set({
-        maxHeight: 30
+        maxHeight: 30,
+      });
+      this.__textFilter = filters.getTextFilter().getChildControl("textfield", true).set({
+        minWidth: 150,
       });
-      this.__textFilter = filters.getTextFilter().getChildControl("textfield", true);
       layout.add(filters);
 
       layout.add(new qx.ui.core.Spacer(), {
@@ -131,9 +133,7 @@ qx.Class.define("osparc.workbench.ServiceCatalog", {
         width: 568,
         backgroundColor: "background-main"
       });
-      const scrolledServices = new qx.ui.container.Scroll().set({
-        height: 260
-      });
+      const scrolledServices = new qx.ui.container.Scroll();
       scrolledServices.add(serviceList);
 
       this.__serviceList.addListener("changeSelected", e => {
diff --git a/services/static-webserver/client/source/class/osparc/workbench/WorkbenchUI.js b/services/static-webserver/client/source/class/osparc/workbench/WorkbenchUI.js
diff --git a/services/web/server/src/simcore_service_webserver/projects/projects_api.py b/services/web/server/src/simcore_service_webserver/projects/projects_api.py

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ qx.Class.define("osparc.dashboard.CardBase", {`
`85`	`85`
`86`	`86`	`filterText: function(checks, text) {`
`87`	`87`	`if (text) {`
`88`		`- const includesSome = checks.some(check => check.toLowerCase().trim().includes(text.toLowerCase()));`
	`88`	`+ const includesSome = checks.some(check => check && check.toLowerCase().trim().includes(text.toLowerCase()));`
`89`	`89`	`return !includesSome;`
`90`	`90`	`}`
`91`	`91`	`return false;`
Original file line number	Diff line number	Diff line change
`@@ -378,7 +378,7 @@ qx.Class.define("osparc.data.model.IframeHandler", {`
`378`	`378`	`const node = this.getNode();`
`379`	`379`	`if (node.getServiceUrl() !== null) {`
`380`	`380`	`// restart button pushed`
`381`		`- if (this.getIFrame().getSource().includes(node.getServiceUrl())) {`
	`381`	`+ if (this.getIFrame() && this.getIFrame().getSource().includes(node.getServiceUrl())) {`
`382`	`382`	`this.__loadIframe();`
`383`	`383`	`}`
`384`	`384`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ qx.Class.define("osparc.desktop.credits.CurrentUsage", {`
`66`	`66`	`limit: 10`
`67`	`67`	`}`
`68`	`68`	`};`
`69`		`- osparc.data.Resources.fetch("resourceUsage", "getWithWallet2", params)`
	`69`	`+ osparc.data.Resources.fetch("resourceUsage", "getWithWallet", params)`
`70`	`70`	`.then(data => {`
`71`	`71`	`const currentTasks = data.filter(d => (d.project_id === currentStudy.getUuid()) && d.service_run_status === "RUNNING");`
`72`	`72`	`let cost = 0;`