@gudhub/core 1.0.63 → 1.0.64

package/GUDHUB/GHConstructor/createAngularModuleInstance.js

@@ -0,0 +1,212 @@
+import axios from 'axios';
+
+/*************** FAKE ANGULAR $Q ***************/
+// It's needed when we eval() angular code.
+
+let $q = {
+    when: function (a) {
+        return new Promise(resolve => {
+            resolve(a);
+        })
+    }
+}
+
+/*************** FAKE ANGULAR ***************/
+// It's needed when we eval() angular code.
+
+let factoryReturns = {};
+
+let angular = {
+    module() {
+        return angular;
+    },
+    directive() {
+        return angular;
+    },
+    factory(name, args) {
+        try {
+            if (typeof args === 'object') {
+                factoryReturns[name] = args[args.length - 1]($q);
+            } else {
+                factoryReturns[name] = args($q);
+            }
+        } catch (error) {
+            console.log('Errror in data type: ', name);
+            console.log(error);
+        }
+        return angular;
+    },
+    service() {
+        return angular;
+    },
+    run() {
+        return angular;
+    },
+    filter() {
+        return angular;
+    },
+    controller() {
+        return angular;
+    },
+    value() {
+        return angular;
+    },
+    element() {
+        return angular;
+    },
+    injector() {
+        return angular;
+    },
+    invoke() {
+        return 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.
+
+export default async function createAngularModuleInstance(module_id, module_url, angularInjector) {
+
+    // If $injector don't have module with this id, than loadding this module using $oxLazyLoad
+
+    if (!angularInjector.has(module_id)) {
+        await angularInjector.get('$ocLazyLoad').load(module_url);
+    }
+
+    let angularModule = await angularInjector.get(module_id);
+
+    // Downloading module's code as text via axios and evaling it
+    // Result of eval will be in factory returns object, with key == module_id
+
+    let module = await axios.get(module_url);
+    module = module.data;
+
+    try {
+        eval(module);
+    } catch (error) {
+        console.error('ERROR WHILE EVAL() IN GHCONSTRUCTOR', error);
+    }
+
+    let result = {
+        type: module_id,
+
+        //*************** GET TEMPLATE ****************//
+
+        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);
+        },
+
+        //*************** GET DEFAULT VALUE ****************//
+
+        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);
+                }
+            });
+        },
+
+        //*************** GET SETTINGS ****************//
+
+        getSettings: function (scope, settingType, fieldModels) {
+            return angularModule.getSettings(scope, settingType, fieldModels);
+        },
+
+        //*************** FILTER****************//
+
+        filter: {
+            getSearchOptions: function (fieldModel) {
+                let d_type = angularModule;
+                if (d_type.filter && d_type.filter.getSearchOptions) {
+                    return angularModule.filter.getSearchOptions(fieldModel);
+                }
+                return [];
+            },
+            getDropdownValues: function () {
+                let d_type = angularModule;
+                if (d_type.filter && d_type.filter.getDropdownValues) {
+                    return d_type.filter.getDropdownValues();
+                } else {
+                    return [];
+                }
+            }
+        },
+
+        //*************** GET INTERPRETATION ****************//
+
+        getInterpretation: function (value, interpretation_id, dataType, field, itemId, appId) {
+            return new Promise(async (resolve) => {
+                let currentDataType = factoryReturns[module_id];
+
+                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()
+
+                    resolve({ html: result });
+                } catch (error) {
+                    console.log(`ERROR IN ${module_id}`, error);
+                    resolve({ html: '<span>no interpretation</span>' })
+                }
+            });
+        },
+
+        //*************** GET INTERPRETATIONS LIST ****************//
+
+        getInterpretationsList: function (field_value, appId, itemId, field) {
+            return factoryReturns[module_id].getInterpretation(field_value, appId, itemId, field);
+        },
+
+        //*************** GET INTERPRETATED 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);
+                }
+            });
+        },
+
+        //*************** EXTEND CONTROLLER ****************//
+
+        extendController: function (actionScope) {
+            angularModule.getActionScope(actionScope);
+        },
+
+        //*************** RUN ACTION ****************//
+
+        runAction: function (scope) {
+            try {
+                angularModule.runAction(scope);
+            } catch (e) {
+
+            }
+        },
+
+        //*************** GET WINDOW SCOPE ****************//
+
+        getWindowScope: function (windowScope) {
+            return angularModule.getWindowScope(windowScope);
+        },
+
+        //*************** GET WINDOW HTML ****************//
+
+        getWindowHTML: function (scope) {
+            return angularModule.getWindowHTML(scope);
+        },
+    }
+
+    return result;
+}

