pinokiod 3.17.4 → 3.17.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinokiod",
-  "version": "3.17.4",
+  "version": "3.17.6",
   "description": "",
   "main": "index.js",
   "scripts": {

package/server/index.js

@@ -1556,6 +1556,7 @@ class Server {
     if (!config) {
       return { menu: [] }
     }
+    console.log("renderMenu2 Before", JSON.stringify(config, null, 2))
 
     if (config.menu) {
       for(let i=0; i<config.menu.length; i++) {
@@ -1574,7 +1575,7 @@ class Server {
       if (config.hasOwnProperty("icon")) {
         config.html = `<i class="${config.icon}"></i> ${config.text}` 
       } else if (config.hasOwnProperty("image")) {
-        let imagePath = `${base.path}/${config.image}`
+        let imagePath = `${base.web_path}/${config.image}`
         config.html = `<img class='menu-item-image' src='${imagePath}' /> ${config.text}`
       } else {
         config.html = `${config.text}` 
@@ -1591,8 +1592,10 @@ class Server {
     */
     if (keypath) {
       config.href = base.href + "/" + keypath.join("/") + "?path=" + base.cwd
-      config.script_id = this.kernel.path(keypath) + "?cwd=" + base.cwd
+      //config.script_id = this.kernel.path(keypath) + "?cwd=" + base.cwd
+      config.script_id = path.resolve(base.path, config.href) + "?cwd=" + base.cwd
     }
+    console.log("renderMenu2 After", JSON.stringify(config, null, 2))
     return config
   }
 
@@ -2368,6 +2371,7 @@ class Server {
         await this.renderMenu(uri, name, plugin, [])
         return plugin
       } catch (e) {
+        console.log("getPlugin ERROR", e)
         return {
           menu: []
         }
@@ -3813,10 +3817,12 @@ class Server {
       }
 
       let config = structuredClone(this.kernel.proto.config)
+      console.log(">>>>>>>> config", config)
       config = this.renderMenu2(config, {
         cwd: req.query.path,
         href: "/prototype/show",
-        path: "/asset/prototype/system"
+        path: this.kernel.path("prototype/system"),
+        web_path: "/asset/prototype/system"
       })
 
 //    {