save

.github/workflows/test.yml

@@ -9,7 +9,7 @@ jobs:
     strategy:
       matrix:
         python-version: ["3.11", "3.12"]
-        package: ["plain", "plain-worker", "plain-flags", "plain-sessions"]
+        package: ["plain", "plain-worker", "plain-flags", "plain-sessions", "plain-staff"]
 
     steps:
     - uses: actions/checkout@v3

.gitignore

@@ -7,3 +7,6 @@ __pycache__
 
 # Build files from poetry publish
 plain*/dist/
+
+# Test apps
+plain*/tests/.plain

plain-auth/pyproject.toml

@@ -10,7 +10,8 @@ authors = ["Dave Gaeddert <[email protected]>"]
 
 [tool.poetry.dependencies]
 python = "^3.11"
-
+"plain.models" = "<1.0.0"
+"plain.sessions" = "<1.0.0"
 
 [build-system]
 requires = ["poetry-core"]

plain-cache/plain/cache/admin.py → plain-cache/plain/cache/staff.py

@@ -1,15 +1,15 @@
 from plain.cache.models import CachedItem
-from plain.staff.admin.views import (
-    AdminModelDetailView,
-    AdminModelListView,
-    AdminModelViewset,
+from plain.staff.views import (
+    StaffModelDetailView,
+    StaffModelListView,
+    StaffModelViewset,
     register_viewset,
 )
 
 
 @register_viewset
-class CachedItemViewset(AdminModelViewset):
-    class ListView(AdminModelListView):
+class CachedItemViewset(StaffModelViewset):
+    class ListView(StaffModelListView):
         nav_section = "Cache"
         model = CachedItem
         title = "Cached items"
@@ -27,6 +27,6 @@ def get_list_queryset(self):
                 "key", "created_at", "expires_at", "updated_at"
             )
 
-    class DetailView(AdminModelDetailView):
+    class DetailView(StaffModelDetailView):
         model = CachedItem
         title = "Cached item"

plain-flags/plain/flags/admin.py → plain-flags/plain/flags/staff.py

@@ -1,12 +1,12 @@
 from functools import cached_property
 
 from plain.models.forms import ModelForm
-from plain.staff.admin.cards import Card
-from plain.staff.admin.views import (
-    AdminModelDetailView,
-    AdminModelListView,
-    AdminModelUpdateView,
-    AdminModelViewset,
+from plain.staff.cards import Card
+from plain.staff.views import (
+    StaffModelDetailView,
+    StaffModelListView,
+    StaffModelUpdateView,
+    StaffModelViewset,
     register_viewset,
 )
 
@@ -28,15 +28,15 @@ def get_text(self):
 
 
 @register_viewset
-class FlagAdmin(AdminModelViewset):
-    class ListView(AdminModelListView):
+class FlagStaff(StaffModelViewset):
+    class ListView(StaffModelListView):
         model = Flag
         fields = ["name", "enabled", "created_at__date", "used_at__date", "uuid"]
         search_fields = ["name", "description"]
         cards = [UnusedFlagsCard]
         nav_section = "Feature flags"
 
-    class DetailView(AdminModelDetailView):
+    class DetailView(StaffModelDetailView):
         model = Flag
 
 
@@ -47,8 +47,8 @@ class Meta:
 
 
 @register_viewset
-class FlagResultAdmin(AdminModelViewset):
-    class ListView(AdminModelListView):
+class FlagResultStaff(StaffModelViewset):
+    class ListView(StaffModelListView):
         model = FlagResult
         title = "Flag results"
         fields = [
@@ -65,11 +65,11 @@ class ListView(AdminModelListView):
         def get_initial_queryset(self):
             return self.model.objects.all().select_related("flag")
 
-    class DetailView(AdminModelDetailView):
+    class DetailView(StaffModelDetailView):
         model = FlagResult
         title = "Flag result"
 
-    class UpdateView(AdminModelUpdateView):
+    class UpdateView(StaffModelUpdateView):
         model = FlagResult
         title = "Update flag result"
         form_class = FlagResultForm

plain-flags/plain/flags/templates/admin/plainflags/flagresult_form.html

@@ -1,8 +1,8 @@
-{% extends "admin/form.html" %}
+{% extends "staff/form.html" %}
 
 {% block form_content %}
 <div class="space-y-4">
-    <admin.InputField label="Key" field=form.key />
-    <admin.InputField label="Value" field=form.value />
+    <staff.InputField label="Key" field=form.key />
+    <staff.InputField label="Value" field=form.value />
 </div>
 {% endblock %}

plain-oauth/plain/oauth/admin.py → plain-oauth/plain/oauth/staff.py

@@ -1,9 +1,9 @@
 from plain.models import Count
-from plain.staff.admin.cards import ChartCard
-from plain.staff.admin.views import (
-    AdminModelDetailView,
-    AdminModelListView,
-    AdminModelViewset,
+from plain.staff.cards import ChartCard
+from plain.staff.views import (
+    StaffModelDetailView,
+    StaffModelListView,
+    StaffModelViewset,
     register_viewset,
 )
 
@@ -34,14 +34,14 @@ def get_chart_data(self) -> dict:
 
 
 @register_viewset
-class OAuthConnectionViewset(AdminModelViewset):
-    class ListView(AdminModelListView):
+class OAuthConnectionViewset(StaffModelViewset):
+    class ListView(StaffModelListView):
         nav_section = "OAuth"
         model = OAuthConnection
         title = "Connections"
         fields = ["id", "user", "provider_key", "provider_user_id"]
         cards = [ProvidersChartCard]
 
-    class DetailView(AdminModelDetailView):
+    class DetailView(StaffModelDetailView):
         model = OAuthConnection
         title = "OAuth connection"

plain-passwords/plain/passwords/urls.py

@@ -1,4 +1,4 @@
-# The views used below are normally mapped in the AdminSite instance.
+# The views used below are normally mapped in the StaffSite instance.
 # This URLs file is used to provide a reliable view deployment for test purposes.
 # It is also provided as a convenience to those who want to deploy these URLs
 # elsewhere.