pinokiod 8.0.13 → 8.0.15

package/package.json

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

package/server/views/setup.ejs

@@ -179,16 +179,11 @@
 
                   <div class="setup-secondary-actions">
                     <span class="task-inline-help">Not working?</span>
-                    <button class="task-button" type="button" id="del-bin">
+                    <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>
                   </div>
-
-                  <div class="reset-bin-loading hidden setup-reset-loading">
-                    <i class="fa-solid fa-circle-notch fa-spin" aria-hidden="true"></i>
-                    <span>Stand by. Do not close this window.</span>
-                  </div>
                 </section>
               </div>
             </div>
@@ -383,30 +378,6 @@
         showWaitError(error && error.message ? error.message : "Failed to restart Pinokio")
       }
     <% } %>
-    if (document.querySelector("#del-bin")) {
-      document.querySelector("#del-bin").addEventListener("click", async () => {
-        let proceed = confirm("Are you sure you wish to delete the bin folder?")
-        if (proceed) {
-          document.querySelector(".reset-bin-loading").classList.remove("hidden")
-          document.querySelector("#del-bin").classList.add("hidden")
-          let res = await PinokioPathRemoval.request((background) => fetch("/pinokio/delete", {
-            method: "post",
-            headers: {
-              "Content-Type": "application/json"
-            },
-            body: JSON.stringify({ type: "bin", background })
-          }))
-          document.querySelector(".reset-bin-loading").classList.add("hidden")
-          if (res.cancelled) {
-            document.querySelector("#del-bin").classList.remove("hidden")
-          } else if (res.error) {
-            alert(res.error)
-          } else {
-            document.querySelector("#install-form").submit()
-          }
-        }
-      })
-    }
   })
   </script>
   <%- include('partials/app_common_scripts') %>

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,10 @@
                             <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">
-                            <button class="task-link-button" type="button" data-tools-reinstall data-bundle-title="<%= bundle.title %>">
+                            <button class="task-link-button" type="submit">
                               <i class="fa-solid fa-rotate" aria-hidden="true"></i>
                               <span>Reinstall</span>
                             </button>
@@ -840,46 +837,6 @@
       });
     };
 
