pinokiod 8.0.112 → 8.0.114

package/package.json

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

package/server/public/vault.css

@@ -1647,16 +1647,20 @@ body[data-vault-mode="global"] .vault-explorer {
 }
 .vault-text-button:hover { color: var(--task-text); }
 .vault-text-button:disabled { cursor: progress; opacity: .55; }
+/* The list is the only part that grows and scrolls; every other row keeps its
+   own height. Laying this out as fixed grid rows tied the footer's position to
+   how many children happened to be in flow, and a status row appearing or a
+   mode declaring a different count pushed the footer out of the pane, where no
+   amount of scrolling could reach it. */
 .vault-pane {
-  display: grid;
+  display: flex;
   min-width: 0;
   min-height: 0;
-  grid-template-rows: auto auto minmax(0, 1fr) auto;
+  flex-direction: column;
   overflow: hidden;
 }
-body[data-vault-mode="global"] .vault-pane {
-  grid-template-rows: auto auto auto minmax(0, 1fr) auto;
-}
+.vault-pane > * { flex: 0 0 auto; }
+.vault-pane > .vault-table-wrap { min-height: 0; flex: 1 1 auto; }
 body.vault-page .vault-view-tabs {
   display: block;
   min-width: 0;
@@ -2192,6 +2196,10 @@ body.dark .vault-row-action .vault-text-button:hover:not(:disabled) {
   align-items: center;
   justify-content: space-between;
   gap: 12px;
+  /* Now that it holds its own place at the bottom, it needs an edge: a short
+     list leaves empty space above it, and without a rule it reads as a stray
+     line of text rather than the foot of the table. */
+  border-top: 1px solid var(--task-border);
   padding: 9px var(--vault-inline) 11px;
   color: var(--task-muted);
   font-size: 10.5px;

package/server/public/vault.js

@@ -2380,10 +2380,13 @@ const renderTable = (items) => {
     state.view === "reclaimable"
   const sizeSortLabel = state.sizeSort === "desc" ? COPY.sort_smallest : COPY.sort_largest
   const sizeSortIcon = state.sizeSort === "desc" ? "fa-arrow-down-wide-short" : state.sizeSort === "asc" ? "fa-arrow-up-short-wide" : "fa-sort"
-  // Only where the page order is the name order: the duplicate, reclaimable
-  // and activity lists are paged by something else, so reordering their rows
-  // would only reorder the page the user happens to be on.
-  const sortableName = tableClass === "flat" || tableClass === "inventory"
+  // Every table whose rows are paths, which is every one whose Name column
+  // holds a name. Content groups are labelled with a sample path rather than an
+  // identity, Trash rows are labelled with a hash, and Activity is a log kept in
+  // time order, so none of the three has a name to sort by.
+  const sortableName = tableClass === "flat" ||
+    tableClass === "inventory" ||
+    tableClass === "matches"
   const nameSortLabel = state.nameSort === "desc" ? COPY.sort_a_z : COPY.sort_z_a
   const nameSortIcon = state.nameSort === "desc"
     ? "fa-arrow-down-z-a"

package/test/vault-ui.test.js

@@ -956,6 +956,53 @@ describe("Save Space interface", () => {
     dom.window.close()
   })
 
+  test("name sorting is offered wherever the Name column holds a name", async () => {
+    const duplicate = item({
+      path: "/pinokio/api/app/models/duplicate.bin",
+      relative_path: "models/duplicate.bin",
+      status: "duplicate",
+      shareable: true,
+      location_count: 2
+    })
+    const base = fixture([duplicate])
+    base.inventory.source_counts.duplicates["app:app"] = 1
+    base.inventory.shareable_by_source["app:app"] = 1
+    const { dom } = await makePage(base)
+    const document = dom.window.document
+    const controls = () => ({
+      name: !!document.querySelector("[data-sort-name]"),
+      size: !!document.querySelector("[data-sort-size]")
+    })
+
+    // Rows are paths here, in either display mode.
+    assert.deepEqual(controls(), { name: true, size: true })
+    document.querySelector('[data-display-mode="files"]').click()
+    await waitFor(() => document.querySelector(
+      '[data-display-mode="files"].selected'))
+    assert.deepEqual(controls(), { name: true, size: true })
+
+    document.querySelector('[data-view="duplicates"]').click()
+    await waitFor(() => document.querySelector(
+      '[data-view="duplicates"].selected'))
+    // Duplicates in Folders is an ordinary tree of paths.
+    assert.deepEqual(controls(), { name: true, size: true })
+
+    document.querySelector('[data-display-mode="files"]').click()
+    await waitFor(() => document.querySelector(
+      '[data-display-mode="files"].selected'))
+    // Content groups are labelled with a sample path, not an identity, so
+    // ordering them by name would order them by an arbitrary member.
+    assert.deepEqual(controls(), { name: false, size: true })
+
+    document.querySelector('[data-view="activity"]').click()
+    await waitFor(() => document.querySelector(
+      '[data-view="activity"].selected'))
+    // A log is kept in time order.
+    assert.deepEqual(controls(), { name: false, size: false })
+    await settle()
+    dom.window.close()
+  })
+
   test("a copy elsewhere links only when it can be pointed at", async () => {
     const duplicate = item({
       path: "/pinokio/api/app/models/duplicate.bin",