arthexis 0.1.19__py3-none-any.whl → 0.1.21__py3-none-any.whl

pages/context_processors.py

@@ -2,7 +2,6 @@ from utils.sites import get_site
 from django.urls import Resolver404, resolve
 from django.conf import settings
 from pathlib import Path
-from types import SimpleNamespace
 from nodes.models import Node
 from core.models import Reference
 from core.reference_utils import filter_visible_references
@@ -11,7 +10,8 @@ from .models import Module
 _FAVICON_DIR = Path(settings.BASE_DIR) / "pages" / "fixtures" / "data"
 _FAVICON_FILENAMES = {
     "default": "favicon.txt",
-    "Constellation": "favicon_constellation.txt",
+    "Watchtower": "favicon_watchtower.txt",
+    "Constellation": "favicon_watchtower.txt",
     "Control": "favicon_control.txt",
     "Satellite": "favicon_satellite.txt",
 }
@@ -48,7 +48,6 @@ def nav_links(request):
         modules = []
 
     valid_modules = []
-    datasette_enabled = False
     current_module = None
     user = getattr(request, "user", None)
     user_is_authenticated = getattr(user, "is_authenticated", False)
@@ -72,19 +71,24 @@ def nav_links(request):
             required_groups = getattr(
                 view_func, "required_security_groups", frozenset()
             )
+            blocked_reason = None
             if required_groups:
                 requires_login = True
-                setattr(landing, "requires_login", True)
                 if not user_is_authenticated:
-                    continue
-                if not user_is_superuser and not (
+                    blocked_reason = "login"
+                elif not user_is_superuser and not (
                     user_group_names & set(required_groups)
                 ):
-                    continue
+                    blocked_reason = "permission"
             elif requires_login and not user_is_authenticated:
-                setattr(landing, "requires_login", True)
-            if staff_only and not request.user.is_staff:
-                continue
+                blocked_reason = "login"
+
+            if staff_only and not getattr(request.user, "is_staff", False):
+                if blocked_reason != "login":
+                    blocked_reason = "permission"
+
+            landing.nav_is_locked = bool(blocked_reason)
+            landing.nav_lock_reason = blocked_reason
             landings.append(landing)
         if landings:
             normalized_module_path = module.path.rstrip("/") or "/"
@@ -100,7 +104,7 @@ def nav_links(request):
                     landings = [landings[0]]
             app_name = getattr(module.application, "name", "").lower()
             if app_name == "awg":
-                module.menu = "Calculate"
+                module.menu = "Calculators"
             elif module.path.rstrip("/").lower() == "/man":
                 module.menu = "Manual"
             module.enabled_landings = landings
@@ -111,15 +115,6 @@ def nav_links(request):
                 ):
                     current_module = module
 
-    datasette_lock = Path(settings.BASE_DIR) / "locks" / "datasette.lck"
-    if datasette_lock.exists():
-        datasette_enabled = True
-        datasette_module = SimpleNamespace(
-            menu_label="Data",
-            path="/data/",
-            enabled_landings=[SimpleNamespace(path="/data/", label="Datasette")],
-        )
-        valid_modules.append(datasette_module)
 
     valid_modules.sort(key=lambda m: m.menu_label.lower())
 
@@ -153,5 +148,4 @@ def nav_links(request):
         "nav_modules": valid_modules,
         "favicon_url": favicon_url,
         "header_references": header_references,
-        "datasette_enabled": datasette_enabled,
     }

pages/defaults.py

@@ -7,7 +7,7 @@ DEFAULT_APPLICATION_DESCRIPTIONS: Dict[str, str] = {
     "awg": "Power, Energy and Cost calculations.",
     "core": "Support for Business Processes and monetization.",
     "ocpp": "Compatibility with Standards and Good Practices.",
-    "nodes": "System and Node-level operations,",
+    "nodes": "System and Node-level operations.",
     "pages": "User QA, Continuity Design and Chaos Testing.",
     "teams": "Identity, Entitlements and Access Controls.",
 }

pages/module_defaults.py

