Renaming working

Author: odeimaiz

services/static-webserver/client/source/class/osparc/store/Conversations.js

@@ -25,6 +25,10 @@ qx.Class.define("osparc.store.Conversations", {
     this.__projectConversations = {};
   },
 
+  events: {
+    "conversationUpdated": "qx.event.type.Data",
+  },
+
   members: {
     __projectConversations: null,
 
@@ -59,7 +63,10 @@ qx.Class.define("osparc.store.Conversations", {
         }
       };
       return osparc.data.Resources.fetch("conversations", "addConversation", params)
-        .then
+        .then(conversation => {
+          // OM add to cache
+          return conversation;
+        })
         .catch(err => osparc.FlashMessenger.logError(err));
     },
 
@@ -85,6 +92,13 @@ qx.Class.define("osparc.store.Conversations", {
         }
       };
       return osparc.data.Resources.fetch("conversations", "renameConversation", params)
+        .then(() => {
+          this.fireDataEvent("conversationUpdated", {
+            studyId,
+            conversationId,
+            name,
+          });
+        })
         .catch(err => osparc.FlashMessenger.logError(err));
     },
 

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

@@ -39,9 +39,9 @@ qx.Class.define("osparc.workbench.Annotation", {
     }
     this.set({
       id,
-      type: data.type,
       color,
-      attributes: data.attributes
+      attributes: data.attributes,
+      type: data.type,
     });
   },
 
@@ -69,7 +69,8 @@ qx.Class.define("osparc.workbench.Annotation", {
         "text", // osparc.workbench.Annotation.TYPES.TEXT
         "conversation", // osparc.workbench.Annotation.TYPES.CONVERSATION
       ],
-      nullable: false
+      nullable: false,
+      apply: "__drawAnnotation"
     },
 
     color: {
@@ -83,7 +84,6 @@ qx.Class.define("osparc.workbench.Annotation", {
     attributes: {
       check: "Object",
       nullable: false,
-      apply: "__drawAnnotation"
     },
 
     representation: {
@@ -101,11 +101,12 @@ qx.Class.define("osparc.workbench.Annotation", {
   members: {
     __svgLayer: null,
 
-    __drawAnnotation: function(attrs) {
+    __drawAnnotation: function() {
       if (this.__svgLayer === null) {
         return;
       }
 
+      const attrs = this.getAttributes();
       let representation = null;
       switch (this.getType()) {
         case this.self().TYPES.NOTE: {
@@ -120,7 +121,16 @@ qx.Class.define("osparc.workbench.Annotation", {
           representation = this.__svgLayer.drawAnnotationText(attrs.x, attrs.y, attrs.text, this.getColor(), attrs.fontSize);
           break;
         case this.self().TYPES.CONVERSATION: {
-          representation = this.__svgLayer.drawAnnotationConversation(attrs.x, attrs.y, attrs.title);
+          representation = this.__svgLayer.drawAnnotationConversation(attrs.x, attrs.y, attrs.text);
+          const conversationId = attrs.conversationId;
+          if (conversationId) {
+            osparc.store.Conversations.getInstance().addListener("conversationUpdated", e => {
+              const data = e.getData();
+              if (data.conversationId === conversationId) {
+                this.setText(data.name);
+              }
+            }, this);
+          }
           break;
         }
       }

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

@@ -1997,7 +1997,7 @@ qx.Class.define("osparc.workbench.WorkbenchUI", {
           osparc.store.Conversations.getInstance().addConversation(this.getStudy().getUuid(), conversationTitle, osparc.study.Conversations.TYPES.PROJECT_ANNOTATION)
             .then(conversationData => {
               serializeData.attributes.conversationId = conversationData["conversationId"];
-              serializeData.attributes.title = conversationData["name"];
+              serializeData.attributes.text = conversationData["name"];
               this.__addAnnotation(serializeData);
               osparc.study.Conversations.popUpInWindow(this.getStudy().serialize(), conversationData["conversationId"]);
             });

services/static-webserver/client/source/class/osparc/wrapper/Svg.js

@@ -321,6 +321,7 @@ qx.Class.define("osparc.wrapper.Svg", {
         })
         .move(padding + iconSize + 8, ((bubbleHeight - titleFontSize) / 2) - 3);
       bubble.add(label);
+      bubble.label = label; // store reference for renaming
 
       // Compute available width for text
       const availableWidth = bubbleWidth - padding * 2 - iconSize - 8;
@@ -363,12 +364,15 @@ qx.Class.define("osparc.wrapper.Svg", {
       return bubble;
     },
 
-    updateText: function(representation, label) {
+    updateText: function(representation, newText) {
       if (representation.type === "text") {
-        representation.text(label);
+        representation.text(newText);
       } else if (representation.type === "svg") {
         // nested
-        representation["textChild"].innerText = label;
+        representation["textChild"].innerText = newText;
+      } else if (representation.type === "g") {
+        // group
+        representation.label.text(newText);
       }
     },