dj-queue 0.2.0__tar.gz → 0.2.1__tar.gz

{dj_queue-0.2.0 → dj_queue-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dj-queue
-Version: 0.2.0
+Version: 0.2.1
 Summary: Database-backed task queue backend for Django's django.tasks framework
 License-Expression: MIT
 License-File: LICENSE

{dj_queue-0.2.0 → dj_queue-0.2.1}/dj_queue/admin.py

@@ -29,10 +29,25 @@ from dj_queue.models import (
 
 
 class DjQueueFirstAdminSite(admin.AdminSite):
+  def _dashboard_app_url(self):
+    return reverse("admin:dj_queue_dashboard_changelist", current_app=self.name)
+
   def get_app_list(self, request, app_label=None):
     app_list = super().get_app_list(request, app_label=app_label)
+    for app in app_list:
+      if app["app_label"] == "dj_queue":
+        app["app_url"] = self._dashboard_app_url()
     return sorted(app_list, key=lambda app: app["app_label"] != "dj_queue")
 
+  def app_index(self, request, app_label, extra_context=None):
+    if app_label == "dj_queue":
+      url = self._dashboard_app_url()
+      query = request.GET.urlencode()
+      if query:
+        url = f"{url}?{query}"
+      return HttpResponseRedirect(url)
+    return super().app_index(request, app_label, extra_context=extra_context)
+
 
 admin.site.__class__ = DjQueueFirstAdminSite
 
@@ -175,10 +190,25 @@ class HiddenSidebarAdminMixin:
   backend_query_param = "backend"
   backend_filter_field = None
   ignored_filter_params = ()
+  change_list_template = "admin/dj_queue/change_list.html"
+  change_form_template = "admin/dj_queue/change_form.html"
 
   def get_list_filter(self, request):
     return (BackendListFilter, *tuple(super().get_list_filter(request)))
 
+  def changelist_view(self, request, extra_context=None):
+    extra_context = {**(extra_context or {}), "dashboard_url": self._dashboard_url(request)}
+    return super().changelist_view(request, extra_context=extra_context)
+
+  def changeform_view(self, request, object_id=None, form_url="", extra_context=None):
+    extra_context = {**(extra_context or {}), "dashboard_url": self._dashboard_url(request)}
+    return super().changeform_view(
+      request,
+      object_id=object_id,
+      form_url=form_url,
+      extra_context=extra_context,
+    )
+
   def has_add_permission(self, request):
     return False
 
@@ -239,6 +269,9 @@ class HiddenSidebarAdminMixin:
   def _backend_database_alias(self, request):
     return get_database_alias(self._backend_alias(request))
 
+  def _dashboard_url(self, request):
+    return f"{reverse('admin:dj_queue_dashboard_changelist')}?{urlencode({'backend': self._backend_alias(request)})}"
+
 
 class JobStatusListFilter(admin.SimpleListFilter):
   title = "status"

{dj_queue-0.2.0 → dj_queue-0.2.1}/dj_queue/apps.py

@@ -3,4 +3,4 @@ from django.apps import AppConfig
 
 class DjQueueConfig(AppConfig):
   name = "dj_queue"
-  verbose_name = "dj queue"
+  verbose_name = "dj_queue"

{dj_queue-0.2.0 → dj_queue-0.2.1}/dj_queue/dashboard.py

@@ -962,6 +962,7 @@ def _overview_headers(
     explicit_sort=explicit_sort,
     page_param=page_param,
     anchor=anchor,
+    preserve_anchor=True,
   )
 
 
@@ -974,11 +975,12 @@ def _queue_page_headers(*, state, query_params, sort, explicit_sort, page_param,
     explicit_sort=explicit_sort,
     page_param=page_param,
     anchor=anchor,
+    preserve_anchor=False,
   )
 
 
 def _sortable_headers(
-  *, fields, query_params, sort_param, sort, explicit_sort, page_param, anchor
+  *, fields, query_params, sort_param, sort, explicit_sort, page_param, anchor, preserve_anchor
 ):
   sort_fields = _parse_sort_fields(sort) if explicit_sort else ()
 
@@ -1021,6 +1023,7 @@ def _sortable_headers(
       sort_value=primary_sort,
       page_param=page_param,
       anchor=anchor,
+      preserve_anchor=preserve_anchor,
     )
     toggle_url = (
       _overview_sort_url(
@@ -1029,6 +1032,7 @@ def _sortable_headers(
         sort_value=toggle_sort,
         page_param=page_param,
         anchor=anchor,
+        preserve_anchor=preserve_anchor,
       )
       if is_sorted
       else primary_url
@@ -1040,6 +1044,7 @@ def _sortable_headers(
         sort_value=remove_sort,
         page_param=page_param,
         anchor=anchor,
+        preserve_anchor=preserve_anchor,
       )
       if is_sorted
       else None
@@ -1073,7 +1078,9 @@ def _queue_result_count_text(*, page_obj, total_count):
   return f"{page_obj.start_index()}-{page_obj.end_index()} of {total_count} jobs"
 
 
-def _overview_sort_url(*, query_params, sort_param, sort_value, page_param, anchor):
+def _overview_sort_url(
+  *, query_params, sort_param, sort_value, page_param, anchor, preserve_anchor
+):
   params = query_params.copy()
   if sort_value:
     params[sort_param] = sort_value
@@ -1082,8 +1089,8 @@ def _overview_sort_url(*, query_params, sort_param, sort_value, page_param, anch
   params.pop(page_param, None)
   url = params.urlencode() if hasattr(params, "urlencode") else urlencode(params, doseq=True)
   if not url:
-    return f"?#{anchor}"
-  return f"?{url}#{anchor}"
+    return f"?#{anchor}" if preserve_anchor else "?"
+  return f"?{url}#{anchor}" if preserve_anchor else f"?{url}"
 
 
 def _queue_rows(*, backend_alias, now, process_cutoff):

dj_queue-0.2.1/dj_queue/templates/admin/dj_queue/change_form.html

@@ -0,0 +1,12 @@
+{% extends "admin/change_form.html" %}
+
+{% load i18n admin_urls %}
+
+{% block breadcrumbs %}
+  <div class="breadcrumbs">
+    <a href='{% url "admin:index" %}'>{% translate "Home" %}</a>
+    › <a href="{{ dashboard_url }}">dj_queue</a>
+    › {% if has_view_permission %}<a href="{% url opts|admin_urlname:'changelist' %}">{{ opts.verbose_name_plural|capfirst }}</a>{% else %}{{ opts.verbose_name_plural|capfirst }}{% endif %}
+    › {% if add %}{% blocktranslate with name=opts.verbose_name %}Add {{ name }}{% endblocktranslate %}{% else %}{{ original|truncatewords:"18" }}{% endif %}
+  </div>
+{% endblock breadcrumbs %}

dj_queue-0.2.1/dj_queue/templates/admin/dj_queue/change_list.html

@@ -0,0 +1,11 @@
+{% extends "admin/change_list.html" %}
+
+{% load i18n %}
+
+{% block breadcrumbs %}
+  <div class="breadcrumbs">
+    <a href='{% url "admin:index" %}'>{% translate "Home" %}</a>
+    › <a href="{{ dashboard_url }}">dj_queue</a>
+    › {{ cl.opts.verbose_name_plural|capfirst }}
+  </div>
+{% endblock breadcrumbs %}

{dj_queue-0.2.0 → dj_queue-0.2.1}/dj_queue/templates/admin/dj_queue/dashboard.html

@@ -7,6 +7,8 @@
   <link rel="stylesheet" type="text/css" href="{% static 'admin/css/changelists.css' %}">
   <style>
     #content-main.djq-dashboard {
+      --djq-status-live-fg: #0b6b2d;
+      --djq-status-stale-fg: #8a4b00;
       width: 100%;
       max-width: 100%;
       min-width: 0;
@@ -16,6 +18,18 @@
       box-sizing: border-box;
     }
 
+    @media (prefers-color-scheme: dark) {
+      html:not([data-theme="light"]) #content-main.djq-dashboard {
+        --djq-status-live-fg: #7ad7a2;
+        --djq-status-stale-fg: #ffbf69;
+      }
+    }
+
+    html[data-theme="dark"] #content-main.djq-dashboard {
+      --djq-status-live-fg: #7ad7a2;
+      --djq-status-stale-fg: #ffbf69;
+    }
+
     .djq-hero,
     .djq-summary-grid,
     .djq-section {
@@ -30,8 +44,8 @@
       display: grid;
       gap: 1rem;
       padding: 1.25rem;
-      border: 1px solid rgba(38, 75, 94, 0.14);
-      background: linear-gradient(180deg, rgba(64, 110, 135, 0.06), rgba(64, 110, 135, 0.02));
+      border: 1px solid var(--hairline-color);
+      background: var(--darkened-bg);
     }
 
     .djq-hero-main {
@@ -43,7 +57,7 @@
     p.djq-eyebrow {
       padding: 0;
       margin: 0;
-      color: #406e87;
+      color: var(--link-fg);
       font-size: 0.78rem;
       font-weight: 700;
       letter-spacing: 0.08em;
@@ -60,7 +74,7 @@
       max-width: 44rem;
       padding: 0;
       margin: 0;
-      color: #4c5b66;
+      color: var(--body-quiet-color);
       font-size: 0.95rem;
       line-height: 1.5;
     }
@@ -69,8 +83,8 @@
       display: grid;
       gap: 0.9rem;
       padding: 1rem;
-      border: 1px solid rgba(38, 75, 94, 0.12);
-      background: rgba(255, 255, 255, 0.84);
+      border: 1px solid var(--hairline-color);
+      background: var(--body-bg);
       min-width: 0;
     }
 
@@ -88,7 +102,7 @@
     }
 
     .djq-backend-switch label {
-      color: #264b5e;
+      color: var(--link-selected-fg);
       font-size: 0.78rem;
       font-weight: 700;
       letter-spacing: 0.06em;
@@ -107,7 +121,7 @@
     p.djq-backend-caption {
       padding: 0;
       margin: 0;
-      color: #4c5b66;
+      color: var(--body-quiet-color);
       font-size: 0.86rem;
       line-height: 1.45;
     }
@@ -126,7 +140,7 @@
 
     .djq-backend-facts dt {
       margin: 0;
-      color: #4c5b66;
+      color: var(--body-quiet-color);
       font-size: 0.76rem;
       font-weight: 700;
       letter-spacing: 0.06em;
@@ -135,7 +149,7 @@
 
     .djq-backend-facts dd {
       margin: 0.2rem 0 0;
-      color: #1f1f1f;
+      color: var(--body-fg);
       font-size: 0.95rem;
       line-height: 1.3;
       word-break: break-word;
@@ -143,8 +157,8 @@
 
     .djq-raw-panel {
       padding: 0.95rem 1rem;
-      border: 1px solid rgba(38, 75, 94, 0.12);
-      background: rgba(255, 255, 255, 0.82);
+      border: 1px solid var(--hairline-color);
+      background: var(--body-bg);
       min-width: 0;
     }
 
@@ -182,7 +196,7 @@
     .djq-raw-group h3 {
       padding: 0;
       margin: 0;
-      color: #4c5b66;
+      color: var(--body-quiet-color);
       font-size: 0.78rem;
       font-weight: 700;
       letter-spacing: 0.08em;
@@ -232,8 +246,8 @@
     }
 
     .djq-summary-card {
-      border: 1px solid rgba(38, 75, 94, 0.12);
-      background: rgba(255, 255, 255, 0.9);
+      border: 1px solid var(--hairline-color);
+      background: var(--body-bg);
       min-width: 0;
     }
 
@@ -250,12 +264,12 @@
       font-size: 1.7rem;
       font-weight: 700;
       line-height: 1.1;
-      color: #1f1f1f;
+      color: var(--body-fg);
     }
 
     .djq-summary-detail {
       margin-top: 0.35rem;
-      color: #4c5b66;
+      color: var(--body-quiet-color);
       font-size: 0.88rem;
     }
 
@@ -276,18 +290,18 @@
       display: block;
       width: 100%;
       padding: 0.5rem;
-      background: #4f82a0;
-      color: #fff;
+      background: var(--primary);
+      color: var(--primary-fg);
       box-sizing: border-box;
     }
 
     .djq-section-copy {
       margin: 0;
       padding: 0.5rem;
-      color: #4c5b66;
+      color: var(--body-quiet-color);
       font-size: 0.9rem;
       line-height: 1.45;
-      border-bottom: 1px solid rgba(38, 75, 94, 0.08);
+      border-bottom: 1px solid var(--hairline-color);
     }
 
     .djq-table-wrap {
@@ -354,7 +368,7 @@
     }
 
     .djq-process-row-group {
-      background: rgba(38, 75, 94, 0.04);
+      background: var(--selected-bg);
     }
 
     .djq-process-row-child th:first-child {
@@ -369,25 +383,25 @@
       top: 0.7rem;
       bottom: 0.7rem;
       width: 2px;
-      background: rgba(38, 75, 94, 0.16);
+      background: var(--border-color);
     }
 
     .djq-process-meta {
       display: block;
       margin-top: 0.15rem;
-      color: #4c5b66;
+      color: var(--body-quiet-color);
       font-size: 0.78rem;
       font-weight: 400;
       white-space: normal;
     }
 
     .djq-status-live {
-      color: #0b6b2d;
+      color: var(--djq-status-live-fg);
       font-weight: 700;
     }
 
     .djq-status-stale {
-      color: #8a4b00;
+      color: var(--djq-status-stale-fg);
       font-weight: 700;
     }
 
@@ -416,7 +430,7 @@
     .djq-empty {
       margin: 0;
       padding: 1rem;
-      color: #4c5b66;
+      color: var(--body-quiet-color);
       font-size: 0.86rem;
       line-height: 1.45;
     }

{dj_queue-0.2.0 → dj_queue-0.2.1}/dj_queue/templates/admin/dj_queue/queue_jobs.html

@@ -6,6 +6,29 @@
   {{ block.super }}
   <link rel="stylesheet" type="text/css" href="{% static 'admin/css/changelists.css' %}">
   <style>
+    #content-main {
+      --djq-tab-selected-bg: var(--primary);
+      --djq-tab-selected-border: var(--primary);
+      --djq-tab-selected-fg: var(--primary-fg);
+      --djq-tab-selected-count-fg: var(--breadcrumbs-link-fg);
+    }
+
+    @media (prefers-color-scheme: dark) {
+      html:not([data-theme="light"]) #content-main {
+        --djq-tab-selected-bg: var(--selected-row);
+        --djq-tab-selected-border: var(--link-selected-fg);
+        --djq-tab-selected-fg: var(--body-fg);
+        --djq-tab-selected-count-fg: var(--body-quiet-color);
+      }
+    }
+
+    html[data-theme="dark"] #content-main {
+      --djq-tab-selected-bg: var(--selected-row);
+      --djq-tab-selected-border: var(--link-selected-fg);
+      --djq-tab-selected-fg: var(--body-fg);
+      --djq-tab-selected-count-fg: var(--body-quiet-color);
+    }
+
     #toolbar .queue-toolbar-row,
     #toolbar .queue-toolbar-meta,
     #toolbar .queue-toolbar-links,
