@gudhub/core 1.1.13 → 1.1.16

package/GUDHUB/ItemProcessor/ItemProcessor.js

@@ -51,10 +51,15 @@ export class ItemProcessor {
   }
 
   addItemsToStorage(app_id, items) {
+    // !!!!! Need to fix this
     const app = this.storage.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);
@@ -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,
@@ -113,9 +120,13 @@ export class ItemProcessor {
   deleteItemsFromStorage(app_id, itemsForDelete = []) {
     const app = this.storage.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);
     }
@@ -148,8 +159,8 @@ export class ItemProcessor {
   }
 
   async deleteItems(app_id, itemsIds) {
-    return this.deleteItemsApi(itemsIds).then(() =>
-      this.deleteItemsFromStorage(app_id, itemsIds)
+    return this.deleteItemsApi(itemsIds).then((items) =>
+      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/AppsTemplateService/AppsTemplateService.js

@@ -23,7 +23,7 @@ export default class AppsTemplateService {
                 })
             }).then(success => {
                 self.createItems(success, maxNumberOfInsstalledItems, (status) => {
-                    if(typeof status === 'string') {
+                    if (typeof status === 'string') {
                         currentStep += 1;
                         progressCallback.call(this, {
                             percent: currentStep * stepPercents,
@@ -51,67 +51,67 @@ export default class AppsTemplateService {
 
             create_apps.forEach(app => {
                 promises.push(new Promise(app_resolve => {
-                self.gudhub.getApp(self._searchOldAppId(app.app_id, self.appsConnectingMap.apps)).then(result_app => {
-                    callback ? callback.call(this, `GET APP: ${result_app.app_name} (Items steps)`) : null;
-                    let source_app = JSON.parse(JSON.stringify(result_app));
-                    let items = source_app.items_list.map(item => {
-                        return {
-                            index_number: item.index_number,
-                            item_id: 0,
-                            fields: []
-                        }
-                    }).filter((item, index) => index <= MAX_NUMBER_OF_INSTALLED_ITEMS);
+                    self.gudhub.getApp(self._searchOldAppId(app.app_id, self.appsConnectingMap.apps)).then(result_app => {
+                        callback ? callback.call(this, `GET APP: ${result_app.app_name} (Items steps)`) : null;
+                        let source_app = JSON.parse(JSON.stringify(result_app));
+                        let items = source_app.items_list.map(item => {
+                            return {
+                                index_number: item.index_number,
+                                item_id: 0,
+                                fields: []
+                            }
+                        }).filter((item, index) => index <= MAX_NUMBER_OF_INSTALLED_ITEMS);
 
-                    self.gudhub.addNewItems(app.app_id, items).then(items => {
-                        callback ? callback.call(this, `ADD NEW ITEMS: ${result_app.app_name} (Items steps)`) : null;
+                        self.gudhub.addNewItems(app.app_id, items).then(items => {
+                            callback ? callback.call(this, `ADD NEW ITEMS: ${result_app.app_name} (Items steps)`) : null;
 
-                        if(items.length === 0) {
-                            callback ? callback.call(this, `NO ITEMS TO REPLACE VALUE: ${result_app.app_name} (Items steps)`) : null;
-                            app_resolve();
-                        }
+                            if (items.length === 0) {
+                                callback ? callback.call(this, `NO ITEMS TO REPLACE VALUE: ${result_app.app_name} (Items steps)`) : null;
+                                app_resolve();
+                            }
 
-                        app.items_list = items;
-                        self._updateMap(app.items_list, source_app.items_list);
-                        self._addFieldValue(source_app.items_list, app.items_list, self.appsConnectingMap);
-
-                        createsItems.push(app);
-
-                        if (self.appsConnectingMap.apps.length === createsItems.length) {
-                            createsItems.forEach(app => {
-                                app.items_list.forEach(item => {
-                                    item.fields.forEach(field_item => {
-                                        self.appsConnectingMap.fields.forEach(field_map => {
-                                            if (field_item.field_id === field_map.old_field_id) {
-                                                field_item.field_id = field_map.new_field_id;
-                                                field_item.element_id = field_map.new_field_id;
-                                            }
+                            app.items_list = items;
+                            self._updateMap(app.items_list, source_app.items_list);
+                            self._addFieldValue(source_app.items_list, app.items_list, self.appsConnectingMap);
+
+                            createsItems.push(app);
+
+                            if (self.appsConnectingMap.apps.length === createsItems.length) {
+                                createsItems.forEach(app => {
+                                    app.items_list.forEach(item => {
+                                        item.fields.forEach(field_item => {
+                                            self.appsConnectingMap.fields.forEach(field_map => {
+                                                if (field_item.field_id === field_map.old_field_id) {
+                                                    field_item.field_id = field_map.new_field_id;
+                                                    field_item.element_id = field_map.new_field_id;
+                                                }
+                                            })
                                         })
                                     })
-                                })
-                            });
-
-                            self.deleteField(createsItems);
-
-                            self.replaceValue(createsItems, self.appsConnectingMap).then(() => {
-                                callback ? callback.call(this, `REPLACE VALUE: ${result_app.app_name} (Items steps)`) : null;
-                                createsItems.forEach(created_app => {
-                                    let newItems = created_app.items_list.map(item => {
-                                        item.fields.forEach(field => {
-                                            delete field.data_id;
+                                });
+
+                                self.deleteField(createsItems);
+
+                                self.replaceValue(createsItems, self.appsConnectingMap).then(() => {
+                                    callback ? callback.call(this, `REPLACE VALUE: ${result_app.app_name} (Items steps)`) : null;
+                                    createsItems.forEach(created_app => {
+                                        let newItems = created_app.items_list.map(item => {
+                                            item.fields.forEach(field => {
+                                                delete field.data_id;
+                                            });
+                                            return item;
                                         });
-                                        return item;
-                                    });
 
-                                    self.gudhub.updateItems(created_app.app_id, newItems).then(() => {
-                                        app_resolve();
+                                        self.gudhub.updateItems(created_app.app_id, newItems).then(() => {
+                                            app_resolve();
+                                        })
                                     })
-                                })
-                            });
-                        }
+                                });
+                            }
+                        });
                     });
-                });
-            }));
-        });
+                }));
+            });
 
             Promise.all(promises).then(() => {
                 let apps = create_apps.map(app => {
@@ -144,24 +144,32 @@ export default class AppsTemplateService {
                         self._replaceValueItemRef(app, field_of_list, map);
                     }
 
-                    allPromises.push(self.gudhub.ghconstructor.getInstance(field_of_list.data_type).then(data => {
-                        if (data.getTemplate().constructor == 'file') {
-                            return self.gudhub.util.fileInstallerHelper(app.app_id, app.items_list, field_of_list.field_id).then(result => {
-                                return result;
-                            });
-                        } else if (data.getTemplate().constructor == 'document') {
-                            self.documentInstallerHelper(app.app_id, app.items_list, field_of_list.field_id).then(result => {
-                                return data;
+                    allPromises.push(new Promise(resolve => {
+                            self.gudhub.ghconstructor.getInstance(field_of_list.data_type).then(data => {
+                                if(typeof data === 'undefined') {
+                                    console.log('ERROR WHILE GETTING INSTANCE OF ', field_of_list.data_type);
+                                    resolve({
+                                        type: field_of_list.data_type
+                                    });
+                                    return;
+                                }
+                                if (data.getTemplate().constructor == 'file') {
+                                    return self.gudhub.util.fileInstallerHelper(app.app_id, app.items_list, field_of_list.field_id).then(result => {
+                                        resolve(result);
+                                    });
+                                } else if (data.getTemplate().constructor == 'document') {
+                                    self.documentInstallerHelper(app.app_id, app.items_list, field_of_list.field_id).then(result => {
+                                        resolve(data);
+                                    })
+                                } else {
+                                    resolve(data);
+                                }
                             })
-                        } else {
-                            return data;
-                        }
                     }))
-
                 })
             });
 
-            if(allPromises.length > 0) {
+            if (allPromises.length > 0) {
 
                 Promise.all(allPromises).then(result => {
                     resolve(result);

package/GUDHUB/Utils/json_constructor/json_constructor.js

@@ -136,7 +136,7 @@ export function compiler(scheme, item, util, variables) {
 
   async function getFilteredItems(filtersList, element_app_id, app_id, item_id, itemsList) {
     const modified_filters_list = await util.gudhub.prefilter(
-      filtersList,
+      JSON.parse(JSON.stringify(filtersList)),
       element_app_id,
       app_id,
       item_id,

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
@@ -17,6 +32,15 @@ describe("JSON CONSTRUCTOR", function () {
     json.fishtank[0].should.have.property("url","https://google.com,https://test.com");
     json.fishtank[0].should.have.property("notes","https://gudhub.com/userdata/16259/811770.html?timestamp=0");
   });
+  it("GET FILTERED ITEMS LENGTH WITH CURRENT ITEM FILTER", async function () {
+    let json = await gudhub.jsonConstructor(currentItemScheme);
+    let firstLength = json.scheme[0].array.length;
+    let secondLength = json.scheme[1].array.length;
+
+    firstLength.should.equal(8);
+    secondLength.should.equal(4);
+   
+  });
 });
 
 var fishtank_scheme = {
@@ -68,3 +92,56 @@ var fishtank_scheme = {
   app_id: "16259",
   filter: [],
 };
+
+let currentItemScheme = {
+  type: "array",
+  id: 1,
+  childs: [
+    {
+      type: "property",
+      id: 3,
+      property_name: "value",
+      property_type: "field_value",
+      field_id: "254056",
+      interpretation: 1,
+    },
+    {
+      type: "property",
+      id: 4,
+      property_name: "image",
+      property_type: "field_value",
+      field_id: "551380",
+      interpretation: 1,
+    },
+    {
+      type: "array",
+      id: 2,
+      childs: [
+        {
+          type: "property",
+          id: 5,
+          property_name: "date",
+          property_type: "field_value",
+          field_id: "1455",
+          interpretation: 1,
+        },
+      ],
+      property_name: "array",
+      app_id: "214",
+      filter: [
+        {
+          field_id: 254058,
+          data_type: "item_ref",
+          valuesArray: [],
+          search_type: "equal_or",
+          selected_search_option_variable: "Variable",
+          input_type: "variable",
+          input_value: "current_item",
+        },
+      ],
+    },
+  ],
+  property_name: "scheme",
+  app_id: "16259",
+  filter: [],
+};

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);