fix performance regression for Site save, use bulk_update for cached fields

netbox/dcim/forms/model_forms.py

@@ -20,9 +20,7 @@ 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, ClearableSelect, HTMXSelect, NumberWithOptions, SelectWithPK,
-)
+from utilities.forms.widgets import APISelect, ClearableFileInput, HTMXSelect, NumberWithOptions, SelectWithPK
 from utilities.jsonschema import JSONSchemaProperty
 from virtualization.models import Cluster, VMInterface
 from wireless.models import WirelessLAN, WirelessLANGroup
@@ -594,14 +592,6 @@ 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/signals.py

@@ -211,12 +211,16 @@ def sync_cached_scope_fields(instance, created, **kwargs):
     for model in (Prefix, Cluster, WirelessLAN):
         qs = model.objects.filter(**filters)
 
+        # Bulk update cached fields to avoid O(N) performance issues with large datasets.
+        # This does not trigger post_save signals, avoiding spurious change log entries.
+        objects_to_update = []
         for obj in qs:
             # Recompute cache using the same logic as save()
             obj.cache_related_objects()
-            obj.save(update_fields=[
-                '_location',
-                '_site',
-                '_site_group',
-                '_region',
-            ])
+            objects_to_update.append(obj)
+
+        if objects_to_update:
+            model.objects.bulk_update(
+                objects_to_update,
+                ['_location', '_site', '_site_group', '_region']
+            )

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

@@ -1,40 +0,0 @@
-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,10 +1,9 @@
-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, initClearField]) {
+  for (const func of [initFormElements, initSpeedSelector, initFilterModifiers]) {
     func();
   }
 }

netbox/utilities/forms/widgets/select.py

@@ -5,7 +5,6 @@ from ..utils import add_blank_choice
 
 __all__ = (
     'BulkEditNullBooleanSelect',
-    'ClearableSelect',
     'ColorSelect',
     'HTMXSelect',
     'SelectWithPK',
@@ -29,24 +28,6 @@ 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:
-            # Convert list to comma-separated string for the data attribute
-            if isinstance(requires_fields, (list, tuple)):
-                requires_fields = ','.join(requires_fields)
-            self.attrs['data-requires-fields'] = requires_fields
-
-
 class ColorSelect(forms.Select):
     """
     Extends the built-in Select widget to colorize each <option>.