@gudhub/core 1.0.39 → 1.0.43

package/GUDHUB/Auth/Auth.js

@@ -128,10 +128,12 @@ export class Auth {
   async updateUser(userData) {
     const user = await this.updateUserApi(userData);
     this.storage.updateUser(user);
+    return user;
   }
 
   async updateAvatar(imageData) {
     const user = await this.avatarUploadApi(imageData);
     this.storage.updateUser(user);
+    return user;
   }
 }

package/GUDHUB/Auth/Auth.test.js

@@ -3,13 +3,60 @@ import {GudHub} from './../gudhub.js';
 
 describe("AUTHORIZATION", async function() {
     const auth_key = 'Z/lxMHLenEaQTvPjW5U6c3jBDwWFYZrh2F9Kxa3fbt8drvabS2u2lXQ2zI+SRmic';
-    const gudhub = new GudHub(auth_key);
 
     it("GET USER BY ID / It Should return user with 'Vasya Pupkin' fullname", async function () {
-        this.timeout(5000);
+        const gudhub = new GudHub(auth_key);
         var user = await gudhub.auth.getUserById("58");
     
         user.fullname.should.equal('Vasya Pupkin');
     })
 
+    it("Authentication with login and password", async function () {
+        const gudhub = new GudHub();
+        let credentials = {
+            username: 'test@gudhub.com',
+            password: 'gudhub'
+        }
+        var user = await gudhub.login(credentials);
+    
+        user.fullname.should.equal('Vasya Pupkin');
+    })
+
+    it("Signing up user", async function () {
+        const gudhub = new GudHub();
+        let credentials =  {
+            fullname: "Vasya Pupkin",
+            password: "gudhub",
+            username: "test@gudhub.com"
+        }
+
+        var user = await gudhub.signup(credentials);
+    
+        user.fullname.should.equal('Vasya Pupkin');
+    })
+
+    it("Update user", async function() {
+        const gudhub = new GudHub(auth_key);
+
+        const dataToUpdate = {
+            fullname: 'Vasya Pupkin'
+        }
+
+        const user = await gudhub.updateUser(dataToUpdate);
+
+        user.fullname.should.equal('Vasya Pupkin');
+    })
+
+    it("Update user avatar", async function() {
+        const gudhub = new GudHub(auth_key);
+
+        const dataToUpdate = {
+            avatar: '/9j/4AAQSkZJRgABAQAAAQA'
+        }
+
+        const user = await gudhub.updateUser(dataToUpdate);
+
+        user.fullname.should.equal('Vasya Pupkin');
+    })
+
 });

package/GUDHUB/Utils/Utils.js

@@ -127,8 +127,8 @@ export class Utils {
     return mergeObjects(target, source, optionsArgument);
   }
 
-  makeNestedList(arr, id, parent_id, children_property) {
-    return makeNestedList(arr, id, parent_id, children_property);
+  makeNestedList(arr, id, parent_id, children_property, priority_property) {
+    return makeNestedList(arr, id, parent_id, children_property, priority_property);
   }
 
   mergeChunks(chunks) {

package/GUDHUB/Utils/interpretation/interpretation.js

@@ -17,7 +17,7 @@ export async function getInterpretedValue(gudhub, app_id, item_id, field_id) {
             );
             return option ? option.name : "";
           })
-          .join(" ");
+          .join(",");
         return fieldNames;
 
       case 'file':

package/GUDHUB/Utils/interpretation/interpretation.test.js

@@ -0,0 +1,11 @@
+import should from "should";
+import {GudHub} from '../../gudhub.js';
+
+describe("CHECK INTERPRETATION", function () {
+  const gudhub = new GudHub();
+
+  it("Check radio_button interpretation", async function () {
+    let interpretationValue = await gudhub.getInterpretedValue(16259,1064673,270607);
+    interpretationValue.should.equal("Normal");
+  });
+});

package/GUDHUB/Utils/nested_list/nested_list.js