package/GUDHUB/GHConstructor/createClassInstance.js

@@ -0,0 +1,148 @@
+export default async function createClassInstance(module_id, js_url, css_url) {
+
+    // Check if there is url to javascript file of module
+
+    if(!js_url) {
+        console.error(`JS link must be provided for this data type - ${module_id}`);
+    }
+
+    // Import module using dynamic import
+
+    let module = await import(/* webpackIgnore: true */js_url);
+
+    // Creating class from imported module
+
+    let importedClass = new module.default(module_id);
+
+    // Checl 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) {
+        const linkTag = document.createElement('link');
+        linkTag.href = css_url;
+        linkTag.setAttribute('data-module', module_id);
+        linkTag.setAttribute('rel', 'stylesheet');
+        document.getElementsByTagName('head')[0].appendChild(linkTag);
+    }
+    
+    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);
+        },
+
+        //*************** FILTER****************//
+
+        filter: {
+            getSearchOptions: function (fieldModel) {
+                let d_type = importedClass;
+                if (d_type.filter && d_type.filter.getSearchOptions) {
+                    return importedClass.filter.getSearchOptions(fieldModel);
+                }
+                return [];
+            },
+            getDropdownValues: function () {
+                let d_type = importedClass;
+                if (d_type.filter && d_type.filter.getDropdownValues) {
+                    return d_type.filter.getDropdownValues();
+                } else {
+                    return [];
+                }
+            }
+        },
+
+        //*************** GET INTERPRETATION ****************//
+
+        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');
+
+                    let result = await data.content()
+
+                    resolve({ html: result });
+                } catch (error) {
+                    console.log(`ERROR IN ${module_id}`, error);
+                    resolve({ html: '<span>no interpretation</span>' })
+                }
+            });
+        },
+
+        //*************** GET INTERPRETATIONS LIST ****************//
+
+        getInterpretationsList: function (field_value, appId, itemId, field) {
+            return importedClass.getInterpretation(field_value, appId, itemId, field);
+        },
+
+        //*************** 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);
+                }
+            });
+        },
+
+        //*************** EXTEND CONTROLLER ****************//
+
+        extendController: function (actionScope) {
+            importedClass.getActionScope(actionScope);
+        },
+
+        //*************** RUN ACTION ****************//
+
+        runAction: function (scope) {
+            try {
+                importedClass.runAction(scope);
+            } catch (e) {
+
+            }
+        },
+
+        //*************** GET WINDOW SCOPE ****************//
+
+        getWindowScope: function (windowScope) {
+            return importedClass.getWindowScope(windowScope);
+        },
+
+        //*************** GET WINDOW HTML ****************//
+
+        getWindowHTML: function (scope) {
+            return importedClass.getWindowHTML(scope);
+        },
+    }
+
+    return result;
+}

package/GUDHUB/GHConstructor/ghconstructor.js

