plain.admin 0.27.1__py3-none-any.whl → 0.28.0__py3-none-any.whl

plain/admin/assets/toolbar/toolbar.js

@@ -32,6 +32,42 @@ var plainToolbar = {
   toggleExpand: function () {
     this.expanded = !this.expanded;
     document.querySelector("#plaintoolbar-details").classList.toggle("hidden");
+    localStorage.setItem('plaintoolbar.expanded', this.expanded ? '1' : '0');
+  },
+  expand: function () {
+    this.expanded = true;
+    document.querySelector("#plaintoolbar-details").classList.remove("hidden");
+    localStorage.setItem('plaintoolbar.expanded', '1');
+  },
+  collapse: function () {
+    this.expanded = false;
+    document.querySelector("#plaintoolbar-details").classList.add("hidden");
+    localStorage.setItem('plaintoolbar.expanded', '0');
+  },
+  showTab: function (tabName) {
+    this.expand();
+
+    var toolbar = document.querySelector("#plaintoolbar");
+    var tab = toolbar.querySelector("div[data-toolbar-tab=" + tabName + "]");
+
+    // Hide all children in the tab parent
+    for (var i = 0; i < tab.parentNode.children.length; i++) {
+      var child = tab.parentNode.children[i];
+      if (child !== tab) {
+        child.style.display = "none";
+      }
+    }
+
+    tab.style.display = "block";
+
+    toolbar.querySelectorAll("button[data-toolbar-tab]").forEach(function (tab) {
+      if (tab.dataset.toolbarTab === tabName) {
+        tab.setAttribute("data-active", true);
+      } else {
+        tab.removeAttribute("data-active");
+      }
+    });
+    localStorage.setItem('plaintoolbar.tab', tabName);
   },
 };
 
@@ -40,12 +76,87 @@ if (plainToolbar.shouldHide()) {
   plainToolbar.hide();
 }
 
