pinokiod 8.0.15 → 8.0.16

package/package.json

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

package/server/index.js

@@ -16619,7 +16619,7 @@ class Server {
     this.app.post("/pinokio/install", ex((req, res) => {
       req.session.requirements = req.body.requirements
       req.session.callback = req.body.callback
-      res.redirect("/pinokio/install")
+      res.redirect(req.query.fresh === "1" ? "/pinokio/install?fresh=1" : "/pinokio/install")
     }))
     this.app.post("/pinokio/install/validate", ex(async (req, res) => {
       res.json({

package/server/views/install.ejs

@@ -819,6 +819,27 @@ document.addEventListener("DOMContentLoaded", async () => {
       options[key] = value;
     }
   }
+  if (options && options.fresh === "1") {
+    try {
+      const result = await PinokioPathRemoval.request((background) => fetch("/pinokio/delete", {
+        method: "post",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({ type: "bin", background })
+      }))
+      if (result.cancelled) {
+        navigateToCallback()
+        return
+      }
+      if (result.error) throw new Error(result.error)
+    } catch (error) {
+      ModalInput({
+        title: "Error",
+        type: "modal",
+        description: error && error.message ? error.message : "Unable to reset managed tools."
+      })
+      return
+    }
+  }
   term.onData((data) => {
     if (shell_id) {
       socket.emit({

package/server/views/setup.ejs

@@ -179,7 +179,7 @@
 
                   <div class="setup-secondary-actions">
                     <span class="task-inline-help">Not working?</span>
-                    <button class="task-button" type="submit" form="install-form">
+                    <button class="task-button" type="submit" form="install-form" formaction="/pinokio/install?fresh=1">
                       <i class="fa-solid fa-trash" aria-hidden="true"></i>
                       <span>Try a fresh install</span>
                     </button>

package/server/views/tools.ejs

@@ -495,7 +495,7 @@
                             <span>Install</span>
                           </a>
                         <% } else { %>
-                          <form method="post" action="/pinokio/install">
+                          <form method="post" action="/pinokio/install?fresh=1">
                             <input type="hidden" name="requirements" value="<%= JSON.stringify(bundle.requirements) %>">
                             <input type="hidden" name="callback" value="/tools">
                             <button class="task-link-button" type="submit">

package/test/tools-reinstall-ui.test.js

@@ -36,11 +36,11 @@ test("Tools reinstall immediately submits a fresh install request", async (t) =>
   })
   t.after(() => dom.window.close())
 
-  const form = dom.window.document.querySelector('.tools-bundle-actions form[action="/pinokio/install"]')
+  const form = dom.window.document.querySelector('.tools-bundle-actions form[action="/pinokio/install?fresh=1"]')
   form.addEventListener("submit", (event) => {
     event.preventDefault()
     submission = {
-      action: new URL(form.action).pathname,
+      action: `${new URL(form.action).pathname}${new URL(form.action).search}`,
       fields: Object.fromEntries(new dom.window.FormData(form)),
     }
   })
@@ -48,7 +48,7 @@ test("Tools reinstall immediately submits a fresh install request", async (t) =>
   button.click()
 
   assert.deepEqual(submission, {
-    action: "/pinokio/install",
+    action: "/pinokio/install?fresh=1",
     fields: {
       requirements: '[{"name":"conda","type":"bin","installed":true}]',
       callback: "/tools",
@@ -58,6 +58,6 @@ test("Tools reinstall immediately submits a fresh install request", async (t) =>
 
 test("setup fresh install immediately submits the existing install form", async () => {
   const source = await fs.readFile(setupViewPath, "utf8")
-  assert.match(source, /<button class="task-button" type="submit" form="install-form">/)
+  assert.match(source, /<button class="task-button" type="submit" form="install-form" formaction="\/pinokio\/install\?fresh=1">/)
   assert.doesNotMatch(source, /id="del-bin"|setup-reset-loading/)
 })