more refactoring!

Author: odeimaiz

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

@@ -38,7 +38,10 @@ qx.Class.define("osparc.data.model.StudyUI", {
     });
 
     if ("annotations" in studyDataUI) {
-      this.__annotationsInitData = studyDataUI["annotations"];
+      Object.entries(studyDataUI["annotations"]).forEach(([annotationId, annotationData]) => {
+        const annotation = new osparc.workbench.Annotation(annotationData, annotationId);
+        this.addAnnotation(annotation);
+      });
     }
   },
 
@@ -99,22 +102,12 @@ qx.Class.define("osparc.data.model.StudyUI", {
   },
 
   members: {
-    __annotationsInitData: null,
-
     __applyMode: function(mode) {
       if (mode === "guided") {
         this.setMode("app");
       }
     },
 
-    getAnnotationsInitData: function() {
-      return this.__annotationsInitData;
-    },
-
-    nullAnnotationsInitData: function() {
-      this.__annotationsInitData = null;
-    },
-
     addAnnotation: function(annotation) {
       this.getAnnotations()[annotation.getId()] = annotation;
     },

services/static-webserver/client/source/class/osparc/workbench/WorkbenchUI.js

@@ -1188,15 +1188,10 @@ qx.Class.define("osparc.workbench.WorkbenchUI", {
     },
 
     __renderAnnotations: function(studyUI) {
-      const initData = studyUI.getAnnotationsInitData();
-      const annotations = initData ? initData : studyUI.getAnnotations();
-      Object.entries(annotations).forEach(([annotationId, annotation]) => {
-        const annotationData = annotation instanceof osparc.workbench.Annotation ? annotation.serialize() : annotation;
-        this.__addAnnotation(annotationData, annotationId);
+      const annotations = studyUI.getAnnotations();
+      Object.values(annotations).forEach(annotation => {
+        this.__renderAnnotation(annotation);
       });
-      if (initData) {
-        studyUI.nullAnnotationsInitData();
-      }
     },
 
     __setSelectedItem: function(newID) {
@@ -2009,12 +2004,18 @@ qx.Class.define("osparc.workbench.WorkbenchUI", {
       this.__toolHint.setValue(null);
     },
 
-    __addAnnotation: function(data, id) {
-      const annotation = new osparc.workbench.Annotation(data, id);
+    __addAnnotation: function(annotationData, id) {
+      const annotation = new osparc.workbench.Annotation(annotationData, id);
+      this.getStudy().getUi().addAnnotation(annotation);
+
+      this.__renderAnnotation(annotation);
+    },
+
+    __renderAnnotation: function(annotation) {
       annotation.setSvgCanvas(this.__svgLayer);
+
       this.__addAnnotationListeners(annotation);
       this.__annotations[annotation.getId()] = annotation;
-      this.getStudy().getUi().addAnnotation(annotation);
 
       if (annotation.getType() === osparc.workbench.Annotation.TYPES.CONVERSATION) {
         osparc.store.Conversations.getInstance().addListener("conversationDeleted", e => {