@gudhub/core 1.0.69 → 1.1.1

package/GUDHUB/AppProcessor/AppProcessor.js

@@ -177,6 +177,18 @@ export class AppProcessor {
     console.log("Apps refreshed: ", JSON.stringify(apps_id));
   }
 
+  async refreshAppsList() {
+    let currentAppsList = this.getAppListFromStorage();
+    let appsListFromApi = await this.getAppListApi();
+    let mergedAppsList = appsListFromApi.map(apiApp => {
+      return { ...apiApp, ...currentAppsList.find(app => app.app_id === apiApp.app_id) }
+    })
+
+    this.updateAppsListInStorage(mergedAppsList);
+
+    this.pipeService.emit('gh_apps_list_refreshed', {});
+  }
+
   async getAppsList() {
     let app_list = this.getAppListFromStorage();
     if (!this.applistReceived) {

package/GUDHUB/GHConstructor/createAngularModuleInstance.js

@@ -1,7 +1,8 @@
 import axios from 'axios';
+import { IS_WEB } from './../consts.js';
 
 /*************** FAKE ANGULAR $Q ***************/
-// It's needed when we eval() angular code.
+// It's needed when we import angular code.
 
 let $q = {
     when: function (a) {
@@ -12,7 +13,7 @@ let $q = {
 }
 
 /*************** FAKE ANGULAR ***************/
-// It's needed when we eval() angular code.
+// It's needed when we import angular code.
 
 let factoryReturns = {};
 
@@ -63,150 +64,210 @@ let angular = {
 }
 
 /*************** CREATE INSTANCE ***************/
-// Get angular module and module's code.
-// Then eval() module's code.
-// Finally, creating instance of module, using functions from angular module and evaled code.
+// Here we are importing modules using dynamic import.
+// For browser: just do dynamic import with url as parameter.
+// In node environment we can't dynamically import module from url, so we download module's code via axios and transform it to data url.
+// Then creating classes from imported modules.
+// Finally, creating instance of module, using functions from imported classes. If we in browser - also takes methods from angular's injector.
 
-export default async function createAngularModuleInstance(module_id, module_url, angularInjector) {
+/*** TODO ***/
+// Need to make angular modules instances creation similar to pure js classes.
 
-    // If $injector don't have module with this id, than loadding this module using $oxLazyLoad
+export default async function createAngularModuleInstance(module_id, module_url, angularInjector, nodeWindow) {
 
-    if (!angularInjector.has(module_id)) {
-        await angularInjector.get('$ocLazyLoad').load(module_url);
-    }
+    try {
 
-    let angularModule = await angularInjector.get(module_id);
+        let angularModule;
+        let importedClass;
 
-    // Downloading module's code as text via axios and evaling it
-    // Result of eval will be in factory returns object, with key == module_id
+        if (IS_WEB) {
 
-    let module = await axios.get(module_url);
-    module = module.data;
+            // Download module with $ocLazyLoad if module not in injector already.
 
-    try {
-        eval(module);
-    } catch (error) {
-        console.error('ERROR WHILE EVAL() IN GHCONSTRUCTOR', error);
-    }
+            if (!angularInjector.has(module_id)) {
+                await angularInjector.get('$ocLazyLoad').load(module_url);
+            }
 
-    let result = {
-        type: module_id,
+            angularModule = await angularInjector.get(module_id);
 
-        //*************** GET TEMPLATE ****************//
+            // Then, dynamically import modules from url.
 
-        getTemplate: function (ref, changeFieldName, displayFieldName, field_model, appId, itemId) {
-            let displayFieldNameChecked = displayFieldName === 'false' ? false : true;
-            return angularModule.getTemplate(ref, changeFieldName, displayFieldNameChecked, field_model, appId, itemId);
-        },
+            let module = await axios.get(module_url);
+            module = module.data;
 
-        //*************** GET DEFAULT VALUE ****************//
+            try {
+                eval(module);
+            } catch (error) {
+                console.error(`ERROR WHILE EVAL() IN GHCONSTRUCTOR. MODULE ID: ${module_id}`);
+                console.log(error);
+            }
 
-        getDefaultValue: function (fieldModel, valuesArray, itemsList, currentAppId) {
-            return new Promise(async (resolve) => {
-                let getValueFunction = angularModule.getDefaultValue;
-                if (getValueFunction) {
-                    let value = await getValueFunction(fieldModel, valuesArray, itemsList, currentAppId);
-                    resolve(value);
-                } else {
-                    resolve(null);
-                }
-            });
-        },
+            importedClass = factoryReturns[module_id];
 
-        //*************** GET SETTINGS ****************//
+        } else {
 
-        getSettings: function (scope, settingType, fieldModels) {
-            return angularModule.getSettings(scope, settingType, fieldModels);
-        },
+            // If node's global object don't have window and it's methods yet - set it.
+            if (!global.hasOwnProperty('window')) {
+                global.window = nodeWindow;
+                global.document = nodeWindow.document;
+                global.Element = nodeWindow.Element;
+                global.navigator = nodeWindow.navigator;
+                global.HTMLElement = nodeWindow.HTMLElement;
+                global.angular = angular;
+            }
 
-        //*************** FILTER****************//
+            // Downloading module's code and transform it to data url.
 
-        filter: {
-            getSearchOptions: function (fieldModel) {
-                let d_type = angularModule;
-                if (d_type.filter && d_type.filter.getSearchOptions) {
-                    return angularModule.filter.getSearchOptions(fieldModel);
-                }
-                return [];
+            let response = await axios.get(module_url);
+            let code = response.data;
+            let encodedCode = encodeURIComponent(code);
+            encodedCode = 'data:text/javascript;charset=utf-8,' + encodedCode;
+
+            let module;
+
+            // Then, dynamically import modules from data url.
+
+            try {
+                module = await import(/* webpackIgnore: true */encodedCode);
+            } catch (err) {
+                console.log(`Error while importing module: ${module_id}`);
+            }
+
+            // Modules always exports classes as default, so we create new class instance.
+
+            importedClass = new module.default();
+
+        }
+
+        let result = {
+            type: module_id,
+
+            //*************** GET TEMPLATE ****************//
+
+            getTemplate: function (ref, changeFieldName, displayFieldName, field_model, appId, itemId) {
+                let displayFieldNameChecked = displayFieldName === 'false' ? false : true;
+                return importedClass.getTemplate(ref, changeFieldName, displayFieldNameChecked, field_model, appId, itemId);
+            },
+
+            //*************** GET DEFAULT VALUE ****************//
+
+            getDefaultValue: function (fieldModel, valuesArray, itemsList, currentAppId) {
+                return new Promise(async (resolve) => {
+                    let getValueFunction = importedClass.getDefaultValue;
+                    if (getValueFunction) {
+                        let value = await getValueFunction(fieldModel, valuesArray, itemsList, currentAppId);
+                        resolve(value);
+                    } else {
+                        resolve(null);
+                    }
+                });
+            },
+
+            //*************** GET SETTINGS ****************//
+
+            getSettings: function (scope, settingType, fieldModels) {
+                return importedClass.getSettings(scope, settingType, fieldModels);
             },
-            getDropdownValues: function () {
-                let d_type = angularModule;
-                if (d_type.filter && d_type.filter.getDropdownValues) {
-                    return d_type.filter.getDropdownValues();
-                } else {
+
+            //*************** FILTER****************//
+
+            filter: {
+                getSearchOptions: function (fieldModel) {
+                    let d_type = importedClass;
+                    if (d_type.filter && d_type.filter.getSearchOptions) {
+                        return importedClass.filter.getSearchOptions(fieldModel) || null;
+                    }
                     return [];
+                },
+                getDropdownValues: function () {
+                    let d_type = importedClass;
+                    if (d_type.filter && d_type.filter.getDropdownValues) {
+                        return d_type.filter.getDropdownValues() || null;
+                    } else {
+                        return [];
+                    }
                 }
-            }
-        },
+            },
 
-        //*************** GET INTERPRETATION ****************//
+            //*************** GET INTERPRETATION ****************//
 
-        getInterpretation: function (value, interpretation_id, dataType, field, itemId, appId) {
-            return new Promise(async (resolve) => {
-                let currentDataType = factoryReturns[module_id];
+            getInterpretation: function (value, interpretation_id, dataType, field, itemId, appId) {
+                return new Promise(async (resolve) => {
+                    let currentDataType = importedClass;
 
-                try {
-                    let interpr_arr = await currentDataType.getInterpretation(value, appId, itemId, field, dataType);
-                    let data = interpr_arr.find((item) => item.id == interpretation_id) || interpr_arr.find((item) => item.id == 'default');
+                    try {
+                        let interpr_arr = await currentDataType.getInterpretation(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()
+                        let result = await data.content()
 
-                    resolve({ html: result });
-                } catch (error) {
-                    console.log(`ERROR IN ${module_id}`, error);
-                    resolve({ html: '<span>no interpretation</span>' })
-                }
-            });
-        },
+                        resolve({ html: result });
+                    } catch (error) {
+                        console.log(`ERROR IN ${module_id}`, error);
+                        resolve({ html: '<span>no interpretation</span>' })
+                    }
+                });
+            },
 
-        //*************** GET INTERPRETATIONS LIST ****************//
+            //*************** GET INTERPRETATIONS LIST ****************//
 
-        getInterpretationsList: function (field_value, appId, itemId, field) {
-            return factoryReturns[module_id].getInterpretation(field_value, appId, itemId, field);
-        },
+            getInterpretationsList: function (field_value, appId, itemId, field) {
+                return importedClass.getInterpretation(field_value, appId, itemId, field);
+            },
 
-        //*************** GET INTERPRETATED VALUE ****************//
+            //*************** GET INTERPRETATED VALUE ****************//
+
+            getInterpretatedValue: function (field_value, field_model, appId, itemId) {
+                return new Promise(async (resolve) => {
+                    let getInterpretatedValueFunction = importedClass.getInterpretatedValue;
+                    if (getInterpretatedValueFunction) {
+                        let value = await getInterpretatedValueFunction(field_value, field_model, appId, itemId);
+                        resolve(value);
+                    } else {
+                        resolve(field_value);
+                    }
+                });
+            },
+        }
 
-        getInterpretatedValue: function (field_value, field_model, appId, itemId) {
-            return new Promise(async (resolve) => {
-                let getInterpretatedValueFunction = factoryReturns[module_id].getInterpretatedValue;
-                if (getInterpretatedValueFunction) {
-                    let value = await getInterpretatedValueFunction(field_value, field_model, appId, itemId);
-                    resolve(value);
-                } else {
-                    resolve(field_value);
-                }
-            });
-        },
+        // We need these methods in browser environment only
 
-        //*************** EXTEND CONTROLLER ****************//
+        if (IS_WEB) {
 
-        extendController: function (actionScope) {
-            angularModule.getActionScope(actionScope);
-        },
+            //*************** EXTEND CONTROLLER ****************//
 
-        //*************** RUN ACTION ****************//
+            result.extendController = function (actionScope) {
+                angularModule.getActionScope(actionScope);
+            }
 
-        runAction: function (scope) {
-            try {
-                angularModule.runAction(scope);
-            } catch (e) {
+            //*************** RUN ACTION ****************//
+
+            result.runAction = function (scope) {
+                try {
+                    angularModule.runAction(scope);
+                } catch (e) {
+
+                }
+            }
+
+            //*************** GET WINDOW SCOPE ****************//
 
+            result.getWindowScope = function (windowScope) {
+                return angularModule.getWindowScope(windowScope);
             }
-        },
 
-        //*************** GET WINDOW SCOPE ****************//
+            //*************** GET WINDOW HTML ****************//
+
+            result.getWindowHTML = function (scope) {
+                return angularModule.getWindowHTML(scope);
+            }
 
-        getWindowScope: function (windowScope) {
-            return angularModule.getWindowScope(windowScope);
-        },
+        }
 
-        //*************** GET WINDOW HTML ****************//
+        return result;
 
-        getWindowHTML: function (scope) {
-            return angularModule.getWindowHTML(scope);
-        },
+    } catch (err) {
+        console.log(err);
+        console.log(`Failed in createAngularModuleInstance (ghconstructor). Module id: ${module_id}.`);
     }
-
-    return result;
 }

package/GUDHUB/GHConstructor/createClassInstance.js

@@ -1,4 +1,9 @@
-export default async function createClassInstance(module_id, js_url, css_url) {
+import axios from 'axios';
+import { IS_WEB } from './../consts.js';
+
+export default async function createClassInstance(module_id, js_url, css_url, nodeWindow) {
+
+    try {
 
     // Check if there is url to javascript file of module
 
@@ -8,16 +13,46 @@ export default async function createClassInstance(module_id, js_url, css_url) {
 
     // Import module using dynamic import
 
-    let module = await import(/* webpackIgnore: true */js_url);
+    let downloadModule = (url) => {
+        if (!IS_WEB && !global.hasOwnProperty('window')) {
+            global.window = nodeWindow;
+            global.document = nodeWindow.document;
+            global.Element = nodeWindow.Element;
+            global.navigator = nodeWindow.navigator;
+            global.HTMLElement = nodeWindow.HTMLElement;
+        }
+        return new Promise(async (resolve) => {
+            let moduleData = await axios.get(url).catch(err => {
+                console.log(`Failed to fetch: ${url} in ghconstructor. Module id: ${module_id}`);
+            })
+
+            let encodedJs = encodeURIComponent(moduleData.data);
+    
+            let dataUri = 'data:text/javascript;charset=utf-8,' + encodedJs;
+    
+            resolve(dataUri);
+        })
+    }
+
+    let moduleData = await downloadModule(js_url);
+
+    let module;
+
+    try {
+        module = await import(/* webpackIgnore: true */moduleData);
+    } catch (err) {
+        console.log(`Error while importing module: ${module_id}`);
+        console.log(err);
+    }
 
     // Creating class from imported module
 
     let importedClass = new module.default(module_id);
 
-    // Checl if there is url to css file of module
+    // Check if there is url to css file of module
     // If true, and there is no css for this data type, than create link tag to this css in head
 
-    if(css_url) {
+    if(css_url && IS_WEB) {
         const linkTag = document.createElement('link');
         linkTag.href = css_url;
         linkTag.setAttribute('data-module', module_id);
@@ -145,4 +180,9 @@ export default async function createClassInstance(module_id, js_url, css_url) {
     }
 
     return result;
+
+    } catch(err) {
+        console.log(err);
+        console.log(`Failed in createClassInstance (ghconstructor). Module id: ${module_id}. JS url: ${js_url}`);
+    }
 }

package/GUDHUB/GHConstructor/ghconstructor.js

@@ -2,15 +2,17 @@ import createAngularModuleInstance from './createAngularModuleInstance.js';
 import createClassInstance from './createClassInstance.js';
 
 export class GHConstructor {
-    constructor() {
+    constructor(gudhub) {
+        this.gudhub = gudhub;
         this.cache = [];
         this.modulesQueue = {};
         this.angularInjector;
+        this.nodeWindow;
     }
 
     /*************** GET INSTANCE ***************/
-    // Firstly, check if module is loading right now in modules query.
-    // If not, check if module is in cache. If not, create new instance and put loading to modules query.
+    // Firstly, check if module is loading right now in modules queue.
+    // If not, check if module is in cache. If not, create new instance and put loading to modules queue.
     // If yes, return module from cache.
 
     async getInstance(module_id) {
@@ -52,19 +54,27 @@ export class GHConstructor {
         this.angularInjector = angularInjector;
     }
 
+    /*************** INIT JSDOM WINDOW ***************/
+    // Saves jsdom's window object to this.window.
+    // It's needed to eval browser code on node when library works in node environment.
+
+    initJsdomWindow(window) {
+        this.nodeWindow = window;
+    }
+
     /*************** CREATE INSTANCE ***************/
     // Check if module is "angular" or "class"
     // Than, creating instance for that type of module
     // Finally, returns the result (created instance) and puting it to the cache
 
     async createInstance(module_id) {
-        let module = gudhub.storage.getModuleUrl(module_id);
+        let module = this.gudhub.storage.getModuleUrl(module_id);
 
         let result;
         if (module.type === 'angular') {
-            result = await createAngularModuleInstance(module_id, module.url, this.angularInjector);
+            result = await createAngularModuleInstance(module_id, module.url, this.angularInjector, this.nodeWindow);
         } else if(module.type === 'class') {
-            result = await createClassInstance(module_id, module.js, module.css);
+            result = await createClassInstance(module_id, module.js, module.css, this.nodeWindow);
         }
 
         this.pupToCache(result);