-    const registerToolsReinstall = () => {
-      document.querySelectorAll("[data-tools-reinstall]").forEach((button) => {
-        button.addEventListener("click", async () => {
-          const bundleTitle = button.dataset.bundleTitle || "this bundle";
-          const proceed = confirm(`Reinstall ${bundleTitle} from scratch? This removes the entire managed tools folder before reinstalling the selected bundle.`);
-          if (!proceed) return;
-
-          const form = button.closest("form");
-          const icon = button.querySelector("i");
-          const restoreButton = () => {
-            button.disabled = false;
-            button.removeAttribute("aria-busy");
-            if (icon) icon.classList.remove("fa-spin");
-          };
-          button.disabled = true;
-          button.setAttribute("aria-busy", "true");
-          if (icon) icon.classList.add("fa-spin");
-          let result;
-          try {
-            result = await PinokioPathRemoval.request((background) => fetch("/pinokio/delete", {
-              method: "post",
-              headers: { "Content-Type": "application/json" },
-              body: JSON.stringify({ type: "bin", background })
-            }));
-          } catch (error) {
-            restoreButton();
-            alert(error && error.message ? error.message : "Unable to reset managed tools.");
-            return;
-          }
-
-          if (result.cancelled || result.error) {
-            restoreButton();
-            if (result.error) alert(result.error);
-            return;
-          }
-          form.submit();
-        });
-      });
-    };
-
     document.addEventListener("DOMContentLoaded", function() {
       const isPending = <%= pending ? 'true' : 'false' %>;
 
@@ -892,7 +849,6 @@
 
       registerPackageInstallSheets();
       registerPackageInstallForms();
-      registerToolsReinstall();
 
       const tabs = document.querySelectorAll(".tools-tab-button");
       const panels = document.querySelectorAll(".tools-package-panel");

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

@@ -6,6 +6,7 @@ const ejs = require("ejs")
 const { JSDOM } = require("jsdom")
 
 const viewPath = path.resolve(__dirname, "../server/views/tools.ejs")
+const setupViewPath = path.resolve(__dirname, "../server/views/setup.ejs")
 
 async function renderTools() {
   const source = await fs.readFile(viewPath, "utf8")
@@ -27,43 +28,25 @@ async function renderTools() {
   })
 }
 
-test("Tools reinstall removes bin and submits the selected bundle", async (t) => {
+test("Tools reinstall immediately submits a fresh install request", async (t) => {
   const html = await renderTools()
-  let request
   let submission
   const dom = new JSDOM(html, {
-    runScripts: "dangerously",
     url: "http://localhost/tools",
-    beforeParse(window) {
-      window.matchMedia = () => ({ matches: false, addEventListener() {}, removeEventListener() {} })
-      window.requestAnimationFrame = (callback) => window.setTimeout(callback, 0)
-      window.confirm = () => true
-      window.PinokioPathRemoval = {
-        request: async (remove) => {
-          request = await remove(false)
-          return { success: true }
-        },
-      }
-      window.fetch = async (url, options) => ({ url, options })
-      window.HTMLFormElement.prototype.submit = function () {
-        submission = {
-          action: new URL(this.action).pathname,
-          fields: Object.fromEntries(new window.FormData(this)),
-        }
-      }
-    },
   })
   t.after(() => dom.window.close())
 
-  await new Promise((resolve) => dom.window.setTimeout(resolve, 0))
-  const button = dom.window.document.querySelector("[data-tools-reinstall]")
-  assert.ok(button)
+  const form = dom.window.document.querySelector('.tools-bundle-actions form[action="/pinokio/install"]')
+  form.addEventListener("submit", (event) => {
+    event.preventDefault()
+    submission = {
+      action: new URL(form.action).pathname,
+      fields: Object.fromEntries(new dom.window.FormData(form)),
+    }
+  })
+  const button = form.querySelector("button[type=submit]")
   button.click()
-  await new Promise((resolve) => dom.window.setTimeout(resolve, 0))
 
-  assert.equal(request.url, "/pinokio/delete")
-  assert.equal(request.options.method, "post")
-  assert.deepEqual(JSON.parse(request.options.body), { type: "bin", background: false })
   assert.deepEqual(submission, {
     action: "/pinokio/install",
     fields: {
@@ -73,32 +56,8 @@ test("Tools reinstall removes bin and submits the selected bundle", async (t) =>
   })
 })
 
-test("Tools reinstall keeps the bundle intact when the user cancels", async (t) => {
-  const html = await renderTools()
-  let removed = false
-  let submitted = false
-  const dom = new JSDOM(html, {
-    runScripts: "dangerously",
-    url: "http://localhost/tools",
-    beforeParse(window) {
-      window.matchMedia = () => ({ matches: false, addEventListener() {}, removeEventListener() {} })
-      window.requestAnimationFrame = (callback) => window.setTimeout(callback, 0)
-      window.fetch = async () => ({ ok: true, json: async () => ({ status: "off" }) })
-      window.confirm = () => false
-      window.PinokioPathRemoval = {
-        request: async () => {
-          removed = true
-          return { success: true }
-        },
-      }
-      window.HTMLFormElement.prototype.submit = () => { submitted = true }
-    },
-  })
-  t.after(() => dom.window.close())
-
-  await new Promise((resolve) => dom.window.setTimeout(resolve, 0))
-  dom.window.document.querySelector("[data-tools-reinstall]").click()
-  await new Promise((resolve) => dom.window.setTimeout(resolve, 0))
-  assert.equal(removed, false)
-  assert.equal(submitted, false)
+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.doesNotMatch(source, /id="del-bin"|setup-reset-loading/)
 })