Initial work on #21259

* #20383 clear rack face if no rack on edit

* #20383 clear rack face if no rack on edit

* review changes

* review changes

netbox/core/models/object_types.py

@@ -9,6 +9,7 @@ from django.db import connection, models
 from django.db.models import Q
 from django.utils.translation import gettext as _
 
+from netbox.context import object_types_cache
 from netbox.plugins import PluginConfig
 from netbox.registry import registry
 from utilities.string import title
@@ -70,6 +71,12 @@ class ObjectTypeManager(models.Manager):
         """
         from netbox.models.features import get_model_features, model_is_public
 
+        # Check the request cache before hitting the database
+        cache = object_types_cache.get()
+        if cache is not None:
+            if ot := cache.get((model._meta.model, for_concrete_model)):
+                return ot
+
         # TODO: Remove this in NetBox v5.0
         # If the ObjectType table has not yet been provisioned (e.g. because we're in a pre-v4.4 migration),
         # fall back to ContentType.
@@ -96,6 +103,10 @@ class ObjectTypeManager(models.Manager):
                 features=get_model_features(model),
             )[0]
 
+        # Populate the request cache to avoid redundant lookups
+        if cache is not None:
+            cache[(model._meta.model, for_concrete_model)] = ot
+
         return ot
 
     def get_for_models(self, *models, for_concrete_models=True):

netbox/dcim/forms/model_forms.py

@@ -20,7 +20,9 @@ from utilities.forms.fields import (
     DynamicModelChoiceField, DynamicModelMultipleChoiceField, JSONField, NumericArrayField, SlugField,
 )
 from utilities.forms.rendering import FieldSet, InlineFields, TabbedGroups
-from utilities.forms.widgets import APISelect, ClearableFileInput, HTMXSelect, NumberWithOptions, SelectWithPK
+from utilities.forms.widgets import (
+    APISelect, ClearableFileInput, ClearableSelect, HTMXSelect, NumberWithOptions, SelectWithPK,
+)
 from utilities.jsonschema import JSONSchemaProperty
 from virtualization.models import Cluster, VMInterface
 from wireless.models import WirelessLAN, WirelessLANGroup
@@ -592,6 +594,14 @@ class DeviceForm(TenancyForm, PrimaryModelForm):
             },
         )
     )
+    face = forms.ChoiceField(
+        label=_('Face'),
+        choices=add_blank_choice(DeviceFaceChoices),
+        required=False,
+        widget=ClearableSelect(
+            requires_fields=['rack']
+        )
+    )
     device_type = DynamicModelChoiceField(
         label=_('Device type'),
         queryset=DeviceType.objects.all(),

netbox/dcim/tables/devices.py

@@ -27,7 +27,6 @@ __all__ = (
     'DeviceTable',
     'FrontPortTable',
     'InterfaceTable',
-    'InterfaceLAGMemberTable',
     'InventoryItemRoleTable',
     'InventoryItemTable',
     'MACAddressTable',
@@ -690,33 +689,6 @@ class InterfaceTable(BaseInterfaceTable, ModularDeviceComponentTable, PathEndpoi
         default_columns = ('pk', 'name', 'device', 'label', 'enabled', 'type', 'description')
 
 
-class InterfaceLAGMemberTable(PathEndpointTable, NetBoxTable):
-    parent = tables.Column(
-        verbose_name=_('Parent'),
-        accessor=Accessor('device'),
-        linkify=True,
-    )
-    name = tables.Column(
-        verbose_name=_('Name'),
-        linkify=True,
-        order_by=('_name',),
-    )
-    connection = columns.TemplateColumn(
-        accessor='connected_endpoints',
-        template_code=INTERFACE_LAG_MEMBERS_LINKTERMINATION,
-        verbose_name=_('Peer'),
-        orderable=False,
-    )
-    tags = columns.TagColumn(
-        url_name='dcim:interface_list'
-    )
-
-    class Meta(NetBoxTable.Meta):
-        model = models.Interface
-        fields = ('pk', 'parent', 'name', 'type', 'connection')
-        default_columns = ('pk', 'parent', 'name', 'type', 'connection')
-
-
 class DeviceInterfaceTable(InterfaceTable):
     name = tables.TemplateColumn(
         verbose_name=_('Name'),

netbox/dcim/tables/template_code.py

@@ -24,24 +24,6 @@ INTERFACE_LINKTERMINATION = """
 {% else %}""" + LINKTERMINATION + """{% endif %}
 """
 
-INTERFACE_LAG_MEMBERS_LINKTERMINATION = """
-{% for termination in value %}
-  {% if termination.parent_object %}
-    <a href="{{ termination.parent_object.get_absolute_url }}">{{ termination.parent_object }}</a>
-    <i class="mdi mdi-chevron-right"></i>
-  {% endif %}
-  <a href="{{ termination.get_absolute_url }}">{{ termination }}</a>
-  {% if termination.lag %}
-    <i class="mdi mdi-chevron-right"></i>
-    <a href="{{ termination.lag.get_absolute_url }}">{{ termination.lag }}</a>
-    <span class="text-muted">(LAG)</span>
-  {% endif %}
-  {% if not forloop.last %}<br />{% endif %}
-{% empty %}
-  {{ ''|placeholder }}
-{% endfor %}
-"""
-
 CABLE_LENGTH = """
 {% load helpers %}
 {% if record.length %}{{ record.length|floatformat:"-2" }} {{ record.length_unit }}{% endif %}

