fix selected item sorting

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

@@ -75,6 +75,7 @@ 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
@@ -84,6 +85,7 @@ export class DynamicTomSelect extends TomSelect {
     // 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);
     }
@@ -97,28 +99,29 @@ 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;
 
-        // Add options and set $order to preserve API response order
+        // Add options and manually set $order to ensure correct sorting
         results.forEach((result, index) => {
           const option = self.getOptionFromData(result);
           self.addOption(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;
           }
         });
 
-        if (self.loading > 0) {
-          self.loading--;
-          if (self.loading === 0) {
-            self.wrapper.classList.remove(self.settings.loadingClass as string);
-          }
+        self.loading--;
+        if (self.loading === 0) {
+          self.wrapper.classList.remove(self.settings.loadingClass as string);
         }
 
+        // Restore the current selection
         if (currentValue && !self.items.includes(currentValue as string)) {
           self.items.push(currentValue as string);
         }

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

@@ -49,6 +49,9 @@ 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: [],