From 86c708ed6866fad7104159bac198238eddaaa033 Mon Sep 17 00:00:00 2001 From: catborise Date: Tue, 27 Oct 2026 14:14:37 +0300 Subject: [PATCH] refactor(computes): the host pages share one section nav Eleven host pages (overview, instances, storages, networks, interfaces, nwfilters, secrets and their item pages) each carried their own copy of the links to the host's sections, as a breadcrumb: the sections are siblings, not a path, and on a phone the separators were left at the start of wrapped lines. The item pages marked no section at all. computes/host_nav.html is the one nav, labelled "Host sections": pills that wrap, the page's section marked active, with aria-current="page" on the section's own page and "true" on an item of it. --- computes/templates/computes/host_nav.html | 28 ++++++++++++++++++++++ computes/templates/computes/instances.html | 26 +------------------- computes/templates/overview.html | 26 +------------------- computes/tests/test_host_nav.py | 25 +++++++++++++++++++ interfaces/templates/interface.html | 24 +------------------ interfaces/templates/interfaces.html | 26 +------------------- networks/templates/network.html | 24 +------------------ networks/templates/networks.html | 26 +------------------- nwfilters/templates/nwfilter.html | 24 +------------------ nwfilters/templates/nwfilters.html | 26 +------------------- storages/templates/storage.html | 24 +------------------ storages/templates/storages.html | 26 +------------------- virtsecrets/templates/secrets.html | 26 +------------------- 13 files changed, 64 insertions(+), 267 deletions(-) create mode 100644 computes/templates/computes/host_nav.html create mode 100644 computes/tests/test_host_nav.py diff --git a/computes/templates/computes/host_nav.html b/computes/templates/computes/host_nav.html new file mode 100644 index 00000000..9b4de4c1 --- /dev/null +++ b/computes/templates/computes/host_nav.html @@ -0,0 +1,28 @@ +{% load i18n %} +{% load bootstrap_icons %} +{# The host's sections. section: the one this page belongs to; detail: the page is an item of it (a pool, a network), not the section's own page #} + diff --git a/computes/templates/computes/instances.html b/computes/templates/computes/instances.html index 0a83eee4..01c1b5f7 100644 --- a/computes/templates/computes/instances.html +++ b/computes/templates/computes/instances.html @@ -20,31 +20,7 @@
- + {% include "computes/host_nav.html" with section="instances" %}
diff --git a/computes/templates/overview.html b/computes/templates/overview.html index 5160d075..efc5a40e 100644 --- a/computes/templates/overview.html +++ b/computes/templates/overview.html @@ -9,31 +9,7 @@ {% block content %}
- + {% include "computes/host_nav.html" with section="overview" %}
diff --git a/computes/tests/test_host_nav.py b/computes/tests/test_host_nav.py new file mode 100644 index 00000000..c181631d --- /dev/null +++ b/computes/tests/test_host_nav.py @@ -0,0 +1,25 @@ +"""The host pages' shared section links.""" + +from django.template.loader import render_to_string +from django.test import TestCase +from lxml import html + +from computes.models import Compute + + +class HostNavTestCase(TestCase): + def setUp(self): + self.compute = Compute.objects.create(name="c", hostname="192.0.2.1", login="u", password="p", type=1) + + def links(self, **context): + nav = html.fromstring(render_to_string("computes/host_nav.html", {"compute": self.compute, **context})) + return {link.text_content().strip(): (link.get("class"), link.get("aria-current")) for link in nav.iter("a")} + + def test_the_section_s_own_page_is_the_current_page(self): + links = self.links(section="storages") + self.assertEqual(len(links), 7) + self.assertEqual(links["Storages"], ("nav-link active", "page")) + self.assertEqual(links["Overview"], ("nav-link", None)) + + def test_an_item_of_a_section_marks_the_section_without_being_its_page(self): + self.assertEqual(self.links(section="networks", detail=True)["Networks"], ("nav-link active", "true")) diff --git a/interfaces/templates/interface.html b/interfaces/templates/interface.html index 21ff5f29..9083a795 100644 --- a/interfaces/templates/interface.html +++ b/interfaces/templates/interface.html @@ -9,29 +9,7 @@ {% block content %}
-
    -
  1. - {% bs_icon 'laptop' %} {% trans "Overview" %} -
    2. -
  2. - {% bs_icon 'server' %} {% trans "Instances" %} -
    3. -
  3. - {% bs_icon 'device-hdd' %} {% trans "Storages" %} -
    4. -
  4. - {% bs_icon 'hdd-network' %} {% trans "Networks" %} -
    5. -
  5. - {% bs_icon 'wifi' %} {% trans "Interfaces" %} -
    6. -
  6. - {% bs_icon 'filter' %} {% trans "NWFilters" %} -
    7. -
  7. - {% bs_icon 'key' %} {% trans "Secrets" %} -
    8. -