@@ -78,12 +101,71 @@
       margin-top: 0.5rem;
     }
 
-    .queue-state-tabs {
-      padding-bottom: 5px;
+    .toplinks.queue-state-tabs {
+      gap: 1rem;
+      margin-top: 0.75rem;
+      padding: 0.45rem;
+      border: 1px solid var(--hairline-color);
+      background: var(--darkened-bg);
+    }
+
+    .queue-state-tab {
+      display: inline-flex;
+      gap: 0.4rem;
+      align-items: center;
+      min-height: 2.15rem;
+      padding: 0 0.9rem;
+      border: 1px solid var(--border-color);
+      border-radius: 999px;
+      background: var(--body-bg);
+      color: var(--link-fg);
+      font-weight: 600;
+      text-decoration: none;
+      transition: background-color 0.15s ease, border-color 0.15s ease, box-shadow 0.15s ease, color 0.15s ease;
+    }
+
+    #changelist .queue-state-tabs a.queue-state-tab,
+    #changelist .queue-state-tabs a.queue-state-tab:hover,
+    #changelist .queue-state-tabs a.queue-state-tab:focus,
+    #changelist .queue-state-tabs a.queue-state-tab:visited {
+      text-decoration: none;
+    }
+
+    .queue-state-tab:not(.queue-state-tab-current):hover,
+    .queue-state-tab:not(.queue-state-tab-current):focus {
+      background: var(--selected-bg);
+      border-color: var(--primary);
+      color: var(--link-hover-color);
+      text-decoration: none;
+    }
+
+    .queue-state-tab-current {
+      background: var(--djq-tab-selected-bg);
+      border-color: var(--djq-tab-selected-border);
+      color: var(--djq-tab-selected-fg);
+      box-shadow: none;
+    }
+
+    .queue-state-tab-current:hover,
+    .queue-state-tab-current:focus {
+      background: var(--djq-tab-selected-bg);
+      border-color: var(--djq-tab-selected-border);
+      color: var(--djq-tab-selected-fg);
+    }
+
+    .queue-state-tab-count {
+      color: var(--body-quiet-color);
+      font-size: 0.82rem;
+      font-weight: 700;
+    }
+
+    .queue-state-tab-current .queue-state-tab-count {
+      color: var(--djq-tab-selected-count-fg);
     }
 
