pinokiod 8.0.14 → 8.0.15

package/package.json

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

package/server/index.js

@@ -16619,7 +16619,6 @@ class Server {
     this.app.post("/pinokio/install", ex((req, res) => {
       req.session.requirements = req.body.requirements
       req.session.callback = req.body.callback
-      req.session.fresh = req.body.fresh === "1"
       res.redirect("/pinokio/install")
     }))
     this.app.post("/pinokio/install/validate", ex(async (req, res) => {
@@ -16631,10 +16630,8 @@ class Server {
       res.set("Cache-Control", "no-store")
       let requirements = req.session.requirements
       let callback = req.session.callback
-      let fresh = req.session.fresh === true
       req.session.requirements = null
       req.session.callback = null
-      req.session.fresh = null
       res.render("install", {
         logo: this.logo,
         theme: this.theme,
@@ -16643,8 +16640,7 @@ class Server {
         display: ["form"],
 //        query: req.query,
         requirements,
-        callback,
-        fresh,
+        callback
       })
     }))
     this.app.get("/pinokio", ex((req, res) => {

package/server/public/task-launcher.css

@@ -1902,6 +1902,16 @@ body.dark .setup-requirement-row.needs-update .setup-requirement-state {
   color: var(--task-muted);
 }
 
+.setup-reset-loading {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  margin-top: 12px;
+  color: var(--task-muted);
+  font-size: 12px;
+  line-height: 1.45;
+}
+
 .setup-state-root {
   min-height: 260px;
   display: flex;

package/server/views/install.ejs

@@ -540,7 +540,6 @@ body.install-page #terminal .xterm {
 </div>
 <input id='requirements' type='hidden' value="<%=requirements%>">
 <input id='callback' type='hidden' value="<%=callback%>">
-<input id='fresh' type='hidden' value="<%=fresh ? '1' : '0'%>">
 <script>
 //
 // /install_bin?type=bin&uri=conda
@@ -732,29 +731,6 @@ const navigateToCallback = () => {
   }
   location.href = href
 }
-const prepareFreshInstall = async () => {
-  if (document.querySelector("#fresh").value !== "1") return true
-  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 false
-    }
-    if (result.error) throw new Error(result.error)
-    return true
-  } catch (error) {
-    ModalInput({
-      title: "Error",
-      type: "modal",
-      description: error && error.message ? error.message : "Unable to reset managed tools."
-    })
-    return false
-  }
-}
 const resumeInstall = () => {
   const form = document.createElement("form")
   form.method = "post"
@@ -827,7 +803,6 @@ const createTerm = async (_theme) => {
 }
 document.addEventListener("DOMContentLoaded", async () => {
   applyInstallSpinnerVariant(randomInstallSpinnerVariant())
-  if (!await prepareFreshInstall()) return
   const n = new N()
   let socket = new Socket()
   <% if (theme === "dark") { %>

package/server/views/setup.ejs

@@ -177,14 +177,9 @@
                     <%= install_required ? 'This uses the same install flow as before.' : 'Pinokio can reopen the same destination without reinstalling anything.' %>
                   </p>
 
-                  <form class="task-hidden" id="fresh-install-form" method="post" action="/pinokio/install">
-                    <input type="hidden" name="requirements" value="<%= JSON.stringify(requirementList) %>">
-                    <input type="hidden" name="callback" value="<%= targetPath %>">
-                    <input type="hidden" name="fresh" value="1">
-                  </form>
                   <div class="setup-secondary-actions">
                     <span class="task-inline-help">Not working?</span>
-                    <button class="task-button" type="submit" form="fresh-install-form">
+                    <button class="task-button" type="submit" form="install-form">
                       <i class="fa-solid fa-trash" aria-hidden="true"></i>
                       <span>Try a fresh install</span>
                     </button>

package/server/views/tools.ejs

@@ -154,9 +154,6 @@
       justify-items: end;
       min-width: 118px;
     }
-    body.tools-page .tools-reinstall-form {
-      margin: 0;
-    }
     body.tools-page .tools-bundle-status {
       display: inline-flex;
       align-items: center;
@@ -498,10 +495,9 @@
                             <span>Install</span>
                           </a>
                         <% } else { %>
-                          <form class="tools-reinstall-form" method="post" action="/pinokio/install">
+                          <form method="post" action="/pinokio/install">
                             <input type="hidden" name="requirements" value="<%= JSON.stringify(bundle.requirements) %>">
                             <input type="hidden" name="callback" value="/tools">
-                            <input type="hidden" name="fresh" value="1">
                             <button class="task-link-button" type="submit">
                               <i class="fa-solid fa-rotate" aria-hidden="true"></i>
                               <span>Reinstall</span>

package/test/path-removal-ui.test.js

@@ -393,7 +393,6 @@ test("successful runtime cleanup resubmits the interrupted install", async (t) =
   const html = ejs.render(source, {
     agent: "web",
     callback: "/tools",
-    fresh: false,
     requirements,
     theme: "dark",
   }, { filename: installViewPath })
@@ -458,65 +457,3 @@ test("successful runtime cleanup resubmits the interrupted install", async (t) =
     fields: { requirements, callback: "/tools" },
   })
 })
-
-test("fresh install removes bin on the install page before starting the installer", async (t) => {
-  const source = await fs.readFile(installViewPath, "utf8")
-  const requirements = '[{"name":"conda"}]'
-  const html = ejs.render(source, {
-    agent: "web",
-    callback: "/tools",
-    fresh: true,
-    requirements,
-    theme: "dark",
-  }, { filename: installViewPath })
-
-  let removal
-  let started
-  const startedPromise = new Promise((resolve) => { started = resolve })
-  const dom = new JSDOM(html, {
-    runScripts: "dangerously",
-    url: "http://localhost/pinokio/install",
-    beforeParse(window) {
-      window.fetch = async (url, options) => {
-        if (url === "/pinokio/delete") {
-          removal = { url, options }
-          return { ok: true, status: 200, json: async () => ({ success: true }) }
-        }
-        return { ok: true, status: 200, json: async () => ({ config: {} }) }
-      }
-      window.matchMedia = () => ({ matches: false, addEventListener() {}, removeEventListener() {} })
-      window.ResizeObserver = class { observe() {} }
-      window.N = class { Noty() {} }
-      window.Terminal = class {
-        constructor() { this.cols = 80; this.rows = 24 }
-        attachCustomKeyEventHandler() {}
-        focus() {}
-        hasSelection() { return false }
-        loadAddon() {}
-        onData() {}
-        open() {}
-        write() {}
-      }
-      window.FitAddon = { FitAddon: class { fit() {} } }
-      window.WebLinksAddon = { WebLinksAddon: class {} }
-      window.xtermTheme = { FrontEndDelight: {} }
-      window.PinokioTouch = { bindTerminalFocus() {} }
-      window.PinokioPathRemoval = {
-        request: async (remove) => (await remove(false)).json(),
-      }
-      window.Socket = class {
-        emit() {}
-        run(request) {
-          assert.ok(removal, "fresh removal must finish before the installer starts")
-          assert.equal(request.params, requirements)
-          started()
-        }
-      }
-    },
-  })
-  t.after(() => dom.window.close())
-
-  await startedPromise
-  assert.equal(removal.url, "/pinokio/delete")
-  assert.deepEqual(JSON.parse(removal.options.body), { type: "bin", background: false })
-})

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

@@ -36,7 +36,7 @@ test("Tools reinstall immediately submits a fresh install request", async (t) =>
   })
   t.after(() => dom.window.close())
 
-  const form = dom.window.document.querySelector(".tools-reinstall-form")
+  const form = dom.window.document.querySelector('.tools-bundle-actions form[action="/pinokio/install"]')
   form.addEventListener("submit", (event) => {
     event.preventDefault()
     submission = {
@@ -52,33 +52,12 @@ test("Tools reinstall immediately submits a fresh install request", async (t) =>
     fields: {
       requirements: '[{"name":"conda","type":"bin","installed":true}]',
       callback: "/tools",
-      fresh: "1",
     },
   })
 })
 
-test("setup fresh install is a direct form submission", async () => {
+test("setup fresh install immediately submits the existing install form", async () => {
   const source = await fs.readFile(setupViewPath, "utf8")
-  const start = source.indexOf('<form class="task-hidden" id="fresh-install-form"')
-  const end = source.indexOf("</div>", source.indexOf("</button>", start)) + 6
-  const fragment = ejs.render(source.slice(start, end), {
-    requirementList: [{ name: "conda", installed: true }],
-    targetPath: "/tools",
-  })
-  const dom = new JSDOM(fragment, { url: "http://localhost/setup/dev" })
-  const form = dom.window.document.querySelector("#fresh-install-form")
-  let submission
-  form.addEventListener("submit", (event) => {
-    event.preventDefault()
-    submission = Object.fromEntries(new dom.window.FormData(form))
-  })
-  dom.window.document.querySelector('[form="fresh-install-form"]').click()
-
-  assert.deepEqual(submission, {
-    requirements: '[{"name":"conda","installed":true}]',
-    callback: "/tools",
-    fresh: "1",
-  })
-  dom.window.close()
+  assert.match(source, /<button class="task-button" type="submit" form="install-form">/)
   assert.doesNotMatch(source, /id="del-bin"|setup-reset-loading/)
 })