devpi-admin 1.4.3__tar.gz → 1.4.4__tar.gz

{devpi_admin-1.4.3 → devpi_admin-1.4.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: devpi-admin
-Version: 1.4.3
+Version: 1.4.4
 Summary: Modern web UI plugin for devpi-server — drop-in replacement for devpi-web
 Author-email: Pavel Revak <pavelrevak@gmail.com>
 License: MIT

{devpi_admin-1.4.3 → devpi_admin-1.4.4}/devpi_admin/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '1.4.3'
-__version_tuple__ = version_tuple = (1, 4, 3)
+__version__ = version = '1.4.4'
+__version_tuple__ = version_tuple = (1, 4, 4)
 
-__commit_id__ = commit_id = 'geb4eac9d6'
+__commit_id__ = commit_id = 'g312e747ee'

{devpi_admin-1.4.3 → devpi_admin-1.4.4}/devpi_admin/main.py

@@ -382,32 +382,29 @@ def _versiondata_view(request):
         return HTTPNotFound(json_body={"error": "version not found"})
     # Convert to plain dict with JSON-safe types
     result = _to_json_safe(verdata)
-    # Include file links — filter releaselinks to this version
-    try:
-        all_links = stage.get_releaselinks(project)
-    except Exception:
-        _log.warning(
-            "Failed to get releaselinks for %s/%s/%s",
-            user, index, project, exc_info=True)
-        all_links = []
+    # Build file links from the verdata's own +elinks. Unlike
+    # get_releaselinks() — which reconstructs ELinks from simplelinks
+    # metadata and therefore has no "_log" — these carry the upload
+    # log entries (who/when). Mirror elinks have no "_log" at all;
+    # the "log" key is then simply absent.
     result["+links"] = []
-    for link in all_links:
-        if link.version != version:
+    for linkdict in result.pop("+elinks", None) or []:
+        if linkdict.get("rel") != "releasefile":
             continue
+        entrypath = linkdict.get("entrypath") or ""
+        hashes = linkdict.get("hashes") or {}
+        if hashes.get("sha256"):
+            hash_spec = "sha256=" + hashes["sha256"]
+        else:
+            hash_spec = linkdict.get("hash_spec") or ""
         link_info = {
-            "href": "/" + link.relpath,
-            "basename": link.basename,
-            "hash_spec": link.best_available_hash_spec,
+            "href": "/" + entrypath,
+            "basename": entrypath.rsplit("/", 1)[-1],
+            "hash_spec": hash_spec,
         }
-        try:
-            log = link._log
-            link_info["log"] = [
-                {k: (list(v) if k == "when" else v)
-                 for k, v in entry.items()}
-                for entry in log
-            ]
-        except (AttributeError, TypeError):
-            pass
+        log = linkdict.get("_log")
+        if log:
+            link_info["log"] = log
         result["+links"].append(link_info)
     return _json_response({"result": result})
 

{devpi_admin-1.4.3 → devpi_admin-1.4.4}/devpi_admin/static/css/style.css

@@ -1579,6 +1579,13 @@ body {
     word-break: break-word;
 }
 
+.pkg-sidebar-text {
+    margin-top: 4px;
+    font-size: 12px;
+    color: var(--text);
+    word-break: break-word;
+}
+
 .pkg-sidebar-list {
     list-style: none;
     margin-top: 4px;
@@ -1691,6 +1698,11 @@ body {
     color: var(--text-faint);
 }
 
+.pkg-card-updated {
+    font-size: 12px;
+    color: var(--text-faint);
+}
+
 /* --- Version cards --- */
 
 .ver-grid {

{devpi_admin-1.4.3 → devpi_admin-1.4.4}/devpi_admin/static/js/app.js

@@ -3341,6 +3341,18 @@
             Api.get('/' + indexPath + '/' + pkg).then(function (pkgData) {
                 var vers = Object.keys(pkgData.result).sort(compareVersions);
                 versionEl.textContent = vers.length ? 'v' + vers[0] : 'no versions';
+                // Last update across all versions of the package
+                var best = null;
+                for (var i = 0; i < vers.length; i++) {
+                    var w = lastLogWhen(pkgData.result[vers[i]]['+links']);
+                    if (w && (!best || cmpLogWhen(w, best) > 0)) best = w;
+                }
+                if (best) {
+                    card.appendChild(el('div', {
+                        className: 'pkg-card-updated',
+                        textContent: 'Updated ' + formatLogWhen(best),
+                    }));
+                }
             }).catch(function () {
                 versionEl.textContent = '';
             });
@@ -3599,7 +3611,22 @@
             content.appendChild(el('div', {className: 'view-header'}, [
                 buildBreadcrumb(indexPath, [
                     ' / ',
-                    el('a', {href: '#package/' + indexPath + '/' + pkg, textContent: pkg}),
+                    el('a', {
+                        href: '#package/' + indexPath + '/' + pkg,
+                        textContent: pkg,
+                        onclick: function (e) {
+                            // Same-hash click fires no hashchange event —
+                            // force a reload of the package detail.
+                            if (e.metaKey || e.ctrlKey || e.shiftKey) return;
+                            e.preventDefault();
+                            var target = '#package/' + indexPath + '/' + pkg;
+                            if (window.location.hash !== target) {
+                                _skipHashChange = true;
+                                window.location.hash = target;
+                            }
+                            loadPackageDetail(indexPath, pkg);
+                        },
+                    }),
                     ' ',
                     el('span', {className: 'page-heading-version', textContent: 'v' + currentVer}),
                 ]),
@@ -3636,6 +3663,18 @@
                 }));
             }
 
+            var uploadedWhen = lastLogWhen(info['+links']);
+            if (uploadedWhen) {
+                infoCard.appendChild(el('div', {
+                    className: 'pkg-sidebar-label',
+                    textContent: 'Uploaded',
+                }));
+                infoCard.appendChild(el('div', {
+                    className: 'pkg-sidebar-text',
+                    textContent: formatLogWhen(uploadedWhen),
+                }));
+            }
+
             var infoRows = [];
             if (info.requires_python) infoRows.push(['Python', info.requires_python]);
             var license = info.license_expression || info.license;
@@ -3736,9 +3775,7 @@
                     var dateStr = '';
                     if (link.log && link.log.length) {
                         var log = link.log[0];
-                        var when = log.when;
-                        dateStr = when[0] + '-' + pad(when[1]) + '-' + pad(when[2]) + ' ' +
-                            pad(when[3]) + ':' + pad(when[4]);
+                        dateStr = formatLogWhen(log.when);
                         if (log.who) dateStr = log.who + ', ' + dateStr;
                     }
                     if (dateStr && dateStr !== lastDate) {
@@ -3920,6 +3957,36 @@
         return n < 10 ? '0' + n : '' + n;
     }
 
+    function formatLogWhen(when) {
+        // keyfs link log 'when' is a UTC tuple [Y, M, D, h, m, s]
+        return when[0] + '-' + pad(when[1]) + '-' + pad(when[2]) + ' ' +
+            pad(when[3]) + ':' + pad(when[4]);
+    }
+
+    function cmpLogWhen(a, b) {
+        for (var i = 0; i < a.length && i < b.length; i++) {
+            if (a[i] !== b[i]) return a[i] - b[i];
+        }
+        return 0;
+    }
+
+    function lastLogWhen(links) {
+        // Latest log timestamp across release links — upload, push and
+        // overwrite entries all represent a content update. Mirror links
+        // carry no log → returns null.
+        var best = null;
+        for (var i = 0; i < (links || []).length; i++) {
+            var log = links[i].log || [];
+            for (var j = 0; j < log.length; j++) {
+                var when = log[j].when;
+                if (when && (!best || cmpLogWhen(when, best) > 0)) {
+                    best = when;
+                }
+            }
+        }
+        return best;
+    }
+
     var _preReleaseOrder = {dev: 0, a: 1, alpha: 1, b: 2, beta: 2, rc: 3, c: 3};
 
     function _parseVersion(v) {

{devpi_admin-1.4.3 → devpi_admin-1.4.4}/devpi_admin.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: devpi-admin
-Version: 1.4.3
+Version: 1.4.4
 Summary: Modern web UI plugin for devpi-server — drop-in replacement for devpi-web
 Author-email: Pavel Revak <pavelrevak@gmail.com>
 License: MIT

{devpi_admin-1.4.3 → devpi_admin-1.4.4}/tests/test_view_helpers.py

@@ -7,7 +7,7 @@ from pyramid.httpexceptions import HTTPBadRequest, HTTPForbidden, HTTPNotFound
 
 from devpi_admin.main import (
     _check_read_access, _get_stage_or_404, _refresh_mirror_cache_view,
-    _serve_index)
+    _serve_index, _versiondata_view)
 
 
 class GetStageOr404Tests(unittest.TestCase):
@@ -147,5 +147,83 @@ class RefreshMirrorCacheViewTests(unittest.TestCase):
                     self._make(xom, auth_user=None))
 
 
+class VersiondataViewTests(unittest.TestCase):
+    """+links must be built from verdata +elinks (which carry _log).
+
+    Regression: get_releaselinks() reconstructs ELinks from simplelinks
+    metadata without "_log", so the upload timestamps never reached the
+    response when the view used it.
+    """
+
+    def _make(self, verdata):
+        stage = MagicMock()
+        stage.get_versiondata.return_value = verdata
+        xom = MagicMock()
+        xom.model.getstage.return_value = stage
+        req = MagicMock()
+        req.registry = {"xom": xom}
+        req.matchdict = {
+            "user": "alice", "index": "dev",
+            "project": "testpkg", "version": "1.0"}
+        req.has_permission.return_value = True
+        req.authenticated_userid = "alice"
+        return req
+
+    def test_links_carry_upload_log(self):
+        verdata = {
+            "name": "testpkg", "version": "1.0",
+            "+elinks": [
+                {
+                    "rel": "releasefile",
+                    "entrypath": "alice/dev/+f/b28/abc/testpkg-1.0.tar.gz",
+                    "hash_spec": "md5=deadbeef",
+                    "hashes": {"sha256": "cafe"},
+                    "_log": [{
+                        "what": "upload", "who": "alice",
+                        "when": (2026, 6, 5, 8, 10, 44),
+                        "dst": "alice/dev"}],
+                },
+                {
+                    # non-releasefile links must be filtered out
+                    "rel": "toxresult",
+                    "entrypath": "alice/dev/+f/123/tox.json",
+                },
+            ],
+        }
+        body = json.loads(_versiondata_view(self._make(verdata)).body)
+        result = body["result"]
+        self.assertNotIn("+elinks", result)
+        self.assertEqual(len(result["+links"]), 1)
+        link = result["+links"][0]
+        self.assertEqual(
+            link["href"], "/alice/dev/+f/b28/abc/testpkg-1.0.tar.gz")
+        self.assertEqual(link["basename"], "testpkg-1.0.tar.gz")
+        self.assertEqual(link["hash_spec"], "sha256=cafe")
+        self.assertEqual(link["log"][0]["when"], [2026, 6, 5, 8, 10, 44])
+        self.assertEqual(link["log"][0]["who"], "alice")
+
+    def test_mirror_links_without_log(self):
+        # Mirror elinks carry no "_log" — the "log" key must be absent,
+        # not present-but-empty.
+        verdata = {
+            "name": "testpkg", "version": "1.0",
+            "+elinks": [{
+                "rel": "releasefile",
+                "entrypath": "root/pypi/+f/abc/testpkg-1.0.tar.gz",
+                "hash_spec": "md5=deadbeef",
+                "hashes": {},
+            }],
+        }
+        body = json.loads(_versiondata_view(self._make(verdata)).body)
+        link = body["result"]["+links"][0]
+        self.assertNotIn("log", link)
+        self.assertEqual(link["hash_spec"], "md5=deadbeef")
+
+    def test_no_elinks_yields_empty_links(self):
+        verdata = {"name": "testpkg", "version": "1.0"}
+        body = json.loads(_versiondata_view(self._make(verdata)).body)
+        self.assertEqual(body["result"]["+links"], [])
+
+
 if __name__ == "__main__":
     unittest.main()