Merge 5f58fe1eb5 into f61a2964c8

* Refactor rack elevation template to use htmx for dynamic loading and improved user experience

* rework to prevent dup loading

* Update netbox/templates/dcim/inc/rack_elevation.html

Co-authored-by: Jeremy Stretch <jstretch@netboxlabs.com>

* Update netbox/templates/dcim/inc/rack_elevation.html

Co-authored-by: Jeremy Stretch <jstretch@netboxlabs.com>

* Move inline styles to styles/custom/racks.css

---------

Co-authored-by: tony.nealon@wholesailnetworks.com <tony.nealon@wholesailnetworks.com>
Co-authored-by: tbotnz <tonynealon1989@gmail.com>
Co-authored-by: Jeremy Stretch <jstretch@netboxlabs.com>

netbox/dcim/migrations/0206_load_module_type_profiles.py

@@ -19,7 +19,8 @@ def load_initial_data(apps, schema_editor):
         'gpu',
         'hard_disk',
         'memory',
-        'power_supply'
+        'power_supply',
+        'expansion_card'
     )
 
     for name in initial_profiles:

netbox/dcim/migrations/initial_data/module_type_profiles/expansion_card.json

@@ -0,0 +1,15 @@
+{
+    "name": "Expansion card",
+    "schema": {
+        "properties": {
+            "connector_type": {
+                "type": "string",
+                "description": "Connector type e.g. PCIe x4"
+            },
+            "bandwidth": {
+                "type": "integer",
+                "description": "Total Bandwidth for this module"
+            }
+        }
+    }
+}

netbox/dcim/models/cables.py

@@ -220,6 +220,7 @@ class Cable(PrimaryModel):
         b_terminations = {ct.termination: ct for ct in self.terminations.filter(cable_end='B')}
 
         # Delete stale CableTerminations
+
         if self._terminations_modified:
             for termination, ct in a_terminations.items():
                 if termination.pk and termination not in self.a_terminations:
@@ -312,6 +313,12 @@ class CableTermination(ChangeLoggedModel):
     def __str__(self):
         return f'Cable {self.cable} to {self.termination}'
 
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        self._orig_cable = self.__dict__.get('cable')
+        self._orig_cable_end = self.__dict__.get('cable_end')
+
     def clean(self):
         super().clean()
 
@@ -349,6 +356,7 @@ class CableTermination(ChangeLoggedModel):
 
         # Cache objects associated with the terminating object (for filtering)
         self.cache_related_objects()
+        created = self.pk is None
 
         super().save(*args, **kwargs)
 
@@ -359,6 +367,28 @@ class CableTermination(ChangeLoggedModel):
         termination.cable_end = self.cable_end
         termination.save()
 
+        # figure out which cable terminations changed
+        if not created:
+            update_cable_termination = False
+            update_orig_cable_termination = False
+
+            if self._orig_cable and self._orig_cable != self.cable:
+                update_cable_termination = True
+                update_orig_cable_termination = True
+            elif self._orig_cable_end and self._orig_cable_end != self.cable_end:
+                update_cable_termination = True
+
+            if update_cable_termination:
+                self.cable._terminations_modified = True
+                trace_paths.send(Cable, instance=self.cable, created=False)
+
+            if update_orig_cable_termination:
+                self._orig_cable._terminations_modified = True
+                trace_paths.send(Cable, instance=self._orig_cable, created=False)
+
+        self._orig_cable_end = self.cable_end
+        self._orig_cable = self.cable
+
     def delete(self, *args, **kwargs):
 
         # Delete the cable association on the terminating object
@@ -369,6 +399,7 @@ class CableTermination(ChangeLoggedModel):
         termination.save()
 
         super().delete(*args, **kwargs)
+        trace_paths.send(Cable, instance=self.cable, created=False)
 
     def cache_related_objects(self):
         """

netbox/project-static/styles/custom/racks.scss

@@ -0,0 +1,4 @@
+.rack-loading-container {
+  min-height: 200px;
+  margin-left: 30px;
+}

netbox/project-static/styles/netbox.scss

@@ -27,3 +27,4 @@
 @import 'custom/markdown';
 @import 'custom/misc';
 @import 'custom/notifications';
+@import 'custom/racks';

netbox/templates/dcim/inc/rack_elevation.html

@@ -1,6 +1,17 @@
 {% load i18n %}
 <div style="margin-left: -30px">
-    <object data="{% url 'dcim-api:rack-elevation' pk=object.pk %}?face={{face}}&render=svg{% if extra_params %}&{{ extra_params }}{% endif %}" class="rack_elevation" aria-label="{% trans "Rack elevation" %}"></object>
+  <div
+    hx-get="{% url 'dcim-api:rack-elevation' pk=object.pk %}?face={{ face }}&render=svg{% if extra_params %}&{{ extra_params }}{% endif %}"
+    hx-trigger="intersect"
+    hx-swap="outerHTML"
+    aria-label="{% trans "Rack elevation" %}"
+  >
+    <div class="d-flex justify-content-center align-items-center rack-loading-container">
+      <div class="spinner-border" role="status">
+        <span class="visually-hidden">{% trans "Loading..." %}</span>
+      </div>
+    </div>
+  </div>
 </div>
 <div class="text-center mt-3">
     <a class="btn btn-outline-primary" href="{% url 'dcim-api:rack-elevation' pk=object.pk %}?face={{face}}&render=svg{% if extra_params %}&{{ extra_params }}{% endif %}" hx-boost="false">

netbox/translations/en/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-07-03 05:04+0000\n"
+"POT-Creation-Date: 2025-07-09 05:04+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -13021,7 +13021,7 @@ msgid "Cable Trace for %(object_type)s %(object)s"
 msgstr ""
 
 #: netbox/templates/dcim/cable_trace.html:24
-#: netbox/templates/dcim/inc/rack_elevation.html:7
+#: netbox/templates/dcim/inc/rack_elevation.html:18
 msgid "Download SVG"
 msgstr ""
 
@@ -13424,10 +13424,14 @@ msgstr ""
 msgid "Descending Units"
 msgstr ""
 
-#: netbox/templates/dcim/inc/rack_elevation.html:3
+#: netbox/templates/dcim/inc/rack_elevation.html:7
 msgid "Rack elevation"
 msgstr ""
 
+#: netbox/templates/dcim/inc/rack_elevation.html:11
+msgid "Loading..."
+msgstr ""
+
 #: netbox/templates/dcim/interface.html:17
 msgid "Add Child Interface"
 msgstr ""