-window.addEventListener("load", function () {
-    document.querySelector('[data-plaintoolbar-hide]').addEventListener('click', function() {
-        console.log("Hiding admin toolbar for 1 hour");
-        plainToolbar.hideUntil(Date.now() + 3600000);
+window.addEventListener("load", function() {
+  // Restore expanded/collapsed state
+  var state = localStorage.getItem('plaintoolbar.expanded');
+  if (state === '1') {
+    plainToolbar.expand();
+    // Restore last active tab
+    var lastTab = localStorage.getItem('plaintoolbar.tab');
+    if (lastTab) {
+      plainToolbar.showTab(lastTab);
+    }
+  } else if (state === '0') {
+    plainToolbar.collapse();
+  }
+  var toolbar = document.querySelector("#plaintoolbar");
+
+  toolbar.querySelectorAll("button[data-toolbar-tab]").forEach(function (tab) {
+    tab.addEventListener("click", function () {
+      plainToolbar.showTab(tab.dataset.toolbarTab);
+    });
+  });
+
+  toolbar.querySelectorAll('[data-plaintoolbar-hide]').forEach(function(btn) {
+    btn.addEventListener('click', function() {
+      plainToolbar.hide();
     });
-    document.querySelector('[data-plaintoolbar-expand]').addEventListener('click', function() {
-        plainToolbar.toggleExpand();
+  });
+
+  toolbar.querySelectorAll('[data-plaintoolbar-hideuntil]').forEach(function(btn) {
+    btn.addEventListener('click', function() {
+      console.log("Hiding admin toolbar for 1 hour");
+      plainToolbar.hideUntil(Date.now() + 3600000);
+    });
+  });
+
+  toolbar.querySelectorAll('[data-plaintoolbar-expand]').forEach(function(btn) {
+    btn.addEventListener('click', function() {
+      plainToolbar.toggleExpand();
     });
+  });
+
+  // Enable manual resize of the expanded toolbar via drag handle
+  var details = document.getElementById('plaintoolbar-details');
+  if (details) {
+    var handle = details.querySelector('[data-resizer]');
+    var content = handle.nextElementSibling;
+    var isDragging = false;
+    var startY = 0;
+    var startHeight = 0;
+    if (handle && content) {
+      // Initial cursor
+      handle.style.cursor = 'grab';
+      // Start dragging
+      handle.addEventListener('mousedown', function(e) {
+        isDragging = true;
+        startY = e.clientY;
+        startHeight = content.offsetHeight;
+        handle.style.cursor = 'grabbing';
+        // Prevent text selection while dragging
+        document.body.style.userSelect = 'none';
+        e.preventDefault();
+      });
+      // Handle dragging
+      document.addEventListener('mousemove', function(e) {
+        if (!isDragging) return;
+        var delta = e.clientY - startY;
+        // Calculate new height: dragging up increases height
+        var newHeight = startHeight - delta;
+        // Clamp between reasonable bounds
+        var minHeight = 50;
+        var maxHeight = window.innerHeight - 100;
+        newHeight = Math.max(minHeight, Math.min(maxHeight, newHeight));
+        content.style.height = newHeight + 'px';
+      });
+      // End dragging
+      document.addEventListener('mouseup', function() {
+        if (isDragging) {
+          isDragging = false;
+          handle.style.cursor = 'grab';
+          document.body.style.userSelect = '';
+        }
+      });
+    }
+  }
 });

plain/admin/querystats/core.py

@@ -141,7 +141,6 @@ class QueryStats:
             "request": {
                 "path": request.path,
                 "method": request.method,
-                "headers": dict(request.headers),
                 "unique_id": request.unique_id,
             },
             "timestamp": time.time(),

plain/admin/querystats/middleware.py

@@ -55,15 +55,14 @@ class QueryStatsMiddleware:
         if self.should_ignore_request(request):
             return self.get_response(request)
 
-        session_querystats_enabled = "querystats" in request.session
-
-        querystats = QueryStats(include_tracebacks=session_querystats_enabled)
-        with connection.execute_wrapper(querystats):
-            # Have to wrap this first call so it is included in the querystats,
-            # but we don't have to wrap everything else unless we are admin or debug
-            is_admin = self.is_admin_request(request)
+        # Previously we wrapped this in execute_wrapper too,
+        # but now there's a chicken and the egg issue with "querystats" being by the view,
+        # which hasn't been processed yet (on the initial request)
+        is_admin = self.is_admin_request(request)
 
         if settings.DEBUG or is_admin:
+            tracking = "querystats" in request.session
+            querystats = QueryStats(include_tracebacks=tracking)
             with connection.execute_wrapper(querystats):
                 response = self.get_response(request)
 
@@ -75,7 +74,7 @@ class QueryStatsMiddleware:
             # by using the server timing API which can be parsed client-side
             response.headers["Server-Timing"] = querystats.as_server_timing()
 
-            if session_querystats_enabled and querystats.num_queries > 0:
+            if tracking and querystats.num_queries > 0:
                 request.session["querystats"][request.unique_id] = json.dumps(
                     querystats.as_context_dict(request), cls=QueryStatsJSONEncoder
                 )

plain/admin/querystats/views.py

@@ -1,3 +1,4 @@
+import datetime
 import json
 
 from plain.auth.views import AuthViewMixin
@@ -17,15 +18,32 @@ class QuerystatsView(AuthViewMixin, TemplateView):
 
         super().check_auth()
 
+    def get_response(self):
+        response = super().get_response()
+        # So we can load it in the toolbar
+        response.headers["X-Frame-Options"] = "SAMEORIGIN"
+        return response
+
+    def get(self):
+        # Give an easy out if things get messed up
+        if (
+            "clear" in self.request.query_params
+            and "querystats" in self.request.session
+        ):
+            del self.request.session["querystats"]
+            self.request.session.modified = True
+
+        return super().get()
+
     def get_template_context(self):
         context = super().get_template_context()
 
         querystats = self.request.session.get("querystats", {})
 
-        for request_id, json_data in querystats.items():
+        for request_id in list(querystats.keys()):
             try:
-                querystats[request_id] = json.loads(json_data)
-            except json.JSONDecodeError:
+                querystats[request_id] = json.loads(querystats[request_id])
+            except (json.JSONDecodeError, TypeError):
                 # If decoding fails, remove the entry from the dictionary
                 del querystats[request_id]
 
@@ -38,7 +56,12 @@ class QuerystatsView(AuthViewMixin, TemplateView):
             )
         )
 
+        # Convert the timestamps back to a python datetime object
+        for data in querystats.values():
+            data["timestamp"] = datetime.datetime.fromtimestamp(data["timestamp"])
+
         context["querystats"] = querystats
+        context["querystats_enabled"] = "querystats" in self.request.session
 
         return context
 

plain/admin/templates/querystats/querystats.html

@@ -6,11 +6,17 @@
     <title>Querystats</title>
     {% tailwind_css %}
 </head>
-<body class="bg-stone-950 text-stone-300">
+<body class="text-stone-300">
 
-    <div class="flex items-center justify-between px-6 py-4">
-        <h1 class="text-lg font-semibold">Querystats</h1>
+    {% if querystats_enabled %}
+    <div class="flex items-center justify-between border-b border-white/5 px-6 h-14 fixed top-0 left-0 right-0 bg-stone-950 z-10">
+        <!-- <h1 class="text-lg font-semibold">Querystats</h1> -->
+        <div></div>
         <div class="flex items-center space-x-2">
+            <form method="get" action=".">
+                {{ csrf_input }}
+                <button type="submit" class="px-2 py-px text-sm rounded-sm bg-stone-700 text-stone-300 hover:bg-stone-600 cursor-pointer whitespace-nowrap">Reload</button>
+            </form>
             <form method="post" action=".">
                 {{ csrf_input }}
                 <input type="hidden" name="querystats_action" value="clear">
@@ -23,88 +29,114 @@
             </form>
         </div>
     </div>
+    {% endif %}
 
-    <div class="space-y-6 px-6 py-4">
-        {% for request_id, qs in querystats.items() %}
-        <div class="p-3 bg-white/5 rounded">
-            <div class="flex justify-between items-center">
-                <div>
-                    <h2 class="font-medium"><span class="font-semibold">{{ qs.request.method }}</span> {{ qs.request.path }}</h2>
-                    <p class="text-sm text-stone-400">{{ qs.summary }}</p>
-                </div>
-                <div class=text-xs>
-                    <p>Request ID <code>{{ qs.request.unique_id }}</code></p>
-                    <p>Timestamp {{ qs.timestamp }}</p>
-                    <details>
-                        <summary>Headers</summary>
-                        <pre><code>{{ qs.request.get("headers", {})|pprint }}</code></pre>
-                    </details>
-                </div>
-            </div>
-
-            <div class="flex w-full mt-5 overflow-auto rounded-sm">
-                {% for query in qs.queries %}
-                <a href="#query-{{ loop.index }}"
-                    {{ loop.cycle('class=\"h-4 bg-amber-300\"', 'class=\"h-4 bg-amber-400\"', 'class="h-4 bg-amber-500"', 'class="h-4 bg-amber-600"')|safe }}
-                    title="[{{ query.duration_display }}] {{ query.sql_display }}"
-                    style="width: {{ query.duration / qs.total_time * 100 }}%">
-                </a>
+    {% if querystats %}
+    <div class="flex mt-2 h-full">
+        <aside id="sidebar" class="fixed left-0 top-14 bottom-0 w-82 overflow-auto p-4">
+            <ul class="space-y-2">
+                {% for request_id, qs in querystats.items() %}
+                <li>
+                    <button data-request-id="{{ request_id }}" class="w-full text-left px-2 py-1 rounded hover:bg-stone-700 cursor-pointer">
+                        <span class="text-sm">{{ qs.request.path }}</span>
+                        <span class="font-semibold bg-white/5 rounded-sm px-1 py-0.5 text-xs">{{ qs.request.method }}</span>
+                        <div class="text-xs text-stone-400">{{ qs.summary }}</div>
+                        <div class="text-xs text-stone-500">{{ qs.timestamp|timesince }} ago</div>
+                    </button>
+                </li>
                 {% endfor %}
-            </div>
+            </ul>
+        </aside>
 
-            <div class="mt-4 space-y-3 text-xs">
-                {% for query in qs.queries %}
-                <details id="query-{{ loop.index }}" class="p-2 rounded bg-zinc-800">
-                    <summary class="truncate">
-                        <div class="float-right px-2 py-px mb-px ml-2 text-xs rounded-full bg-zinc-700">
-                            <span>{{ query.duration_display }}</span>
-                            {% if query.duplicate_count is defined %}
-                            <span class="text-red-500">&nbsp; duplicated {{ query.duplicate_count }} times</span>
-                            {% endif %}
-
-                            {#
-                            <div>many {{ query.many }}</div>
-                            <div>result {{ query.result }}</div>
-                            #}
-                        </div>
-                        <code class="font-mono">{{ query.sql }}</code>
-                    </summary>
-                    <div class="space-y-3 mt-3">
-                        <div>
-                            <pre><code class="font-mono whitespace-pre-wrap text-zinc-100">{{ query.sql_display }}</code></pre>
-                        </div>
-                        <div class="text-zinc-400">
-                            <span class="font-medium">Parameters</span>
-                            <pre><code class="font-mono">{{ query.params|pprint }}</code></pre>
-                        </div>
-                        <details>
-                            <summary>Traceback</summary>
-                            <pre><code class="block overflow-x-auto font-mono text-xs">{{ query.tb }}</code></pre>
-                        </details>
+        <main id="content" class="flex-1 p-6 overflow-auto ml-82 mt-14">
+            {% for request_id, qs in querystats.items() %}
+            <div class="request-detail" data-request-id="{{ request_id }}" style="display: none;">
+                <div class="flex justify-between">
+                    <div>
+                        <h2 class="font-medium text-sm"><span class="font-semibold">{{ qs.request.method }}</span> {{ qs.request.path }}</h2>
+                        <p class="text-sm text-white/70">{{ qs.summary }}</p>
                     </div>
-                </details>
-                {% else %}
-                <div>No queries...</div>
-                {% endfor %}
-            </div>
-        </div>
-
-        {% else %}
+                    <div class="text-right">
+                        <div class="text-xs text-white/60">Request ID <code>{{ qs.request.unique_id }}</code></div>
+                        <div class="text-xs text-white/60"><code>{{ qs.timestamp }}</code></div>
+                    </div>
+                </div>
 
-        <div class="text-center">
-            {% if "querystats" in request.session %}
-            <div class="text-stone-500">Querystats are enabled but nothing has been tracked yet.</div>
-            {% else %}
-            <form method="post" action=".">
-                {{ csrf_input }}
-                <input type="hidden" name="querystats_action" value="enable">
-                <button type="submit" class="px-2 rounded-sm bg-stone-700 text-stone-300 hover:bg-stone-600 cursor-pointer whitespace-nowrap">Enable querystats</button>
-            </form>
-            {% endif %}
-        </div>
+                <div class="flex w-full mt-3 overflow-auto rounded-sm">
+                    {% for query in qs.queries %}
+                    <a href="#query-{{ loop.index }}"
+                        {{ loop.cycle('class=\"h-2 bg-amber-400\"', 'class=\"h-2 bg-orange-400\"', 'class=\"h-2 bg-yellow-400\"', 'class=\"h-2 bg-amber-600\"')|safe }}
+                        title="[{{ query.duration_display }}] {{ query.sql_display }}"
+                        style="width: {{ query.duration / qs.total_time * 100 }}%">
+                    </a>
+                    {% endfor %}
+                </div>
 
-        {% endfor %}
+                <div class="mt-4 space-y-3 text-xs">
+                    {% for query in qs.queries %}
+                    <details id="query-{{ loop.index }}" class="p-2 rounded bg-white/5">
+                        <summary class="truncate">
+                            <div class="float-right px-2 py-px mb-px ml-2 text-xs rounded-full bg-zinc-700">
+                                <span>{{ query.duration_display }}</span>
+                                {% if query.duplicate_count is defined %}
+                                <span class="text-red-500">&nbsp; duplicated {{ query.duplicate_count }} times</span>
+                                {% endif %}
+                            </div>
+                            <code class="font-mono">{{ query.sql }}</code>
+                        </summary>
+                        <div class="space-y-3 mt-3">
+                            <div>
+                                <pre><code class="font-mono whitespace-pre-wrap text-zinc-100">{{ query.sql_display }}</code></pre>
+                            </div>
+                            <div class="text-zinc-400">
+                                <span class="font-medium">Parameters</span>
+                                <pre><code class="font-mono">{{ query.params|pprint }}</code></pre>
+                            </div>
+                            <details>
+                                <summary>Traceback</summary>
+                                <pre><code class="block overflow-x-auto font-mono text-xs">{{ query.tb }}</code></pre>
+                            </details>
+                        </div>
+                    </details>
+                    {% else %}
+                    <div>No queries...</div>
+                    {% endfor %}
+                </div>
+            </div>
+            {% endfor %}
+        </main>
+    </div>
+    {% elif querystats_enabled %}
+    <div class="text-center text-white/30 py-8">Querystats are enabled but nothing has been recorded yet.</div>
+    {% else %}
+    <div class="text-center py-8">
+        <div class="text-white/30">Querystats are disabled.</div>
+        <form method="post" action=".">
+            {{ csrf_input }}
+            <input type="hidden" name="querystats_action" value="enable">
+            <button type="submit" class="mt-2 px-2 py-px text-sm rounded-sm bg-stone-700 text-stone-300 hover:bg-stone-600 cursor-pointer whitespace-nowrap">Enable</button>
+        </form>
     </div>
+    {% endif %}
+
+    <script>
+        document.addEventListener('DOMContentLoaded', function() {
+            const buttons = document.querySelectorAll('#sidebar [data-request-id]');
+            const details = document.querySelectorAll('#content .request-detail');
+            buttons.forEach(function(btn) {
+                btn.addEventListener('click', function(e) {
+                    e.preventDefault();
+                    const id = this.getAttribute('data-request-id');
+                    details.forEach(div => div.style.display = 'none');
+                    const sel = document.querySelector('#content .request-detail[data-request-id="' + id + '"]');
+                    if (sel) sel.style.display = 'block';
+                    buttons.forEach(b => b.classList.remove('bg-stone-700', 'text-white'));
+                    this.classList.add('bg-stone-700', 'text-white');
+                });
+            });
+            if (buttons.length > 0) buttons[0].click();
+        });
+    </script>
 
-</body>
+    </body>
 </html>

plain/admin/templates/querystats/toolbar.html

@@ -1,25 +1,25 @@
 <div data-querystats class="relative group/querystats" style="display: none;">
     {% if "querystats" in request.session %}
-    <a href="{{ url('admin:querystats:querystats') }}" target="querystats" class="inline-flex items-center cursor-pointer text-xs rounded-full px-2 py-px bg-stone-700 text-stone-300 whitespace-nowrap">
+    <button data-toolbar-tab="querystats" class="inline-flex items-center cursor-pointer text-xs rounded-full px-2 py-px bg-white/20 text-white/80 whitespace-nowrap">
         <span class="relative inline-flex size-2 mr-2">
             <span class="absolute inline-flex h-full w-full animate-ping rounded-full bg-green-400 opacity-75"></span>
             <span class="relative inline-flex size-2 rounded-full bg-green-500"></span>
         </span>
         <span data-querystats-summary></span>
-    </a>
+    </button>
     {% else %}
     <form action="{{ url('admin:querystats:querystats') }}" method="post">
         {{ csrf_input }}
         <input type="hidden" name="redirect_url" value="{{ request.get_full_path() }}">
         <input type="hidden" name="querystats_action" value="enable">
-        <button type="submit" class="cursor-pointer text-xs rounded-full px-2 py-px bg-stone-700 text-stone-300 whitespace-nowrap">
+        <button type="submit" class="cursor-pointer text-xs rounded-full px-2 py-px bg-white/20 text-white/80 whitespace-nowrap">
             <span class="rounded-full bg-zinc-500 w-2 h-2 inline-block mr-1"></span>
             <span data-querystats-summary></span>
         </button>
     </form>
     {% endif %}
 
-    <div data-querystats-list style="display: none;" class="absolute z-50 -translate-x-1/2 hidden -translate-y-full left-1/2 -top-1 group-hover/querystats:block">
+    <div data-querystats-list style="display: none;" class="absolute z-50 hidden -translate-y-full right-0 -top-1 group-hover/querystats:block">
         <div class="p-2 text-xs border rounded shadow-md bg-zinc-900 border-zinc-700"><table><tbody></tbody></table></div>
     </div>
     <script async defer>

plain/admin/templates/toolbar/toolbar.html

@@ -1,10 +1,199 @@
 {% if toolbar.should_render() %}
 {% set exception=toolbar.request_exception() %}
-<script src="{{ asset('toolbar/toolbar.js') }}"></script>
-<div id="plaintoolbar" class="print:hidden text-sm py-1.5 text-stone-300 fixed bottom-3 mx-3 max-w-full drop-shadow-sm z-30 ring-1 ring-stone-200/5 rounded-2xl lg:flex lg:flex-col -translate-x-1/2 left-1/2 max-h-[90vh] bg-gradient-to-b from-stone-950/90 to-stone-950/95 backdrop-blur-sm">
-    <div class="flex justify-between px-3 mx-auto space-x-4">
+<script defer src="{{ asset('toolbar/toolbar.js') }}"></script>
+<div id="plaintoolbar" class="print:hidden text-stone-300 fixed bottom-0 w-full z-30 hidden sm:flex sm:flex-col">
+
+    <div id="plaintoolbar-details" class="{% if not exception %}hidden{% endif %} relative text-sm border-white/5 shadow-xl border-t inset-shadow-xs inset-shadow-stone-800 rounded-t-xl bg-stone-950/95 backdrop-blur-sm">
+
+        <div class="flex items-center border-b border-white/5 px-2 justify-between">
+            <div class="flex items-center">
+                <button data-active data-toolbar-tab="request" class="data-active:border-yellow-500 px-4 py-2.5 -mb-px cursor-pointer border-b border-transparent hover:border-yellow-600" type="button">Request</button>
+                {% if request.session is defined %}
+                <button data-toolbar-tab="session" class="data-active:border-yellow-500 px-4 py-2.5 -mb-px cursor-pointer border-b border-transparent hover:border-yellow-600" type="button">Session</button>
+                {% endif %}
+                <button data-toolbar-tab="querystats" class="data-active:border-yellow-500 px-4 py-2.5 -mb-px cursor-pointer border-b border-transparent hover:border-yellow-600" type="button">Querystats</button>
+                {% if toolbar.metadata %}
+                <button data-toolbar-tab="metadata" class="data-active:border-yellow-500 px-4 py-2.5 -mb-px cursor-pointer border-b border-transparent hover:border-yellow-600" type="button">Metadata</button>
+                {% endif %}
+            </div>
+            <div class="px-4 flex items-center space-x-4">
+                <button title="Hide toolbar for 1 hour" class="cursor-pointer hover:text-white text-white/50" type="button" data-plaintoolbar-hideuntil>
+                    <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="w-4 h-4" viewBox="0 0 16 16">
+                        <path d="M8.515 1.019A7 7 0 0 0 8 1V0a8 8 0 0 1 .589.022zm2.004.45a7 7 0 0 0-.985-.299l.219-.976q.576.129 1.126.342zm1.37.71a7 7 0 0 0-.439-.27l.493-.87a8 8 0 0 1 .979.654l-.615.789a7 7 0 0 0-.418-.302zm1.834 1.79a7 7 0 0 0-.653-.796l.724-.69q.406.429.747.91zm.744 1.352a7 7 0 0 0-.214-.468l.893-.45a8 8 0 0 1 .45 1.088l-.95.313a7 7 0 0 0-.179-.483m.53 2.507a7 7 0 0 0-.1-1.025l.985-.17q.1.58.116 1.17zm-.131 1.538q.05-.254.081-.51l.993.123a8 8 0 0 1-.23 1.155l-.964-.267q.069-.247.12-.501m-.952 2.379q.276-.436.486-.908l.914.405q-.24.54-.555 1.038zm-.964 1.205q.183-.183.35-.378l.758.653a8 8 0 0 1-.401.432z"/>
+                        <path d="M8 1a7 7 0 1 0 4.95 11.95l.707.707A8.001 8.001 0 1 1 8 0z"/>
+                        <path d="M7.5 3a.5.5 0 0 1 .5.5v5.21l3.248 1.856a.5.5 0 0 1-.496.868l-3.5-2A.5.5 0 0 1 7 9V3.5a.5.5 0 0 1 .5-.5"/>
+                    </svg>
+                </button>
+                <button class="cursor-pointer hover:text-white text-white/50" type="button" data-plaintoolbar-expand>
+                    <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="w-4 h-4" viewBox="0 0 16 16">
+                        <path fill-rule="evenodd" d="M1.646 4.646a.5.5 0 0 1 .708 0L8 10.293l5.646-5.647a.5.5 0 0 1 .708.708l-6 6a.5.5 0 0 1-.708 0l-6-6a.5.5 0 0 1 0-.708"/>
+                    </svg>
+                </button>
+            </div>
+        </div>
+
+        <div data-resizer class="cursor-grab w-20 h-1.5 top-1 bg-white/15 rounded-full absolute top-0 left-1/2 -translate-x-1/2"></div>
+
+        <div class="overflow-auto h-[30vh] flex flex-col">
+            <div data-toolbar-tab="request" class="px-6 py-4">
+
+                {% if exception %}
+                <div class="p-2 mb-5 border-amber-500 border rounded">
+                    <div class="text-amber-500 text-lg flex justify-between items-center">
+                        <div>
+                            <span class="font-bold">Exception</span>
+                            {{ exception }}
+                        </div>
+                        <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="w-5 h-5 bi bi-exclamation-triangle-fill" viewBox="0 0 16 16">
+                            <path d="M8.982 1.566a1.13 1.13 0 0 0-1.96 0L.165 13.233c-.457.778.091 1.767.98 1.767h13.713c.889 0 1.438-.99.98-1.767zM8 5c.535 0 .954.462.9.995l-.35 3.507a.552.552 0 0 1-1.1 0L7.1 5.995A.905.905 0 0 1 8 5m.002 6a1 1 0 1 1 0 2 1 1 0 0 1 0-2"/>
+                        </svg>
+                    </div>
+                    <div class="text-amber-400 text-xs mt-3 bg-white/5 p-2 rounded overflow-auto">
+                        <pre><code>{{ exception._traceback_string }}</code></pre>
+                    </div>
+                </div>
+                {% endif %}
+
+                <dl class="text-sm grid grid-cols-1 sm:grid-cols-[max-content_1fr] sm:gap-y-2 gap-x-8">
+                    <dt>Request ID</dt>
+                    <dd class="text-sm text-white/50">{{ request.unique_id }}</dd>
+
+                    <dt>Query params</dt>
+                    <dd class="text-sm text-white/50">{{ request.query_params }}</dd>
+
+                    <dt>Method</dt>
+                    <dd class="text-sm text-white/50">{{ request.method }}</dd>
+
+                    {% if request.resolver_match %}
+                    <dt>View</dt>
+                    <dd class="text-sm text-white/50">{{ request.resolver_match.view.view_class|pprint }}</dd>
+
+                    <dt>URL pattern</dt>
+                    <dd class="text-sm text-white/50">
+                        <pre><code>{{ request.resolver_match.route }}</code></pre>
+                    </dd>
+
+                    <dt>URL name</dt>
+                    <dd class="text-sm text-white/50">
+                        <pre><code>{{ request.resolver_match.namespaced_url_name }}</code></pre>
+                    </dd>
+
+                    <dt>URL args</dt>
+                    <dd class="text-sm text-white/50">
+                        <pre><code>{{ request.resolver_match.args }}</code></pre>
+                    </dd>
+
+                    <dt>URL kwargs</dt>
+                    <dd class="text-sm text-white/50">
+                        <pre><code>{{ request.resolver_match.kwargs }}</code></pre>
+                    </dd>
+                    {% endif %}
+
+                    {% if template_names is defined %}
+                    <dt>Template names</dt>
+                    <dd class="text-sm text-white/50">
+                        <pre><code>{{ template_names }}</code></pre>
+                    </dd>
+                    {% endif %}
+
+                    {% if object|default(false) %}
+                    <dt>Primary object</dt>
+                    <dd class="text-sm text-white/50 inline-flex items-center" title="PK: {{ object.pk|default('unknown') }}">
+                        <pre><code>{{ object.__repr__() }}</code></pre>
+                        {% if object|get_admin_model_detail_url %}
+                        <a class="ml-2 inline-flex items-center p-1 text-blue-500 hover:text-blue-400" href="{{ object|get_admin_model_detail_url }}">
+                            <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="w-3 h-3 bi bi-database-fill" viewBox="0 0 16 16">
+                                <path d="M3.904 1.777C4.978 1.289 6.427 1 8 1s3.022.289 4.096.777C13.125 2.245 14 2.993 14 4s-.875 1.755-1.904 2.223C11.022 6.711 9.573 7 8 7s-3.022-.289-4.096-.777C2.875 5.755 2 5.007 2 4s.875-1.755 1.904-2.223"/>
+                                <path d="M2 6.161V7c0 1.007.875 1.755 1.904 2.223C4.978 9.71 6.427 10 8 10s3.022-.289 4.096-.777C13.125 8.755 14 8.007 14 7v-.839c-.457.432-1.004.751-1.49.972C11.278 7.693 9.682 8 8 8s-3.278-.307-4.51-.867c-.486-.22-1.033-.54-1.49-.972"/>
+                                <path d="M2 9.161V10c0 1.007.875 1.755 1.904 2.223C4.978 12.711 6.427 13 8 13s3.022-.289 4.096-.777C13.125 11.755 14 11.007 14 10v-.839c-.457.432-1.004.751-1.49.972-1.232.56-2.828.867-4.51.867s-3.278-.307-4.51-.867c-.486-.22-1.033-.54-1.49-.972"/>
+                                <path d="M2 12.161V13c0 1.007.875 1.755 1.904 2.223C4.978 15.711 6.427 16 8 16s3.022-.289 4.096-.777C13.125 14.755 14 14.007 14 13v-.839c-.457.432-1.004.751-1.49.972-1.232.56-2.828.867-4.51.867s-3.278-.307-4.51-.867c-.486-.22-1.033-.54-1.49-.972"/>
+                            </svg>
+                        </a>
+                        {% endif %}
+                    </dd>
+                    {% endif %}
+
+                </dl>
+            </div>
+
+            {% if request.session is defined %}
+            <div data-toolbar-tab="session" style="display: none;">
+                <div class="px-6 py-4">
+                    <dl class="text-sm grid grid-cols-1 sm:grid-cols-[max-content_1fr] sm:gap-y-2 gap-x-8">
+                        <dt>Session ID</dt>
+                        <dd class="text-sm text-white/50">{{ request.session.session_key }}</dd>
+
+                        {% for k, v in request.session.items() %}
+                        <dt>session["{{ k }}"]</dt>
+                        <dd class="text-sm text-white/50 max-h-32 overflow-auto">
+                            {% if v is iterable and not v|string %}
+                            <pre><code>{{ v }}</code></pre>
+                            {% else %}
+                            {{ v }}
+                            {% endif %}
+                        </dd>
+                        {% endfor %}
+                    </dl>
+                </div>
+            </div>
+            {% endif %}
+
+            <div data-toolbar-tab="querystats" style="display: none;" class="h-full">
+                <div id="querystats-container" class="h-full">
+                    <div class="px-6 py-4 text-center">
+                        <p>Loading querystats...</p>
+                    </div>
+                </div>
+                <script>
+                (function() {
+                    var container = document.getElementById('querystats-container');
+                    var loaded = false;
+                    var parent = container.parentNode;
+                    var observer = new IntersectionObserver(function(entries) {
+                        entries.forEach(function(entry) {
+                            if (entry.isIntersecting && !loaded) {
+                                loaded = true;
+                                var iframe = document.createElement('iframe');
+                                iframe.src = "{{ url('admin:querystats:querystats') }}";
+                                iframe.frameBorder = "0";
+                                iframe.style.width = "100%";
+                                iframe.style.height = "100%";
+                                container.innerHTML = '';
+                                container.appendChild(iframe);
+                                observer.disconnect();
+                            }
+                        });
+                    }, { root: parent, threshold: 0 });
+                    observer.observe(container);
+                })();
+                </script>
+            </div>
+
+            {% if toolbar.metadata %}
+            <div data-toolbar-tab="metadata" style="display: none;">
+                <div class="px-6 py-4">
+                    <dl class="text-sm grid grid-cols-1 sm:grid-cols-[max-content_1fr] sm:gap-y-2 gap-x-8">
+                        {% for k, v in toolbar.metadata.items() %}
+                        <dt>{{ k }}</dt>
+                        <dd class="text-sm text-white/50 max-h-32 overflow-auto">
+                            {% if v is iterable and not v|string %}
+                            <pre><code>{{ v }}</code></pre>
+                            {% else %}
+                            {{ v }}
+                            {% endif %}
+                        </dd>
+                        {% endfor %}
+                    </dl>
+                </div>
+            </div>
+            {% endif %}
+        </div>
+
+    </div>
+
+    <div class="flex px-3 text-xs border-t border-white/5 space-x-4 py-2 bg-stone-950 shadow-xl">
         <div class="flex items-center">
-            <code class="ml-1.5 text-xs whitespace-nowrap text-mono">{{ toolbar.version }}</code>
+            <code class="ml-1.5 bg-white/10 px-1.5 rounded-sm whitespace-nowrap text-mono">{{ toolbar.version }}</code>
 
             {% if request.impersonator is defined %}
             <div class="flex items-center ml-1 font-light">
@@ -18,69 +207,39 @@
             </div>
             {% endif %}
         </div>
+        <button type="button" data-plaintoolbar-expand class="flex-grow cursor-pointer"></button>
         <div class="flex items-center space-x-4">
             {% include "querystats/toolbar.html" %}
 
             <div class="flex items-center space-x-3 transition-all">
-                <a href="{{ url('admin:index') }}" class="hover:underline">Admin</a>
-                {% if object|default(false) and object|get_admin_model_detail_url %}
-                <a class="inline-flex items-center p-1 text-blue-500 hover:text-blue-400" href="{{ object|get_admin_model_detail_url }}">
-                    <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="w-3 h-3 bi bi-database-fill" viewBox="0 0 16 16">
-                        <path d="M3.904 1.777C4.978 1.289 6.427 1 8 1s3.022.289 4.096.777C13.125 2.245 14 2.993 14 4s-.875 1.755-1.904 2.223C11.022 6.711 9.573 7 8 7s-3.022-.289-4.096-.777C2.875 5.755 2 5.007 2 4s.875-1.755 1.904-2.223"/>
-                        <path d="M2 6.161V7c0 1.007.875 1.755 1.904 2.223C4.978 9.71 6.427 10 8 10s3.022-.289 4.096-.777C13.125 8.755 14 8.007 14 7v-.839c-.457.432-1.004.751-1.49.972C11.278 7.693 9.682 8 8 8s-3.278-.307-4.51-.867c-.486-.22-1.033-.54-1.49-.972"/>
-                        <path d="M2 9.161V10c0 1.007.875 1.755 1.904 2.223C4.978 12.711 6.427 13 8 13s3.022-.289 4.096-.777C13.125 11.755 14 11.007 14 10v-.839c-.457.432-1.004.751-1.49.972-1.232.56-2.828.867-4.51.867s-3.278-.307-4.51-.867c-.486-.22-1.033-.54-1.49-.972"/>
-                        <path d="M2 12.161V13c0 1.007.875 1.755 1.904 2.223C4.978 15.711 6.427 16 8 16s3.022-.289 4.096-.777C13.125 14.755 14 14.007 14 13v-.839c-.457.432-1.004.751-1.49.972-1.232.56-2.828.867-4.51.867s-3.278-.307-4.51-.867c-.486-.22-1.033-.54-1.49-.972"/>
+
+                {% if exception %}
+                <button class="cursor-pointer text-amber-500 hover:text-amber-400" type="button" data-toolbar-tab="request">
+                    <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="w-4 h-4 bi bi-exclamation-triangle-fill" viewBox="0 0 16 16">
+                        <path d="M8.982 1.566a1.13 1.13 0 0 0-1.96 0L.165 13.233c-.457.778.091 1.767.98 1.767h13.713c.889 0 1.438-.99.98-1.767zM8 5c.535 0 .954.462.9.995l-.35 3.507a.552.552 0 0 1-1.1 0L7.1 5.995A.905.905 0 0 1 8 5m.002 6a1 1 0 1 1 0 2 1 1 0 0 1 0-2"/>
                     </svg>
-                </a>
+                </button>
                 {% endif %}
+
+                <a href="{{ url('admin:index') }}" class="hover:underline">Admin</a>
+
                 {% include "toolbar/links.html" ignore missing %}
-                <button data-plaintoolbar-expand class="hover:text-orange-500" type="button">
+
+                <button data-plaintoolbar-expand class="hover:text-white cursor-pointer" type="button" title="Expand toolbar">
                     <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="w-4 h-4" viewBox="0 0 16 16">
-                        <path fill-rule="evenodd" d="M3.646 9.146a.5.5 0 0 1 .708 0L8 12.793l3.646-3.647a.5.5 0 0 1 .708.708l-4 4a.5.5 0 0 1-.708 0l-4-4a.5.5 0 0 1 0-.708zm0-2.292a.5.5 0 0 0 .708 0L8 3.207l3.646 3.647a.5.5 0 0 0 .708-.708l-4-4a.5.5 0 0 0-.708 0l-4 4a.5.5 0 0 0 0 .708z"/>
+                        <path fill-rule="evenodd" d="M7.646 4.646a.5.5 0 0 1 .708 0l6 6a.5.5 0 0 1-.708.708L8 5.707l-5.646 5.647a.5.5 0 0 1-.708-.708z"/>
+                    </svg>
+                </button>
+
+                <button data-plaintoolbar-hide class="hover:text-red-500 cursor-pointer" type="button" title="Hide toolbar">
+                    <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-x w-4 h-4" viewBox="0 0 16 16">
+                        <path d="M2.146 2.854a.5.5 0 1 1 .708-.708L8 7.293l5.146-5.147a.5.5 0 0 1 .708.708L8.707 8l5.147 5.146a.5.5 0 0 1-.708.708L8 8.707l-5.146 5.147a.5.5 0 0 1-.708-.708L7.293 8z"/>
                     </svg>
                 </button>
+
             </div>
         </div>
     </div>
-    <div id="plaintoolbar-details" class="{% if not exception %}hidden{% endif %} p-4 overflow-auto text-sm space-y-2">
-
-        {% if exception %}
-        <div class="p-2 border-amber-500 border rounded">
-            <div class="text-amber-500 text-lg flex justify-between items-center">
-                <div>
-                    <span class="font-bold">Exception</span>
-                    {{ exception }}
-                </div>
-                <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="w-5 h-5 bi bi-exclamation-triangle-fill" viewBox="0 0 16 16">
-                    <path d="M8.982 1.566a1.13 1.13 0 0 0-1.96 0L.165 13.233c-.457.778.091 1.767.98 1.767h13.713c.889 0 1.438-.99.98-1.767zM8 5c.535 0 .954.462.9.995l-.35 3.507a.552.552 0 0 1-1.1 0L7.1 5.995A.905.905 0 0 1 8 5m.002 6a1 1 0 1 1 0 2 1 1 0 0 1 0-2"/>
-                </svg>
-            </div>
-            <div class="text-amber-400 text-xs mt-3 bg-white/5 p-2 rounded overflow-auto">
-                <pre><code>{{ exception._traceback_string }}</code></pre>
-            </div>
-        </div>
-        {% endif %}
-
-        <table>
-            <tbody>
-            {% for k, v in toolbar.metadata.items() %}
-            <tr>
-                <td class="pr-2 font-medium whitespace-nowrap">{{ k }}</td>
-                <td class="whitespace-nowrap">{{ v }}</td>
-            </tr>
-            {% endfor %}
-            </tbody>
-        </table>
-
-        {% if object|default(false) %}
-        <div class="font-mono" title="PK: {{ object.pk|default('unknown') }}">
-            {{ object.__repr__() }}
-        </div>
-        {% endif %}
 
-        <button data-plaintoolbar-hide class="hover:text-red-500" type="button">
-            Hide toolbar for 1 hour
-        </button>
-    </div>
 </div>
 {% endif %}

plain/admin/toolbar.py

@@ -9,9 +9,7 @@ class Toolbar:
     def __init__(self, request):
         self.request = request
         self.version = settings.ADMIN_TOOLBAR_VERSION
-        self.metadata = {
-            "Request ID": request.unique_id,
-        }
+        self.metadata = {}
 
     def should_render(self):
         if settings.DEBUG:

{plain_admin-0.27.1.dist-info → plain_admin-0.28.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plain.admin
-Version: 0.27.1
+Version: 0.28.0
 Summary: Admin dashboard and tools for Plain.
 Author-email: Dave Gaeddert <dave.gaeddert@dropseed.dev>
 License-Expression: BSD-3-Clause

{plain_admin-0.27.1.dist-info → plain_admin-0.28.0.dist-info}/RECORD

@@ -5,7 +5,7 @@ plain/admin/dates.py,sha256=EEhcQhHt3-k6kE9yvPdH5X6EecmUQ259xywbDBec3Dg,10253
 plain/admin/default_settings.py,sha256=S22r8JtwY-ArlNO4waBOrnRfb2qPbUQ5VSP6niJRzZw,145
 plain/admin/middleware.py,sha256=k3yP1o3CzvLiZZSoxqq-DvAZlp4sICRauaT-kD3FJKM,398
 plain/admin/templates.py,sha256=0xgMQmJEbh5U45ZlN2f15Xs42Y2A_lSS-_wdMp1BeD4,854
-plain/admin/toolbar.py,sha256=doW1Eg9rYfLZulRTAyFACDaUDi2xkDlsdVABzCQKHG4,979
+plain/admin/toolbar.py,sha256=GrIy_Kdm1KVRkOq4fKmzCfmTcXzoe6vcC3LBG4hEFoM,925
 plain/admin/urls.py,sha256=sriMi2RCkcrkjCX3CIIP1-Qzs_zDm2pxXeOw28vc7Y4,1301
 plain/admin/assets/admin/admin.css,sha256=Gu6GpRymJriFitAaKh_P5Sm8ZKrX9jdw6Uflxgypff8,2786
 plain/admin/assets/admin/admin.js,sha256=2-o4g6EtiiF2HGZIKfnVkC8shXFjY1xFSehDlR9550s,2852
@@ -14,7 +14,7 @@ plain/admin/assets/admin/jquery-3.6.1.slim.min.js,sha256=W2eb4M1jdKpuZ_-_KnDgqI9
 plain/admin/assets/admin/list.js,sha256=_DPneRvk3VSzjVzfEaxyif4vLD75sCWz7bkHYp89uL8,1826
 plain/admin/assets/admin/popper.min.js,sha256=SgCxkjQZdrt2puqn62YUu9hknpCBGBEAy9uhQ9PPZaI,20083
 plain/admin/assets/admin/tippy-bundle.umd.min.js,sha256=oVWBpeGTKMG_iBWGkQF02JnGIMFPYuFqTjUWeJY3pZ0,25668
-plain/admin/assets/toolbar/toolbar.js,sha256=kRCQ37iQNklzBjjBeHSeBU39mLpQ4Q0pnC3cdbQAy28,1636
+plain/admin/assets/toolbar/toolbar.js,sha256=lT63RDzAxHn95IaVl7Wx4ycAaOUjS_IVeCCYiK3iRkc,5265
 plain/admin/cards/__init__.py,sha256=8NfWrguyJRriJFUc3_QeGaDILhgeU3d1aXktzIuAR1E,172
 plain/admin/cards/base.py,sha256=ESYY0tX3OossyZi9ubCrLxwxUZ0Z3snZUCVmLvTIg-U,2247
 plain/admin/cards/charts.py,sha256=uUNO_uN_GVdkwYNSTx1bt1j2L-89rEyIg0vDaxP-9NE,4929
@@ -29,10 +29,10 @@ plain/admin/impersonate/urls.py,sha256=s8bwi8qPueKCCYcLW75p-hPFkBKhm2AMi6AQKQcZs
 plain/admin/impersonate/views.py,sha256=PzVmzhlS0LmbHgxdLhc2G27ltvk3zgmO-3QWNAcD-l0,807
 plain/admin/querystats/README.md,sha256=ONscu4dQOVe20CPHFyI8vR8iL2kvo3cOM8iwVO-lDyM,4821
 plain/admin/querystats/__init__.py,sha256=VmP1aQ5Pviq4Z3izCB8G9g0Weq-2SYR88UFNtwqAPpo,81
-plain/admin/querystats/core.py,sha256=kh45lRPEv9lYiTDNI_srrfoJue48v3kcrBNbOIHYCmw,4480
-plain/admin/querystats/middleware.py,sha256=g5Ld-Xx1eKq1AfED4oBHNkuhr5nUL1ILrzTv_tQVlPY,3528
+plain/admin/querystats/core.py,sha256=g7Iz8i4J7CUFL_HqTneoBKpJcVUxsAzLCPlqdX2cKTU,4430
+plain/admin/querystats/middleware.py,sha256=4Y3AE7CSsNkCgvQ0xtp6KkKxB4yc3eDjOcJBH479hFw,3478
 plain/admin/querystats/urls.py,sha256=H8wMpqKBnXqA8ZsdwdxTKQguNYJ0JsMRqqMunccBm2I,198
-plain/admin/querystats/views.py,sha256=bt6GKEbvqYb1HFhVOXHUbZErmjQMuvAIC5a3Mb5Pfuw,1754
+plain/admin/querystats/views.py,sha256=noSElnwo3DhRL9a77rwaDDZ16HMLRqeUf4MsW4gHjqU,2582
 plain/admin/templates/admin/base.html,sha256=npIwsxHa7Gf5FYTmsXfgSor2bbYIWwTSk0-UFmnqmfE,8481
 plain/admin/templates/admin/delete.html,sha256=lNuU2G-BR6TH6NUmh7VcvjnEuFeI84rwwk_oO1jkUq0,431
 plain/admin/templates/admin/detail.html,sha256=AizpXs6HguFzwbk7JDbH8poJB5dM2CaVVaQ4FThAHaw,730
@@ -66,9 +66,9 @@ plain/admin/templates/elements/admin/SelectField.html,sha256=P2-vXifOs2-ie20AgLy
 plain/admin/templates/elements/admin/Submit.html,sha256=1Lgn3Du9rXplbM3V12z2JckSaiWPlPGLP48xIZ887AA,150
 plain/admin/templates/elements/admin/Textarea.html,sha256=nCSaGa9t5A5Oj6ZPWW-jSJiGqI1NLPahhXJblq62QME,363
 plain/admin/templates/elements/admin/TextareaField.html,sha256=4IOJapBNEfhUpMkkLW-gliIefZCEMn5aKyW4QagfcNw,223
-plain/admin/templates/querystats/querystats.html,sha256=oeDswOjN_11weKsj_x1iOKyTucyU1X7aL1vvxqhIUMc,5088
-plain/admin/templates/querystats/toolbar.html,sha256=JFuG97PackHuhRFxnOHEiKGMa_gmCsy3l4PotrwKt9Q,4369
-plain/admin/templates/toolbar/toolbar.html,sha256=KcGAG6kRmx60wfqEsdD5C4nDMilH-JvPjHoU6EktfaY,5985
+plain/admin/templates/querystats/querystats.html,sha256=ie6_z5f2Vd0Z6EIwzlu7nE-QzjlcVEdjOeM7hsE5G2A,7385
+plain/admin/templates/querystats/toolbar.html,sha256=mvERfzU-CdzIBS7aQNosazSeCe9iyDOsswCGFxssdXc,4319
+plain/admin/templates/toolbar/toolbar.html,sha256=AKISfakxIrjOTEmPsDI58hXpNthQQjSuSe444bSddIA,15561
 plain/admin/views/__init__.py,sha256=nF6AENZ3Xxyi08OTRrF6e-HYBkZSFj7XBK2mVzMYqN4,846
 plain/admin/views/base.py,sha256=S1oaMUXnMOwRozbn2K-tk9tL4BMimemfMagZD9QxrJw,3512
 plain/admin/views/models.py,sha256=DAv7YzeSyQHLLAVdUhSPCkmx2B10g5ksAjHm2jrgQfw,5973
@@ -76,7 +76,7 @@ plain/admin/views/objects.py,sha256=eKL8A2B1ZMgTrCbTXnh6vCeju_HObxwetn_xc1vYlfY,
 plain/admin/views/registry.py,sha256=Lxib4YSQCMHb_zACnLKymJakV8jCZPWYll7J8-aV9Xw,3712
 plain/admin/views/types.py,sha256=ONMMdUoapgMoUVYgSIe-4YCdfvaVMQ4jgPWYiMo0pDk,178
 plain/admin/views/viewsets.py,sha256=dqMlQ6kLn9iqd9BwBWAZT1S271wH1FdfM5HXbOgBMEw,1655
-plain_admin-0.27.1.dist-info/METADATA,sha256=CNTq99YxmZ1mso29n54YdPJ6wOdQQw6TRajtUIEVA2c,4237
-plain_admin-0.27.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-plain_admin-0.27.1.dist-info/licenses/LICENSE,sha256=cvKM3OlqHx3ijD6e34zsSUkPvzl-ya3Dd63A6EHL94U,1500
-plain_admin-0.27.1.dist-info/RECORD,,
+plain_admin-0.28.0.dist-info/METADATA,sha256=svNc-LixFxD0pxyDsX5-lQGmwQjYtFvk8c4GwfjHjHo,4237
+plain_admin-0.28.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+plain_admin-0.28.0.dist-info/licenses/LICENSE,sha256=cvKM3OlqHx3ijD6e34zsSUkPvzl-ya3Dd63A6EHL94U,1500
+plain_admin-0.28.0.dist-info/RECORD,,