@gudhub/core 1.2.4-beta.50 → 1.2.4-beta.55

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/GUDHUB/api/AppApi.js

@@ -11,4 +11,4 @@ export class AppAPI {
       },
     });
   }
-};
+};

package/GUDHUB/api/ChunkApi.js

@@ -16,4 +16,4 @@ export class ChunkAPI {
         method: 'GET'
     });
   }
-};
+};

package/GUDHUB/gudhub.js

@@ -240,6 +240,21 @@ export class GudHub {
     return this.util.sortItems(items, options);
   }
 
+
+  //
+  //here
+  triggerAppChange(id, prevVersion, newVersion) {
+    this.itemProcessor.handleItemsChange(id, prevVersion, newVersion);
+    this.appProcessor.handleAppChange(id, prevVersion, newVersion);
+  }
+
+
+  //
+  //TODO handleAppChange
+  triggerIemsChange(id, compareRes) {
+    this.itemProcessor.triggerItemsChange(id, compareRes);
+  }
+
   jsonToItems(json, map) {
     return this.util.jsonToItems(json, map);
   }
@@ -354,6 +369,10 @@ export class GudHub {
     return this.itemProcessor.deleteItems(app_id, itemsIds);
   }
 
+  restoreItems(app_id, itemsIds) {
+    return this.itemProcessor.restoreItems(app_id, itemsIds);
+  }
+
   getField(app_id, field_id) {
     return this.fieldProcessor.getField(app_id, field_id);
   }

package/GUDHUB/gudhubAppRequestWorker.js

@@ -1,5 +1,6 @@
 import { AppProcessor } from "./AppProcessor/AppProcessor";
-import { AppHttpService } from "./DataService/httpService/AppHttpService";
+import { AppDataServiceForWorker } from "./DataService/export";
+import { appsConf } from "./DataService/IndexedDB/appDataConf";
 import { GudHub } from "./gudhub";
 
 export class GudHubForAppRequestWorker extends GudHub {
@@ -11,7 +12,7 @@ export class GudHubForAppRequestWorker extends GudHub {
       this.ws,
       this.util,
       false,
-      new AppHttpService(this.req, null, this),
+      new AppDataServiceForWorker(this.req, appsConf, this),
     );
   }
-};
+};

package/build.sh

@@ -55,37 +55,73 @@ git checkout -- GUDHUB/DataService/IndexedDB/IndexedDBAppService.js
 rm ./dist/PARCEL_APP_REQUEST_WORKER_FILENAME.js
 
 
+#TODO write inlined js code that finds new variable for angular and reverts back it and execute in Node env
+# grep below doesnt handle that how it should - mangledAngularVariable
 
 
-# sets correct variable for esm package
+# sets correct angular variable for esm package after build
 
+file="./dist/gudhub.es.js"
 
-file_es="./dist/gudhub.es.js"
+# mangledAngularVariable=$(grep -oP 'let \K[a-zA-Z0-9$]+(?=\s*=\s*new\s+AngularClass\(\);)' "$file")
+mangledAngularVariable="angular\$1"
 
-new_var=$(grep -oP '.+\s+([a-zA-Z_$][a-zA-Z_$0-9]*)\s*=.+AngularClass' "$file_es" | sed -E 's/.*\s+([a-zA-Z_$][a-zA-Z_$0-9]*).*=.*/\1/')
 
-escaped_new_var=$(echo "$new_var" | sed 's/[\*\.\$]/\\&/g')
+echo $mangledAngularVariable
 
 
-if [[ -z "$escaped_new_var" ]]; then
+if [[ -n "$mangledAngularVariable" ]]; then
+
+  angularVariableCorrectName="angular"
+
+  # Escape the $ symbol in the variable name for use in sed (since $ is special in regex)
+  escapedMangledAngularVariable=$(echo "$mangledAngularVariable" | sed 's/\$/\\$/g')
+
+
+  if [[ -z "$escapedMangledAngularVariable" ]]; then
+    echo "Error while add escapes for special characters in new angular variable name"
     exit 1
+  fi
+
+  sed -i "s/\b$escapedMangledAngularVariable\b/$angularVariableCorrectName/g" "$file"
+
+  echo "Replaced all occurrences of '$mangledAngularVariable' with '$angularVariableCorrectName' in '$file'."
+else
+  echo "Cant find mangled angular variable"
+  exit 1
 fi
 
-sed -i "s/$escaped_new_var/angular/g" "$file_es"
 
 
+# sets correct angular variable for umd package after build
+
+file="./dist/gudhub.umd.js"
 
-# sets correct variable for umd package
+# mangledAngularVariable=$(grep -oP 'let \K[a-zA-Z0-9$]+(?=\s*=\s*new\s+AngularClass\(\);)' "$file")
+mangledAngularVariable="angular\$1"
 
-file_umd="./dist/gudhub.umd.js"
 
-new_var=$(grep -oP '.+\s+([a-zA-Z_$][a-zA-Z_$0-9]*)\s*=.+AngularClass' "$file_umd" | sed -E 's/.*\s+([a-zA-Z_$][a-zA-Z_$0-9]*).*=.*/\1/')
+echo $mangledAngularVariable
 
-escaped_new_var=$(echo "$new_var" | sed 's/[\*\.\$]/\\&/g')
 
 
-if [[ -z "$escaped_new_var" ]]; then
+if [[ -n "$mangledAngularVariable" ]]; then
+
+  angularVariableCorrectName="angular"
+
+  # Escape the $ symbol in the variable name for use in sed (since $ is special in regex)
+  escapedMangledAngularVariable=$(echo "$mangledAngularVariable" | sed 's/\$/\\$/g')
+
+
+  if [[ -z "$escapedMangledAngularVariable" ]]; then
+    echo "Error while add escapes for special characters in new angular variable name"
     exit 1
-fi
+  fi
+
+  sed -i "s/\b$escapedMangledAngularVariable\b/$angularVariableCorrectName/g" "$file"
 
-sed -i "s/$escaped_new_var/angular/g" "$file_umd"
+  echo "Replaced all occurrences of '$mangledAngularVariable' with '$angularVariableCorrectName' in '$file'."
+else
+  echo "Cant find mangled angular variable"
+  exit 1
+fi