@@ -1,6 +1,7 @@
-export function makeNestedList(arr, id, parent_id, children_property) {
+export function makeNestedList(arr, id, parent_id, children_property, priority_property) {
   let array = JSON.parse(JSON.stringify(arr));
   let children = Boolean(children_property) ? children_property : 'children';
+  let priority = Boolean(priority_property) ? priority_property : false;
   let i;
   for (i = 0; i < array.length; i++) {
     if (array[i][parent_id] && array[i][parent_id] !== 0) {
@@ -34,5 +35,22 @@ export function makeNestedList(arr, id, parent_id, children_property) {
     });
   }
 
+  function sortChildrensByPriority(unsorted_array) {
+    unsorted_array.forEach(item => {
+      if(item[children]) {
+        item[children].sort((a, b) => a[priority] - b[priority]);
+        item[children].forEach(child => {
+          if(child[children]) {
+            sortChildrensByPriority(child[children]);
+        }
+      })
+    }
+    });
+  }
+
+  if(priority) {
+    sortChildrensByPriority(array);
+  }
+  
   return array;
 }

package/GUDHUB/Utils/nested_list/nested_list.test.js

@@ -19,6 +19,11 @@ describe("NESTED LIST", function () {
         nestedList[0].custom_children[0].should.have.property('custom_children');
     })
 
+    it('Should sort nested list childrens by priority', function () {
+        let nestedList = gudhub.makeNestedList(complicatedInput, 'id', 'parent_id', 'custom_children_array_name', 'priority');
+        nestedList[0].custom_children_array_name[1].title.should.equal('Child 1');
+    })
+
 });
 
 let input = [
@@ -67,4 +72,77 @@ let input = [
         id: 9,
         parent_id: 8
     },
-];
+];
+
+let complicatedInput = [
+    {
+        id: "26553.2884361",
+        parent_id: "26553.2904452",
+        title: "Second parent",
+        priority: 3
+    },
+    {
+        id: "26553.2904452",
+        parent_id: "",
+        title: "Parent"
+    },
+    {
+        id: "26553.2904533",
+        parent_id: "26553.2904452",
+        title: "Child 2",
+        priority: 5
+    },
+    {
+        id: "26553.2904534",
+        parent_id: "26553.2904452",
+        title: "Child 3",
+        priority: 4
+    },
+    {
+        id: "26553.2904535",
+        parent_id: "26553.2884361",
+        title: "Child of child 1"
+    },
+    {
+        id: "26553.2904536",
+        parent_id: "26553.2884361",
+        title: "Child of child 2"
+    },
+    {
+        id: "26553.2904538",
+        parent_id: "26553.2884361",
+        title: "Third parent"
+    },
+    {
+        id: "26553.2904539",
+        parent_id: "26553.2904538",
+        title: "Child of child of child"
+    },
+    {
+        id: "26553.2904540",
+        parent_id: "",
+        title: "Another parent"
+    },
+    {
+        id: "26553.2906081",
+        parent_id: "26553.2904452",
+        title: "Child 1",
+        priority: 2
+    },
+    {
+        id: "26553.2914316",
+        parent_id: "26553.2904540",
+        title: "Child of another parent"
+    },
+    {
+        id: "26553.2914491",
+        parent_id: "26553.2904452",
+        title: "Child of first parent",
+        priority: 1
+    },
+    {
+        id: "26553.2914500",
+        parent_id: "26553.2884361",
+        title: "Child of second parent"
+    }
+]

package/GUDHUB/gudhub.js

@@ -65,7 +65,7 @@ export class GudHub {
       this.appProcessor,
       this.itemProcessor
     );
-    this.fileManager = new FileManager(this.storage, this.req, this.pipeService, this.appProcessor);
+    this.fileManager = new FileManager(this.storage, this.pipeService, this.req, this.appProcessor);
     this.documentManager = new DocumentManager(this.req);
 
     if (options.initWebsocket) {
@@ -216,8 +216,8 @@ export class GudHub {
     return this.util.mergeObjects(sourceObject, destinationObject);
   }
 
-  makeNestedList(arr, id, parent_id, children_property) {
-    return this.util.makeNestedList(arr, id, parent_id, children_property);
+  makeNestedList(arr, id, parent_id, children_property, priority_property) {
+    return this.util.makeNestedList(arr, id, parent_id, children_property, priority_property);
   }
 
   jsonConstructor(scheme, items, variables){