pinokiod 8.0.63 → 8.0.65

package/package.json

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

package/server/public/layout.js

@@ -1308,7 +1308,6 @@
         }
       };
       eventSource.onerror = () => {
-        resetCards();
         loadState();
       };
     }

package/server/public/vault.js

@@ -2232,6 +2232,8 @@ const renderNormalOverview = () => {
   const activeScan = scanActive(data.scan)
   const scanning = scanMatchesContext(data.scan)
   const busyElsewhere = activeScan && !scanning
+  const actionableDuplicates = Math.max(0, Number(
+    data.inventory && data.inventory.shareable_duplicates) || 0)
   const metrics = el("vault-metrics")
   const existingModeMenu = el("vault-auto-mode")
   const modeMenuOpen = !!(existingModeMenu && existingModeMenu.open) ||
@@ -2313,7 +2315,8 @@ const renderNormalOverview = () => {
       ? `<i class="fa-solid fa-circle-notch fa-spin"></i>${esc(COPY.scanning)}`
     : `<i class="fa-solid fa-rotate"></i>${esc(idleScanLabel)}`
   const firstScan = !last && !activeScan
-  scanButton.classList.toggle("primary", firstScan)
+  const scanIsPrimary = firstScan || (!activeScan && !actionableDuplicates)
+  scanButton.classList.toggle("primary", scanIsPrimary)
   scanButton.disabled = busyElsewhere || state.scanCancelRequested
   if (state.automaticReviewRequested && !activeScan &&
       !scanButton.disabled) {

package/test/vault-automatic-scan-ui.test.js

@@ -582,7 +582,17 @@ test("an empty automatic check briefly confirms completion", async () => {
   assert.equal(revealTimers.length, revealsBeforeFocusedCompletion + 1)
   assert.equal(completionTimers.length, timersBeforeFocusedCompletion,
     "completion dismissal cannot start before its result is revealed")
+  eventSources[0].onerror()
+  await new Promise((resolve) => nativeSetTimeout(resolve, 0))
+  assert.equal(tray.hidden, false,
+    "a reconnect cannot erase a pending completion reveal")
+  assert.equal(tray.querySelector(".vault-auto-scan-close"), focusedClose)
+  assert.equal(tray.querySelector(
+    '.vault-auto-scan-row[data-state="complete"]'), null)
   revealTimers.at(-1).callback()
+  const focusedCompleted = tray.querySelector(
+    '.vault-auto-scan-row[data-state="complete"]')
+  assert.ok(focusedCompleted)
   assert.equal(completionTimers.length, timersBeforeFocusedCompletion,
     "completion does not start its timer while focus is already in the card")
   focusedClose.dispatchEvent(new dom.window.FocusEvent("focusout", {
@@ -590,10 +600,8 @@ test("an empty automatic check briefly confirms completion", async () => {
     relatedTarget: null
   }))
   assert.equal(completionTimers.length, timersBeforeFocusedCompletion + 1)
-  eventSources[0].onerror()
-  await new Promise((resolve) => nativeSetTimeout(resolve, 0))
-  assert.equal(tray.hidden, true,
-    "a reconnect drops presentation-only completion state")
+  completionTimers.at(-1).callback()
+  assert.equal(tray.hidden, true)
 
   send({
     enabled: true,

package/test/vault-ui.test.js

@@ -654,7 +654,7 @@ describe("Save Space interface", () => {
     assert.match(document.getElementById("btn-scan").textContent,
       /Scan again/)
     assert.equal(document.getElementById("btn-scan").classList
-      .contains("primary"), false)
+      .contains("primary"), true)
     assert.equal(document.querySelector("#vault-scan-size-menu > summary")
       .classList.contains("primary"), false)
     assert.match(document.getElementById("vault-scan-size-label").textContent,
@@ -751,6 +751,10 @@ describe("Save Space interface", () => {
       /Cannot deduplicate\s*1/)
     assert.match(document.querySelector("#vault-status-filter").textContent,
       /Cannot deduplicate/)
+    assert.equal(document.getElementById("btn-review-metric").classList
+      .contains("primary"), true)
+    assert.equal(document.getElementById("btn-scan").classList
+      .contains("primary"), false)
 
     document.querySelector('[data-view="duplicates"]').click()
     await waitFor(() => document.querySelector(
@@ -759,7 +763,10 @@ describe("Save Space interface", () => {
       /duplicate\.bin/)
     assert.doesNotMatch(document.querySelector(".vault-table").textContent,
       /blocked\.bin/)
-    assert.ok(document.querySelector("[data-deduplicate-all]"))
+    assert.equal(document.querySelector("[data-deduplicate-all]")
+      .classList.contains("primary"), true)
+    assert.equal(document.getElementById("btn-scan").classList
+      .contains("primary"), false)
 
     document.querySelector('[data-view="unavailable"]').click()
     await waitFor(() => document.querySelector(
@@ -2221,6 +2228,37 @@ describe("Save Space interface", () => {
     dom.window.close()
   })
 
+  test("a completed app workspace keeps Scan again primary", async () => {
+    const { dom } = await makePage(fixture([]), {
+      appMode: true,
+      scopeId: "app:app"
+    })
+    const document = dom.window.document
+
+    assert.match(document.getElementById("btn-scan").textContent,
+      /Scan again/)
+    assert.equal(document.getElementById("btn-scan").classList
+      .contains("primary"), true)
+
+    dom.window.close()
+  })
+
+  test("an app with duplicates keeps Scan again secondary", async () => {
+    const duplicate = item({ status: "duplicate", shareable: true })
+    const { dom } = await makePage(fixture([duplicate]), {
+      appMode: true,
+      scopeId: "app:app"
+    })
+    const document = dom.window.document
+
+    assert.equal(document.getElementById("btn-review-metric").classList
+      .contains("primary"), true)
+    assert.equal(document.getElementById("btn-scan").classList
+      .contains("primary"), false)
+
+    dom.window.close()
+  })
+
   test("an app without a global baseline shows setup and opens global Disk Saver", async () => {
     const status = fixture([], {
       global_scan_ready: false,