@@ -10,15 +10,15 @@ LandingDefinition = tuple[str, str]
 
 
 ROLE_MODULE_DEFAULTS: Mapping[str, tuple[ModuleDefinition, ...]] = {
-    "Constellation": (
+    "Watchtower": (
         {
             "application": "ocpp",
             "path": "/ocpp/",
             "menu": "Chargers",
             "landings": (
-                ("/ocpp/", "CPMS Online Dashboard"),
-                ("/ocpp/simulator/", "Charge Point Simulator"),
-                ("/ocpp/rfid/", "RFID Tag Validator"),
+                ("/ocpp/cpms/dashboard/", "CPMS Online Dashboard"),
+                ("/ocpp/evcs/simulator/", "Charge Point Simulator"),
+                ("/ocpp/rfid/validator/", "RFID Tag Validator"),
             ),
         },
         {
@@ -26,7 +26,7 @@ ROLE_MODULE_DEFAULTS: Mapping[str, tuple[ModuleDefinition, ...]] = {
             "path": "/awg/",
             "menu": "",
             "landings": (
-                ("/awg/", "AWG Calculator"),
+                ("/awg/", "AWG Cable Calculator"),
                 ("/awg/energy-tariff/", "Energy Tariff Calculator"),
             ),
         },

pages/tests.py

@@ -3,6 +3,7 @@ import os
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "config.settings")
 
 import django
+import pytest
 
 django.setup()
 
@@ -508,6 +509,7 @@ class InvitationTests(TestCase):
         lead = InviteLead.objects.get()
         self.assertEqual(lead.mac_address, "aa:bb:cc:dd:ee:ff")
 
+    @pytest.mark.feature("ap-router")
     @patch("pages.views.public_wifi.grant_public_access")
     @patch(
         "pages.views.public_wifi.resolve_mac_address",
@@ -1360,6 +1362,7 @@ class SiteAdminRegisterCurrentTests(TestCase):
         self.assertEqual(site.name, "")
 
 
+@pytest.mark.feature("screenshot-poll")
 class SiteAdminScreenshotTests(TestCase):
     def setUp(self):
         self.client = Client()
@@ -1479,17 +1482,17 @@ class NavAppsTests(TestCase):
         )
         app = Application.objects.create(name="Readme")
         Module.objects.create(
-            node_role=role, application=app, path="/", is_default=True, menu="Cookbook"
+            node_role=role, application=app, path="/", is_default=True, menu="Cookbooks"
         )
 
     def test_nav_pill_renders(self):
         resp = self.client.get(reverse("pages:index"))
-        self.assertContains(resp, "COOKBOOK")
+        self.assertContains(resp, "COOKBOOKS")
         self.assertContains(resp, "badge rounded-pill")
 
     def test_nav_pill_renders_with_port(self):
         resp = self.client.get(reverse("pages:index"), HTTP_HOST="127.0.0.1:8000")
-        self.assertContains(resp, "COOKBOOK")
+        self.assertContains(resp, "COOKBOOKS")
 
     def test_nav_pill_uses_menu_field(self):
         site_app = Module.objects.get()
@@ -1497,7 +1500,7 @@ class NavAppsTests(TestCase):
         site_app.save()
         resp = self.client.get(reverse("pages:index"))
         self.assertContains(resp, 'badge rounded-pill text-bg-secondary">DOCS')
-        self.assertNotContains(resp, 'badge rounded-pill text-bg-secondary">COOKBOOK')
+        self.assertNotContains(resp, 'badge rounded-pill text-bg-secondary">COOKBOOKS')
 
     def test_app_without_root_url_excluded(self):
         role = NodeRole.objects.get(name="Terminal")
@@ -1562,20 +1565,22 @@ class RoleLandingRedirectTests(TestCase):
 
     def test_satellite_redirects_to_dashboard(self):
         target = self._configure_role_landing(
-            "Satellite", "/ocpp/", "CPMS Online Dashboard"
+            "Satellite", "/ocpp/cpms/dashboard/", "CPMS Online Dashboard"
         )
         resp = self.client.get(reverse("pages:index"))
         self.assertRedirects(resp, target, fetch_redirect_response=False)
 
     def test_control_redirects_to_rfid(self):
         target = self._configure_role_landing(
-            "Control", "/ocpp/rfid/", "RFID Tag Validator"
+            "Control", "/ocpp/rfid/validator/", "RFID Tag Validator"
         )
         resp = self.client.get(reverse("pages:index"))
         self.assertRedirects(resp, target, fetch_redirect_response=False)
 
     def test_security_group_redirect_takes_priority(self):
-        self._configure_role_landing("Control", "/ocpp/rfid/", "RFID Tag Validator")
+        self._configure_role_landing(
+            "Control", "/ocpp/rfid/validator/", "RFID Tag Validator"
+        )
         role = self.node.role
         group = SecurityGroup.objects.create(name="Operators")
         group_landing = self._ensure_landing(role, "/ocpp/group/", "Group Landing")
@@ -1592,7 +1597,9 @@ class RoleLandingRedirectTests(TestCase):
         )
 
     def test_user_redirect_overrides_group_with_higher_priority(self):
-        self._configure_role_landing("Control", "/ocpp/rfid/", "RFID Tag Validator")
+        self._configure_role_landing(
+            "Control", "/ocpp/rfid/validator/", "RFID Tag Validator"
+        )
         role = self.node.role
         group = SecurityGroup.objects.create(name="Operators")
         group_landing = self._ensure_landing(role, "/ocpp/group/", "Group Landing")
@@ -1614,10 +1621,10 @@ class RoleLandingRedirectTests(TestCase):
         )
 
 
-class ConstellationNavTests(TestCase):
+class WatchtowerNavTests(TestCase):
     def setUp(self):
         self.client = Client()
-        role, _ = NodeRole.objects.get_or_create(name="Constellation")
+        role, _ = NodeRole.objects.get_or_create(name="Watchtower")
         Node.objects.update_or_create(
             mac_address=Node.get_current_mac(),
             defaults={
@@ -1627,38 +1634,56 @@ class ConstellationNavTests(TestCase):
             },
         )
         Site.objects.update_or_create(
-            id=1, defaults={"domain": "testserver", "name": ""}
+            id=1, defaults={"domain": "arthexis.com", "name": "Arthexis"}
         )
         fixtures = [
             Path(
                 settings.BASE_DIR,
                 "pages",
                 "fixtures",
-                "constellation__application_ocpp.json",
+                "default__application_pages.json",
+            ),
+            Path(
+                settings.BASE_DIR,
+                "pages",
+                "fixtures",
+                "watchtower__application_ocpp.json",
+            ),
+            Path(
+                settings.BASE_DIR,
+                "pages",
+                "fixtures",
+                "watchtower__module_ocpp.json",
             ),
             Path(
                 settings.BASE_DIR,
                 "pages",
                 "fixtures",
-                "constellation__module_ocpp.json",
+                "watchtower__landing_ocpp_dashboard.json",
             ),
             Path(
                 settings.BASE_DIR,
                 "pages",
                 "fixtures",
-                "constellation__landing_ocpp_dashboard.json",
+                "watchtower__landing_ocpp_cp_simulator.json",
             ),
             Path(
                 settings.BASE_DIR,
                 "pages",
                 "fixtures",
-                "constellation__landing_ocpp_cp_simulator.json",
+                "watchtower__landing_ocpp_rfid.json",
             ),
             Path(
                 settings.BASE_DIR,
                 "pages",
                 "fixtures",
-                "constellation__landing_ocpp_rfid.json",
+                "watchtower__module_readme.json",
+            ),
+            Path(
+                settings.BASE_DIR,
+                "pages",
+                "fixtures",
+                "watchtower__landing_readme.json",
             ),
         ]
         call_command("loaddata", *map(str, fixtures))
@@ -1671,13 +1696,13 @@ class ConstellationNavTests(TestCase):
         self.assertNotIn("RFID", nav_labels)
         self.assertTrue(
             Module.objects.filter(
-                path="/ocpp/", node_role__name="Constellation"
+                path="/ocpp/", node_role__name="Watchtower"
             ).exists()
         )
         self.assertFalse(
             Module.objects.filter(
                 path="/ocpp/rfid/",
-                node_role__name="Constellation",
+                node_role__name="Watchtower",
                 is_deleted=False,
             ).exists()
         )
@@ -1689,9 +1714,16 @@ class ConstellationNavTests(TestCase):
         landing_labels = [landing.label for landing in ocpp_module.enabled_landings]
         self.assertIn("RFID Tag Validator", landing_labels)
 
+    @override_settings(ALLOWED_HOSTS=["testserver", "arthexis.com"])
+    def test_cookbooks_pill_visible_for_arthexis(self):
+        resp = self.client.get(
+            reverse("pages:index"), HTTP_HOST="arthexis.com"
+        )
+        self.assertContains(resp, 'badge rounded-pill text-bg-secondary">COOKBOOKS')
+
     def test_ocpp_dashboard_visible(self):
         resp = self.client.get(reverse("pages:index"))
-        self.assertContains(resp, 'href="/ocpp/"')
+        self.assertContains(resp, 'href="/ocpp/cpms/dashboard/"')
 
 
 class ReleaseModuleNavTests(TestCase):
@@ -1833,7 +1865,7 @@ class ControlNavTests(TestCase):
         self.client.force_login(user)
         resp = self.client.get(reverse("pages:index"))
         self.assertEqual(resp.status_code, 200)
-        self.assertContains(resp, 'href="/ocpp/"')
+        self.assertContains(resp, 'href="/ocpp/cpms/dashboard/"')
         self.assertContains(
             resp, 'badge rounded-pill text-bg-secondary">CHARGERS'
         )
@@ -1865,10 +1897,27 @@ class ControlNavTests(TestCase):
         self.assertFalse(resp.context["header_references"])
         self.assertNotContains(resp, "https://example.com/hidden")
 
+    def test_header_link_hidden_when_only_site_matches(self):
+        terminal_role, _ = NodeRole.objects.get_or_create(name="Terminal")
+        site = Site.objects.get(domain="testserver")
+        reference = Reference.objects.create(
+            alt_text="Restricted",
+            value="https://example.com/restricted",
+            show_in_header=True,
+        )
+        reference.roles.add(terminal_role)
+        reference.sites.add(site)
+
+        resp = self.client.get(reverse("pages:index"))
+
+        self.assertIn("header_references", resp.context)
+        self.assertFalse(resp.context["header_references"])
+        self.assertNotContains(resp, "https://example.com/restricted")
+
     def test_readme_pill_visible(self):
         resp = self.client.get(reverse("pages:readme"))
         self.assertContains(resp, 'href="/read/"')
-        self.assertContains(resp, 'badge rounded-pill text-bg-secondary">COOKBOOK')
+        self.assertContains(resp, 'badge rounded-pill text-bg-secondary">COOKBOOKS')
 
     def test_cookbook_pill_has_no_dropdown(self):
         module = Module.objects.get(node_role__name="Control", path="/read/")
@@ -1883,7 +1932,7 @@ class ControlNavTests(TestCase):
 
         self.assertContains(
             resp,
-            '<a class="nav-link" href="/read/"><span class="badge rounded-pill text-bg-secondary">COOKBOOK</span></a>',
+            '<a class="nav-link" href="/read/"><span class="badge rounded-pill text-bg-secondary">COOKBOOKS</span></a>',
             html=True,
         )
         self.assertNotContains(resp, 'dropdown-item" href="/man/"')
@@ -1990,7 +2039,7 @@ class SatelliteNavTests(TestCase):
     def test_readme_pill_visible(self):
         resp = self.client.get(reverse("pages:readme"))
         self.assertContains(resp, 'href="/read/"')
-        self.assertContains(resp, 'badge rounded-pill text-bg-secondary">COOKBOOK')
+        self.assertContains(resp, 'badge rounded-pill text-bg-secondary">COOKBOOKS')
 
 
 class PowerNavTests(TestCase):
@@ -2025,9 +2074,9 @@ class PowerNavTests(TestCase):
                 power_module = module
                 break
         self.assertIsNotNone(power_module)
-        self.assertEqual(power_module.menu_label.upper(), "CALCULATE")
+        self.assertEqual(power_module.menu_label.upper(), "CALCULATORS")
         landing_labels = {landing.label for landing in power_module.enabled_landings}
-        self.assertIn("AWG Calculator", landing_labels)
+        self.assertIn("AWG Cable Calculator", landing_labels)
 
     def test_manual_pill_label(self):
         resp = self.client.get(reverse("pages:index"))
@@ -2051,9 +2100,26 @@ class PowerNavTests(TestCase):
                 break
         self.assertIsNotNone(power_module)
         landing_labels = {landing.label for landing in power_module.enabled_landings}
-        self.assertIn("AWG Calculator", landing_labels)
+        self.assertIn("AWG Cable Calculator", landing_labels)
         self.assertIn("Energy Tariff Calculator", landing_labels)
 
+    def test_locked_landing_shows_lock_icon(self):
+        resp = self.client.get(reverse("pages:index"))
+        html = resp.content.decode()
+        energy_index = html.find("Energy Tariff Calculator")
+        self.assertGreaterEqual(energy_index, 0)
+        icon_index = html.find("dropdown-lock-icon", energy_index, energy_index + 300)
+        self.assertGreaterEqual(icon_index, 0)
+
+    def test_lock_icon_disappears_after_login(self):
+        self.client.force_login(self.user)
+        resp = self.client.get(reverse("pages:index"))
+        html = resp.content.decode()
+        energy_index = html.find("Energy Tariff Calculator")
+        self.assertGreaterEqual(energy_index, 0)
+        icon_index = html.find("dropdown-lock-icon", energy_index, energy_index + 300)
+        self.assertEqual(icon_index, -1)
+
 
 class StaffNavVisibilityTests(TestCase):
     def setUp(self):
@@ -2075,12 +2141,12 @@ class StaffNavVisibilityTests(TestCase):
     def test_nonstaff_pill_hidden(self):
         self.client.login(username="user", password="pw")
         resp = self.client.get(reverse("pages:index"))
-        self.assertContains(resp, 'href="/ocpp/"')
+        self.assertContains(resp, 'href="/ocpp/cpms/dashboard/"')
 
     def test_staff_sees_pill(self):
         self.client.login(username="staff", password="pw")
         resp = self.client.get(reverse("pages:index"))
-        self.assertContains(resp, 'href="/ocpp/"')
+        self.assertContains(resp, 'href="/ocpp/cpms/dashboard/"')
 
 
 class ModuleAdminReloadActionTests(TestCase):
@@ -2093,7 +2159,7 @@ class ModuleAdminReloadActionTests(TestCase):
             password="pw",
         )
         self.client.force_login(self.superuser)
