@gudhub/core 1.2.4-beta.6 → 1.2.4-beta.60

package/GUDHUB/GHConstructor/createAngularModuleInstance.js

@@ -1,5 +1,5 @@
 import axios from 'axios';
-import { IS_WEB } from './../consts.js';
+import { IS_BROWSER_MAIN_THREAD } from './../consts.js';
 
 /*************** FAKE ANGULAR $Q ***************/
 // It's needed when we import angular code.
@@ -17,13 +17,14 @@ let $q = {
 
 let factoryReturns = {};
 
-let angular = {
+// required for building project to single file. Bundlers mangle angular variable, therefore class required for context only. Search it across project for details
+class AngularClass {
     module() {
         return angular;
-    },
+    }
     directive() {
         return angular;
-    },
+    }
     factory(name, args) {
         try {
             if (typeof args === 'object') {
@@ -36,33 +37,37 @@ let angular = {
             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;
     }
 }
 
+
+let angular = new AngularClass();
+
+
 /*************** CREATE INSTANCE ***************/
 // Here we are importing modules using dynamic import.
 // For browser: just do dynamic import with url as parameter.
@@ -80,7 +85,9 @@ export default async function createAngularModuleInstance(gudhub, module_id, mod
         let angularModule;
         let importedClass;
 
-        if (IS_WEB) {
+        if (
+            IS_BROWSER_MAIN_THREAD
+        ) {
 
             if(window.angular) {
 
@@ -125,19 +132,24 @@ export default async function createAngularModuleInstance(gudhub, module_id, mod
             }
 
         } else {
-
             const proxy = new Proxy(nodeWindow, {
                 get: (target, property) => {
-                    return target[property]
+                    const value = target[property];
+                    if (typeof value === 'symbol') {
+                        return undefined;
+                    }
+                    return value;
                 },
                 set: (target, property, value) => {
+                    if (typeof value === 'symbol') {
+                        return false;
+                    }
                     target[property] = value;
                     global[property] = value;
                     return true;
                 }
-            })
-
-            // If node's global object don't have window and it's methods yet - set it.
+            });
+        
             if (!global.hasOwnProperty('window')) {
                 global.window = proxy;
                 global.document = nodeWindow.document;
@@ -153,35 +165,42 @@ export default async function createAngularModuleInstance(gudhub, module_id, mod
                 global.WebSocket = nodeWindow.WebSocket;
                 global.crypto = nodeWindow.crypto;
                 global.DOMParser = nodeWindow.DOMParser;
-                global.Symbol = nodeWindow.Symbol;
+        
                 global.document.queryCommandSupported = (command) => {
                     return false;
-                }
+                };
                 global.angular = angular;
             }
-
-            // Downloading module's code and transform it to data url.
-
-            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.
-
+        
+            // Downloading module's code and transforming it to a data URL.
             try {
-                module = await import(/* webpackIgnore: true */encodedCode);
-            } catch (err) {
-                console.log(`Error while importing module: ${module_id}`);
-                console.log(err);
+                let response = await axios.get(module_url);
+                let code = response.data;
+        
+                // Ensure code is properly encoded, excluding any symbols
+                let encodedCode = encodeURIComponent(code);
+        
+                // Creating a data URL
+                encodedCode = 'data:text/javascript;charset=utf-8,' + encodedCode;
+        
+                let module;
+        
+                // Dynamically import the module from the data URL.
+                try {
+                    module = await import(/* webpackIgnore: true */ encodedCode);
+                } catch (err) {
+                    console.log(`Error while importing module: ${module_id}`);
+                    console.log(err);
+                }
+        
+                if (module && module.default) {
+                    importedClass = new module.default();
+                } else {
+                    console.error(`Module ${module_id} didn't export a default class`);
+                }
+            } catch (error) {
+                console.error("Error fetching module code:", error);
             }
-
-            // Modules always exports classes as default, so we create new class instance.
-
-            importedClass = new module.default();
-
         }
 
         let result = {
@@ -290,7 +309,9 @@ export default async function createAngularModuleInstance(gudhub, module_id, mod
 
         // We need these methods in browser environment only
 
-        if (IS_WEB) {
+        if (
+            IS_BROWSER_MAIN_THREAD
+        ) {
 
             //*************** EXTEND CONTROLLER ****************//
 

package/GUDHUB/GHConstructor/createClassInstance.js

@@ -1,5 +1,5 @@
 import axios from 'axios';
-import { IS_WEB } from './../consts.js';
+import { IS_BROWSER, IS_BROWSER_MAIN_THREAD } from './../consts.js';
 
 export default async function createClassInstance(gudhub, module_id, js_url, css_url, nodeWindow) {
 
@@ -14,7 +14,9 @@ export default async function createClassInstance(gudhub, module_id, js_url, css
         // Import module using dynamic import
 
         let downloadModule = (url) => {
-            if (!IS_WEB && !global.hasOwnProperty('window')) {
+            if (
+                !IS_BROWSER_MAIN_THREAD
+            ) {
                 global.window = proxy;
                 global.document = nodeWindow.document;
                 global.Element = nodeWindow.Element;
@@ -67,7 +69,10 @@ export default async function createClassInstance(gudhub, module_id, js_url, css
         // 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 && IS_WEB) {
+        if (
+            css_url &&
+            IS_BROWSER
+        ) {
             const linkTag = document.createElement('link');
             linkTag.href = css_url;
             linkTag.setAttribute('data-module', module_id);

package/GUDHUB/ItemProcessor/ItemProcessor.js

@@ -118,11 +118,10 @@ export class ItemProcessor {
     return items;
   }
 
-  handleItemsChange(v1, v2) {
-    let compareRes = this.util.compareItems(v1.items_list, v2.items_list);
-
-    this.updateItemsInStorage(v1.app_id, compareRes.diff_src_items);
-    this.addItemsToStorage(v1.app_id, compareRes.new_src_items);
+  handleDiff(id, compare) {
+    this.updateItemsInStorage(id, compare.diff_src_items);
+    this.addItemsToStorage(id, compare.new_src_items);
+    this.deleteItemsFromStorage(id, compare.trash_src_items);
   }
 
   async deleteItemsFromStorage(app_id, itemsForDelete = []) {
@@ -141,7 +140,7 @@ export class ItemProcessor {
   }
 
   async getItems(app_id, trash = false) {
-    const app = await this.appProcessor.getApp(app_id, trash);
+    const app = await this.appProcessor.getApp(app_id);
     if(!app) return null;
     return app.items_list;
   }
@@ -172,6 +171,15 @@ export class ItemProcessor {
     );
   }
 
+  async restoreItems(app_id, itemsIds) {
+    const preparedItemsList = itemsIds.map((id) => ({
+     item_id: id,
+     trash: false
+    }));
+    const updatedItems = await this.updateItemsApi(app_id, preparedItemsList);
+    return await this.updateItemsInStorage(app_id, updatedItems);
+  }
+
   itemListeners() {
     this.pipeService.onRoot("gh_items_get", {}, async (event, data) => {
       if(data && data.app_id) {

package/GUDHUB/Storage/ModulesList.js

@@ -142,7 +142,7 @@ export default function generateModulesList(async_modules_path, file_server_url,
             data_type: "calendar",
             name: 'Calendar',
             icon: 'calendar',
-            js: 'https://gudhub.com/modules/FullCalendar-Gh-Element/dist/main.js?t=4',
+            js: 'https://gudhub.com/modules/FullCalendar-Gh-Element/dist/main.js?t=6',
             css: 'https://gudhub.com/modules/FullCalendar-Gh-Element/dist/style.css?t=1',
             type: 'gh_element',
             technology: "class"
@@ -931,7 +931,7 @@ export default function generateModulesList(async_modules_path, file_server_url,
             data_type: 'study_journal',
             name: 'Study Journal',
             icon: 'timeline',
-            js: 'https://gudhub.com/modules/Study-Journal/dist/main.js',
+            js: 'https://gudhub.com/modules/Study-Journal/dist/main.js?t=1',
             css: 'https://gudhub.com/modules/Study-Journal/dist/style.css',
             type: 'gh_element',
             technology: 'class'
@@ -958,11 +958,53 @@ export default function generateModulesList(async_modules_path, file_server_url,
             data_type: "text_area",
             name: "Text Area",
             icon: "text_icon",
-            js: "https://gudhub.com/modules/text-area-ghe/dist/main.js?t=1",
+            js: "https://gudhub.com/modules/text-area-ghe/dist/main.js?t=3",
             css: "https://gudhub.com/modules/text-area-ghe/dist/style.css",
             type: "gh_element",
             technology: "class",
         },
+        {
+            data_type: "resource_calendar",
+            name: "Resource Сalendar",
+            icon: "calendar",
+            url: file_server_url + '/' + async_modules_path + "resource_calendar_data.js",
+            type: 'gh_element',
+            technology: 'angular'
+        },
+        {
+            data_type: "visualizer_with_control_panel",
+            name: "Visualizer With Control Panel",
+            icon: 'visualizer',
+            url: file_server_url + '/' + async_modules_path + "visualizer_with_control_panel_data.js",
+            type: 'gh_element',
+            technology: 'angular'
+        },
+        {
+            data_type: "svg_to_pdf",
+            name: "SVG To PDF",
+            icon: "box",
+            js: "https://gudhub.com/modules/SVG-to-PDF-Gh-Element/dist/main.js",
+            css: "https://gudhub.com/modules/SVG-to-PDF-Gh-Element/dist/style.css",
+            type: "gh_element",
+            technology: "class",
+        },
+        {
+            data_type: "recycle_bin",
+            name: "Recycle Bin",
+            icon: 'recycle_bin',
+            url: file_server_url + '/' + async_modules_path + "recycle_bin_data.js",
+            type: 'gh_element',
+            technology: "angular",
+        },
+        {
+            data_type: "assessment_journual",
+            name: "Assessment Journual",
+            icon: "text_icon",
+            js: "https://gudhub.com/modules/Assessment-Journal/dist/main.js",
+            css: "https://gudhub.com/modules/Assessment-Journal/dist/style.css",
+            type: "gh_element",
+            technology: "class",
+        },
         /* AUTOMATION MODULES */
         /*
             We have next types for automations:
@@ -1340,6 +1382,27 @@ export default function generateModulesList(async_modules_path, file_server_url,
             url: file_server_url + '/' + automation_modules_path + 'turbo_sms.js',
             type: 'automation',
             icon: 'email'
+        },
+        {
+            data_type: 'JsCode',
+            name: 'Js Code',
+            url: file_server_url + '/' + automation_modules_path + 'js_code.js',
+            type: 'automation',
+            icon: 'code_editor'
+        },
+        {
+            data_type: 'AskChatGPT',
+            name: 'Ask ChatGPT',
+            url: file_server_url + '/' + automation_modules_path + 'ask_chat_gpt.js',
+            type: 'automation',
+            icon: 'ask_chat_gpt'
+        },
+        {
+            data_type: 'TeachChatGPT',
+            name: 'Teach ChatGPT',
+            url: file_server_url + '/' + automation_modules_path + 'teach_chat_gpt.js',
+            type: 'automation',
+            icon: 'teach_chat_gpt'
         }
     ]
 }

package/GUDHUB/Utils/AppsTemplateService/AppsTemplateService.js

@@ -195,6 +195,8 @@ export default class AppsTemplateService {
 
     documentInstallerHelper(appId, items, elementId) {
         const self = this;
+        const itemsWithClonedDocument = [];
+
         return new Promise(async (resolve) => {
             for(const item of items) {
                 const itemId = item.item_id;
@@ -216,10 +218,11 @@ export default class AppsTemplateService {
 
                         field.field_value = newDocument._id;
 
+                        itemsWithClonedDocument.push(item);
                     }
                 }
             }
-            resolve();
+            resolve(itemsWithClonedDocument);
         });
     }
 
@@ -440,7 +443,14 @@ export default class AppsTemplateService {
             });
 
             self.crawling(app.field_list, function (prop, value, parent) {
-                if (prop.indexOf("field_id") !== -1 || prop.indexOf("FieldId") !== -1 || prop.indexOf("destination_field") !== -1) {
+                const fieldProps = ["field_id", "FieldId", "destination_field", "element_id"];
+                const appProps = ["app_id", "AppId", "destination_app"];
+                const viewProps = ["view_id"];
+                const srcProps = ["src"];
+
+                const hasProp = (prop, propArray) => propArray.some(key => prop.indexOf(key) !== -1);
+
+                if (hasProp(prop, fieldProps)) {
                     let fieldsArr = String(value).split(','), newFieldsArr = [];
 
                     appsConnectingMap.fields.forEach(field => {
@@ -456,7 +466,7 @@ export default class AppsTemplateService {
                     }
                 }
 
-                if (prop.indexOf("app_id") != -1 || prop.indexOf("AppId") != -1 || prop.indexOf("destination_app") != -1) {
+                if (hasProp(prop, appProps)) {
                     appsConnectingMap.apps.forEach(app => {
                         if (value == app.old_app_id) {
                             parent[prop] = app.new_app_id;
@@ -464,7 +474,7 @@ export default class AppsTemplateService {
                     })
                 }
 
-                if (prop.indexOf("view_id") !== -1) {
+                if (hasProp(prop, viewProps)) {
                     appsConnectingMap.views.forEach(view => {
                         if (value == view.old_view_id) {
                             parent[prop] = view.new_view_id;
@@ -472,7 +482,7 @@ export default class AppsTemplateService {
                     })
                 }
 
-                if (prop.indexOf("src") !== -1 && isFinite(value)) {
+                if (hasProp(prop, srcProps) && isFinite(value)) {
                     const pron_name = 'container_id';
                     const old_app_id = appsConnectingMap.apps.find(appMap => appMap.new_app_id === app.app_id).old_app_id;
                     const path = self.findPath(source_apps[old_app_id].views_list, pron_name, value);
@@ -480,6 +490,39 @@ export default class AppsTemplateService {
                     parent[prop] = `${self.getValueByPath(app.views_list, path, pron_name)}`;
                 }
 
+                if (prop.indexOf("trigger") !== -1 && value.model && value.model.nodes) {
+                    const nodes = value.model.nodes;
+                    const nodeProperties = ["inputs", "outputs"];
+
+                    for (const index in nodes) {
+                        nodeProperties.forEach((property) => {
+                            const node = nodes[index];
+                            const numericProperties = Object.keys(node[property]).filter(prop => prop !== '' && !isNaN(prop)); // field_id as keys
+
+                            numericProperties.forEach((old_field_id) => {
+                                const correspondFieldOfConnectingMap = appsConnectingMap.fields.filter((field) => field.old_field_id == old_field_id);
+
+                                if (correspondFieldOfConnectingMap.length !== 0 && correspondFieldOfConnectingMap[0].new_field_id) {
+                                    const new_field_id = correspondFieldOfConnectingMap[0].new_field_id.toString();
+
+                                    const connectionObjectCopy = node[property][old_field_id];
+                                    connectionObjectCopy.connections.forEach((connection) => {
+                                        if (connection.input == old_field_id) {
+                                            connection.input = new_field_id;
+                                        }
+                                        if (connection.output == old_field_id) {
+                                            connection.output = new_field_id;
+                                        }
+                                    });
+
+                                    delete node[property][old_field_id];
+
+                                    node[property][new_field_id] = connectionObjectCopy;
+                                }
+                            });
+                        });
+                    };
+                }
             })
         })
 

package/GUDHUB/Utils/Utils.js

@@ -24,6 +24,7 @@ import { FileHelper } from "./FIleHelper/FileHelper.js";
 import { compareObjects } from "./compareObjects/compareObjects.js";
 import { dynamicPromiseAll } from "./dynamicPromiseAll/dynamicPromiseAll.js";
 import { sortItems } from './filter/sortItems.js';
+import { mergeChunksWorker } from "./merge_chunks/merge_chunks.worker.js";
 
 export class Utils {
   constructor(gudhub) {
@@ -126,6 +127,7 @@ export class Utils {
     );
   }
 
+  //here
   compareItems(sourceItems, destinationItems, fieldToCompare) {
     return compareItems(sourceItems, destinationItems, fieldToCompare);
   }
@@ -142,8 +144,19 @@ export class Utils {
     return makeNestedList(arr, id, parent_id, children_property, priority_property);
   }
 
-  mergeChunks(chunks) {
+  async mergeChunks(chunks) {
     return mergeChunks(chunks);
+
+
+    // const chunkWorkerBlob = new Blob([mergeChunksWorker()], {
+    //   type: "application/javascript",
+    // });
+    // this.worker = new Worker(URL.createObjectURL(chunkWorkerBlob));
+    // this.worker.postMessage(chunks);
+    // this.worker.addEventListener("message", (event) => {
+    //   const { diff } = event.data;
+    //   callback(event.data);
+    // });
   }
 
   mergeFieldLists(fieldsToView, fieldList) {
@@ -194,10 +207,25 @@ export class Utils {
     return this.AppsTemplateService.createItems(create_apps, maxNumberOfInsstalledItems);
   }
 
+  areViewListsEqual(list1, list2) {
+    let sortedList1 = list1.sort((e1, e2) => e1.view_id - e2.view_id);
+    let sortedList2 = list2.sort((e1, e2) => e1.view_id - e2.view_id);
+
+    return this.compareObjects(sortedList1, sortedList2);
+  }
+
+  areFieldListsEqual(list1, list2) {
+    let sortedList1 = list1.sort((e1, e2) => e1.field_id - e2.field_id);
+    let sortedList2 = list2.sort((e1, e2) => e1.field_id - e2.field_id);
+
+    return this.compareObjects(sortedList1, sortedList2);
+  }
+
   compareObjects(obj1, obj2) {
     return compareObjects(obj1, obj2);
   }
   
+  //
   compareAppsItemsLists(items_list1, items_list2, callback) {
     const chunkWorkerBlob = new Blob([compare_items_lists_Worker()], {
       type: "application/javascript",

package/GUDHUB/Utils/filter/filter.js

@@ -157,6 +157,24 @@ class Checker {
           );
         };
         break;
+      
+      case 'month_before_date':
+        this._checkFn = function (data, filtersValues) {
+          return filtersValues.some((_filter) =>
+            data.some((_dataItem) => {
+              const itemDate = new Date(_dataItem);
+              const endDate = new Date(_filter);
+              const startDate = new Date(endDate);
+
+              startDate.setMonth(startDate.getMonth() - 1);
+      
+              if (isNaN(itemDate) || isNaN(startDate) || isNaN(endDate)) return false;
+      
+              return itemDate >= startDate && itemDate <= endDate;
+            })
+          );
+        };
+        break;
     }
     return this;
   }
@@ -232,6 +250,16 @@ class RecurringDateStrategy {
   }
 }
 
+class MonthBeforeDateStrategy {
+  convert(val) {
+    return [Number(val)];
+  }
+
+  convertFilterValue(val) {
+    return Number(val);
+  }
+}
+
 class Aggregate {
   constructor() {
     this._strategies = {
@@ -240,7 +268,8 @@ class Aggregate {
       booleanStrategy: new BooleanFetchStrategy(),
       rangeStrategy: new RangeFetchStrategy(),
       dateStrategy: new dateFetchStrategy(),
-      recurringDateStrategy: new RecurringDateStrategy()
+      recurringDateStrategy: new RecurringDateStrategy(),
+      monthBeforeDate: new MonthBeforeDateStrategy()
     };
   }
 
@@ -276,6 +305,8 @@ class Aggregate {
         break;
       case "recurring_date":
         this._currentStrategy = this._strategies.recurringDateStrategy
+      case "month_before_date":
+        this._currentStrategy = this._strategies.monthBeforeDate
     }
     return this;
   }

package/GUDHUB/Utils/get_date/get_date.test.js

@@ -53,7 +53,7 @@ describe("GET DATE", function () {
     day.getDay().should.equal(6);
   });
 
-  it("CHECK IF DATE TODAY", function() {
+  it("CHECK RECURRING DATE / today", function() {
     let today = new Date();
     let result = gudhub.checkRecurringDate(today, 'day');
     result.should.equal(true);
@@ -64,7 +64,7 @@ describe("GET DATE", function () {
     result.should.equal(false);
   })
 
-  it("CHECK IF DATE IN THIS WEEK", function() {
+  it("CHECK RECURRING DATE / week", function() {
     let today = new Date();
     let result = gudhub.checkRecurringDate(today, 'week');
     result.should.equal(true);
@@ -75,16 +75,7 @@ describe("GET DATE", function () {
     result.should.equal(false);
   });
 
-  it('CHECK IF DATE IN THIS WEEK / Compare this wednesday with wednesday two years ago', function(){
-    let day = gudhub.getDate('this_wednesday');
-    let dayTwoYearsBefore = subYears(day, 2);
-
-    // console.log(dayTwoYearsBefore);
-    let result = gudhub.checkRecurringDate(dayTwoYearsBefore, 'week');
-    result.should.equal(true);
-  });
-
-  it("CHECK IF DATE IN THIS MONTH", function() {
+  it("CHECK RECURRING DATE / month", function() {
     let today = new Date();
     let result = gudhub.checkRecurringDate(today, 'month');
     result.should.equal(true);