open conversations on click

Author: odeimaiz

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

@@ -261,8 +261,8 @@ qx.Class.define("osparc.study.Conversations", {
       osparc.data.Resources.fetch("conversations", "getConversationsPage", params)
         .then(conversations => {
           if (conversations.length) {
-            // Sort conversations by created date, newest first
-            conversations.sort((a, b) => new Date(b["created"]) - new Date(a["created"]));
+            // Sort conversations by created date, oldest first (the new ones will be next to the plus button)
+            conversations.sort((a, b) => new Date(a["created"]) - new Date(b["created"]));
             conversations.forEach(conversation => this.__addConversationPage(conversation));
             if (this.__openConversationId) {
               const conversationsLayout = this.getChildControl("conversations-layout");

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

@@ -120,7 +120,6 @@ 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: {
-          const text = `${attrs.x}, ${attrs.y}`;
           representation = this.__svgLayer.drawAnnotationConversation(attrs.x, attrs.y, attrs.title);
           break;
         }

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

@@ -1211,16 +1211,7 @@ qx.Class.define("osparc.workbench.WorkbenchUI", {
         edge.setSelected(true);
       } else if (this.__isSelectedItemAnAnnotation()) {
         const annotation = this.__getAnnotation(newID);
-        this.__setSelectedAnnotations([annotation]);
-        const annotationEditor = this.__getAnnotationEditorView();
-        annotationEditor.setAnnotation(annotation);
-        annotationEditor.makeItModal();
-        annotationEditor.addListener("deleteAnnotation", () => {
-          annotationEditor.exclude();
-          this.__removeAnnotation(annotation.getId());
-          this.resetSelection();
-        }, this);
-        annotation.addListener("changeColor", e => this.__annotationLastColor = e.getData());
+        this.__annotationSelected(annotation);
       } else {
         this.fireDataEvent("changeSelectedNode", newID);
       }
@@ -1242,6 +1233,29 @@ qx.Class.define("osparc.workbench.WorkbenchUI", {
       return this.__isSelectedItemAnAnnotation() ? this.__annotations[this.__selectedItemId] : null;
     },
 
+    __annotationSelected: function(annotation) {
+      this.__setSelectedAnnotations([annotation]);
+      switch (annotation.getType()) {
+        case osparc.workbench.Annotation.TYPES.CONVERSATION: {
+          const studyData = this.getStudy().serialize();
+          osparc.study.Conversations.popUpInWindow(studyData, annotation.getAttributes()["conversationId"]);
+          break;
+        }
+        default: {
+          const annotationEditor = this.__getAnnotationEditorView();
+          annotationEditor.setAnnotation(annotation);
+          annotationEditor.makeItModal();
+          annotationEditor.addListener("deleteAnnotation", () => {
+            annotationEditor.exclude();
+            this.__removeAnnotation(annotation.getId());
+            this.resetSelection();
+          }, this);
+          annotation.addListener("changeColor", e => this.__annotationLastColor = e.getData());
+          break;
+        }
+      }
+    },
+
     __scaleCoordinates: function(x, y) {
       return {
         x: parseInt(x / this.getScale()),

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

@@ -319,11 +319,6 @@ qx.Class.define("osparc.wrapper.Svg", {
         .move(padding + iconSize + 8, ((bubbleHeight - titleFontSize) / 2) - 3);
       bubble.add(title);
 
-      // Add a click event to the button
-      icon.click(() => {
-        alert('Popup or conversation panel here!');
-      });
-
       return bubble;
     },