pinokiod 8.0.117 → 8.1.0

package/kernel/vault/registry_core.js

@@ -5414,12 +5414,18 @@ class RegistryCore {
       where.push(clause.sql)
       values.push(...clause.values)
     }
+    // Folded so a capitalised folder does not lead every lowercase one, and
+    // broken by the raw name so the order is total: this level pages by offset,
+    // and two names differing only in case would otherwise tie and let a page
+    // boundary repeat or skip a row.
     const folded = "pinokio_path_name(name)"
     const order = sizeSort === "asc"
-      ? `bytes ASC, ${folded} ASC`
+      ? `bytes ASC, ${folded} ASC, name ASC`
       : sizeSort === "desc"
-        ? `bytes DESC, ${folded} ASC`
-        : nameSort === "desc" ? `${folded} DESC` : `${folded} ASC`
+        ? `bytes DESC, ${folded} ASC, name ASC`
+        : nameSort === "desc"
+          ? `${folded} DESC, name DESC`
+          : `${folded} ASC, name ASC`
     // Values bind in the order the placeholders appear: the CTE's substr, then
     // its WHERE, then the two separators in the outer select and filter.
     return this.database.prepare(`

package/package.json

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

package/server/views/partials/main_sidebar.ejs

@@ -9,7 +9,8 @@
 <aside class="main-sidebar" id="main-sidebar" aria-label="Primary navigation">
   <nav class="main-sidebar-nav" aria-label="Pinokio navigation">
     <div class='main-sidebar-section main-sidebar-section-actions' aria-label="Actions">
-      <a class='tab main-sidebar-action <%= sidebarSelected === 'explore' ? 'selected' : '' %>' id='explore' href="/home?mode=explore"><i class="fa-solid fa-globe main-sidebar-action-icon"></i><div class='caption'>Explore</div></a>
+      <a class='tab main-sidebar-action <%= sidebarSelected === 'home' ? 'selected' : '' %>' id='home' href="/home"<% if (sidebarSelected === 'home') { %> aria-current="page"<% } %>><i class="fa-solid fa-layer-group main-sidebar-action-icon"></i><div class='caption'>My Apps</div></a>
+      <a class='tab main-sidebar-action <%= sidebarSelected === 'explore' ? 'selected' : '' %>' id='explore' href="/home?mode=explore"<% if (sidebarSelected === 'explore') { %> aria-current="page"<% } %>><i class="fa-solid fa-globe main-sidebar-action-icon"></i><div class='caption'>Explore</div></a>
       <details class="universal-create-menu">
         <summary class="tab main-sidebar-action" aria-label="Create options"><i class="fa-solid fa-plus main-sidebar-action-icon"></i><div class='caption'>Create</div></summary>
         <div class="universal-create-dropdown">

package/test/main-sidebar.test.js

@@ -5,6 +5,18 @@ const test = require('node:test')
 
 const sidebarFile = path.resolve(__dirname, '..', 'server', 'views', 'partials', 'main_sidebar.ejs')
 
+test('main sidebar exposes My Apps before Explore', async () => {
+  const source = await fs.readFile(sidebarFile, 'utf8')
+
+  const myAppsIndex = source.indexOf("<div class='caption'>My Apps</div>")
+  const exploreIndex = source.indexOf("<div class='caption'>Explore</div>")
+
+  assert.notEqual(myAppsIndex, -1)
+  assert.notEqual(exploreIndex, -1)
+  assert.ok(myAppsIndex < exploreIndex)
+  assert.match(source, /sidebarSelected === 'home'[\s\S]*id='home' href="\/home"[\s\S]*aria-current="page"[\s\S]*fa-layer-group[\s\S]*>My Apps</)
+})
+
 test('main sidebar moves Home Server under Configure', async () => {
   const source = await fs.readFile(sidebarFile, 'utf8')