pinokiod 2.15.21 → 2.15.23
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/server/index.js +0 -31
- package/server/views/env_editor.ejs +5 -21
package/package.json
CHANGED
package/server/index.js
CHANGED
|
@@ -893,7 +893,6 @@ class Server {
|
|
|
893
893
|
let editorUrl = edu.pathname + edu.search
|
|
894
894
|
|
|
895
895
|
let referer = req.get("Referer")
|
|
896
|
-
console.log({ referer })
|
|
897
896
|
|
|
898
897
|
let prev = null
|
|
899
898
|
if (/\/env\/api\/.+/.test(new URL(referer).pathname)) {
|
|
@@ -902,13 +901,10 @@ class Server {
|
|
|
902
901
|
|
|
903
902
|
|
|
904
903
|
let requires_instantiation = false
|
|
905
|
-
console.log("resolved", resolved)
|
|
906
904
|
let pre_items = []
|
|
907
905
|
if (resolved && resolved.pre) {
|
|
908
906
|
let env = await Environment.get2(filepath, this.kernel)
|
|
909
|
-
console.log("_________ENV", env)
|
|
910
907
|
for(let item of resolved.pre) {
|
|
911
|
-
console.log("ITEM" , item)
|
|
912
908
|
if (item.env) {
|
|
913
909
|
if (env[item.env]) {
|
|
914
910
|
item.val = env[item.env]
|
|
@@ -919,7 +915,6 @@ class Server {
|
|
|
919
915
|
}
|
|
920
916
|
}
|
|
921
917
|
}
|
|
922
|
-
console.log({ requires_instantiation, pre_items })
|
|
923
918
|
if (requires_instantiation) {
|
|
924
919
|
let p = Util.api_path(filepath, this.kernel)
|
|
925
920
|
res.render("required_env_editor", {
|
|
@@ -966,8 +961,6 @@ class Server {
|
|
|
966
961
|
proxies: this.kernel.api.proxies[filepath],
|
|
967
962
|
}
|
|
968
963
|
|
|
969
|
-
console.log({ result })
|
|
970
|
-
|
|
971
964
|
res.render(template, result)
|
|
972
965
|
}
|
|
973
966
|
|
|
@@ -2396,9 +2389,7 @@ class Server {
|
|
|
2396
2389
|
}
|
|
2397
2390
|
}))
|
|
2398
2391
|
this.app.post("/env", ex(async (req, res) => {
|
|
2399
|
-
console.log("req.body", req.body)
|
|
2400
2392
|
let fullpath = path.resolve(this.kernel.homedir, req.body.filepath, "ENVIRONMENT")
|
|
2401
|
-
console.log("fullpath", fullpath)
|
|
2402
2393
|
let updated = req.body.vals
|
|
2403
2394
|
await Util.update_env(fullpath, updated)
|
|
2404
2395
|
res.json({})
|
|
@@ -2473,25 +2464,6 @@ class Server {
|
|
|
2473
2464
|
})
|
|
2474
2465
|
} else {
|
|
2475
2466
|
|
|
2476
|
-
let requires_instantiation = false
|
|
2477
|
-
let pre_items = {}
|
|
2478
|
-
console.log("## CONFIG", config)
|
|
2479
|
-
if (config && config.pre) {
|
|
2480
|
-
let env = await Environment.get2(filepath, this.kernel)
|
|
2481
|
-
console.log("_________ENV", env)
|
|
2482
|
-
for(let item of config.pre) {
|
|
2483
|
-
console.log("ITEM" , item)
|
|
2484
|
-
if (item.env) {
|
|
2485
|
-
pre_items[item.env] = item
|
|
2486
|
-
if (env[item.env]) {
|
|
2487
|
-
|
|
2488
|
-
} else {
|
|
2489
|
-
requires_instantiation = true
|
|
2490
|
-
}
|
|
2491
|
-
}
|
|
2492
|
-
}
|
|
2493
|
-
}
|
|
2494
|
-
console.log({ requires_instantiation })
|
|
2495
2467
|
|
|
2496
2468
|
res.render("env_editor", {
|
|
2497
2469
|
home: null,
|
|
@@ -2503,8 +2475,6 @@ class Server {
|
|
|
2503
2475
|
theme: this.theme,
|
|
2504
2476
|
filepath,
|
|
2505
2477
|
agent: this.agent,
|
|
2506
|
-
pre_items,
|
|
2507
|
-
requires_instantiation,
|
|
2508
2478
|
})
|
|
2509
2479
|
}
|
|
2510
2480
|
//res.render("env_editor", {
|
|
@@ -2530,7 +2500,6 @@ class Server {
|
|
|
2530
2500
|
}
|
|
2531
2501
|
})
|
|
2532
2502
|
let env = await Environment.get2(p2, this.kernel)
|
|
2533
|
-
console.log("ENV", env)
|
|
2534
2503
|
res.render("pre", {
|
|
2535
2504
|
name: req.params.name,
|
|
2536
2505
|
theme: this.theme,
|
|
@@ -305,31 +305,15 @@ document.addEventListener("DOMContentLoaded", async () => {
|
|
|
305
305
|
</h1>
|
|
306
306
|
</header>
|
|
307
307
|
<% } %>
|
|
308
|
-
<div id='editor' class='<%=init
|
|
309
|
-
<!--
|
|
310
|
-
<h1>Configure</h1>
|
|
311
|
-
-->
|
|
308
|
+
<div id='editor' class='<%=init ? "hidden" : ""%>'>
|
|
312
309
|
<% items.forEach((item) => { %>
|
|
313
310
|
<% if (item.type === "comment") { %>
|
|
314
311
|
<div class='comment'><%=item.val.replaceAll(/^[ #]+/g, "")%></div>
|
|
315
312
|
<% } else { %>
|
|
316
|
-
|
|
317
|
-
<
|
|
318
|
-
|
|
319
|
-
|
|
320
|
-
<div class='env-title'><%=pre_items[item.key].title%></div>
|
|
321
|
-
<% } %>
|
|
322
|
-
<% if (pre_items[item.key].description) { %>
|
|
323
|
-
<div class='env-description'><%=pre_items[item.key].description%></div>
|
|
324
|
-
<% } %>
|
|
325
|
-
<input id="<%=item.key%>" type="text" value="<%=item.val%>">
|
|
326
|
-
</div>
|
|
327
|
-
<% } else { %>
|
|
328
|
-
<div class='env-item'>
|
|
329
|
-
<label for="<%=item.key%>"><%=item.key%></label>
|
|
330
|
-
<input id="<%=item.key%>" type="text" value="<%=item.val%>">
|
|
331
|
-
</div>
|
|
332
|
-
<% } %>
|
|
313
|
+
<div class='env-item'>
|
|
314
|
+
<label for="<%=item.key%>"><%=item.key%></label>
|
|
315
|
+
<input id="<%=item.key%>" type="text" value="<%=item.val%>">
|
|
316
|
+
</div>
|
|
333
317
|
<% } %>
|
|
334
318
|
<% }) %>
|
|
335
319
|
</div>
|