@gudhub/core 1.2.4-beta.20 → 1.2.4-beta.22

package/GUDHUB/AppProcessor/AppProcessor.js

@@ -235,7 +235,7 @@ export class AppProcessor {
       // Here we get default user's app
       // We do it here to do it only once
       // We do it because we need to initialize WebSockets, which we do in getApp method
-      this.getApp(this.storage.getUser().app_init);
+      // this.getApp(this.storage.getUser().app_init); // commented due to unfinished app_init development, its shape causes exceptions
     }
 
     return app_list;
@@ -288,6 +288,8 @@ export class AppProcessor {
         // This code for trash must be changed
         // return trash ? app : {...app, items_list: app.items_list.filter(item => !item.trash)};
         let filtered =  trash ? app : {...app, items_list: app.items_list.filter(item => !item.trash)};
+        filtered =  trash ? filtered : {...filtered, field_list: filtered.field_list.filter(f => !f.trash)};
+
         resolve(filtered);
     
         self.saveAppInStorage(filtered);
@@ -344,7 +346,15 @@ export class AppProcessor {
   }
 
   async handleAppChange(id, prevVersion, nextVersion) {
-    // generate required events etc, do job
+    let res1 = this.util.areViewListsEqual(prevVersion.views_list, nextVersion.views_list);
+    let res2 = this.util.areFieldListsEqual(prevVersion.field_list, nextVersion.field_list);
+
+    if (
+      res1 ||
+      res2
+    ) {
+      this.updateAppFieldsAndViews({id, views_list: nextVersion.views_list, field_list: nextVersion.field_list});
+    }
   }
 
   clearAppProcessor() {

package/GUDHUB/DataService/AppDataService.js

@@ -119,6 +119,7 @@ export class AppDataService extends DataService {
                 ]);
 
 
+                //TODO check this for AppHttpService, seems isnt necessary
                 // this.gudhub.triggerAppChange(id, cachedVersion, sentData);
 
 

package/GUDHUB/DataService/IndexedDB/IndexedDBAppService.js

@@ -486,7 +486,7 @@ export class IndexedDBAppService extends AppDataService {
   constructor(req, conf, gudhub) {
     super(req, conf, gudhub);
 
-    this.dataService = new AppHttpService(req, conf, gudhub);
+    this.dataService = new AppHttpService(req, conf, gudhub);// TODO isnt used in class. Why?
 
     // let indexDBService = new IndexedDBService(conf);
 
@@ -553,6 +553,20 @@ export class IndexedDBAppService extends AppDataService {
       ) {
       // if (id == e.data.id) {
         self.gudhub.itemProcessor.handleDiff(e.data.id, e.data.compareRes);
+
+
+        if (
+          e.data.viewListChanged ||
+          e.data.fieldListChanged
+        ) {
+          self.gudhub.appProcessor.updateAppFieldsAndViews(e.data.newVersion);
+        }
+
+
+
+
+        //here
+
       // }
       }
 

package/GUDHUB/DataService/IndexedDB/appRequestWorker.js

@@ -17,6 +17,9 @@ let appDataService = {};
 self.onmessage = async function(e) {
   if (e.data.type === 'init') {
 
+
+    e.data.gudhubSerialized.options.initWebsocket = false;
+
     gudhub = new GudHub(e.data.gudhubSerialized.authKey, e.data.gudhubSerialized.options);
     appDataService = new IndexedDBAppServiceForWorker(gudhub.req, appsConf, gudhub);
 
@@ -30,18 +33,38 @@ self.onmessage = async function(e) {
 
     let cached = await appDataService.getCached(e.data.id);
 
-    let newVersion = await appDataService.getApp(e.data.id);
+    let nextVersion = await appDataService.getApp(e.data.id);
 
 
 
 
 
     // let comparison = gudhub.compareItems(cached.items_list, newVersion.items_list);
-    let comparison = gudhub.compareItems(newVersion.items_list, cached.items_list);
+    let comparison = gudhub.compareItems(nextVersion.items_list, cached.items_list);
+
+
+    // async handleAppChange(id, prevVersion, nextVersion) {
+    let flag1 = gudhub.util.areViewListsEqual(cached.views_list, nextVersion.views_list);
+    let flag2 = gudhub.util.areFieldListsEqual(cached.field_list, nextVersion.field_list);
+
+    // if (
+    //   res1 ||
+    //   res2
+    // ) {
+    //   this.updateAppFieldsAndViews({id, views_list: nextVersion.views_list, field_list: nextVersion.field_list});
+    // }
+    // }
 
 
 
-    this.postMessage({id: e.data.id, compareRes: comparison, newVersion, type: e.data.type});
+    this.postMessage({
+      id: e.data.id, 
+      compareRes: comparison, 
+      newVersion: nextVersion, 
+      type: e.data.type, 
+      viewListChanged: flag1,
+      fieldListChanged: flag2,
+    });
 
 
 

package/GUDHUB/DataService/httpService/AppHttpService.js

@@ -21,7 +21,7 @@ export class AppHttpService extends AppDataService {
 
     async getApp(id) {
         let sentData = await this.appApi.getApp(id);
-        return this.processRequestedApp(id, sentData);// here is a problem. IndexedDB App service has Data service AppHttpService
+        return this.processRequestedApp(id, sentData); //TODO check is it ok to trigger change isnide method for AppHttpService
     }
 
     //TODO should be getApp and getAppAndProcessData - refactor whole code to use them

package/GUDHUB/ItemProcessor/ItemProcessor.js

@@ -119,6 +119,8 @@ export class ItemProcessor {
   }
 
   //here
+
+  /////
   handleItemsChange(id, prevVersion, nextVersion) {
     let compareRes = this.util.compareItems(prevVersion.items_list, nextVersion.items_list);
 
@@ -126,11 +128,14 @@ export class ItemProcessor {
     this.addItemsToStorage(id, compareRes.new_src_items);
   }
 
+
+  //
   triggerItemsChange(id, compareRes) {
     this.updateItemsInStorage(id, compareRes.diff_src_items);
     this.addItemsToStorage(id, compareRes.new_src_items);
   }
 
+  //
   handleDiff(id, compare) {
     this.updateItemsInStorage(id, compare.diff_src_items);
     this.addItemsToStorage(id, compare.new_src_items);

package/GUDHUB/Utils/Utils.js

@@ -207,10 +207,25 @@ export class Utils {
     return this.AppsTemplateService.createItems(create_apps, maxNumberOfInsstalledItems);
   }
 
+  areViewListsEqual(list1, list2) {
+    let sortedList1 = list1.sort((e1, e2) => e1.view_id - e2.view_id);
+    let sortedList2 = list2.sort((e1, e2) => e1.view_id - e2.view_id);
+
+    return this.compareObjects(sortedList1, sortedList2);
+  }
+
+  areFieldListsEqual(list1, list2) {
+    let sortedList1 = list1.sort((e1, e2) => e1.field_id - e2.field_id);
+    let sortedList2 = list2.sort((e1, e2) => e1.field_id - e2.field_id);
+
+    return this.compareObjects(sortedList1, sortedList2);
+  }
+
   compareObjects(obj1, obj2) {
     return compareObjects(obj1, obj2);
   }
   
+  //
   compareAppsItemsLists(items_list1, items_list2, callback) {
     const chunkWorkerBlob = new Blob([compare_items_lists_Worker()], {
       type: "application/javascript",

package/GUDHUB/Utils/merge_chunks/merge_chunks.js

@@ -5,6 +5,10 @@ import { mergeChunks as mergeChunksByMainThread, mergeChunksWorker } from "./mer
 
 
 export function mergeChunks(chunks) {
+  //dont launch new thread because already used in worker.
+  // Main reason is that renderer process allocates memory for structured clones for communication between trheads
+  return mergeChunksByMainThread(chunks);
+
   if (
     typeof Worker !== 'undefined'
   ) {

package/GUDHUB/gudhub.js

@@ -242,12 +242,16 @@ export class GudHub {
     return this.util.sortItems(items, options);
   }
 
+
+  //
   //here
   triggerAppChange(id, prevVersion, newVersion) {
     this.itemProcessor.handleItemsChange(id, prevVersion, newVersion);
     this.appProcessor.handleAppChange(id, prevVersion, newVersion);
   }
 
+
+  //
   //TODO handleAppChange
   triggerIemsChange(id, compareRes) {
     this.itemProcessor.triggerItemsChange(id, compareRes);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gudhub/core",
-  "version": "1.2.4-beta.20",
+  "version": "1.2.4-beta.22",
   "description": "",
   "main": "index.js",
   "scripts": {