@gudhub/core 1.0.37 → 1.0.41

package/GUDHUB/Processors/AppProcessor/AppProcessor.js

@@ -205,7 +205,7 @@ export class AppProcessor {
     return this.deletingAppFromStorage(app_id);
   }
 
-  async getApp(app_id) {
+  async getApp(app_id, trash = false) {
     if (!app_id) return null;
 
     let app = this.getAppFromStorage(app_id);
@@ -242,7 +242,7 @@ export class AppProcessor {
       }
     }
     
-    return app;
+    return trash ? app : {...app, items_list: app.items_list.filter(item => !item.trash)};
   }
 
   async updateApp(app) {
@@ -372,17 +372,18 @@ export class AppProcessor {
     if (IS_WEB && this.activateSW) {
       navigator.serviceWorker.addEventListener("message", async (event) => {
         if (event.data.type === "refresh app") {
-          const app = this.getAppFromStorage(event.data.payload.app_id);
-          if (app && app.items_list.length) {
+          const app = await this.getApp(event.data.payload.app_id);
+          if (app) {
             this.util.compareAppsItemsLists(
-              event.data.payload.items_list,
               app.items_list,
-              ({ diff_fields_items, diff_fields_items_Ids, diff_items }) => {
-                if (diff_items.length) {
+              event.data.payload.items_list.filter(item => !item.trash),
+              ({ diff_fields_items, diff_fields_items_Ids, diff_items, newItems, deletedItems }) => {
+                if (diff_items.length || newItems.length || deletedItems.length) {
+               
                   this.pipeService.emit(
                     "gh_items_update",
                     { app_id: event.data.payload.app_id },
-                    event.data.payload.items_list
+                    event.data.payload.items_list.filter(item => !item.trash),
                   );
                   diff_items.forEach((item) =>
                     this.pipeService.emit(

package/GUDHUB/Processors/ItemProcessor/ItemProcessor.js

@@ -122,9 +122,9 @@ export class ItemProcessor {
   }
 
   async getItems(app_id, trash = false) {
-    const app = await this.appProcessor.getApp(app_id)
+    const app = await this.appProcessor.getApp(app_id, trash);
     if(!app) return null;
-    return trash ? app.items_list : app.items_list.filter(item => !item.trash);
+    return app.items_list;
   }
 
   async addNewItems(app_id, itemsList) {

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/compare_items_lists_worker/compare_items_lists.worker.js

@@ -1,46 +1,71 @@
 export function compare_items_lists_Worker() {
-  return `function compareItemsLists(items_list1 = [], items_list2 = []) {
-  const diff_fields_items = {};
-  const diff_fields_items_Ids = []
-  
-  items_list1.forEach((item1) => {
-    const sameItem = items_list2.find(
-      (item2) => Number(item2.item_id) === Number(item1.item_id)
+  return `function createList(items) {
+    return items.reduce(
+      (acc, item) => {
+        acc.list[item.item_id] = item;
+        acc.ids.push(item.item_id);
+        return acc;
+      },
+      { ids: [], list: {} }
     );
+  };
+  function compareItemsLists(oldItems, newItems) {
+    const { ids: oldIds, list: oldList } = createList(oldItems);
+    const { ids: newIds, list: newList } = createList(newItems);
 
-    if (!sameItem) {
-      diff_fields_items_Ids.push(item1.item_id)
-      return diff_fields_items[item1.item_id] = [...item1.fields];
-    }
-
-    item1.fields.forEach((field1) => {
-      const sameField = sameItem.fields.find(
-        (field2) => Number(field2.field_id) === Number(field1.field_id)
-      );
-
-      if (!sameField) {
-        if (!diff_fields_items[item1.item_id]) {
-          diff_fields_items[item1.item_id] = []
-          diff_fields_items_Ids.push(item1.item_id)
-        };
-
-        return diff_fields_items[item1.item_id].push(field1);
-      }
-
-      if (field1.field_value != sameField.field_value) {
-         if (!diff_fields_items[item1.item_id]) {
-           diff_fields_items[item1.item_id] = []
-           diff_fields_items_Ids.push(item1.item_id)
-         };
-        return diff_fields_items[item1.item_id].push(field1);
-      }
-
-      return;
+    const deletedItemsIds = oldIds.filter((id) => !newIds.includes(id));
+    const recentItemsIds = oldIds.filter((id) => !deletedItemsIds.includes(id));
+    const newItemsIds = newIds.filter((id) => !oldIds.includes(id));
+
+    const diff_fields_items = {};
+    const diff_fields_items_Ids = [];
+    
+    recentItemsIds.forEach((id) => {
+      const newItem = newList[id];
+      const oldItem = oldList[id];
+
+      oldItem.fields.forEach((field1) => {
+        const sameField = newItem.fields.find(
+          (field2) => Number(field2.field_id) === Number(field1.field_id)
+        );
+
+        if (!sameField) {
+          if (!diff_fields_items[newItem.item_id]) {
+            diff_fields_items[newItem.item_id] = [];
+            diff_fields_items_Ids.push(newItem.item_id);
+          }
+
+          return diff_fields_items[newItem.item_id].push(field1);
+        }
+
+        if (field1.field_value != sameField.field_value) {
+          if (!diff_fields_items[newItem.item_id]) {
+            diff_fields_items[newItem.item_id] = [];
+            diff_fields_items_Ids.push(newItem.item_id);
+          }
+          return diff_fields_items[newItem.item_id].push(field1);
+        }
+      });
     });
-  });
 
-  return {diff_fields_items,diff_fields_items_Ids, diff_items: items_list1.filter(item => diff_fields_items_Ids.includes(item.item_id)) };
-}
+    return {
+      newItems: newItemsIds.reduce((acc, id) => {
+        acc.push(newList[id]);
+        return acc;
+      }, []),
+      deletedItems: deletedItemsIds.reduce((acc, id) => {
+        acc.push(oldList[id]);
+        return acc;
+      }, []),
+      diff_fields_items_Ids,
+      diff_fields_items,
+      diff_items: diff_fields_items_Ids.reduce((acc, id) => {
+        acc.push(oldList[id]);
+        return acc;
+      }, []),
+    };
+  }
+
   self.addEventListener("message", (event) => {
     const { items_list1, items_list2 } = event.data;
 

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/merge_chunks/merge_chunks.js

@@ -5,6 +5,7 @@ export function mergeChunks(chunks) {
     chunk.items_list.forEach((item) => {
       const dstItem = result[item.item_id];
       if (dstItem) {
+        dstItem.trash = item.trash;
         return item.fields.forEach((srcField) => {
           let isFieldNonExist = true;
           dstItem.fields = dstItem.fields.map((dstField) => {

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) {
@@ -11,7 +12,7 @@ export function makeNestedList(arr, id, parent_id, children_property) {
           }
           parent[children].push(array[i]);
           array.splice(i, 1);
-          i--;
+          i == 0 ? i = 0 : i--;
         } else if (parent[children]) {
           findIdsOfChildren(parent);
         }
@@ -27,12 +28,29 @@ export function makeNestedList(arr, id, parent_id, children_property) {
         }
         child[children].push(array[i]);
         array.splice(i, 1);
-        i--;
+        i == 0 ? i = 0 : i--;
       } else if (child[children]) {
         findIdsOfChildren(child);
       }
     });
   }
 
+  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

@@ -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){

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gudhub/core",
-  "version": "1.0.37",
+  "version": "1.0.41",
   "description": "",
   "main": "index.js",
   "scripts": {