Merge branch 'main' into 20911-dropdown

netbox/dcim/forms/model_forms.py

@@ -722,9 +722,6 @@ class DeviceForm(TenancyForm, PrimaryModelForm):
         if position:
             self.fields['position'].widget.choices = [(position, f'U{position}')]
 
-        # Clear face field when rack is cleared
-        self.fields['face'].widget.attrs['ts-clear-field'] = 'rack'
-
 
 class ModuleForm(ModuleCommonForm, PrimaryModelForm):
     device = DynamicModelChoiceField(
@@ -736,9 +733,10 @@ class ModuleForm(ModuleCommonForm, PrimaryModelForm):
     )
     module_bay = DynamicModelChoiceField(
         label=_('Module bay'),
-        queryset=ModuleBay.objects.all(),
+        queryset=ModuleBay.objects.order_by('name'),
         query_params={
-            'device_id': '$device'
+            'device_id': '$device',
+            'ordering': 'name',
         },
         context={
             'disabled': 'installed_module',

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

@@ -1,4 +1,3 @@
-import TomSelect from 'tom-select';
 import { getElements } from '../util';
 
 function handleFormSubmit(): void {
@@ -9,37 +8,6 @@ function handleFormSubmit(): void {
   }
 }
 
-/**
- * Initialize clear-field dependencies.
- * When a field with ts-clear-field attribute's parent field is cleared, this field will also be cleared.
- */
-function initClearFieldDependencies(): void {
-  // Find all fields with ts-clear-field attribute
-  for (const field of getElements<HTMLSelectElement>('[ts-clear-field]')) {
-    const parentFieldName = field.getAttribute('ts-clear-field');
-    if (!parentFieldName) continue;
-
-    // Find the parent field
-    const parentField = document.querySelector<HTMLSelectElement>(`[name="${parentFieldName}"]`);
-    if (!parentField) continue;
-
-    // Listen for changes on the parent field
-    parentField.addEventListener('change', () => {
-      // If parent field is cleared, also clear this dependent field
-      if (!parentField.value || parentField.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 = '';
-        }
-      }
-    });
-  }
-}
-
 /**
  * Attach event listeners to each form's submit/reset buttons.
  */
@@ -60,7 +28,4 @@ export function initFormElements(): void {
       });
     }
   }
-
-  // Initialize clear-field dependencies
-  initClearFieldDependencies();
 }

netbox/project-static/src/select/classes/dynamicTomSelect.ts

@@ -75,11 +75,15 @@ export class DynamicTomSelect extends TomSelect {
   load(value: string) {
     const self = this;
 
+    const currentValue = self.getValue();
+
     // Automatically clear any cached options. (Only options included
     // in the API response should be present.)
     self.clearOptions();
 
-    // Populate the null option (if any) if not searching
+    // Clear user_options to prevent the pre-selected option from being treated specially
+    (self as any).user_options = {};
+
     if (self.nullOption && !value) {
       self.addOption(self.nullOption);
     }
@@ -93,21 +97,33 @@ export class DynamicTomSelect extends TomSelect {
     addClasses(self.wrapper, self.settings.loadingClass);
     self.loading++;
 
-    // Make the API request
     fetch(url)
       .then(response => response.json())
       .then(apiData => {
         const results: Dict[] = apiData.results;
-        const options: Dict[] = [];
-        for (const result of results) {
+
+        // Add options and set $order to preserve API response order
+        results.forEach((result, index) => {
           const option = self.getOptionFromData(result);
-          options.push(option);
+          self.addOption(option);
+          const key = option[self.settings.valueField as string] as string;
+          if (self.options[key]) {
+            (self.options[key] as any).$order = index;
+          }
+        });
+
+        if (self.loading > 0) {
+          self.loading--;
+          if (self.loading === 0) {
+            self.wrapper.classList.remove(self.settings.loadingClass as string);
+          }
         }
-        return options;
-      })
-      // Pass the options to the callback function
-      .then(options => {
-        self.loadCallback(options, []);
+
+        if (currentValue && !self.items.includes(currentValue as string)) {
+          self.items.push(currentValue as string);
+        }
+
+        self.refreshOptions(false);
       })
       .catch(() => {
         self.loadCallback([], []);