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

Author: matusdrobuliak66

packages/models-library/src/models_library/api_schemas_resource_usage_tracker/pricing_plans.py

@@ -1,8 +1,7 @@
 from datetime import datetime
 from decimal import Decimal
-from typing import Annotated
 
-from pydantic import BaseModel, ConfigDict, PlainSerializer
+from pydantic import BaseModel, ConfigDict
 
 from ..resource_tracker import (
     HardwareInfo,
@@ -19,9 +18,7 @@ class PricingUnitGet(BaseModel):
     pricing_unit_id: PricingUnitId
     unit_name: str
     unit_extra_info: UnitExtraInfo
-    current_cost_per_unit: Annotated[
-        Decimal, PlainSerializer(float, return_type=float, when_used="json")
-    ]
+    current_cost_per_unit: Decimal
     current_cost_per_unit_id: PricingUnitCostId
     default: bool
     specific_info: HardwareInfo

packages/models-library/src/models_library/api_schemas_webserver/resource_usage.py

@@ -1,8 +1,7 @@
 from datetime import datetime
 from decimal import Decimal
-from typing import Annotated
 
-from pydantic import BaseModel, ConfigDict, Field, PlainSerializer
+from pydantic import BaseModel, ConfigDict, Field
 
 from ..projects import ProjectID
 from ..projects_nodes_io import NodeID
@@ -50,9 +49,7 @@ class PricingUnitGet(OutputSchema):
     pricing_unit_id: PricingUnitId
     unit_name: str
     unit_extra_info: UnitExtraInfo
-    current_cost_per_unit: Annotated[
-        Decimal, PlainSerializer(float, return_type=float, when_used="json")
-    ]
+    current_cost_per_unit: Decimal
     default: bool
 
 

packages/models-library/src/models_library/api_schemas_webserver/wallets.py

@@ -1,15 +1,8 @@
 from datetime import datetime
 from decimal import Decimal
-from typing import Annotated, Literal, TypeAlias
+from typing import Literal, TypeAlias
 
-from pydantic import (
-    ConfigDict,
-    Field,
-    HttpUrl,
-    PlainSerializer,
-    ValidationInfo,
-    field_validator,
-)
+from pydantic import ConfigDict, Field, HttpUrl, ValidationInfo, field_validator
 
 from ..basic_types import AmountDecimal, IDStr, NonNegativeDecimal
 from ..users import GroupID
@@ -20,9 +13,9 @@
 class WalletGet(OutputSchema):
     wallet_id: WalletID
     name: IDStr
-    description: str | None
+    description: str | None = None
     owner: GroupID
-    thumbnail: str | None
+    thumbnail: str | None = None
     status: WalletStatus
     created: datetime
     modified: datetime
@@ -31,7 +24,7 @@ class WalletGet(OutputSchema):
 
 
 class WalletGetWithAvailableCredits(WalletGet):
-    available_credits: Annotated[Decimal, PlainSerializer(float)]
+    available_credits: Decimal
 
 
 class WalletGetPermissions(WalletGet):

services/api-server/openapi.json

@@ -6492,7 +6492,7 @@
             "$ref": "#/components/schemas/UnitExtraInfo"
           },
           "currentCostPerUnit": {
-            "type": "number",
+            "type": "string",
             "title": "Currentcostperunit"
           },
           "default": {
@@ -7093,7 +7093,7 @@
             "title": "Modified"
           },
           "availableCredits": {
-            "type": "number",
+            "type": "string",
             "title": "Availablecredits"
           }
         },

services/resource-usage-tracker/tests/unit/api_rest/test__oas_spec.py

@@ -209,17 +209,10 @@ qx.Class.define("osparc.Application", {
     },
 
     __updateTabName: function() {
-      const platformName = osparc.store.StaticInfo.getInstance().getPlatformName();
-      if (osparc.utils.Utils.isInZ43()) {
-        document.title += " Z43";
-      }
-      if (platformName) {
-        document.title += ` (${platformName})`;
-      }
+      const newName = osparc.utils.Utils.composeTabName();
+      osparc.utils.Utils.updateTabName(newName);
     },
 
-
-
     __setDeviceSpecificIcons: function() {
       const isIOS = /iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream;
       const isAndroid = /android/i.test(navigator.userAgent);

services/static-webserver/client/source/class/osparc/Application.js

@@ -167,7 +167,6 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
       if (
         !osparc.auth.Manager.getInstance().isLoggedIn() ||
         this.getCurrentContext() === "studiesAndFolders" ||
-        this.getCurrentContext() === "search" || // not yet implemented for workspaces
         this.__loadingWorkspaces
       ) {
         return;
@@ -178,7 +177,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
         case "search": {
           const filterData = this._searchBarFilter.getFilterData();
           const text = filterData.text ? encodeURIComponent(filterData.text) : "";
-          request = osparc.store.Workspaces.getInstance().searchWorkspaces(text);
+          request = osparc.store.Workspaces.getInstance().searchWorkspaces(text, this.getOrderBy());
           break;
         }
         case "workspaces": {

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

@@ -368,7 +368,7 @@ qx.Class.define("osparc.data.Resources", {
           getPageSearch: {
             useCache: false,
             method: "GET",
-            url: statics.API + "/workspaces:search?offset={offset}&limit={limit}&text={text}&order_by={orderBy}"
+            url: statics.API + "/workspaces?offset={offset}&limit={limit}&filters={filters}&order_by={orderBy}"
           },
           getPageTrashed: {
             useCache: false,

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

@@ -59,7 +59,8 @@ qx.Class.define("osparc.store.Store", {
       check: "osparc.data.model.Study",
       init: null,
       nullable: true,
-      event: "changeCurrentStudy"
+      event: "changeCurrentStudy",
+      apply: "__applyCurrentStudy",
     },
     currentStudyId: {
       check: "String",
@@ -334,6 +335,21 @@ qx.Class.define("osparc.store.Store", {
       }
     },
 
+    __applyCurrentStudy: function(study) {
+      if (study) {
+        study.addListener("changeName", () => {
+          if (this.getCurrentStudy() === study) {
+            // the study might have been closed
+            osparc.utils.Utils.updateTabName(study.getName());
+          }
+        });
+        osparc.utils.Utils.updateTabName(study.getName());
+      } else {
+        const newName = osparc.utils.Utils.composeTabName();
+        osparc.utils.Utils.updateTabName(newName);
+      }
+    },
+
     __applyWallets: function(wallets) {
       const preferenceSettings = osparc.Preferences.getInstance();
       const preferenceWalletId = preferenceSettings.getPreferredWalletId();

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

@@ -103,16 +103,24 @@ qx.Class.define("osparc.store.Workspaces", {
         });
     },
 
-    searchWorkspaces: function(text) {
+    searchWorkspaces: function(
+      text,
+      orderBy = {
+        field: "modified_at",
+        direction: "desc"
+      },
+    ) {
       if (osparc.auth.Data.getInstance().isGuest()) {
         return new Promise(resolve => {
           resolve([]);
         });
       }
 
+      const curatedOrderBy = this.self().curateOrderBy(orderBy);
       const params = {
         url: {
-          text,
+          filters: JSON.stringify({text: text}),
+          orderBy: JSON.stringify(curatedOrderBy),
         }
       };
       return osparc.data.Resources.getInstance().getAllPages("workspaces", params, "getPageSearch")