Merge branch 'master' into is7852/filter-autogenerated-api-keys

Author: giancarloromeo

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

@@ -699,14 +699,12 @@ qx.Class.define("osparc.data.model.Study", {
     /**
      * Call patch Study, but the changes were already applied on the frontend
      * @param studyDiffs {Object} Diff Object coming from the JsonDiffPatch lib. Use only the keys, not the changes.
-     * @param sourceStudy {Object} Study object that was used to apply the diffs on the frontend.
+     * @param studySource {Object} Study object that was used to check the diffs on the frontend.
      */
-    patchStudyDelayed: function(studyDiffs, sourceStudy) {
+    patchStudyDelayed: function(studyDiffs, studySource) {
       const promises = [];
-      let workbenchDiffs = {};
       if ("workbench" in studyDiffs) {
-        workbenchDiffs = studyDiffs["workbench"];
-        promises.push(this.getWorkbench().patchWorkbenchDelayed(workbenchDiffs));
+        promises.push(this.getWorkbench().patchWorkbenchDelayed(studyDiffs["workbench"], studySource["workbench"]));
         delete studyDiffs["workbench"];
       }
       const fieldKeys = Object.keys(studyDiffs);
@@ -731,7 +729,7 @@ qx.Class.define("osparc.data.model.Study", {
       }
       return Promise.all(promises)
         .then(() => {
-          return sourceStudy;
+          return studySource;
         });
     }
   }

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

@@ -784,21 +784,26 @@ qx.Class.define("osparc.data.model.Workbench", {
     /**
      * Call patch Node, but the changes were already applied on the frontend
      * @param workbenchDiffs {Object} Diff Object coming from the JsonDiffPatch lib. Use only the keys, not the changes.
+     * @param workbenchSource {Object} Workbench object that was used to check the diffs on the frontend.
      */
-    patchWorkbenchDelayed: function(workbenchDiffs) {
+    patchWorkbenchDelayed: function(workbenchDiffs, workbenchSource) {
       const promises = [];
       Object.keys(workbenchDiffs).forEach(nodeId => {
         const node = this.getNode(nodeId);
         if (node === null) {
           // the node was removed
           return;
         }
+        // use the node data that was used to check the diffs
+        const nodeData = workbenchSource[nodeId];
+        if (!nodeData) {
+          // skip if nodeData is undefined or null
+          return;
+        }
 
-        const nodeData = node.serialize();
         let patchData = {};
         if (workbenchDiffs[nodeId] instanceof Array) {
-          // if workbenchDiffs is an array means that the node was either added or removed
-          // the node was added
+          // if workbenchDiffs is an array means that the node was added
           patchData = nodeData;
         } else {
           // patch only what was changed

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

@@ -858,20 +858,18 @@ qx.Class.define("osparc.desktop.StudyEditor", {
 
     __getStudyDiffs: function() {
       const sourceStudy = this.getStudy().serialize();
+      const studyDiffs = {
+        sourceStudy,
+        delta: {},
+      }
       const delta = osparc.wrapper.JsonDiffPatch.getInstance().diff(this.__studyDataInBackend, sourceStudy);
       if (delta) {
         // lastChangeDate and creationDate should not be taken into account as data change
         delete delta["creationDate"];
         delete delta["lastChangeDate"];
-        return {
-          sourceStudy,
-          delta,
-        };
+        studyDiffs.delta = delta;
       }
-      return {
-        sourceStudy,
-        delta: {},
-      };
+      return studyDiffs;
     },
 
     didStudyChange: function() {

services/web/server/src/simcore_service_webserver/projects/_crud_api_create.py

@@ -62,7 +62,7 @@
 ]
 
 
-log = logging.getLogger(__name__)
+_logger = logging.getLogger(__name__)
 
 CopyFileCoro: TypeAlias = Coroutine[Any, Any, None]
 CopyProjectNodesCoro: TypeAlias = Coroutine[Any, Any, dict[NodeID, ProjectNodeCreate]]
@@ -285,6 +285,13 @@ async def create_project(  # pylint: disable=too-many-arguments,too-many-branche
 
     """
     assert request.app  # nosec
+    _logger.info(
+        "create_project for '%s' with %s %s %s",
+        f"{user_id=}",
+        f"{predefined_project=}",
+        f"{product_name=}",
+        f"{from_study=}",
+    )
 
     _projects_repository = ProjectDBAPI.get_from_app_context(request.app)
 
@@ -459,6 +466,17 @@ async def create_project(  # pylint: disable=too-many-arguments,too-many-branche
                 for gid, access in workspace.access_rights.items()
             }
 
+        _project_product_name = await _projects_repository.get_project_product(
+            project_uuid=new_project["uuid"]
+        )
+        assert (
+            _project_product_name == product_name  # nosec
+        ), "Project product name mismatch"
+        if _project_product_name != product_name:
+            raise web.HTTPBadRequest(
+                text=f"Project product name mismatch {product_name=} {_project_product_name=}"
+            )
+
         data = ProjectGet.from_domain_model(new_project).model_dump(
             **RESPONSE_MODEL_POLICY
         )
@@ -488,7 +506,7 @@ async def create_project(  # pylint: disable=too-many-arguments,too-many-branche
         raise web.HTTPNotFound(text=f"{exc}") from exc
 
     except asyncio.CancelledError:
-        log.warning(
+        _logger.warning(
             "cancelled create_project for '%s'. Cleaning up",
             f"{user_id=}",
         )