Merge branch 'master' into feature/render-unknown-service

odeimaiz · web-flow · commit 3a489b5ba3dc · 2025-08-07T09:24:37.000+02:00
diff --git a/services/static-webserver/client/Manifest.json b/services/static-webserver/client/Manifest.json
@@ -27,7 +27,7 @@
       "osparc/schedulerWorker.js",
       "svg/svg.js",
       "svg/svg.path.js",
-      "jsondiffpatch/jsondiffpatch.min.js",
+      "jsondiffpatch/jsondiffpatch-0.7.3.min.js",
       "jsontreeviewer/jsonTree.js",
       "marked/marked.min.js",
       "DOMPurify/purify.min.js"
diff --git a/services/static-webserver/client/source/class/osparc/wrapper/JsonDiffPatch.js b/services/static-webserver/client/source/class/osparc/wrapper/JsonDiffPatch.js
@@ -55,7 +55,7 @@ qx.Class.define("osparc.wrapper.JsonDiffPatch", {
 
     init: function() {
       // initialize the script loading
-      const jsondiffpatchPath = "jsondiffpatch/jsondiffpatch.min.js"; // own build required for the formatters to work
+      const jsondiffpatchPath = "jsondiffpatch/jsondiffpatch-0.7.3.min.js"; // own build required for the formatters to work
       const dynLoader = new qx.util.DynamicScriptLoader([
         jsondiffpatchPath
       ]);
diff --git a/services/static-webserver/client/source/resource/jsondiffpatch/jsondiffpatch-0.7.3.min.js b/services/static-webserver/client/source/resource/jsondiffpatch/jsondiffpatch-0.7.3.min.js
diff --git a/services/web/server/src/simcore_service_webserver/projects/utils.py b/services/web/server/src/simcore_service_webserver/projects/utils.py
@@ -94,7 +94,7 @@ def _replace_uuids(node: str | list | dict) -> str | list | dict:
         )
 
         # exclude annotations UI info for conversations done in the source project
-        annotations = project_copy.get("ui", {}).get("annotations", {}).copy()
+        annotations = deepcopy(project_copy.get("ui", {}).get("annotations", {})) or {}
         for ann_id, ann in annotations.items():
             if ann["type"] == "conversation":
                 project_copy["ui"]["annotations"].pop(ann_id)

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ def _replace_uuids(node: str \| list \| dict) -> str \| list \| dict:`
`94`	`94`	`)`
`95`	`95`
`96`	`96`	`# exclude annotations UI info for conversations done in the source project`
`97`		`- annotations = project_copy.get("ui", {}).get("annotations", {}).copy()`
	`97`	`+ annotations = deepcopy(project_copy.get("ui", {}).get("annotations", {})) or {}`
`98`	`98`	`for ann_id, ann in annotations.items():`
`99`	`99`	`if ann["type"] == "conversation":`
`100`	`100`	`project_copy["ui"]["annotations"].pop(ann_id)`