Fixes #21140: Ensure default panel attribute labels are translated

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',
-            'ordering': 'name',
+            'device_id': '$device'
         },
         context={
             'disabled': 'installed_module',

netbox/dcim/graphql/filter_mixins.py

@@ -38,15 +38,6 @@ class ScopedFilterMixin:
 
 @dataclass
 class ComponentModelFilterMixin:
-    _site: Annotated['SiteFilter', strawberry.lazy('dcim.graphql.filters')] | None = (
-        strawberry_django.filter_field(name='site')
-    )
-    _location: Annotated['LocationFilter', strawberry.lazy('dcim.graphql.filters')] | None = (
-        strawberry_django.filter_field(name='location')
-    )
-    _rack: Annotated['RackFilter', strawberry.lazy('dcim.graphql.filters')] | None = (
-        strawberry_django.filter_field(name='rack')
-    )
     device: Annotated['DeviceFilter', strawberry.lazy('dcim.graphql.filters')] | None = strawberry_django.filter_field()
     device_id: ID | None = strawberry_django.filter_field()
     name: FilterLookup[str] | None = strawberry_django.filter_field()

netbox/netbox/plugins/navigation.py

@@ -37,6 +37,8 @@ class PluginMenuItem:
     Alternatively, a pre-generated url can be set on the object which will be rendered literally.
     Buttons are each specified as a list of PluginMenuButton instances.
     """
+    permissions = []
+    buttons = []
     _url = None
 
     def __init__(
@@ -52,14 +54,10 @@ class PluginMenuItem:
             if type(permissions) not in (list, tuple):
                 raise TypeError(_("Permissions must be passed as a tuple or list."))
             self.permissions = permissions
-        else:
-            self.permissions = []
         if buttons is not None:
             if type(buttons) not in (list, tuple):
                 raise TypeError(_("Buttons must be passed as a tuple or list."))
             self.buttons = buttons
-        else:
-            self.buttons = []
 
     @property
     def url(self):
@@ -76,6 +74,7 @@ class PluginMenuButton:
     ButtonColorChoices.
     """
     color = ButtonColorChoices.DEFAULT
+    permissions = []
     _url = None
 
     def __init__(self, link, title, icon_class, color=None, permissions=None):
@@ -88,8 +87,6 @@ class PluginMenuButton:
             if type(permissions) not in (list, tuple):
                 raise TypeError(_("Permissions must be passed as a tuple or list."))
             self.permissions = permissions
-        else:
-            self.permissions = []
         if color is not None:
             if color not in ButtonColorChoices.values():
                 raise ValueError(_("Button color must be a choice within ButtonColorChoices."))

netbox/netbox/tests/test_plugins.py

@@ -11,7 +11,7 @@ from netbox.tests.dummy_plugin import config as dummy_config
 from netbox.tests.dummy_plugin.data_backends import DummyBackend
 from netbox.tests.dummy_plugin.jobs import DummySystemJob
 from netbox.tests.dummy_plugin.webhook_callbacks import set_context
-from netbox.plugins.navigation import PluginMenu, PluginMenuItem, PluginMenuButton
+from netbox.plugins.navigation import PluginMenu
 from netbox.plugins.utils import get_plugin_config
 from netbox.graphql.schema import Query
 from netbox.registry import registry
@@ -227,46 +227,3 @@ class PluginTest(TestCase):
         Test the registration of webhook callbacks.
         """
         self.assertIn(set_context, registry['webhook_callbacks'])
-
-
-class PluginNavigationTest(TestCase):
-
-    def test_plugin_menu_item_independent_permissions(self):
-        item1 = PluginMenuItem(link='test1', link_text='Test 1')
-        item1.permissions.append('leaked_permission')
-
-        item2 = PluginMenuItem(link='test2', link_text='Test 2')
-
-        self.assertIsNot(item1.permissions, item2.permissions)
-        self.assertEqual(item1.permissions, ['leaked_permission'])
-        self.assertEqual(item2.permissions, [])
-
-    def test_plugin_menu_item_independent_buttons(self):
-        item1 = PluginMenuItem(link='test1', link_text='Test 1')
-        button = PluginMenuButton(link='button1', title='Button 1', icon_class='mdi-test')
-        item1.buttons.append(button)
-
-        item2 = PluginMenuItem(link='test2', link_text='Test 2')
-
-        self.assertIsNot(item1.buttons, item2.buttons)
-        self.assertEqual(len(item1.buttons), 1)
-        self.assertEqual(item1.buttons[0], button)
-        self.assertEqual(item2.buttons, [])
-
-    def test_plugin_menu_button_independent_permissions(self):
-        button1 = PluginMenuButton(link='button1', title='Button 1', icon_class='mdi-test')
-        button1.permissions.append('leaked_permission')
-
-        button2 = PluginMenuButton(link='button2', title='Button 2', icon_class='mdi-test')
-
-        self.assertIsNot(button1.permissions, button2.permissions)
-        self.assertEqual(button1.permissions, ['leaked_permission'])
-        self.assertEqual(button2.permissions, [])
-
-    def test_explicit_permissions_remain_independent(self):
-        item1 = PluginMenuItem(link='test1', link_text='Test 1', permissions=['explicit_permission'])
-        item2 = PluginMenuItem(link='test2', link_text='Test 2', permissions=['different_permission'])
-
-        self.assertIsNot(item1.permissions, item2.permissions)
-        self.assertEqual(item1.permissions, ['explicit_permission'])
-        self.assertEqual(item2.permissions, ['different_permission'])

netbox/netbox/ui/panels.py

@@ -164,7 +164,7 @@ class ObjectAttributesPanel(ObjectPanel, metaclass=ObjectAttributesPanelMeta):
         """
         label = name[:1].upper() + name[1:]
         label = label.replace('_', ' ')
-        return label
+        return _(label)
 
     def get_context(self, context):
         # Determine which attributes to display in the panel based on only/exclude args

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;
-
-        // Add options and manually set $order to ensure correct sorting
-        results.forEach((result, index) => {
+        const options: Dict[] = [];
+        for (const result of results) {
           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;
-          }
-        });
-
-        self.loading--;
-        if (self.loading === 0) {
-          self.wrapper.classList.remove(self.settings.loadingClass as string);
+          options.push(option);
         }
-
-        // Restore the current selection
-        if (currentValue && !self.items.includes(currentValue as string)) {
-          self.items.push(currentValue as string);
-        }
-
-        self.refreshOptions(false);
+        return options;
+      })
+      // Pass the options to the callback function
+      .then(options => {
+        self.loadCallback(options, []);
       })
       .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: [],