Merge branch 'master' into add_function_job_filters

Author: wvangeit

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"

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

@@ -1210,12 +1210,12 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
         }
         // then update the search context this will trigger the search
         const searchContext = data["searchContext"];
-        switch (searchContext) {
-          case osparc.dashboard.StudyBrowser.CONTEXT.SEARCH_PROJECTS:
-          case osparc.dashboard.StudyBrowser.CONTEXT.SEARCH_TEMPLATES:
-          case osparc.dashboard.StudyBrowser.CONTEXT.SEARCH_PUBLIC_TEMPLATES:
-            this._changeContext(searchContext);
-            break;
+        if ([
+          osparc.dashboard.StudyBrowser.CONTEXT.SEARCH_PROJECTS,
+          osparc.dashboard.StudyBrowser.CONTEXT.SEARCH_TEMPLATES,
+          osparc.dashboard.StudyBrowser.CONTEXT.SEARCH_PUBLIC_TEMPLATES,
+        ].includes(searchContext)) {
+          this._changeContext(searchContext);
         }
       });
     },
@@ -1304,7 +1304,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
 
     _changeContext: function(context, workspaceId = null, folderId = null) {
       if (
-        !context.includes("search") && // load projects if search string changed
+        !context.includes("search") && // move on if it's a search context, it will be handled later
         context === this.getCurrentContext() &&
         workspaceId === this.getCurrentWorkspaceId() &&
         folderId === this.getCurrentFolderId()
@@ -1315,11 +1315,12 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
 
       if (
         context.includes("search") &&
+        context === this.getCurrentContext() &&
         this.__lastUrlParams &&
         "text" in this.__lastUrlParams &&
         this.__lastUrlParams["text"] === this._searchBarFilter.getTextFilterValue()
       ) {
-        // text search didn't change
+        // context and text search didn't change
         return;
       }
 

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
       ]);

services/static-webserver/client/source/resource/jsondiffpatch/jsondiffpatch.min.js renamed to services/static-webserver/client/source/resource/jsondiffpatch/jsondiffpatch-0.7.3.min.js

@@ -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)