Merge branch 'master' into enh/open-request-account

odeimaiz · web-flow · commit bf3c545eeb30 · 2025-06-11T23:44:45.000+02:00
diff --git a/packages/models-library/src/models_library/rest_error.py b/packages/models-library/src/models_library/rest_error.py
@@ -4,6 +4,7 @@
 from common_library.basic_types import DEFAULT_FACTORY
 from models_library.generics import Envelope
 from pydantic import BaseModel, ConfigDict, Field
+from pydantic.config import JsonDict
 
 from .basic_types import IDStr, LogLevel
 
@@ -72,39 +73,55 @@ class ErrorGet(BaseModel):
             description="Message displayed to the user",
         ),
     ]
+
     support_id: Annotated[
         IDStr | None,
         Field(description="ID to track the incident during support", alias="supportId"),
     ] = None
-    status: int
 
-    # NOTE: The fields blow are DEPRECATED. Still here to keep compatibilty with front-end until updated
+    status: Annotated[
+        int,
+        Field(
+            description="Redundant HTTP status code of the error."
+            "Must be the same as in the HTTP response"
+        ),
+    ]
+
+    # NOTE: The fields below are DEPRECATED.
+    #  Still here to keep compatibilty with front-end until updated
     errors: Annotated[
         list[ErrorItemType],
         Field(deprecated=True, default_factory=list, json_schema_extra={"default": []}),
     ] = DEFAULT_FACTORY
+
     logs: Annotated[
         list[LogMessageType],
         Field(deprecated=True, default_factory=list, json_schema_extra={"default": []}),
     ] = DEFAULT_FACTORY
 
+    @staticmethod
+    def _update_json_schema_extra(schema: JsonDict) -> None:
+        schema.update(
+            {
+                "examples": [
+                    {
+                        "message": "Sorry you do not have sufficient access rights for product",
+                        "status": 401,
+                    },
+                    {
+                        "message": "Opps this error was unexpected. We are working on that!",
+                        "supportId": "OEC:12346789",
+                        "status": 500,
+                    },
+                ]
+            }
+        )
+
     model_config = ConfigDict(
         populate_by_name=True,
         extra="ignore",  # Used to prune extra fields from internal data
         frozen=True,
-        json_schema_extra={
-            "examples": [
-                {
-                    "message": "Sorry you do not have sufficient access rights for product",
-                    "status": 401,
-                },
-                {
-                    "message": "Opps this error was unexpected. We are working on that!",
-                    "supportId": "OEC:12346789",
-                    "status": 500,
-                },
-            ]
-        },
+        json_schema_extra=_update_json_schema_extra,
     )
 
 
diff --git a/services/static-webserver/client/source/class/osparc/FlashMessenger.js b/services/static-webserver/client/source/class/osparc/FlashMessenger.js
@@ -105,13 +105,14 @@ qx.Class.define("osparc.FlashMessenger", {
         allowGrowX: false,
       });
       errorLabel.addListener("tap", () => {
+        const currentStudy = osparc.store.Store.getInstance().getCurrentStudy();
         const dataToClipboard = {
           message,
           supportId,
           timestamp: new Date().toString(),
           url: window.location.href,
           releaseTag: osparc.utils.Utils.getReleaseTag(),
-          studyId: osparc.store.Store.getInstance().getCurrentStudy() || "",
+          studyId: currentStudy ? currentStudy.getUuid() : "",
         }
         osparc.utils.Utils.copyTextToClipboard(osparc.utils.Utils.prettifyJson(dataToClipboard));
       });
diff --git a/services/static-webserver/client/source/class/osparc/dashboard/NewPlans.js b/services/static-webserver/client/source/class/osparc/dashboard/NewPlans.js
@@ -15,7 +15,7 @@
 
 ************************************************************************ */
 