-        self.role, _ = NodeRole.objects.get_or_create(name="Constellation")
+        self.role, _ = NodeRole.objects.get_or_create(name="Watchtower")
         Application.objects.get_or_create(name="ocpp")
         Application.objects.get_or_create(name="awg")
         Site.objects.update_or_create(
@@ -2131,7 +2197,11 @@ class ModuleAdminReloadActionTests(TestCase):
         )
         self.assertSetEqual(
             charger_landings,
-            {"/ocpp/", "/ocpp/simulator/", "/ocpp/rfid/"},
+            {
+                "/ocpp/cpms/dashboard/",
+                "/ocpp/evcs/simulator/",
+                "/ocpp/rfid/validator/",
+            },
         )
 
         calculator_landings = set(
@@ -2331,12 +2401,12 @@ class LandingCreationTests(TestCase):
 
 
 class LandingFixtureTests(TestCase):
-    def test_constellation_fixture_loads_without_duplicates(self):
+    def test_watchtower_fixture_loads_without_duplicates(self):
         from glob import glob
 
-        NodeRole.objects.get_or_create(name="Constellation")
+        NodeRole.objects.get_or_create(name="Watchtower")
         fixtures = glob(
-            str(Path(settings.BASE_DIR, "pages", "fixtures", "constellation__*.json"))
+            str(Path(settings.BASE_DIR, "pages", "fixtures", "watchtower__*.json"))
         )
         fixtures = sorted(
             fixtures,
@@ -2346,9 +2416,11 @@ class LandingFixtureTests(TestCase):
         )
         call_command("loaddata", *fixtures)
         call_command("loaddata", *fixtures)
-        module = Module.objects.get(path="/ocpp/", node_role__name="Constellation")
+        module = Module.objects.get(path="/ocpp/", node_role__name="Watchtower")
         module.create_landings()
-        self.assertEqual(module.landings.filter(path="/ocpp/rfid/").count(), 1)
+        self.assertEqual(
+            module.landings.filter(path="/ocpp/rfid/validator/").count(), 1
+        )
 
 
 class AllowedHostSubnetTests(TestCase):
@@ -2501,9 +2573,9 @@ class FaviconTests(TestCase):
             )
             self.assertContains(resp, b64)
 
