@gudhub/core 1.2.4-beta.37 → 1.2.4-beta.38

package/GUDHUB/Utils/AppsTemplateService/AppsTemplateService.js

@@ -443,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 => {
@@ -459,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;
@@ -467,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;
@@ -475,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);

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;
+};

package/GUDHUB/Utils/nested_list/nested_list.test.js

@@ -29,6 +29,35 @@ describe("NESTED LIST", function () {
         nestedList[0].title.should.equal('Nineth');
     })
 
+    it("Should return correct nested structure with children", function () {
+        let nestedList = gudhub.makeNestedList(nestedComplicatedListWithDocs, 'id', 'parent_id', 'children');
+        
+        nestedList.should.be.an.Array().and.have.length(1);
+        nestedList[0].should.have.property('children');
+        nestedList[0].children.should.be.an.Array().and.have.length(4);
+    });
+    
+    it("Should correctly sort children by priority", function () {
+        let nestedList = gudhub.makeNestedList(nestedComplicatedListWithDocs, 'id', 'parent_id', 'children', 'priority');
+        
+        nestedList[0].children[0].title.should.equal('Intro');
+        nestedList[0].children[1].title.should.equal('Getting Started');
+        nestedList[0].children[2].title.should.equal('Node Installing');
+    });
+    
+    it("Should correctly handle deeply nested structures", function () {
+        let nestedList = gudhub.makeNestedList(nestedComplicatedListWithDocs, 'id', 'parent_id', 'children', 'priority');
+        let featuresChildren = nestedList[0].children[3].children[4].children;
+        
+        featuresChildren.should.be.an.Array().and.have.length(8);
+        featuresChildren[0].title.should.equal("Bundler");
+        featuresChildren[7].title.should.equal("SSR-Menu");
+    });
+    
+    it("Should return empty array for items without parents when parent_id is not found", function () {
+        let nestedList = gudhub.makeNestedList([], 'id', 'parent_id', 'children');
+        nestedList.should.be.an.Array().and.have.length(0);
+    });
 });
 
 let input = [
@@ -150,7 +179,8 @@ let complicatedInput = [
         parent_id: "26553.2884361",
         title: "Child of second parent"
     }
-]
+];
+
 let parentInput = [
     {
         "id": "27026.2937695",
@@ -182,4 +212,112 @@ let parentInput = [
         "title": "Nineth",
         "priority": "0"
     }
-]
+];
+
+let nestedComplicatedListWithDocs = [
+    {
+        id: "123001.1237001",
+        parent_id: "",
+        title: "SSR/SSG - Parent"
+    },
+    {
+        id: "123002.1237002",
+        parent_id: "123001.1237001",
+        title: "Intro",
+        priority: 1
+    },
+    {
+        id: "123003.1237003",
+        parent_id: "123001.1237001",
+        title: "Getting Started",
+        priority: 2
+    },
+    {
+        id: "123004.1237004",
+        parent_id: "123001.1237001",
+        title: "Node Installing",
+        priority: 3
+    },
+    {
+        id: "123005.1237005",
+        parent_id: "123001.1237001",
+        title: "Server - Parent 2"
+    },
+    {
+        id: "123006.1237006",
+        parent_id: "123005.1237005",
+        title: "Server",
+        priority: 4
+    },
+    {
+        id: "123007.1237007",
+        parent_id: "123005.1237005",
+        title: "Install",
+        priority: 5
+    },
+    {
+        id: "123008.1237008",
+        parent_id: "123005.1237005",
+        title: "Endpoints",
+        priority: 6
+    },
+    {
+        id: "123009.1237009",
+        parent_id: "123005.1237005",
+        title: "Configure",
+        priority: 7
+    },
+    {
+        id: "123010.1237010",
+        parent_id: "123005.1237005",
+        title: "Features - Parent 3"
+    },
+    {
+        id: "123011.1237011",
+        parent_id: "123010.1237010",
+        title: "Bundler",
+        priority: 8
+    },
+    {
+        id: "123012.1237012",
+        parent_id: "123010.1237010",
+        title: "RedirectsHandler",
+        priority: 9
+    },
+    {
+        id: "123013.1237013",
+        parent_id: "123010.1237010",
+        title: "SSG",
+        priority: 10
+    },
+    {
+        id: "123014.1237014",
+        parent_id: "123010.1237010",
+        title: "SSR",
+        priority: 11
+    },
+    {
+        id: "123015.1237015",
+        parent_id: "123010.1237010",
+        title: "RouteHandler",
+        priority: 12
+    },
+    {
+        id: "123016.1237016",
+        parent_id: "123010.1237010",
+        title: "SitemapGenerator",
+        priority: 13
+    },
+    {
+        id: "123017.1237017",
+        parent_id: "123010.1237010",
+        title: "ImageHandler",
+        priority: 14
+    },
+    {
+        id: "123018.1237018",
+        parent_id: "123010.1237010",
+        title: "SSR-Menu",
+        priority: 15
+    },
+];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gudhub/core",
-  "version": "1.2.4-beta.37",
+  "version": "1.2.4-beta.38",
   "description": "",
   "main": "index.js",
   "scripts": {