-    .queue-state-current {
-      color: var(--link-selected-fg);
+    .queue-state-tab-current:hover .queue-state-tab-count,
+    .queue-state-tab-current:focus .queue-state-tab-count {
+      color: var(--djq-tab-selected-count-fg);
     }
 
     #result_list {
@@ -104,7 +186,7 @@
 {% block breadcrumbs %}
   <div class="breadcrumbs">
     <a href="{% url 'admin:index' %}">Home</a>
-    › <a href="{% url 'admin:dj_queue_dashboard_changelist' %}?backend={{ backend_alias }}">dj queue</a>
+    › <a href="{% url 'admin:dj_queue_dashboard_changelist' %}?backend={{ backend_alias }}">dj_queue</a>
     › {{ queue_name }}
   </div>
 {% endblock breadcrumbs %}
@@ -150,12 +232,18 @@
             {% endif %}
           </div>
 
-          <div class="toplinks queue-state-tabs">
+          <div class="toplinks queue-state-tabs" aria-label="Job state navigation">
             {% for tab in state_tabs %}
               {% if tab.selected %}
-                <span class="queue-state-current">{{ tab.label }} ({{ tab.count }})</span>
+                <span class="queue-state-tab queue-state-tab-current" aria-current="page">
+                  <span>{{ tab.label }}</span>
+                  <span class="queue-state-tab-count">{{ tab.count }}</span>
+                </span>
               {% else %}
-                <a href="{% url 'admin:dj_queue_dashboard_queue' queue_name %}?backend={{ backend_alias }}&state={{ tab.name }}">{{ tab.label }} ({{ tab.count }})</a>
+                <a class="queue-state-tab" href="{% url 'admin:dj_queue_dashboard_queue' queue_name %}?backend={{ backend_alias }}&state={{ tab.name }}">
+                  <span>{{ tab.label }}</span>
+                  <span class="queue-state-tab-count">{{ tab.count }}</span>
+                </a>
               {% endif %}
             {% endfor %}
           </div>

{dj_queue-0.2.0 → dj_queue-0.2.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "uv_build"
 
 [project]
 name = "dj-queue"
-version = "0.2.0"
+version = "0.2.1"
 description = "Database-backed task queue backend for Django's django.tasks framework"
 readme = "README.md"
 license = "MIT"