pinokiod 8.0.112 → 8.0.113

package/package.json

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

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",