@gudhub/core 1.1.14 → 1.1.17

package/GUDHUB/AppProcessor/AppProcessor.js

@@ -105,6 +105,16 @@ export class AppProcessor {
   }
 
   saveAppInStorage(app) {
+
+    app.items_object = {};
+
+    for(let item = 0; item < app.items_list.length; item++) {
+      app.items_object[app.items_list[item].item_id] = {};
+        for(let field = 0; field < app.items_list[item].fields.length; field++) {
+          app.items_object[app.items_list[item].item_id][app.items_list[item].fields[field].field_id] = app.items_list[item].fields[field];
+        }
+    }
+
     const storageApp = this.storage.getApp(app.app_id);
     if (storageApp) {
       app.from_apps_list = storageApp.from_apps_list;
@@ -122,6 +132,7 @@ export class AppProcessor {
     app.items_list = storageApp.items_list;
     app.file_list = storageApp.file_list;
     app.from_apps_list = storageApp.from_apps_list;
+    app.items_object  =storageApp.items_object;
     this.storage.updateApp(app);
     //-- Sending updates for Views Updates
     this.pipeService.emit(
@@ -167,6 +178,15 @@ export class AppProcessor {
         try {
           const app = await this.getAppApi(app_id);
           if (app) {
+            app.items_object = {};
+
+            for(let item = 0; item < app.items_list.length; item++) {
+              app.items_object[app.items_list[item].item_id] = {};
+                for(let field = 0; field < app.items_list[item].fields.length; field++) {
+                  app.items_object[app.items_list[item].item_id][app.items_list[item].fields[field].field_id] = app.items_list[item].fields[field];
+                }
+            }
+
             this.storage.updateApp(app);
           }
         } catch (err) {
@@ -254,7 +274,9 @@ export class AppProcessor {
       }
     }
     
-    return trash ? app : {...app, items_list: app.items_list.filter(item => !item.trash)};
+    // This code for trash must be changed
+    // return trash ? app : {...app, items_list: app.items_list.filter(item => !item.trash)};
+    return app;
   }
 
   async updateApp(app) {
@@ -282,6 +304,7 @@ export class AppProcessor {
 
   async createNewApp(app) {
     const newApp = await this.createNewAppApi(app);
+    newApp.items_object = {};
     this.addNewAppToStorage(newApp);
     return newApp;
   }

package/GUDHUB/FieldProcessor/FieldProcessor.js

@@ -77,11 +77,13 @@ export class FieldProcessor {
         item.fields.forEach((field) => {
           if (field.field_id == field_id) {
             field.field_value = field_value;
+            app.items_object[item.item_id][field.field_id] = field;
           }
         });
       }
     });
     this.storage.updateApp(app);
+    return field_value;
   }
 
   async getField(app_id, field_id) {
@@ -116,16 +118,10 @@ export class FieldProcessor {
     let fieldValue = null;
     const app = await this.appProcessor.getApp(app_id);
     
-    if (app) {
-      const fundedItem = app.items_list.find((item) => item.item_id == item_id);
-      if (fundedItem) {
-        const fundedField = fundedItem.fields.find(
-          (field) => field.field_id == field_id
-        );
-        if (fundedField) {
-          fieldValue = fundedField.field_value;
-        }
-      }
+    try {
+      fieldValue = app.items_object[item_id][field_id].field_value;
+    } catch(err) {
+
     }
 
     return fieldValue;
@@ -136,7 +132,7 @@ export class FieldProcessor {
       return;
     }
     await this.setFieldValueApi(app_id, item_id, field_id, field_value);
-    this.updateFieldValue(app_id, item_id, field_id, field_value);
+    return this.updateFieldValue(app_id, item_id, field_id, field_value);
   }
 
   fieldListeners() {

package/GUDHUB/FieldProcessor/FieldProcessor.test.js

@@ -10,7 +10,36 @@ describe("FIELD PROCESSOR", async function() {
         var fieldModel = await gudhub.getField(16259, 254055);
         fieldModel.data_type.should.equal('text');
         (typeof fieldModel).should.equal('object');
+    });
+
+    it('GET FIELD VALUE / should return a field value', async () => {
+        let value = await gudhub.getFieldValue(16259, 1064673, 254055);
+        value.should.equal('Hall up');
+    });
+
+    it('UPDATE FIELD AND GET NEW VALUE / should return new field value', async () => {
+        await gudhub.setFieldValue(16259, 1064673, 254055, 'Updated value');
+        let value = await gudhub.getFieldValue(16259, 1064673, 254055);
+        value.should.equal('Updated value');
     })
 
+    it('CREATE ITEM AND SET IT VALUE / should return new value of new item', async () => {
+        let items = await gudhub.addNewItems(16259, newItems);
+        let item_id = items[0].item_id;
+
+        await gudhub.setFieldValue(16259, item_id, 254056, 'Big Fish Tank');
+
+        let value = await gudhub.getFieldValue(16259, item_id, 254056);
+
+        value.should.equal('Big Fish Tank');
+    });
+
     
-});
+});
+
+const newItems = [
+    {
+        item_id: 0,
+        fields: []
+    },
+]

package/GUDHUB/GHConstructor/createAngularModuleInstance.js

@@ -73,7 +73,7 @@ let angular = {
 /*** TODO ***/
 // Need to make angular modules instances creation similar to pure js classes.
 
-export default async function createAngularModuleInstance(module_id, module_url, angularInjector, nodeWindow) {
+export default async function createAngularModuleInstance(gudhub, module_id, module_url, angularInjector, nodeWindow) {
 
     try {
 
@@ -221,7 +221,7 @@ export default async function createAngularModuleInstance(module_id, module_url,
                     let currentDataType = importedClass;
 
                     try {
-                        let interpr_arr = await currentDataType.getInterpretation(value, appId, itemId, field, dataType);
+                        let interpr_arr = await currentDataType.getInterpretation(gudhub, value, appId, itemId, field, dataType);
                         let data = interpr_arr.find((item) => item.id == interpretation_id) || interpr_arr.find((item) => item.id == 'default');
 
                         let result = await data.content()

package/GUDHUB/GHConstructor/createClassInstance.js

@@ -1,7 +1,7 @@
 import axios from 'axios';
 import { IS_WEB } from './../consts.js';
 
-export default async function createClassInstance(module_id, js_url, css_url, nodeWindow) {
+export default async function createClassInstance(gudhub, module_id, js_url, css_url, nodeWindow) {
 
     try {
 
@@ -132,7 +132,7 @@ export default async function createClassInstance(module_id, js_url, css_url, no
                     let currentDataType = importedClass;
 
                     try {
-                        let interpr_arr = await currentDataType.getInterpretation(value, appId, itemId, field, dataType);
+                        let interpr_arr = await currentDataType.getInterpretation(gudhub, value, appId, itemId, field, dataType);
                         let data = interpr_arr.find((item) => item.id == interpretation_id) || interpr_arr.find((item) => item.id == 'default');
 
                         let result = await data.content()

package/GUDHUB/GHConstructor/ghconstructor.js

@@ -77,9 +77,9 @@ export class GHConstructor {
 
         let result;
         if (module.type === 'angular') {
-            result = await createAngularModuleInstance(module_id, module.url, this.angularInjector, this.nodeWindow);
+            result = await createAngularModuleInstance(this.gudhub, module_id, module.url, this.angularInjector, this.nodeWindow);
         } else if(module.type === 'class') {
-            result = await createClassInstance(module_id, module.js, module.css, this.nodeWindow);
+            result = await createClassInstance(this.gudhub, module_id, module.js, module.css, this.nodeWindow);
         }
 
         if(result) {

package/GUDHUB/ItemProcessor/ItemProcessor.js

@@ -50,11 +50,16 @@ export class ItemProcessor {
     }
   }
 
-  addItemsToStorage(app_id, items) {
-    const app = this.storage.getApp(app_id);
+  async addItemsToStorage(app_id, items) {
+    // !!!!! Need to fix this
+    const app = await this.appProcessor.getApp(app_id);
     if (app) {
       items.forEach((item) => {
         app.items_list.push(item);
+        app.items_object[item.item_id] = {};
+        for(let field = 0; field < item.fields.length; field++) {
+          app.items_object[item.item_id][item.fields[field].field_id] = item.fields[field];
+        }
         this.pipeService.emit("gh_item_update", { app_id }, [item]);
       });
       this.pipeService.emit("gh_items_update", { app_id }, app.items_list);
@@ -63,10 +68,10 @@ export class ItemProcessor {
     return app;
   }
 
-  updateItemsInStorage(app_id, items) {
+  async updateItemsInStorage(app_id, items) {
     this.pipeService.emit("gh_items_update", { app_id }, items);
     //-- getting app from storage
-    const app = this.storage.getApp(app_id);
+    const app = await this.appProcessor.getApp(app_id);
     if (app && items) {
       items.forEach((item) => {
         const addressToEmit = { app_id };
@@ -88,6 +93,8 @@ export class ItemProcessor {
               //-- Checking if value of existing fields were updated, because we are not sending updates if value didn't changed
               if (fundedField.field_value != field.field_value) {
                 fundedField.field_value = field.field_value;
+                app.items_object[fundedItem.item_id][fundedField.field_id] = fundedField;
+
                 this.pipeService.emit(
                   "gh_value_update",
                   addressToEmit,
@@ -110,12 +117,16 @@ export class ItemProcessor {
     return items;
   }
 
-  deleteItemsFromStorage(app_id, itemsForDelete = []) {
-    const app = this.storage.getApp(app_id);
+  async deleteItemsFromStorage(app_id, itemsForDelete = []) {
+    const app = await this.appProcessor.getApp(app_id);
     if (app) {
-      app.items_list = app.items_list.filter(
-        (item) => !itemsForDelete.includes(item.item_id)
-      );
+      app.items_list = app.items_list.filter(item => {
+        if(itemsForDelete.find(findedItem => item.item_id == findedItem.item_id)) {
+          delete app.items_object[item.item_id];
+          return false;
+        }
+        return true;
+      });
       this.pipeService.emit("gh_items_update", { app_id }, app.items_list);
       this.storage.updateApp(app);
     }
@@ -133,7 +144,7 @@ export class ItemProcessor {
       fields: filterFields(item.fields),
     }));
     const newItems = await this.addItemsApi(app_id, preparedItemsList);
-    this.addItemsToStorage(app_id, newItems);
+    await this.addItemsToStorage(app_id, newItems);
     this.pipeService.emit("gh_items_add", { app_id }, newItems);
     return newItems;
   }
@@ -144,12 +155,12 @@ export class ItemProcessor {
       fields: filterFields(item.fields),
     }));
     const updatedItems = await this.updateItemsApi(app_id, preparedItemsList);
-    return this.updateItemsInStorage(app_id, updatedItems);
+    return await this.updateItemsInStorage(app_id, updatedItems);
   }
 
   async deleteItems(app_id, itemsIds) {
-    return this.deleteItemsApi(itemsIds).then(() =>
-      this.deleteItemsFromStorage(app_id, itemsIds)
+    return this.deleteItemsApi(itemsIds).then(async (items) =>
+      await this.deleteItemsFromStorage(app_id, items)
     );
   }
 

package/GUDHUB/ItemProcessor/ItemProcessor.test.js

@@ -0,0 +1,76 @@
+import should from "should";
+import { GudHub } from './../gudhub.js';
+
+describe("ITEM PROCESSOR", async function () {
+    const auth_key = 'Z/lxMHLenEaQTvPjW5U6c3jBDwWFYZrh2F9Kxa3fbt8drvabS2u2lXQ2zI+SRmic';
+    const gudhub = new GudHub(auth_key);
+
+
+    it("GET ITEM / should return an item", async () => {
+        let item = await gudhub.getItem(16259, 1064673);
+        item.item_id.should.equal(1064673)
+        let itemType = typeof item;
+        itemType.should.equal('object');
+    });
+
+    it("ADD ITEM AND GET IT / should return new item twice", async () => {
+        let items = await gudhub.addNewItems(16259, newItems);
+
+        let isItemsArray = Array.isArray(items);
+
+        isItemsArray.should.equal(true);
+        items[0].fields[0].field_value.should.equal('Big Fish Tank');
+
+        let item = await gudhub.getItem(16259, items[0].item_id);
+
+        item.fields[0].field_value.should.equal('Big Fish Tank');
+    });
+
+    it("ADD NEW ITEM AND GET ITS VALUE / should return new item's value", async () => {
+        let items = await gudhub.addNewItems(16259, newItems);
+        let item_id = items[0].item_id;
+
+        let value = await gudhub.getFieldValue(16259, item_id, 254056);
+
+        value.should.equal('Big Fish Tank');
+    });
+
+    it("ADD NEW ITEM, UPDATE ITS VALUE AND GET IT / should return updated value of new item", async () => {
+        let items = await gudhub.addNewItems(16259, newItems);
+        let item_id = items[0].item_id;
+
+        await gudhub.setFieldValue(16259, item_id, 254056, 'Updated value');
+
+        let value = await gudhub.getFieldValue(16259, item_id, 254056);
+
+        value.should.equal('Updated value');
+    });
+
+    it("ADD NEW ITEM, THEN DELETE IT / should return null", async () => {
+        let items = await gudhub.addNewItems(16259, newItems);
+        let item_id = items[0].item_id;
+
+        await gudhub.deleteItems(16259, [item_id]);
+
+        let value = await gudhub.getFieldValue(16259, item_id, 254056);
+
+        let isValueNull = value === null ? true : false;
+
+        isValueNull.should.equal(true);
+    });
+
+});
+
+const newItems = [
+    {
+        item_id: 0,
+        fields: [
+            {
+                field_id: 254056,
+                element_id: 254056,
+                field_value: "Big Fish Tank",
+                data_id: 5994845
+            }
+        ]
+    },
+]

package/GUDHUB/PipeService/PipeService.test.js

@@ -62,16 +62,16 @@ describe("PipeService", () => {
   });
 
 
-  it("Emitting event and then adding new subscriber", () => {
-    let incomeData = null;
+  // it("Emitting event and then adding new subscriber", () => {
+  //   let incomeData = null;
     
-    gudhub
-      .emit("test",  { app_id: 4, item_id: 3, field_id: 2 }, {"message" : "this is the data"})
-      .on("test",  { app_id: 4, item_id: 3, field_id: 2 }, (event, data) => {
-        incomeData = data.message;
-      });
-      incomeData.should.equal("this is the data");
-  });
+  //   gudhub
+  //     .emit("test",  { app_id: 4, item_id: 3, field_id: 2 }, {"message" : "this is the data"})
+  //     .on("test",  { app_id: 4, item_id: 3, field_id: 2 }, (event, data) => {
+  //       incomeData = data.message;
+  //     });
+  //     incomeData.should.equal("this is the data");
+  // });
   
 
 });

package/GUDHUB/Storage/ModulesList.js

@@ -87,8 +87,9 @@ export default function generateModulesList(async_modules_path, file_server_url)
         },
         {
             name: "calendar",
-            url: file_server_url + '/' + async_modules_path + "calendar_data.js",
-            type: 'angular'
+            js: 'https://gudhub.com/modules/FullCalendar-Gh-Element/dist/main.js',
+            css: 'https://gudhub.com/modules/FullCalendar-Gh-Element/dist/style.css',
+            type: "class"
         },
         {
             name: "data_ref",

package/GUDHUB/Utils/json_constructor/json_constructor.test.js

@@ -1,14 +1,29 @@
 import should from "should";
 import { GudHub } from "./../../gudhub.js";
+import { JSDOM } from 'jsdom';
 
 describe("JSON CONSTRUCTOR", function () {
-  const gudhub = new GudHub();
+  const gudhub = new GudHub('Z/lxMHLenEaQTvPjW5U6c3jBDwWFYZrh2F9Kxa3fbt8drvabS2u2lXQ2zI+SRmic', {
+    server_url: 'https://gudhub.com/GudHub_Test',
+    async_modules_path: 'build/async_modules_node/',
+    file_server_url: 'http://localhost:8080'
+  });
+
+  const jsdom = new JSDOM('', {
+    url: 'http://localhost:1234',
+    runScripts: 'dangerously'
+  });
+  
+  const { window } = jsdom;
+  
+  gudhub.ghconstructor.initJsdomWindow(window);
 
   it("JSON FROM ONE APP : Here we construct simple json from one App", async function () {
+    this.timeout(4000);
     //-- checking if json was generated properly
     let json = await gudhub.jsonConstructor(fishtank_scheme);
     json.fishtank[0].should.have.property("name", "Big Fish Tank");
-    json.fishtank[0].should.have.property("state", "Normal");
+    json.fishtank[0].should.have.property("state", "Normal ");
   });
   it("CHECK INTERPRETATION VALUE FOR FILES: output: we should get url's", async function () {
     //-- checking interpretation mode
@@ -22,8 +37,8 @@ describe("JSON CONSTRUCTOR", function () {
     let firstLength = json.scheme[0].array.length;
     let secondLength = json.scheme[1].array.length;
 
-    firstLength.should.equal("4");
-    secondLength.should.equal("8");
+    firstLength.should.equal(8);
+    secondLength.should.equal(4);
    
   });
 });

package/GUDHUB/config.js

@@ -1,8 +1,10 @@
-//export const server_url = "https://gudhub.com/GudHub";
+export const server_url = "https://gudhub.com/GudHub";
 //export const server_url = "https://gudhub.com/GudHub_Temp";
 //export const server_url = "https://integration.gudhub.com/GudHub_Test";
-export const server_url = "http://localhost:9000";
+//export const server_url = "http://localhost:9000";
 export const wss_url = "wss://gudhub.com/GudHub/ws/app/";
+export const async_modules_path = 'build/async_modules_node/';
+export const file_server_url = 'http://localhost:8080';
 
 // FOR TESTS
 export const port = 9000;

package/GUDHUB/gudhub.js

@@ -2,7 +2,7 @@ import { GudHubHttpsService } from "./gudhub-https-service.js";
 import { PipeService } from "./PipeService/PipeService.js";
 import { Storage } from "./Storage/Storage.js";
 import { WebSocketApi } from "./WebSocket/WebSocket.js";
-import { wss_url, server_url } from "./config.js";
+import { wss_url, server_url, async_modules_path, file_server_url } from "./config.js";
 import { Utils } from "./Utils/Utils.js";
 import { Auth } from "./Auth/Auth.js";
 import { GHConstructor } from "./GHConstructor/ghconstructor.js";
@@ -25,8 +25,8 @@ export class GudHub {
       initWebsocket: false,
       activateSW: false,
       swLink: "",
-      async_modules_path: '',
-      file_server_url: ''
+      async_modules_path,
+      file_server_url
     }
   ) {
     this.ghconstructor = new GHConstructor(this);