-qx.Class.define("osparc.dashboard.NewStudies", {
+qx.Class.define("osparc.dashboard.NewPlans", {
   extend: qx.ui.core.Widget,
 
   construct: function(newStudiesData) {
@@ -38,7 +38,8 @@ qx.Class.define("osparc.dashboard.NewStudies", {
 
     osparc.store.Templates.getHypertools()
       .then(hypertools => {
-        this.__newStudies = newButtonsInfo.filter(newButtonInfo => {
+        // TIP and TIP lite templates are template_type: "hypertool"
+        this.__newPlans = newButtonsInfo.filter(newButtonInfo => {
           if (newButtonInfo.showDisabled) {
             return true;
           }
@@ -59,15 +60,15 @@ qx.Class.define("osparc.dashboard.NewStudies", {
   },
 
   events: {
-    "newStudyClicked": "qx.event.type.Data",
+    "newPlanClicked": "qx.event.type.Data",
   },
 
   statics: {
     WIDTH: 600
   },
 
   members: {
-    __newStudies: null,
+    __newPlans: null,
     __groups: null,
     __flatList: null,
     __groupedContainers: null,
@@ -103,7 +104,7 @@ qx.Class.define("osparc.dashboard.NewStudies", {
       }
 
       const newCards = [];
-      this.__newStudies.forEach(resourceData => {
+      this.__newPlans.forEach(resourceData => {
         const cards = this.__resourceToCards(resourceData);
         cards.forEach(newCard => {
           if (resourceData.showDisabled) {
@@ -175,7 +176,7 @@ qx.Class.define("osparc.dashboard.NewStudies", {
     },
 
     __createCard: function(templateInfo) {
-      const newStudyClicked = () => this.fireDataEvent("newStudyClicked", templateInfo);
+      const newPlanClicked = () => this.fireDataEvent("newPlanClicked", templateInfo);
 
       const title = templateInfo.title;
       const desc = templateInfo.description;
@@ -184,7 +185,7 @@ qx.Class.define("osparc.dashboard.NewStudies", {
         newPlanButton.setCardKey(templateInfo["idToWidget"]);
         osparc.utils.Utils.setIdToWidget(newPlanButton, templateInfo["idToWidget"]);
       }
-      newPlanButton.addListener("tap", () => newStudyClicked());
+      newPlanButton.addListener("tap", () => newPlanClicked());
       return newPlanButton;
     },
 
diff --git a/services/static-webserver/client/source/class/osparc/dashboard/NewPlusMenu.js b/services/static-webserver/client/source/class/osparc/dashboard/NewPlusMenu.js
@@ -168,9 +168,7 @@ qx.Class.define("osparc.dashboard.NewPlusMenu", {
 
     __addItems: function() {
       this.__addUIConfigItems();
-      if (osparc.product.Utils.isS4LProduct()) {
-        this.__addHypertools();
-      }
+      this.__addHypertools();
       this.__addMoreMenu();
       this.getChildControl("new-folder");
     },
@@ -196,18 +194,21 @@ qx.Class.define("osparc.dashboard.NewPlusMenu", {
     },
 
     __addHypertools: function() {
+      const hypertoolsMenuButton = this.self().createMenuButton(null, this.tr("Hypertools"));
+      hypertoolsMenuButton.exclude();
+      this.addAt(hypertoolsMenuButton, this.__itemIdx);
+      this.__itemIdx++;
+      this.self().setIcon(hypertoolsMenuButton, osparc.data.model.StudyUI.HYPERTOOL_ICON);
+
       osparc.store.Templates.getHypertools()
         .then(hypertools => {
+          hypertoolsMenuButton.setVisibility(hypertools.length > 0 ? "visible" : "excluded");
+          // add entry for hypertools if there are any
           if (hypertools.length) {
-            const hypertoolsMenuButton = this.self().createMenuButton(null, this.tr("Hypertools"));
-            this.addAt(hypertoolsMenuButton, this.__itemIdx);
-            this.__itemIdx++;
-
             const hypertoolsMenu = new qx.ui.menu.Menu().set({
               appearance: "menu-wider",
             });
             hypertoolsMenuButton.setMenu(hypertoolsMenu);
-            this.self().setIcon(hypertoolsMenuButton, osparc.data.model.StudyUI.HYPERTOOL_ICON);
 
             hypertools.forEach(templateData => {
               const hypertoolButton = this.self().createMenuButton(null, templateData["name"]);
diff --git a/services/static-webserver/client/source/class/osparc/dashboard/ResourceBrowserBase.js b/services/static-webserver/client/source/class/osparc/dashboard/ResourceBrowserBase.js
@@ -526,7 +526,7 @@ qx.Class.define("osparc.dashboard.ResourceBrowserBase", {
       });
       task.addListener("taskAborted", () => {
         finished();
-        const msg = this.tr("Study to Template cancelled");
+        const msg = this.tr("Project to Template cancelled");
         osparc.FlashMessenger.logAs(msg, "WARNING");
       });
       task.addListener("pollingError", e => {
diff --git a/services/static-webserver/client/source/class/osparc/dashboard/ResourceBrowserFilter.js b/services/static-webserver/client/source/class/osparc/dashboard/ResourceBrowserFilter.js
@@ -421,6 +421,11 @@ qx.Class.define("osparc.dashboard.ResourceBrowserFilter", {
 
       // hypertools filter
       const button = new qx.ui.toolbar.RadioButton("Hypertools", null);
+      button.exclude();
+      osparc.store.Templates.getHypertools()
+        .then(hypertools => {
+          button.setVisibility(hypertools.length > 0 ? "visible" : "excluded");
+        });
       osparc.utils.Utils.replaceIconWithThumbnail(button, osparc.data.model.StudyUI.HYPERTOOL_ICON, 26);
       // align it with the rest of icons
       button.set({
diff --git a/services/static-webserver/client/source/class/osparc/dashboard/SearchBarFilter.js b/services/static-webserver/client/source/class/osparc/dashboard/SearchBarFilter.js
@@ -278,6 +278,11 @@ qx.Class.define("osparc.dashboard.SearchBarFilter", {
 
       // hypertools filter
       const hypertoolTypeButton = new qx.ui.menu.Button("Hypertools", null);
+      hypertoolTypeButton.exclude();
+      osparc.store.Templates.getHypertools()
+        .then(hypertools => {
+          hypertoolTypeButton.setVisibility(hypertools.length > 0 ? "visible" : "excluded");
+        });
       osparc.utils.Utils.replaceIconWithThumbnail(hypertoolTypeButton, osparc.data.model.StudyUI.HYPERTOOL_ICON, 18);
       serviceTypeMenu.add(hypertoolTypeButton);
       hypertoolTypeButton.addListener("execute", () => this.__addChip("app-type", "hypertool", "Hypertools"), this);
diff --git a/services/static-webserver/client/source/class/osparc/dashboard/StudyBrowser.js b/services/static-webserver/client/source/class/osparc/dashboard/StudyBrowser.js
@@ -966,13 +966,13 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
           osparc.store.Templates.getHypertools()
             .then(hypertools => {
               if (hypertools) {
-                const newStudies = new osparc.dashboard.NewStudies(newStudiesConfig);
+                const newPlans = new osparc.dashboard.NewPlans(newStudiesConfig);
                 const winTitle = this.tr("New Plan");
-                const win = osparc.ui.window.Window.popUpInWindow(newStudies, winTitle, osparc.dashboard.NewStudies.WIDTH+40, 300).set({
+                const win = osparc.ui.window.Window.popUpInWindow(newPlans, winTitle, osparc.dashboard.NewPlans.WIDTH+40, 300).set({
                   clickAwayClose: false,
                   resizable: true
                 });
-                newStudies.addListener("newStudyClicked", e => {
+                newPlans.addListener("newPlanClicked", e => {
                   win.close();
                   const templateInfo = e.getData();
                   const templateData = hypertools.find(t => t.name === templateInfo.expectedTemplateLabel);
diff --git a/services/static-webserver/client/source/class/osparc/desktop/MainPage.js b/services/static-webserver/client/source/class/osparc/desktop/MainPage.js
@@ -341,7 +341,7 @@ qx.Class.define("osparc.desktop.MainPage", {
           osparc.data.Resources.fetch("studies", "getOne", params2)
             .then(studyData => {
               if (!studyData) {
-                const msg = this.tr("Study not found");
+                const msg = this.tr("Project not found");
                 throw new Error(msg);
               }
               osparc.desktop.MainPageHandler.getInstance().loadStudy(studyData);
diff --git a/services/static-webserver/client/source/class/osparc/desktop/MainPageHandler.js b/services/static-webserver/client/source/class/osparc/desktop/MainPageHandler.js
@@ -72,7 +72,7 @@ qx.Class.define("osparc.desktop.MainPageHandler", {
       osparc.data.Resources.fetch("studies", "getOne", params)
         .then(studyData => {
           if (!studyData) {
-            const msg = qx.locale.Manager.tr("Study not found");
+            const msg = qx.locale.Manager.tr("Project not found");
             throw new Error(msg);
           }
           this.loadStudy(studyData);
diff --git a/services/static-webserver/client/source/class/osparc/desktop/StudyEditor.js b/services/static-webserver/client/source/class/osparc/desktop/StudyEditor.js
@@ -618,10 +618,8 @@ qx.Class.define("osparc.desktop.StudyEditor", {
                 this.__requestStartPipeline(studyId, partialPipeline, true);
               }
             }, this);
-          } else if (err.status == "402") {
-            osparc.FlashMessenger.logAs(msg, "WARNING");
           } else {
-            osparc.FlashMessenger.logAs(msg, "WARNING");
+            osparc.FlashMessenger.logError(err);
             this.getStudyLogger().error(null, "Unsuccessful pipeline submission");
           }
           this.getStudy().setPipelineRunning(false);
diff --git a/services/static-webserver/client/source/class/osparc/desktop/WorkbenchView.js b/services/static-webserver/client/source/class/osparc/desktop/WorkbenchView.js
@@ -387,7 +387,7 @@ qx.Class.define("osparc.desktop.WorkbenchView", {
       });
       this.__addTopBarSpacer(topBar);
 
-      const studyOptionsPage = this.__studyOptionsPage = this.__createTabPage("@FontAwesome5Solid/book", this.tr("Study options"));
+      const studyOptionsPage = this.__studyOptionsPage = this.__createTabPage("@FontAwesome5Solid/book", this.tr("Project options"));
       studyOptionsPage.getLayout().set({
         separator: "separator-vertical",
         spacing: 10
diff --git a/services/static-webserver/client/source/class/osparc/info/StudyMedium.js b/services/static-webserver/client/source/class/osparc/info/StudyMedium.js
@@ -162,7 +162,7 @@ qx.Class.define("osparc.info.StudyMedium", {
 
     __openStudyDetails: function() {
       const studyDetails = new osparc.info.StudyLarge(this.getStudy());
-      const title = this.tr("Study Information");
+      const title = this.tr("Project Information");
       const width = osparc.info.CardLarge.WIDTH;
       const height = osparc.info.CardLarge.HEIGHT;
       osparc.ui.window.Window.popUpInWindow(studyDetails, title, width, height).set({
diff --git a/services/static-webserver/client/source/class/osparc/widget/NodesTree.js b/services/static-webserver/client/source/class/osparc/widget/NodesTree.js
@@ -284,7 +284,7 @@ qx.Class.define("osparc.widget.NodesTree", {
         const height = osparc.info.CardLarge.HEIGHT;
         if (nodeId === study.getUuid()) {
           const studyDetails = new osparc.info.StudyLarge(study);
-          const title = this.tr("Study Information");
+          const title = this.tr("Project Information");
           osparc.ui.window.Window.popUpInWindow(studyDetails, title, width, height).set({
             maxHeight: height
           });
diff --git a/services/static-webserver/client/source/class/osparc/widget/StudyTitleOnlyTree.js b/services/static-webserver/client/source/class/osparc/widget/StudyTitleOnlyTree.js
@@ -45,7 +45,7 @@ qx.Class.define("osparc.widget.StudyTitleOnlyTree", {
 
     __openStudyInfo: function() {
       const studyDetails = new osparc.info.StudyLarge(this.getStudy());
-      const title = this.tr("Study Information");
+      const title = this.tr("Project Information");
       const width = osparc.info.CardLarge.WIDTH;
       const height = osparc.info.CardLarge.HEIGHT;
       osparc.ui.window.Window.popUpInWindow(studyDetails, title, width, height).set({
diff --git a/services/web/server/src/simcore_service_webserver/api/v0/openapi.yaml b/services/web/server/src/simcore_service_webserver/api/v0/openapi.yaml
@@ -11403,6 +11403,8 @@ components:
         status:
           type: integer
           title: Status
+          description: Redundant HTTP status code of the error.Must be the same as
+            in the HTTP response
         errors:
           items:
             $ref: '#/components/schemas/ErrorItemType'
diff --git a/services/web/server/src/simcore_service_webserver/director_v2/_controller/_rest_exceptions.py b/services/web/server/src/simcore_service_webserver/director_v2/_controller/_rest_exceptions.py
@@ -72,7 +72,7 @@ async def _handler_director_service_error_as_503_or_4xx(
             exception.status
         ), f"DirectorV2ServiceError must be a client error, got {exception=}"  # nosec
 
-        error = ErrorGet(status=exception.status, message="{exception}")
+        error = ErrorGet(status=exception.status, message=f"{exception}")
 
     return create_error_response(error, status_code=error.status)
 

Original file line number	Diff line number	Diff line change
`@@ -341,7 +341,7 @@ qx.Class.define("osparc.desktop.MainPage", {`
`341`	`341`	`osparc.data.Resources.fetch("studies", "getOne", params2)`
`342`	`342`	`.then(studyData => {`
`343`	`343`	`if (!studyData) {`
`344`		`- const msg = this.tr("Study not found");`
	`344`	`+ const msg = this.tr("Project not found");`
`345`	`345`	`throw new Error(msg);`
`346`	`346`	`}`
`347`	`347`	`osparc.desktop.MainPageHandler.getInstance().loadStudy(studyData);`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ qx.Class.define("osparc.desktop.MainPageHandler", {`
`72`	`72`	`osparc.data.Resources.fetch("studies", "getOne", params)`
`73`	`73`	`.then(studyData => {`
`74`	`74`	`if (!studyData) {`
`75`		`- const msg = qx.locale.Manager.tr("Study not found");`
	`75`	`+ const msg = qx.locale.Manager.tr("Project not found");`
`76`	`76`	`throw new Error(msg);`
`77`	`77`	`}`
`78`	`78`	`this.loadStudy(studyData);`