+ {% include "computes/host_nav.html" with section="interfaces" detail=True %}
diff --git a/interfaces/templates/interfaces.html b/interfaces/templates/interfaces.html index fce57db4..6a2bd0e3 100644 --- a/interfaces/templates/interfaces.html +++ b/interfaces/templates/interfaces.html @@ -14,31 +14,7 @@ {% block content %}
- + {% include "computes/host_nav.html" with section="interfaces" %}
diff --git a/networks/templates/network.html b/networks/templates/network.html index e67f3ea5..88efedc9 100644 --- a/networks/templates/network.html +++ b/networks/templates/network.html @@ -10,29 +10,7 @@ {% block content %}
-
    -
  1. - {% bs_icon 'laptop' %} {% trans "Overview" %} -
    2. -
  2. - {% bs_icon 'server' %} {% trans "Instances" %} -
    3. -
  3. - {% bs_icon 'device-hdd' %} {% trans "Storages" %} -
    4. -
  4. - {% bs_icon 'hdd-network' %} {% trans "Networks" %} -
    5. -
  5. - {% bs_icon 'wifi' %} {% trans "Interfaces" %} -
    6. -
  6. - {% bs_icon 'filter' %} {% trans "NWFilters" %} -
    7. -
  7. - {% bs_icon 'key' %} {% trans "Secrets" %} -
    8. -
+ {% include "computes/host_nav.html" with section="networks" detail=True %}
diff --git a/networks/templates/networks.html b/networks/templates/networks.html index 6d3abb9d..fdd4d6d1 100644 --- a/networks/templates/networks.html +++ b/networks/templates/networks.html @@ -11,31 +11,7 @@ {% block content %}
- + {% include "computes/host_nav.html" with section="networks" %}
diff --git a/nwfilters/templates/nwfilter.html b/nwfilters/templates/nwfilter.html index 8e2be12c..0e77cfd8 100644 --- a/nwfilters/templates/nwfilter.html +++ b/nwfilters/templates/nwfilter.html @@ -10,29 +10,7 @@ {% block content %}
-
    -
  1. - {% bs_icon 'laptop' %} {% trans "Overview" %} -
    2. -
  2. - {% bs_icon 'server' %} {% trans "Instances" %} -
    3. -
  3. - {% bs_icon 'device-hdd' %} {% trans "Storages" %} -
    4. -
  4. - {% bs_icon 'hdd-network' %} {% trans "Networks" %} -
    5. -
  5. - {% bs_icon 'wifi' %} {% trans "Interfaces" %} -
    6. -
  6. - {% bs_icon 'filter' %} {% trans "NWFilters" %} -
    7. -
  7. - {% bs_icon 'key' %} {% trans "Secrets" %} -
    8. -
+ {% include "computes/host_nav.html" with section="nwfilters" detail=True %}
diff --git a/nwfilters/templates/nwfilters.html b/nwfilters/templates/nwfilters.html index 2aaeb655..c9753d2d 100644 --- a/nwfilters/templates/nwfilters.html +++ b/nwfilters/templates/nwfilters.html @@ -15,31 +15,7 @@ {% block content %}
- + {% include "computes/host_nav.html" with section="nwfilters" %}
diff --git a/storages/templates/storage.html b/storages/templates/storage.html index a9598b98..b10ce6a6 100644 --- a/storages/templates/storage.html +++ b/storages/templates/storage.html @@ -14,29 +14,7 @@
-
    -
  1. - {% bs_icon 'laptop' %} {% trans "Overview" %} -
    2. -
  2. - {% bs_icon 'server' %} {% trans "Instances" %} -
    3. -
  3. - {% bs_icon 'device-hdd' %} {% trans "Storages" %} -
    4. -
  4. - {% bs_icon 'hdd-network' %} {% trans "Networks" %} -
    5. -
  5. - {% bs_icon 'wifi' %} {% trans "Interfaces" %} -
    6. -
  6. - {% bs_icon 'filter' %} {% trans "NWFilters" %} -
    7. -
  7. - {% bs_icon 'key' %} {% trans "Secrets" %} -
    8. -
+ {% include "computes/host_nav.html" with section="storages" detail=True %}
diff --git a/storages/templates/storages.html b/storages/templates/storages.html index b629c408..86c2a40f 100644 --- a/storages/templates/storages.html +++ b/storages/templates/storages.html @@ -11,31 +11,7 @@ {% block content %}
- + {% include "computes/host_nav.html" with section="storages" %}
diff --git a/virtsecrets/templates/secrets.html b/virtsecrets/templates/secrets.html index 6bc6be4e..dd78bbd7 100644 --- a/virtsecrets/templates/secrets.html +++ b/virtsecrets/templates/secrets.html @@ -14,31 +14,7 @@ {% block content %}
- + {% include "computes/host_nav.html" with section="virtsecrets" %}