@gudhub/core 1.0.38 → 1.0.39

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/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/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) => {