@@ -1,66 +1,5 @@
-import axios from 'axios';
-
-/*************** FAKE ANGULAR $Q ***************/
-// It's needed when we eval() angular code.
-
-let $q = {
-    when: function (a) {
-        return new Promise(resolve => {
-            resolve(a);
-        })
-    }
-}
-
-/*************** FAKE ANGULAR ***************/
-// It's needed when we eval() angular code.
-
-let factoryReturns = {};
-
-let angular = {
-    module() {
-        return angular;
-    },
-    directive() {
-        return angular;
-    },
-    factory(name, args) {
-        try {
-            if(typeof args === 'object') {
-                factoryReturns[name] = args[args.length - 1]($q);
-            } else {
-                factoryReturns[name] = args($q);
-            }
-        } catch(error) {
-            console.log('Errror in data type: ', name);
-            console.log(error);
-        }
-        return angular;
-    },
-    service() {
-        return angular;
-    },
-    run() {
-        return angular;
-    },
-    filter() {
-        return angular;
-    },
-    controller() {
-        return angular;
-    },
-    value() {
-        return angular;
-    },
-    element() {
-        return angular;
-    },
-    injector() {
-        return angular;
-    },
-    invoke() {
-        return angular;
-    }
-}
+import createAngularModuleInstance from './createAngularModuleInstance.js';
+import createClassInstance from './createClassInstance.js';
 
 export class GHConstructor {
     constructor() {
@@ -114,139 +53,18 @@ export class GHConstructor {
     }
 
     /*************** 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.
+    // 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_url = gudhub.storage.getModuleUrl(module_id);
-
-        if(!this.angularInjector.has(module_id)) {
-            await this.angularInjector.get('$ocLazyLoad').load(gudhub.storage.getModuleUrl(module_id));
-        }
-
-        let angularModule = await this.angularInjector.get(module_id);
-
-        let module = await axios.get(module_url);
-        module = module.data;
-
-        try {
-            eval(module);
-        } catch(error) {
-            console.error('ERROR WHILE EVAL() IN GHCONSTRUCTOR', error);
-        }
-
-        let result = {
-            type: module_id,
-
-            //*************** GET TEMPLATE ****************//
-
-            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);
-            },
-
-            //*************** GET DEFAULT VALUE ****************//
-
-            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);
-                    }
-                });
-            },
-
-            //*************** GET SETTINGS ****************//
-
-            getSettings: function (scope, settingType, fieldModels) {
-                return angularModule.getSettings(scope, settingType, fieldModels);
-            },
-
-            //*************** FILTER****************//
-
-            filter: {
-                getSearchOptions: function (fieldModel) {
-                    let d_type = angularModule;
-                    if (d_type.filter && d_type.filter.getSearchOptions) {
-                        return angularModule.filter.getSearchOptions(fieldModel);
-                    }
-                    return [];
-                },
-                getDropdownValues: function () {
-                    let d_type = angularModule;
-                    if (d_type.filter && d_type.filter.getDropdownValues) {
-                        return d_type.filter.getDropdownValues();
-                    } else {
-                        return [];
-                    }
-                }
-            },
-
-            //*************** GET INTERPRETATION ****************//
-
-            getInterpretation: function(value, interpretation_id, dataType, field, itemId, appId) {
-                return new Promise(async (resolve) => {
-                    let currentDataType = factoryReturns[module_id];
-
-                    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()
-
-                        resolve({ html: result });
-                    } catch(error) {
-                        console.log(`ERROR IN ${module_id}`, error);
-                        resolve({ html: '<span>no interpretation</span>' })
-                    }
-                });
-            },
-
-            //*************** GET INTERPRETATED 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);
-                    }
-                });
-            },
-
-            //*************** EXTEND CONTROLLER ****************//
-
-            extendController: function (actionScope) {
-                angularModule.getActionScope(actionScope);
-            },
-
-            //*************** RUN ACTION ****************//
-
-            runAction: function (scope) {
-                try {
-                    angularModule.runAction(scope);
-                } catch (e) {
-
-                }
-            },
-
-            //*************** GET WINDOW SCOPE ****************//
-
-            getWindowScope: function (windowScope) {
-                return angularModule.getWindowScope(windowScope);
-            },
-
-            //*************** GET WINDOW HTML ****************//
+        let module = gudhub.storage.getModuleUrl(module_id);
 
-            getWindowHTML: function (scope) {
-                return angularModule.getWindowHTML(scope);
-            },
+        let result;
+        if (module.type === 'angular') {
+            result = await createAngularModuleInstance(module_id, module.url, this.angularInjector);
+        } else if(module.type === 'class') {
+            result = await createClassInstance(module_id, module.js, module.css);
         }
 
         this.pupToCache(result);