improved workflow

Author: odeimaiz

services/static-webserver/client/source/class/osparc/editor/AnnotationNoteCreator.js

@@ -151,35 +151,34 @@ qx.Class.define("osparc.editor.AnnotationNoteCreator", {
     },
 
     __recipientSelected: function(userGid) {
-      this.__setRecipientGid(userGid);
       const currentAccessRights = this.__study.getAccessRights();
-      const proposeSharing = [];
-      if (!(userGid in currentAccessRights)) {
-        proposeSharing.push(userGid);
-      }
-      if (proposeSharing.length) {
-        const collaboratorsManager = new osparc.share.NewCollaboratorsManager(currentStudy, false, true, proposeSharing);
-        collaboratorsManager.addListener("addCollaborators", ev => {
-          const {
-            selectedGids,
-            newAccessRights,
-          } = ev.getData();
-          const newCollaborators = {};
-          selectedGids.forEach(gid => {
-            newCollaborators[gid] = newAccessRights;
-          });
-          const studyData = this.__study.serialize();
-          osparc.store.Study.addCollaborators(studyData, newCollaborators)
-            .then(() => {
-              const potentialCollaborators = osparc.store.Groups.getInstance().getPotentialCollaborators()
-              selectedGids.forEach(gid => {
-                if (gid in potentialCollaborators && "getUserId" in potentialCollaborators[gid]) {
-                  const uid = potentialCollaborators[gid].getUserId();
+      if (userGid in currentAccessRights) {
+        this.__setRecipientGid(userGid);
+      } else {
+        const msg = this.tr("This user has no access to the project. Do you want to share it?");
+        const win = new osparc.ui.window.Confirmation(msg).set({
+          caption: this.tr("Share"),
+          confirmText: this.tr("Share"),
+          confirmAction: "create"
+        });
+        win.center();
+        win.open();
+        win.addListener("close", () => {
+          if (win.getConfirmed()) {
+            const newCollaborators = {
+              [userGid]: osparc.data.Roles.STUDY["write"].accessRights
+            };
+            osparc.store.Study.addCollaborators(this.__studyData, newCollaborators)
+              .then(() => {
+                this.__setRecipientGid(userGid);
+                const potentialCollaborators = osparc.store.Groups.getInstance().getPotentialCollaborators()
+                if (userGid in potentialCollaborators && "getUserId" in potentialCollaborators[userGid]) {
+                  const uid = potentialCollaborators[userGid].getUserId();
                   osparc.notification.Notifications.postNewStudy(uid, studyData["uuid"]);
                 }
-              });
-            })
-            .finally(() => collaboratorsManager.close());
+              })
+              .finally(() => collaboratorsManager.close());
+          }
         });
       }
     },

services/static-webserver/client/source/class/osparc/info/CommentAdd.js

@@ -165,7 +165,9 @@ qx.Class.define("osparc.info.CommentAdd", {
       // Note!
       // This check only works if the project is directly shared with the user.
       // If it's shared through a group, it might be a bit confusing
-      if (!(userGid in this.__studyData["accessRights"])) {
+      if (userGid in this.__studyData["accessRights"]) {
+        this.__addNotify(userGid);
+      } else {
         const msg = this.tr("This user has no access to the project. Do you want to share it?");
         const win = new osparc.ui.window.Confirmation(msg).set({
           caption: this.tr("Share"),
@@ -180,12 +182,17 @@ qx.Class.define("osparc.info.CommentAdd", {
               [userGid]: osparc.data.Roles.STUDY["write"].accessRights
             };
             osparc.store.Study.addCollaborators(this.__studyData, newCollaborators)
-              .then(() => this.__addNotify(userGid))
+              .then(() => {
+                this.__addNotify(userGid);
+                const potentialCollaborators = osparc.store.Groups.getInstance().getPotentialCollaborators()
+                if (userGid in potentialCollaborators && "getUserId" in potentialCollaborators[userGid]) {
+                  const uid = potentialCollaborators[userGid].getUserId();
+                  osparc.notification.Notifications.postNewStudy(uid, studyData["uuid"]);
+                }
+              })
               .catch(err => osparc.FlashMessenger.logError(err));
           }
         }, this);
-      } else {
-        this.__addNotify(userGid);
       }
     },