@gudhub/core 1.1.90 → 1.1.92

package/GUDHUB/AppProcessor/AppProcessor.js

@@ -298,9 +298,6 @@ export class AppProcessor {
         }
       }
     }
-    
-    // This code for trash must be changed
-    // return trash ? app : {...app, items_list: app.items_list.filter(item => !item.trash)};
     return app;
   }
 

package/GUDHUB/Auth/Auth.js

@@ -10,6 +10,12 @@ export class Auth {
     return user;
   }
 
+  async loginWithToken(token) {
+    const user = await this.loginWithTokenApi(token);
+    this.storage.updateUser(user);
+    return user;
+  }
+
   async logout(token) {
     const response = await this.logoutApi(token);
     return response;
@@ -58,6 +64,18 @@ export class Auth {
     }
   }
 
+  async loginWithTokenApi(token) {
+    try {
+      const user = await this.req.axiosRequest({
+        method: 'POST',
+        url: `${this.req.root}/auth/login?accesstoken=${token}`
+      });
+      return user;
+    } catch (error) {
+      console.log(error);
+    }
+  }
+
   async updateTokenApi(auth_key) {
     try {
       const user = await this.req.axiosRequest({

package/GUDHUB/Auth/Auth.test.js

@@ -1,4 +1,4 @@
-import should from "should";
+
 import {GudHub} from './../gudhub.js';
 
 describe("AUTHORIZATION", async function() {
@@ -22,6 +22,16 @@ describe("AUTHORIZATION", async function() {
         user.fullname.should.equal('Vasya Pupkin');
     })
 
+    it("Authentication with access token", async function () {
+        const gudhub = new GudHub();
+
+        const token = 'accesstoken';
+
+        const user = await gudhub.loginWithToken(token);
+
+        user.hasOwnProperty('fullname').should.equal(true);
+    })
+
     it("Signing up user", async function () {
         const gudhub = new GudHub();
         let credentials =  {

package/GUDHUB/FileManager/FileManager.js

@@ -39,7 +39,7 @@ export class FileManager {
     }
   }
 
-  async updateFileFromStringApi(data, file_id, file_name, extension, format) {
+  async updateFileFromStringApi(data, file_id, file_name, extension, format, alt, title) {
     try {
       const fileObj = {
         file_name,
@@ -47,6 +47,8 @@ export class FileManager {
         file_id,
         format,
         source: data,
+        alt,
+        title
       };
 
       const file = await this.req.post({
@@ -198,13 +200,15 @@ async getFiles(app_id, filesId = []) {
     return file;
   }
 
-  async updateFileFromString(data, file_id, file_name, extension, format) {
+  async updateFileFromString(data, file_id, file_name, extension, format, alt, title) {
     const file = await this.updateFileFromStringApi(
       data,
       file_id,
       file_name,
       extension,
-      format
+      format,
+      alt,
+      title
     );
     this.updateFileInStorage(file_id, file.app_id, file);
     return file;

package/GUDHUB/GHConstructor/createAngularModuleInstance.js

@@ -119,25 +119,27 @@ export default async function createAngularModuleInstance(gudhub, module_id, mod
                 }
 
                 // Modules always exports classes as default, so we create new class instance.
-
                 importedClass = factoryReturns[module_id];
-
             }
-
         } 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 +155,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 = {

package/GUDHUB/ItemProcessor/ItemProcessor.js

@@ -134,7 +134,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;
   }
@@ -165,6 +165,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

@@ -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,44 @@ 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",
+        },
         /* AUTOMATION MODULES */
         /*
             We have next types for automations:
@@ -1340,6 +1373,13 @@ 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'
         }
     ]
 }

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

package/GUDHUB/Utils/nested_list/nested_list.js

@@ -1,52 +1,55 @@
-export function makeNestedList(arr, id, parent_id, children_property, priority_property) {
-  let array = JSON.parse(JSON.stringify(arr));
-  let children = Boolean(children_property) ? children_property : 'children';
-  let priority = Boolean(priority_property) ? priority_property : false;
-  let i;
-  for (i = 0; i < array.length; i++) {
-    if (array[i][parent_id] && array[i][parent_id] !== 0) {
-      array.forEach((parent) => {
-        if (array[i][parent_id] == parent[id]) {
-          if (!parent[children]) {
-            parent[children] = [];
-          }
-          parent[children].push(array[i]);
-          array.splice(i, 1);
-          i == 0 ? i = 0 : i--;
-        } else if (parent[children]) {
-          findIdsOfChildren(parent);
-        }
-      });
-    }
-  }
-
-  function findIdsOfChildren(parent) {
-    parent[children].forEach((child) => {
-      if (child[id] == array[i][parent_id]) {
-        if (!child[children]) {
-          child[children] = [];
+export function makeNestedList(
+    arr,
+    id,
+    parent_id,
+    children_property = "children",
+    priority_property = null
+) {
+    let map = {};
+    let roots = [];
+
+    arr.forEach((item) => {
+        map[item[id]] = { ...item, [children_property]: [] };
+    });
+
+    arr.forEach((item) => {
+        const parentId = item[parent_id];
+        if (parentId && map[parentId]) {
+            map[parentId][children_property].push(map[item[id]]);
+        } else {
+            roots.push(map[item[id]]);
         }
-        child[children].push(array[i]);
-        array.splice(i, 1);
-        i == 0 ? i = 0 : i--;
-      } else if (child[children]) {
-        findIdsOfChildren(child);
-      }
     });
-  }
-
-  function sortChildrensByPriority(unsorted_array) {
-    unsorted_array.sort( (a, b) => a[priority] - b[priority])
-    unsorted_array.forEach(element => {
-      if(element[children]) {
-        sortChildrensByPriority(element[children])
-      }
-    })
-  }
-
-  if(priority) {
-    sortChildrensByPriority(array);
-  }
-  
-  return array;
-}
+
+    const sortTreeByPriority = (nodes) => {
+        nodes.forEach((node) => {
+            if (node[children_property].length > 0) {
+                sortTreeByPriority(node[children_property]);
+            }
+        });
+
+        if (priority_property) {
+            nodes.sort((a, b) => {
+                const priorityA = a[priority_property] ?? Infinity;
+                const priorityB = b[priority_property] ?? Infinity;
+                return priorityA - priorityB;
+            });
+        }
+    };
+
+    sortTreeByPriority(roots);
+
+    const cleanEmptyChildren = (nodes) => {
+        nodes.forEach((node) => {
+            if (node[children_property].length === 0) {
+                delete node[children_property];
+            } else {
+                cleanEmptyChildren(node[children_property]);
+            }
+        });
+    };
+
+    cleanEmptyChildren(roots);
+
+    return roots;
+};