change ordering field, remove front-end changes

netbox/dcim/forms/model_forms.py

@@ -733,10 +733,9 @@ class ModuleForm(ModuleCommonForm, PrimaryModelForm):
     )
     module_bay = DynamicModelChoiceField(
         label=_('Module bay'),
-        queryset=ModuleBay.objects.order_by('name'),
+        queryset=ModuleBay.objects.all(),
         query_params={
-            'device_id': '$device',
+            'device_id': '$device'
-            'ordering': 'name',
         },
         context={
             'disabled': 'installed_module',

netbox/dcim/models/device_components.py

@@ -1273,7 +1273,7 @@ class ModuleBay(ModularComponentModel, TrackingModelMixin, MPTTModel):
         verbose_name_plural = _('module bays')
 
     class MPTTMeta:
-        order_insertion_by = ('module',)
+        order_insertion_by = ('name',)
 
     def clean(self):
         super().clean()

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

@@ -75,16 +75,10 @@ export class DynamicTomSelect extends TomSelect {
   load(value: string) {
     const self = this;
 
-    // Save current selection before clearing
-    const currentValue = self.getValue();
-
     // Automatically clear any cached options. (Only options included
     // in the API response should be present.)
     self.clearOptions();
 
-    // Clear user_options to prevent the pre-selected option from being treated specially
-    (self as any).user_options = {};
-
     // Populate the null option (if any) if not searching
     if (self.nullOption && !value) {
       self.addOption(self.nullOption);
@@ -104,29 +98,16 @@ export class DynamicTomSelect extends TomSelect {
       .then(response => response.json())
       .then(apiData => {
         const results: Dict[] = apiData.results;
-
+        const options: Dict[] = [];
-        // Add options and manually set $order to ensure correct sorting
+        for (const result of results) {
-        results.forEach((result, index) => {
           const option = self.getOptionFromData(result);
-          self.addOption(option);
+          options.push(option);
-          // Set $order after addOption() to override any special handling of pre-selected items
-          const key = option[self.settings.valueField as string] as string;
-          if (self.options[key]) {
-            (self.options[key] as any).$order = index;
-          }
-        });
-
-        self.loading--;
-        if (self.loading === 0) {
-          self.wrapper.classList.remove(self.settings.loadingClass as string);
         }
-
+        return options;
-        // Restore the current selection
+      })
-        if (currentValue && !self.items.includes(currentValue as string)) {
+      // Pass the options to the callback function
-          self.items.push(currentValue as string);
+      .then(options => {
-        }
+        self.loadCallback(options, []);
-
-        self.refreshOptions(false);
       })
       .catch(() => {
         self.loadCallback([], []);

netbox/project-static/src/select/dynamic.ts

@@ -49,9 +49,6 @@ export function initDynamicSelects(): void {
       labelField: LABEL_FIELD,
       maxOptions: MAX_OPTIONS,
 
-      // Preserve API response order
-      sortField: '$order',
-
       // Disable local search (search is performed on the backend)
       searchField: [],