netbox/dcim/views.py

@@ -3135,14 +3135,6 @@ class InterfaceView(generic.ObjectView):
         )
         child_interfaces_table.configure(request)
 
-        # Get LAG interfaces
-        lag_interfaces = Interface.objects.restrict(request.user, 'view').filter(lag=instance)
-        lag_interfaces_table = tables.InterfaceLAGMemberTable(
-            lag_interfaces,
-            orderable=False
-        )
-        lag_interfaces_table.configure(request)
-
         # Get assigned VLANs and annotate whether each is tagged or untagged
         vlans = []
         if instance.untagged_vlan is not None:
@@ -3172,7 +3164,6 @@ class InterfaceView(generic.ObjectView):
             'bridge_interfaces': bridge_interfaces,
             'bridge_interfaces_table': bridge_interfaces_table,
             'child_interfaces_table': child_interfaces_table,
-            'lag_interfaces_table': lag_interfaces_table,
             'vlan_table': vlan_table,
             'vlan_translation_table': vlan_translation_table,
         }

netbox/extras/events.py

@@ -86,7 +86,7 @@ def enqueue_event(queue, instance, request, event_type):
 
 
 def process_event_rules(event_rules, object_type, event_type, data, username=None, snapshots=None, request=None):
-    user = User.objects.get(username=username) if username else None
+    user = None  # To be resolved from the username if needed
 
     for event_rule in event_rules:
 
