@gudhub/core 1.1.26 → 1.1.27

package/GUDHUB/FieldProcessor/FieldProcessor.js

@@ -89,8 +89,13 @@ export class FieldProcessor {
 
   async getField(app_id, field_id) {
     const app = await this.appProcessor.getApp(app_id);
-    if(!app) return null
-    return app.field_list.find((field) => field.field_id == field_id);
+    if(!app) return null;
+    for(let i = 0; i < app.field_list.length; i++) {
+      if(app.field_list[i].field_id == field_id) {
+        return app.field_list[i];
+      }
+    }
+    return null;
   }
 
   //!!!!! Shou Be Renamed to  getFields() !!!!!!!

package/GUDHUB/GHConstructor/ghconstructor.js

@@ -4,7 +4,7 @@ import createClassInstance from './createClassInstance.js';
 export class GHConstructor {
     constructor(gudhub) {
         this.gudhub = gudhub;
-        this.cache = [];
+        this.cache = {};
         this.modulesQueue = {};
         this.angularInjector;
         this.nodeWindow;
@@ -16,34 +16,29 @@ export class GHConstructor {
     // If yes, return module from cache.
 
     async getInstance(module_id) {
-        return new Promise(async (resolve) => {
-            if (this.modulesQueue[module_id]) {
-                return this.modulesQueue[module_id].then(() => {
-                    resolve(this.getCached(module_id));
-                });
-            } else if (!this.cache.find(module => module.type === module_id)) {
-                this.modulesQueue[module_id] = this.createInstance(module_id);
-                this.modulesQueue[module_id].then(() => {
-                    resolve(this.getCached(module_id));
-                });
-            } else {
-                resolve(this.getCached(module_id));
-            }
-        });
+        if(this.getCached(module_id)) {
+            return this.getCached(module_id);
+        } else if (this.modulesQueue[module_id]) {
+            await this.modulesQueue[module_id];
+        } else {
+            this.modulesQueue[module_id] = this.createInstance(module_id);
+            await this.modulesQueue[module_id];
+        }
+        return this.getCached(module_id);
     }
 
     /*************** PUT TO CACHE ***************/
     // Just pushing module to cache.
 
-    pupToCache(module) {
-        this.cache.push(module);
+    pupToCache(module_id, module) {
+        this.cache[module_id] = module;
     }
 
     /*************** GET CACHED ***************/
     // Find module in cache and return it.
 
     getCached(module_id) {
-        return this.cache.find(module => module.type === module_id);
+        return this.cache[module_id];
     }
 
     /*************** INIT ANGULAR INJECTOR ***************/
@@ -83,7 +78,7 @@ export class GHConstructor {
         }
 
         if(result) {
-            this.pupToCache(result);
+            this.pupToCache(module_id, result);
         }
         
         return result;

package/GUDHUB/GHConstructor/interpritate.js

@@ -72,22 +72,25 @@ export class Interpritate {
 
     /********************* GET INTERPRETATION BY ID *********************/
 
-    getInterpretationById(appId, itemId, fieldId, interpretationId) {
-        return new Promise(async (resolve) => {
-            let fieldValue = await this.gudhub.getFieldValue(appId, itemId, fieldId);
-            let fieldModel = await this.gudhub.getField(appId, fieldId);
-            if(fieldModel == null) {
-                resolve('');
-            }
-            this.gudhub.ghconstructor.getInstance(fieldModel.data_type).then(async (instance) => {
-                let interpretatedValue = await instance.getInterpretation(fieldValue, interpretationId, fieldModel.data_type, fieldModel, itemId, appId);
-                if(interpretatedValue.html == '<span>no interpretation</span>') {
-                    resolve(fieldValue);
-                } else {
-                    resolve(interpretatedValue.html);
-                }
-            });
-        });
+    // We add ability to pass value as argument, to reduce number of operations in this case (getFieldValue)
+    // This helps if you call method many times, for example in calculator sum and you already have field value
+    // By default, value is null, to not break old code working with this method
+
+    // For field same as above for value
+    async getInterpretationById(appId, itemId, fieldId, interpretationId, value = null, field = null) {
+        let fieldValue = value == null ? await this.gudhub.getFieldValue(appId, itemId, fieldId) : value;
+        let fieldModel = field == null ? await this.gudhub.getField(appId, fieldId) : field;
+        if(fieldModel == null) {
+            resolve('');
+        }
+
+        const instance = await this.gudhub.ghconstructor.getInstance(fieldModel.data_type);
+        const interpretatedValue = await instance.getInterpretation(fieldValue, interpretationId, fieldModel.data_type, fieldModel, itemId, appId);
+        if(interpretatedValue.html == '<span>no interpretation</span>') {
+            return fieldValue;
+        } else {
+            return interpretatedValue.html;
+        }
     }
 
 }

package/GUDHUB/Storage/Storage.js

@@ -61,7 +61,11 @@ export class Storage {
 
 
   getApp(app_id) {
-    return this.apps_list.find((app) => app.app_id == app_id);
+    for(let i = 0; i < this.apps_list.length; i++) {
+      if(this.apps_list[i].app_id == app_id) {
+        return this.apps_list[i];
+      }
+    }
   }
 
   unsetApps() {

package/GUDHUB/gudhub.js

@@ -166,8 +166,8 @@ export class GudHub {
 
   /******************* GET INTERPRETATION BY ID *******************/
 
-  getInterpretationById(appId, itemId, fieldId, interpretationId) {
-    return this.interpritate.getInterpretationById(appId, itemId, fieldId, interpretationId);
+  getInterpretationById(appId, itemId, fieldId, interpretationId, value, field) {
+    return this.interpritate.getInterpretationById(appId, itemId, fieldId, interpretationId, value, field);
   }
 
   //============ FILTER ==========//

package/package.json

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