devpi-admin 1.4.1__tar.gz → 1.4.2__tar.gz

{devpi_admin-1.4.1 → devpi_admin-1.4.2}/.github/workflows/publish.yml

@@ -12,12 +12,12 @@ jobs:
       id-token: write
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           fetch-depth: 0  # needed for setuptools-scm to derive version from tag
 
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: "3.14"
 

{devpi_admin-1.4.1 → devpi_admin-1.4.2}/.github/workflows/tests.yml

@@ -14,12 +14,12 @@ jobs:
         python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           fetch-depth: 0  # needed for setuptools-scm to read git tags
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.python-version }}
 

{devpi_admin-1.4.1 → devpi_admin-1.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: devpi-admin
-Version: 1.4.1
+Version: 1.4.2
 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.1 → devpi_admin-1.4.2}/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.1'
-__version_tuple__ = version_tuple = (1, 4, 1)
+__version__ = version = '1.4.2'
+__version_tuple__ = version_tuple = (1, 4, 2)
 
-__commit_id__ = commit_id = 'gf69f25fba'
+__commit_id__ = commit_id = 'g1bf2e00e1'

{devpi_admin-1.4.1 → devpi_admin-1.4.2}/devpi_admin/static/css/style.css

@@ -1588,15 +1588,18 @@ body {
     align-items: center;
     justify-content: space-between;
     padding: 2px 0;
+    gap: 4px;
 }
 
 .pkg-version-link {
-    flex: 1;
+    flex: 1 1 auto;
+    min-width: 0;
     padding: 5px 8px;
     border-radius: 4px;
     font-size: 13px;
     color: var(--text-muted);
     text-decoration: none;
+    overflow-wrap: anywhere;
 }
 
 .pkg-version-link:hover {
@@ -1619,6 +1622,7 @@ body {
     font-size: 16px;
     line-height: 1;
     border-radius: 4px;
+    flex-shrink: 0;
 }
 
 .pkg-version-del:hover {

{devpi_admin-1.4.1 → devpi_admin-1.4.2}/devpi_admin/static/js/app.js

@@ -1242,10 +1242,65 @@
     // Token types supported by the unified Issue modal. The selector at the
     // top of the modal switches the form between Devpi tokens (multi-index,
     // permission checkboxes) and Admin tokens (single index, scope select).
-    // Devpi is the default unless the plugin isn't installed.
+    // When the caller doesn't pin a type, the modal defaults to whichever
+    // backend the user *most recently* issued against — saves picking the
+    // same radio every time. Falls back to Devpi (or Admin if the plugin
+    // isn't installed) for users with no tokens yet.
     var TOKEN_TYPE_DEVPI = 'devpi';
     var TOKEN_TYPE_ADMIN = 'admin';
 
+    function _detectRecentTokenType(username) {
+        // Returns Promise<TOKEN_TYPE_*|null>. ``null`` means the user has
+        // no tokens (or detection failed) — caller picks a static default.
+        //
+        // Admin tokens carry ``issued_at`` (epoch). Macaroon tokens have
+        // no first-class issuance timestamp; we use ``not_before`` when
+        // present (it tracks the issue moment for the typical "starts
+        // now" flow) and fall back to ``expires`` so a freshly-issued
+        // long-TTL token still wins over an older short-TTL one.
+        var pAdmin = Api.get(
+            '/+admin-api/users/' + encodeURIComponent(username) + '/tokens')
+            .then(function (data) {
+                var tokens = (data && data.result) || [];
+                var max = 0;
+                for (var i = 0; i < tokens.length; i++) {
+                    var t = tokens[i].issued_at || 0;
+                    if (t > max) max = t;
+                }
+                return max || null;
+            })
+            .catch(function () { return null; });
+
+        var pDevpi = hasDevpiTokens()
+            ? Api.get('/' + encodeURIComponent(username) + '/+tokens')
+                .then(function (data) {
+                    var tokens = (data && data.result
+                        && data.result.tokens) || {};
+                    var max = 0;
+                    for (var id in tokens) {
+                        if (!Object.prototype.hasOwnProperty.call(
+                                tokens, id)) continue;
+                        var parsed = parseMacaroonRestrictions(
+                            tokens[id].restrictions);
+                        var t = parsed.not_before
+                            || parsed.expires || 0;
+                        if (t > max) max = t;
+                    }
+                    return max || null;
+                })
+                .catch(function () { return null; })
+            : Promise.resolve(null);
+
+        return Promise.all([pAdmin, pDevpi]).then(function (results) {
+            var adminTs = results[0];
+            var devpiTs = results[1];
+            if (!adminTs && !devpiTs) return null;
+            if (!adminTs) return TOKEN_TYPE_DEVPI;
+            if (!devpiTs) return TOKEN_TYPE_ADMIN;
+            return adminTs >= devpiTs ? TOKEN_TYPE_ADMIN : TOKEN_TYPE_DEVPI;
+        });
+    }
+
     // Public entry point. `options` may include:
     //  • `preselectType` — 'devpi' or 'admin'
     //  • `preselectIndexes` — list of 'user/index' strings
@@ -1259,18 +1314,25 @@
     function showIssueTokenModal(username, options) {
         options = options || {};
         var presel = (options.preselectIndexes || []).slice();
-        var preselType = options.preselectType || TOKEN_TYPE_DEVPI;
+        var explicitType = options.preselectType || null;
         _issueReturnTo = options.returnTo || function () {
             showTokensModal(username);
         };
         _issueLockedIndex = (options.lockIndex && presel.length)
             ? presel[0] : null;
-        // If the user asked for Devpi but the plugin isn't installed, silently
-        // fall back to Admin — saves them a trip back through the kebab.
-        if (preselType === TOKEN_TYPE_DEVPI && !hasDevpiTokens()) {
-            preselType = TOKEN_TYPE_ADMIN;
-        }
-        fetchRoot().then(function (rootResult) {
+        // Caller pinned the type → honour it; otherwise detect from the
+        // user's existing tokens (most-recently-issued backend wins).
+        // Detection failure falls back to Devpi (or Admin if the plugin
+        // isn't installed).
+        var pType = explicitType
+            ? Promise.resolve(explicitType)
+            : _detectRecentTokenType(username);
+        Promise.all([fetchRoot(), pType]).then(function (results) {
+            var rootResult = results[0];
+            var preselType = results[1] || TOKEN_TYPE_DEVPI;
+            if (preselType === TOKEN_TYPE_DEVPI && !hasDevpiTokens()) {
+                preselType = TOKEN_TYPE_ADMIN;
+            }
             var indexInfos = getAllIndexes(rootResult);
             var aclByIndex = {};
             // Indexes accessible to the bound user: ones they own, ones
@@ -1304,11 +1366,13 @@
             };
             _renderIssueTokenModal(username, presel, preselType);
         }).catch(function () {
+            var fallbackType = explicitType
+                || (hasDevpiTokens() ? TOKEN_TYPE_DEVPI : TOKEN_TYPE_ADMIN);
             _issueContext = {
                 accessibleIndexes: presel.slice(),
                 aclByIndex: {},
             };
-            _renderIssueTokenModal(username, presel, preselType);
+            _renderIssueTokenModal(username, presel, fallbackType);
         });
     }
 

{devpi_admin-1.4.1 → devpi_admin-1.4.2}/devpi_admin.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: devpi-admin
-Version: 1.4.1
+Version: 1.4.2
 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.1 → devpi_admin-1.4.2}/tests/test_devpi_tokens_ui.py

@@ -277,6 +277,23 @@ class UnifiedIssueModalTests(unittest.TestCase):
     def test_unified_entry_point_exists(self):
         self.assertIn("function showIssueTokenModal(username, options)", self.js)
 
+    def test_recent_token_type_detector_present(self):
+        # Auto-preselect: when caller doesn't pin a type, pick the
+        # backend the user most recently issued against.
+        self.assertIn("function _detectRecentTokenType(username)", self.js)
+        # Admin tokens compared by issued_at, macaroons by
+        # not_before / expires.
+        self.assertIn("tokens[i].issued_at", self.js)
+        self.assertIn("parsed.not_before", self.js)
+
+    def test_issue_modal_uses_detector_when_caller_is_silent(self):
+        # `options.preselectType` short-circuits detection; absence
+        # triggers _detectRecentTokenType.
+        self.assertIn("var explicitType = options.preselectType || null;",
+                      self.js)
+        self.assertIn("explicitType\n            ? Promise.resolve(explicitType)\n"
+                      "            : _detectRecentTokenType(username);", self.js)
+
     def test_unified_listing_has_issue_button(self):
         # Single Issue entry point on the unified per-user Tokens modal —
         # no preselectType so the user picks devpi/admin in the form.