Fixes: Annotations

services/web/client/source/class/osparc/component/widget/NodeTreeItem.js

@@ -146,8 +146,10 @@ qx.Class.define("osparc.component.widget.NodeTreeItem", {
         case "node-id": {
           control = new qx.ui.basic.Label().set({
             maxWidth: 70,
-            alignY: "middle"
+            alignY: "middle",
+            cursor: "copy"
           });
+          control.addListener("tap", () => osparc.utils.Utils.copyTextToClipboard(this.getNodeId()));
           this.bind("nodeId", control, "value", {
             converter: value => value && value.substring(0, 8)
           });

services/web/client/source/class/osparc/component/workbench/WorkbenchUI.js

@@ -1196,7 +1196,13 @@ qx.Class.define("osparc.component.workbench.WorkbenchUI", {
         const studyUI = model.getStudy().getUi();
         const initData = studyUI.getAnnotationsInitData();
         const annotations = initData ? initData : studyUI.getAnnotations();
-        Object.entries(annotations).forEach(([annotationId, annotation]) => this.__addAnnotation(annotation, annotationId));
+        Object.entries(annotations).forEach(([annotationId, annotation]) => {
+          if (annotation instanceof osparc.component.workbench.Annotation) {
+            this.__addAnnotation(annotation.serialize(), annotationId);
+          } else {
+            this.__addAnnotation(annotation, annotationId);
+          }
+        });
         if (initData) {
           studyUI.nullAnnotationsInitData();
         }

services/web/client/source/class/osparc/data/model/StudyUI.js

@@ -32,7 +32,8 @@ qx.Class.define("osparc.data.model.StudyUI", {
       workbench: studyDataUI && studyDataUI.workbench ? studyDataUI.workbench : this.getWorkbench(),
       slideshow: new osparc.data.model.Slideshow(studyDataUI && studyDataUI.slideshow ? studyDataUI.slideshow : this.getSlideshow()),
       currentNodeId: studyDataUI && studyDataUI.currentNodeId ? studyDataUI.currentNodeId : this.initCurrentNodeId(),
-      mode: studyDataUI && studyDataUI.mode ? studyDataUI.mode : this.initMode()
+      mode: studyDataUI && studyDataUI.mode ? studyDataUI.mode : this.initMode(),
+      annotations: {}
     });
 
     if ("annotations" in studyDataUI) {

services/web/client/source/class/osparc/desktop/MainPage.js

@@ -105,25 +105,23 @@ qx.Class.define("osparc.desktop.MainPage", {
       }
     },
 
-    __backToDashboard: function() {
+    __backToDashboard: async function() {
       const dashboardBtn = this.__navBar.getChildControl("dashboard-button");
       dashboardBtn.setFetching(true);
+      if (this.__studyEditor.didStudyChange()) {
+        await this.__studyEditor.updateStudyDocument(false);
+      }
       const studyId = this.__studyEditor.getStudy().getUuid();
-      this.__studyEditor.updateStudyDocument(false)
+      this.__studyEditor.closeEditor();
+      this.__showDashboard();
+      this.__dashboard.getStudyBrowser().invalidateStudies();
+      this.__dashboard.getStudyBrowser().reloadResources();
+      this.__dashboard.getStudyBrowser().resetSelection();
+      this.__dashboard.getStudyBrowser().reloadStudy(studyId)
         .then(() => {
-          this.__studyEditor.closeEditor();
-          this.__showDashboard();
-          this.__dashboard.getStudyBrowser().invalidateStudies();
-          this.__dashboard.getStudyBrowser().reloadResources();
-          this.__dashboard.getStudyBrowser().resetSelection();
-          this.__dashboard.getStudyBrowser().reloadStudy(studyId)
-            .then(() => {
-              this.__closeStudy(studyId);
-            });
-        })
-        .finally(() => {
-          dashboardBtn.setFetching(false);
+          this.__closeStudy(studyId);
         });
+      dashboardBtn.setFetching(false);
     },
 
     __createMainStack: function() {

services/web/client/source/class/osparc/desktop/StudyEditor.js

@@ -162,6 +162,8 @@ qx.Class.define("osparc.desktop.StudyEditor", {
       study.buildWorkbench();
       study.openStudy()
         .then(() => {
+          this.__lastSavedStudy = study.serialize();
+
           this.__workbenchView.setStudy(study);
           this.__slideshowView.setStudy(study);
 
@@ -540,7 +542,7 @@ qx.Class.define("osparc.desktop.StudyEditor", {
       timer.start();
     },
 
-    __checkStudyChanges: function() {
+    didStudyChange: function() {
       const newObj = this.getStudy().serialize();
       const diffPatcher = osparc.wrapper.JsonDiffPatch.getInstance();
       const delta = diffPatcher.diff(this.__lastSavedStudy, newObj);
@@ -557,13 +559,18 @@ qx.Class.define("osparc.desktop.StudyEditor", {
           }
         });
 
-        if (deltaKeys.length > 0) {
-          if (this.__updatingStudy > 0) {
-            // throttle update
-            this.__updateThrottled = true;
-          } else {
-            this.updateStudyDocument(false);
-          }
+        return deltaKeys.length;
+      }
+      return false;
+    },
+
+    __checkStudyChanges: function() {
+      if (this.didStudyChange()) {
+        if (this.__updatingStudy > 0) {
+          // throttle update
+          this.__updateThrottled = true;
+        } else {
+          this.updateStudyDocument(false);
         }
       }
     },