@@ -134,6 +134,10 @@ def process_event_rules(event_rules, object_type, event_type, data, username=Non
             # Resolve the script from action parameters
             script = event_rule.action_object.python_class()
 
+            # Retrieve the User if not already resolved
+            if user is None:
+                user = User.objects.get(username=username)
+
             # Enqueue a Job to record the script's execution
             from extras.jobs import ScriptJob
             params = {

netbox/netbox/context.py

@@ -3,8 +3,10 @@ from contextvars import ContextVar
 __all__ = (
     'current_request',
     'events_queue',
+    'object_types_cache',
 )
 
 
 current_request = ContextVar('current_request', default=None)
 events_queue = ContextVar('events_queue', default=dict())
+object_types_cache = ContextVar('object_types_cache', default=None)

netbox/netbox/context_managers.py

@@ -1,6 +1,6 @@
 from contextlib import contextmanager
 
-from netbox.context import current_request, events_queue
+from netbox.context import current_request, events_queue, object_types_cache
 from netbox.utils import register_request_processor
 from extras.events import flush_events
 
@@ -16,6 +16,7 @@ def event_tracking(request):
     """
     current_request.set(request)
     events_queue.set({})
+    object_types_cache.set({})
 
     yield
 
@@ -26,3 +27,4 @@ def event_tracking(request):
     # Clear context vars
     current_request.set(None)
     events_queue.set({})
+    object_types_cache.set(None)

netbox/project-static/src/forms/clearField.ts

@@ -0,0 +1,40 @@
+import TomSelect from 'tom-select';
+import { getElements } from '../util';
+
+/**
+ * Initialize clear-field dependencies.
+ * When a required field is cleared, dependent fields with data-requires-fields attribute will also be cleared.
+ */
+export function initClearField(): void {
+  // Find all fields with data-requires-fields attribute
+  for (const field of getElements<HTMLSelectElement>('[data-requires-fields]')) {
+    const requiredFieldsAttr = field.getAttribute('data-requires-fields');
+    if (!requiredFieldsAttr) continue;
+
+    // Parse the comma-separated list of required field names
+    const requiredFields = requiredFieldsAttr.split(',').map(name => name.trim());
+
+    // Set up listeners for each required field
+    for (const requiredFieldName of requiredFields) {
+      const requiredField = document.querySelector<HTMLSelectElement>(
+        `[name="${requiredFieldName}"]`,
+      );
+      if (!requiredField) continue;
+
+      // Listen for changes on the required field
+      requiredField.addEventListener('change', () => {
+        // If required field is cleared, also clear this dependent field
+        if (!requiredField.value || requiredField.value === '') {
+          // Check if this field uses TomSelect
+          const tomselect = (field as HTMLSelectElement & { tomselect?: TomSelect }).tomselect;
+          if (tomselect) {
+            tomselect.clear();
+          } else {
+            // Regular select field
+            field.value = '';
+          }
+        }
+      });
+    }
+  }
+}

netbox/project-static/src/forms/index.ts

@@ -1,9 +1,10 @@
+import { initClearField } from './clearField';
 import { initFormElements } from './elements';
 import { initFilterModifiers } from './filterModifiers';
 import { initSpeedSelector } from './speedSelector';
 
 export function initForms(): void {
-  for (const func of [initFormElements, initSpeedSelector, initFilterModifiers]) {
+  for (const func of [initFormElements, initSpeedSelector, initFilterModifiers, initClearField]) {
     func();
   }
 }

netbox/templates/dcim/interface.html

@@ -370,6 +370,33 @@
           </table>
         </div>
       {% endif %}
+      {% if object.is_lag %}
+        <div class="card">
+          <h2 class="card-header">{% trans "LAG Members" %}</h2>
+          <table class="table table-hover">
+            <thead>
+              <tr>
+                <th>{% trans "Parent" %}</th>
+                <th>{% trans "Interface" %}</th>
+                <th>{% trans "Type" %}</th>
+              </tr>
+            </thead>
+            <tbody>
+              {% for member in object.member_interfaces.all %}
+                <tr>
+                  <td>{{ member.device|linkify }}</td>
+                  <td>{{ member|linkify }}</td>
+                  <td>{{ member.get_type_display }}</td>
+                </tr>
+              {% empty %}
+                <tr>
+                  <td colspan="3" class="text-muted">{% trans "No member interfaces" %}</td>
+                </tr>
+              {% endfor %}
+            </tbody>
+          </table>
+        </div>
+      {% endif %}
       {% include 'ipam/inc/panels/fhrp_groups.html' %}
       {% include 'dcim/inc/panels/inventory_items.html' %}
       {% plugin_right_page object %}
@@ -414,13 +441,6 @@
       {% include 'inc/panel_table.html' with table=vlan_table heading="VLANs" %}
     </div>
   </div>
-  {% if object.is_lag %}
-    <div class="row mb-3">
-      <div class="col col-md-12">
-        {% include 'inc/panel_table.html' with table=lag_interfaces_table heading="LAG Members" %}
-      </div>
-    </div>
-  {% endif %}
   {% if object.vlan_translation_policy %}
     <div class="row mb-3">
       <div class="col col-md-12">

netbox/utilities/forms/widgets/select.py

@@ -5,6 +5,7 @@ from ..utils import add_blank_choice
 
 __all__ = (
     'BulkEditNullBooleanSelect',
+    'ClearableSelect',
     'ColorSelect',
     'HTMXSelect',
     'SelectWithPK',
@@ -28,6 +29,21 @@ class BulkEditNullBooleanSelect(forms.NullBooleanSelect):
         )
 
 
+class ClearableSelect(forms.Select):
+    """
+    A Select widget that will be automatically cleared when one or more required fields are cleared.
+
+    Args:
+        requires_fields: A list of field names that this field depends on. When any of these fields
+                        are cleared, this field will also be cleared automatically via JavaScript.
+    """
+
+    def __init__(self, *args, requires_fields=None, **kwargs):
+        super().__init__(*args, **kwargs)
+        if requires_fields:
+            self.attrs['data-requires-fields'] = ','.join(requires_fields)
+
+
 class ColorSelect(forms.Select):
     """
     Extends the built-in Select widget to colorize each <option>.