replace "login" by "email"

Author: odeimaiz

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

@@ -105,7 +105,7 @@ qx.Class.define("osparc.data.model.Group", {
     },
 
     getGroupMemberByLogin: function(userEmail) {
-      return Object.values(this.getGroupMembers()).find(user => user.getLogin() === userEmail);
+      return Object.values(this.getGroupMembers()).find(user => user.getEmail() === userEmail);
     },
 
     addGroupMember: function(user) {

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

@@ -29,12 +29,13 @@ qx.Class.define("osparc.data.model.User", {
     this.base(arguments);
 
     const label = this.self().namesToLabel(userData["first_name"], userData["last_name"]) || userData["login"];
+    const thumbnail = this.self().emailToThumbnail(userData.login);
     this.set({
       userId: userData.id,
       groupId: userData.gid,
       label: label,
-      login: userData.login,
-      thumbnail: this.self().emailToThumbnail(userData.login),
+      email: userData.login,
+      thumbnail: thumbnail,
       accessRights: userData.accessRights,
     });
   },
@@ -61,11 +62,11 @@ qx.Class.define("osparc.data.model.User", {
       event: "changeLabel",
     },
 
-    login: {
+    email: {
       check: "String",
       nullable: true,
       init: null,
-      event: "changeLogin",
+      event: "changeEmail",
     },
 
     accessRights: {

services/static-webserver/client/source/class/osparc/desktop/organizations/MembersList.js

@@ -70,8 +70,8 @@ qx.Class.define("osparc.desktop.organizations.MembersList", {
       if (sorted !== 0) {
         return sorted;
       }
-      if (("login" in a) && ("login" in b)) {
-        return a["login"].localeCompare(b["login"]);
+      if (("email" in a) && ("email" in b)) {
+        return a["email"].localeCompare(b["email"]);
       }
       return 0;
     }
@@ -156,7 +156,7 @@ qx.Class.define("osparc.desktop.organizations.MembersList", {
           ctrl.bindProperty("thumbnail", "thumbnail", null, item, id);
           ctrl.bindProperty("name", "title", null, item, id);
           ctrl.bindProperty("accessRights", "accessRights", null, item, id);
-          ctrl.bindProperty("login", "subtitleMD", null, item, id);
+          ctrl.bindProperty("email", "subtitleMD", null, item, id);
           ctrl.bindProperty("options", "options", null, item, id);
           ctrl.bindProperty("showOptions", "showOptions", null, item, id);
         },
@@ -233,7 +233,7 @@ qx.Class.define("osparc.desktop.organizations.MembersList", {
         member["groupId"] = groupMember.getGroupId();
         member["thumbnail"] = groupMember.getThumbnail();
         member["name"] = groupMember.getLabel();
-        member["login"] = groupMember.getLogin();
+        member["email"] = groupMember.getEmail();
         member["accessRights"] = groupMember.getAccessRights();
         let options = [];
         if (canIDelete) {

services/static-webserver/client/source/class/osparc/desktop/wallets/MembersList.js

@@ -70,8 +70,8 @@ qx.Class.define("osparc.desktop.wallets.MembersList", {
       if (sorted !== 0) {
         return sorted;
       }
-      if (("login" in a) && ("login" in b)) {
-        return a["login"].localeCompare(b["login"]);
+      if (("email" in a) && ("email" in b)) {
+        return a["email"].localeCompare(b["email"]);
       }
       return 0;
     }
@@ -172,7 +172,7 @@ qx.Class.define("osparc.desktop.wallets.MembersList", {
           ctrl.bindProperty("thumbnail", "thumbnail", null, item, id);
           ctrl.bindProperty("name", "title", null, item, id);
           ctrl.bindProperty("accessRights", "accessRights", null, item, id);
-          ctrl.bindProperty("login", "subtitleMD", null, item, id);
+          ctrl.bindProperty("email", "subtitleMD", null, item, id);
           ctrl.bindProperty("options", "options", null, item, id);
           ctrl.bindProperty("showOptions", "showOptions", null, item, id);
         },
@@ -223,7 +223,7 @@ qx.Class.define("osparc.desktop.wallets.MembersList", {
           collaborator["groupId"] = collab.getGroupId();
           collaborator["thumbnail"] = collab.getThumbnail();
           collaborator["name"] = collab.getLabel();
-          collaborator["login"] = gid === myGroupId ? osparc.auth.Data.getInstance().getEmail() : collab.getLogin();
+          collaborator["email"] = gid === myGroupId ? osparc.auth.Data.getInstance().getEmail() : collab.getEmail();
           collaborator["accessRights"] = {
             read: accessRights["read"],
             write: accessRights["write"],

services/static-webserver/client/source/class/osparc/filter/CollaboratorToggleButton.js

@@ -24,10 +24,10 @@ qx.Class.define("osparc.filter.CollaboratorToggleButton", {
     });
 
     let label = collaborator.getLabel();
-    if ("getLogin" in collaborator) {
+    if ("getEmail" in collaborator) {
       // user
-      label += ` (${collaborator.getLogin()})`;
-      this.setToolTipText(collaborator.getLogin());
+      label += ` (${collaborator.getEmail()})`;
+      this.setToolTipText(collaborator.getEmail());
     }
     this.setLabel(label);
 

services/static-webserver/client/source/class/osparc/share/Collaborators.js

@@ -295,7 +295,7 @@ qx.Class.define("osparc.share.Collaborators", {
           ctrl.bindProperty("thumbnail", "thumbnail", null, item, id);
           ctrl.bindProperty("name", "title", null, item, id); // user
           ctrl.bindProperty("label", "title", null, item, id); // organization
-          ctrl.bindProperty("login", "subtitleMD", null, item, id); // user
+          ctrl.bindProperty("email", "subtitleMD", null, item, id); // user
           ctrl.bindProperty("description", "subtitle", null, item, id); // organization
           ctrl.bindProperty("resourceType", "resourceType", null, item, id); // Resource type
           ctrl.bindProperty("accessRights", "accessRights", null, item, id);
@@ -413,7 +413,7 @@ qx.Class.define("osparc.share.Collaborators", {
           if ("getUserId" in collab) {
             // user
             collaborator["name"] = collab.getLabel();
-            collaborator["login"] = collab.getLogin();
+            collaborator["email"] = collab.getEmail();
           } else {
             // org/group
             collaborator["label"] = collab.getLabel();