ui: place connection VLANs below cable B side

netbox_utilities/tests/test_connection_vlans.py

@@ -1,8 +1,10 @@
+from pathlib import Path
 from types import SimpleNamespace
 from unittest.mock import MagicMock, patch
 
 from django import forms
 from django.forms.utils import ErrorDict
+from django.template.loader import get_template
 from django.test import SimpleTestCase
 
 from netbox_utilities.connection_vlans import (
@@ -14,6 +16,19 @@ from netbox_utilities.models import CableVLANAssignment, WirelessLinkVLANAssignm
 
 
 class ConnectionVLANTest(SimpleTestCase):
+    def test_cable_vlan_field_is_rendered_below_b_side(self):
+        self.assertIsNotNone(get_template("netbox_utilities/cable_edit_form.html"))
+        template_path = Path(__file__).parents[1] / "templates" / "netbox_utilities" / "cable_edit_form.html"
+        template = template_path.read_text(encoding="utf-8")
+
+        b_side = template.index('{% trans "B Side" %}')
+        vlan_field = template.index("{% render_field form.utilities_vlans %}")
+        cable_section = template.index('{% trans "Cable" %}')
+
+        self.assertLess(b_side, vlan_field)
+        self.assertLess(vlan_field, cable_section)
+        self.assertEqual(template.count("{% render_field form.utilities_vlans %}"), 1)
+
     def test_assignment_models_are_tied_to_their_connection_and_vlans(self):
         self.assertEqual(
             CableVLANAssignment._meta.get_field("cable").remote_field.model._meta.label_lower, "dcim.cable"

netbox_utilities/tests/test_reorder_rack.py

@@ -449,7 +449,7 @@ class ReorderRackFrontendTest(SimpleTestCase):
         self.assertEqual(template_name, "netbox_utilities/reorder_rack.html")
         self.assertEqual(context["reorder_devices"][0]["label"], "LEO-Fritzbox")
         self.assertEqual(context["reorder_devices"][0]["grid_width"], 6)
-        self.assertEqual(context["asset_version"], "0.10.1")
+        self.assertEqual(context["asset_version"], "0.10.2")
         self.assertIs(context["reorder_rack_width_data"], get_width_data.return_value)
         get_width_data.assert_called_once()
         self.assertIs(get_width_data.call_args.kwargs["rack"], rack)

netbox_utilities/tests/test_topology_views.py

@@ -246,7 +246,7 @@ class TopologyViewsRackWidthTest(SimpleTestCase):
         self.assertIn('id="netbox-utilities-topology-rack-width-styles"', html)
         self.assertIn('.rack-device[href="/dcim/devices/334/"]', html)
         self.assertIn("left: calc(50% + 3px) !important", html)
-        self.assertIn("netbox_utilities/topology-rack-width.js?v=0.10.1", html)
+        self.assertIn("netbox_utilities/topology-rack-width.js?v=0.10.2", html)
         self.assertIn("left:calc(0% + 3px)!important", html)
         self.assertIn("left:calc(50% + 3px)!important", html)
         self.assertIn("width:calc(50% - 6px)!important", html)