-    def test_constellation_nodes_use_goldenrod_favicon(self):
+    def test_watchtower_nodes_use_goldenrod_favicon(self):
         with override_settings(MEDIA_ROOT=self.tmpdir):
-            role, _ = NodeRole.objects.get_or_create(name="Constellation")
+            role, _ = NodeRole.objects.get_or_create(name="Watchtower")
             Node.objects.update_or_create(
                 mac_address=Node.get_current_mac(),
                 defaults={
@@ -2518,7 +2590,7 @@ class FaviconTests(TestCase):
             resp = self.client.get(reverse("pages:index"))
             b64 = (
                 Path(settings.BASE_DIR)
-                .joinpath("pages", "fixtures", "data", "favicon_constellation.txt")
+                .joinpath("pages", "fixtures", "data", "favicon_watchtower.txt")
                 .read_text()
                 .strip()
             )
@@ -3149,47 +3221,6 @@ class AdminModelGraphViewTests(TestCase):
         self.assertEqual(kwargs.get("format"), "pdf")
 
 
-class DatasetteTests(TestCase):
-    def setUp(self):
-        self.client = Client()
-        User = get_user_model()
-        self.user = User.objects.create_user(username="ds", password="pwd")
-        Site.objects.update_or_create(id=1, defaults={"name": "Terminal"})
-
-    def test_datasette_auth_endpoint(self):
-        resp = self.client.get(reverse("pages:datasette-auth"))
-        self.assertEqual(resp.status_code, 401)
-        self.client.force_login(self.user)
-        resp = self.client.get(reverse("pages:datasette-auth"))
-        self.assertEqual(resp.status_code, 200)
-
-    def test_navbar_includes_datasette_when_enabled(self):
-        lock_dir = Path(settings.BASE_DIR) / "locks"
-        lock_dir.mkdir(exist_ok=True)
-        lock_file = lock_dir / "datasette.lck"
-        try:
-            lock_file.touch()
-            resp = self.client.get(reverse("pages:index"))
-            self.assertContains(resp, 'href="/data/"')
-        finally:
-            lock_file.unlink(missing_ok=True)
-
-    def test_admin_home_includes_datasette_button_when_enabled(self):
-        lock_dir = Path(settings.BASE_DIR) / "locks"
-        lock_dir.mkdir(exist_ok=True)
-        lock_file = lock_dir / "datasette.lck"
-        try:
-            lock_file.touch()
-            self.user.is_staff = True
-            self.user.is_superuser = True
-            self.user.save()
-            self.client.force_login(self.user)
-            resp = self.client.get(reverse("admin:index"))
-            self.assertContains(resp, 'href="/data/"')
-            self.assertContains(resp, ">Datasette<")
-        finally:
-            lock_file.unlink(missing_ok=True)
-
 
 class UserStorySubmissionTests(TestCase):
     def setUp(self):

pages/urls.py

@@ -6,6 +6,7 @@ app_name = "pages"
 
 urlpatterns = [
     path("", views.index, name="index"),
+    path("read/<path:doc>/edit/", views.readme_edit, name="readme-edit"),
     path("read/", views.readme, name="readme"),
     path("read/<path:doc>", views.readme, name="readme-document"),
     path("sitemap.xml", views.sitemap, name="pages-sitemap"),
@@ -20,7 +21,6 @@ urlpatterns = [
         views.invitation_login,
         name="invitation-login",
     ),
-    path("datasette-auth/", views.datasette_auth, name="datasette-auth"),
     path("man/", views.manual_list, name="manual-list"),
     path("man/<slug:slug>/", views.manual_detail, name="manual-detail"),
     path("man/<slug:slug>/pdf/", views.manual_pdf, name="manual-pdf"),