[skip ci] refactor

Author: odeimaiz

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

@@ -41,12 +41,12 @@ qx.Class.define("osparc.data.model.User", {
     }
     const thumbnail = osparc.utils.Avatar.emailToThumbnail(userData["login"], userData["userName"]);
     this.set({
-      userId: parseInt(userData["id"]),
-      groupId: parseInt(userData["gid"]),
+      userId: ("id" in userData) ? parseInt(userData["id"]) : parseInt(userData["userId"]),
+      groupId: ("gid" in userData) ? parseInt(userData["gid"]) : parseInt(userData["groupId"]),
       username: userData["userName"],
-      firstName: userData["first_name"],
-      lastName: userData["last_name"],
-      email: userData["login"],
+      firstName: ("first_name" in userData) ? userData["first_name"] : userData["firstName"],
+      lastName: ("last_name" in userData) ? userData["last_name"] : userData["lastName"],
+      email: ("login" in userData) ? userData["login"] : userData["email"],
       label: userData["userName"],
       description,
       thumbnail,

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

@@ -111,17 +111,14 @@ qx.Class.define("osparc.share.NewCollaboratorsManager", {
 
     __searchUsers: function() {
       const text = this.__textFilter.getChildControl("textfield").getValue();
-      const params = {
-        data: {
-          match: text
-        }
-      };
-      osparc.data.Resources.fetch("users", "search", params)
-        .then(data => console.log(data))
+      osparc.store.Users.getInstance().searchUsers(text)
+        .then(users => {
+          console.log(users);
+        })
         .catch(err => {
           console.error(err);
           osparc.FlashMessenger.getInstance().logAs(err.message, "ERROR");
-        })
+        });
     },
 
     __reloadCollaborators: function() {

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

@@ -22,16 +22,31 @@ qx.Class.define("osparc.store.Users", {
   construct: function() {
     this.base(arguments);
 
-    this.usersCached = [];
+    this.__usersCached = [];
   },
 
   members: {
     addUser: function(userData) {
-      const userFound = this.usersCached.find(user => user.getGroupId() === userData["groupId"]);
+      const user = new osparc.data.model.User(userData);
+      const userFound = this.__usersCached.find(usr => usr.getGroupId() === user.getGroupId());
       if (!userFound) {
-        const user = new osparc.data.model.User(userData);
-        this.usersCached.push(user);
+        this.__usersCached.push(user);
       }
+      return user;
+    },
+
+    searchUsers: function(text) {
+      const params = {
+        data: {
+          match: text
+        }
+      };
+      return osparc.data.Resources.fetch("users", "search", params)
+        .then(usersData => {
+          const users = [];
+          usersData.forEach(userData => users.push(this.addUser(userData)));
+          return users;
+        });
     },
   }
 });