From ca4589dbb9ab121fbb05eb641b8d0b3053734205 Mon Sep 17 00:00:00 2001
From: Jan Krupa <jan.krupa@cesnet.cz>
Date: Wed, 22 Apr 2026 14:33:13 +0000
Subject: [PATCH 1/2] Add Add-button on Typed tabs with reverse-reference
 prefill (closes #9)

Each typed tab now exposes an "Add <Type>" button that links to the native
customobject_add view with the back-reference field pre-populated to the
parent object's PK and return_url set to the current tab path. After saving,
the user lands back on the tab with filters preserved.

When a Custom Object Type has multiple back-reference fields to the same
parent model (e.g. primary_device + backup_device both -> dcim.device),
the button becomes a Bootstrap split-dropdown listing each field. The
button is hidden for users without add_customobject permission.

Implementation:
- New module-level _build_add_links() helper computes URLs from
  (slug, instance_pk, field_infos, return_url). Pure function, fully unit-tested.
- field_infos tuples extended from (name, type) to (name, type, label) so the
  dropdown can show human-readable field labels. Star-unpacking in
  _count_for_type and the queryset filter loop preserves backward compatibility
  with 2-tuple shapes used by existing tests.
- Permission gate uses utilities.permissions.get_permission_for_model, matching
  the pattern used by netbox_custom_objects.tables.CustomObjectActionsColumn.
- field_infos is sorted by field name in register_typed_tabs so the dropdown
  order is deterministic.

Tab placement: top-right of tab content, scoped entirely to typed/tab.html.
Tabs with hide_if_empty=True remain hidden until the first object is created
via the native menu - the button surfaces once the tab is visible.

Bumps version to 2.2.0 (minor, new feature). Test suite extended from 53 to 61
tests covering reverse failure, single/multi field, deduplication, label
fallback, 2-tuple back-compat, and return_url URL-encoding.
---
 CHANGELOG.md                                  |  15 +
 .../netbox_custom_objects_tab/typed/tab.html  |  28 ++
 netbox_custom_objects_tab/views/typed.py      |  65 ++-
 pyproject.toml                                |   2 +-
 tests/conftest.py                             |  65 +--
 tests/settings.py                             |  12 +-
 tests/test_views_typed_smoke.py               | 422 ++++++++++++++++--
 7 files changed, 529 insertions(+), 80 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 64c8751..e6b2333 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,21 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.2.0] - 2026-04-22
+
+### Added
+
+- **Add button on Typed tabs** ([#9](https://github.com/CESNET/netbox-custom-objects-tab/issues/9)) —
+  each Typed tab now shows an "Add *Type*" button (top-right) that opens the native
+  `customobject_add` view with the reverse-reference field pre-filled to the parent
+  object's PK and `return_url` set back to the tab. After saving, the user lands back
+  on the same tab, with any active filters preserved. When a Custom Object Type has
+  multiple fields referencing the same parent model (e.g. `primary_device` and
+  `backup_device` both → Device), the button becomes a split-dropdown listing each
+  field. The button is hidden for users without `add_customobject` permission.
+  Tabs with `hide_if_empty=True` are still hidden until the first object is created
+  via the native menu — subsequent additions can use the new button.
+
 ## [2.1.0] - 2026-03-16
 
 ### Added
diff --git a/netbox_custom_objects_tab/templates/netbox_custom_objects_tab/typed/tab.html b/netbox_custom_objects_tab/templates/netbox_custom_objects_tab/typed/tab.html
index 3ad9097..ad313c3 100644
--- a/netbox_custom_objects_tab/templates/netbox_custom_objects_tab/typed/tab.html
+++ b/netbox_custom_objects_tab/templates/netbox_custom_objects_tab/typed/tab.html
@@ -5,6 +5,34 @@
 {% load i18n %}
 {% block content %}
     {% if table %}
+        {# Add button (single) or split-dropdown (multiple back-reference fields) #}
+        {% if can_add and add_links %}
+            <div class="d-flex justify-content-end mt-2 mb-2">
+                {% if add_links|length == 1 %}
+                    <a href="{{ add_links.0.url }}" class="btn btn-sm btn-primary">
+                        <i class="mdi mdi-plus-thick"></i>
+                        {% blocktrans with label=add_label %}Add {{ label }}{% endblocktrans %}
+                    </a>
+                {% else %}
+                    <div class="btn-group">
+                        <button type="button"
+                                class="btn btn-sm btn-primary dropdown-toggle"
+                                data-bs-toggle="dropdown"
+                                aria-expanded="false">
+                            <i class="mdi mdi-plus-thick"></i>
+                            {% blocktrans with label=add_label %}Add {{ label }}{% endblocktrans %}
+                        </button>
+                        <ul class="dropdown-menu dropdown-menu-end">
+                            {% for link in add_links %}
+                                <li>
+                                    <a class="dropdown-item" href="{{ link.url }}">{% blocktrans with f=link.label %}via {{ f }}{% endblocktrans %}</a>
+                                </li>
+                            {% endfor %}
+                        </ul>
+                    </div>
+                {% endif %}
+            </div>
+        {% endif %}
         <hr class="mt-0 mb-3">
         {# Results / Filters inner tabs #}
         <ul class="nav nav-tabs custom-objects-subtabs mb-3" role="tablist">
diff --git a/netbox_custom_objects_tab/views/typed.py b/netbox_custom_objects_tab/views/typed.py
index 666c739..855388f 100644
--- a/netbox_custom_objects_tab/views/typed.py
+++ b/netbox_custom_objects_tab/views/typed.py
@@ -1,10 +1,12 @@
 import logging
 from collections import defaultdict
+from urllib.parse import urlencode
 
 from django.contrib.contenttypes.models import ContentType
 from django.db.models import Q
 from django.db.utils import OperationalError, ProgrammingError
 from django.shortcuts import get_object_or_404, render
+from django.urls import NoReverseMatch, reverse
 from django.views.generic import View
 from extras.choices import CustomFieldTypeChoices, CustomFieldUIVisibleChoices
 from netbox.forms import NetBoxModelFilterSetForm
@@ -14,6 +16,7 @@
 from netbox_custom_objects.models import CustomObjectTypeField
 from netbox_custom_objects.tables import CustomObjectTable
 from utilities.forms.fields import TagFilterField
+from utilities.permissions import get_permission_for_model
 from utilities.views import ViewTab, register_model_view
 
 from ._co_common import _CO_BASE_TEMPLATE, _CUSTOM_OBJECTS_APP, _get_base_template  # noqa: F401
@@ -99,10 +102,44 @@ def _build_filterset_form(custom_object_type, dynamic_model):
     )
 
 
+def _build_add_links(custom_object_type_slug, instance_pk, field_infos, return_url):
+    """
+    Build pre-filled "Add" URLs for the native customobject_add view.
+
+    field_infos = list of (field_name, field_type, [label]) for fields referencing the parent.
+    Returns list of {"field_name", "label", "url"} dicts (one per unique field), or [] if URL
+    cannot be reversed (e.g. plugin URL conf not loaded).
+    """
+    try:
+        add_base = reverse(
+            "plugins:netbox_custom_objects:customobject_add",
+            kwargs={"custom_object_type": custom_object_type_slug},
+        )
+    except NoReverseMatch:
+        return []
+
+    links = []
+    seen = set()
+    for field_name, _field_type, *rest in field_infos:
+        if field_name in seen:
+            continue
+        seen.add(field_name)
+        field_label = (rest[0] if rest else field_name) or field_name
+        qs = urlencode({field_name: instance_pk, "return_url": return_url})
+        links.append(
+            {
+                "field_name": field_name,
+                "label": field_label,
+                "url": f"{add_base}?{qs}",
+            }
+        )
+    return links
+
+
 def _count_for_type(custom_object_type, field_infos):
     """
     Return a badge callable for one Custom Object Type.
-    field_infos = list of (field_name, field_type) for fields referencing the parent model.
+    field_infos = list of (field_name, field_type, [label]) for fields referencing the parent model.
     Uses COUNT(*) only. Returns None when 0.
     """
 
@@ -117,7 +154,7 @@ def _badge(instance):
             return None
 
         total = 0
-        for field_name, field_type in field_infos:
+        for field_name, field_type, *_ in field_infos:
             if field_type == CustomFieldTypeChoices.TYPE_OBJECT:
                 total += dynamic_model.objects.filter(**{f"{field_name}_id": instance.pk}).count()
             elif field_type == CustomFieldTypeChoices.TYPE_MULTIOBJECT:
@@ -177,7 +214,7 @@ def get(self, request, pk, **kwargs):
 
             # Build base queryset: union of all field filters for this type
             q_filter = Q()
-            for field_name, field_type in field_infos:
+            for field_name, field_type, *_ in field_infos:
                 if field_type == CustomFieldTypeChoices.TYPE_OBJECT:
                     q_filter |= Q(**{f"{field_name}_id": instance.pk})
                 elif field_type == CustomFieldTypeChoices.TYPE_MULTIOBJECT:
@@ -213,6 +250,16 @@ def get(self, request, pk, **kwargs):
 
             return_url = request.get_full_path()
 
+            # Add-button: link(s) to native CO add view with reverse field pre-filled
+            add_permission = get_permission_for_model(dynamic_model, "add")
+            can_add = request.user.has_perm(add_permission)
+            add_links = _build_add_links(cot.slug, instance.pk, field_infos, return_url) if can_add else []
+
+            try:
+                add_label = cot.get_verbose_name()
+            except AttributeError:
+                add_label = str(cot)
+
             context = {
                 "object": instance,
                 "tab": self.tab,
@@ -223,6 +270,9 @@ def get(self, request, pk, **kwargs):
                 "custom_object_type": cot,
                 "model": dynamic_model,
                 "preferences": preferences,
+                "can_add": can_add,
+                "add_links": add_links,
+                "add_label": add_label,
             }
 
             if request.htmx and not request.htmx.boosted:
@@ -250,16 +300,21 @@ def register_typed_tabs(model_classes, weight):
         ).select_related("custom_object_type")
 
         # Group by (content_type_id, custom_object_type_pk)
-        # -> list of (field_name, field_type)
+        # -> list of (field_name, field_type, field_label)
         ct_cot_fields = defaultdict(list)
         ct_cot_map = {}  # (ct_id, cot_pk) -> CustomObjectType
         for field in all_fields:
             if field.related_object_type_id is None:
                 continue
             key = (field.related_object_type_id, field.custom_object_type_id)
-            ct_cot_fields[key].append((field.name, field.type))
+            label = getattr(field, "label", "") or field.name
+            ct_cot_fields[key].append((field.name, field.type, label))
             ct_cot_map[key] = field.custom_object_type
 
+        # Sort each group by field name for deterministic Add-button order
+        for key in ct_cot_fields:
+            ct_cot_fields[key].sort(key=lambda f: f[0])
+
         # Build a set of content_type_ids we care about
         model_ct_map = {}  # content_type_id -> model_class
         for model_class in model_classes:
diff --git a/pyproject.toml b/pyproject.toml
index 3b69d1e..af4bd41 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "netbox-custom-objects-tab"
-version = "2.1.1"
+version = "2.2.0"
 description = "NetBox plugin that adds a Custom Objects tab to object detail pages"
 readme = "README.md"
 requires-python = ">=3.12"
diff --git a/tests/conftest.py b/tests/conftest.py
index de8a150..934eac8 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -4,6 +4,7 @@
 This file is loaded by pytest before collection, ensuring mocks exist before
 plugin modules are imported.
 """
+
 import sys
 from types import ModuleType
 from unittest.mock import MagicMock
@@ -16,10 +17,10 @@ def _mock(dotted_name, **attrs):
     Create a mock module at `dotted_name` and register it (and any missing
     parent packages) in sys.modules.  Does NOT overwrite already-present entries.
     """
-    parts = dotted_name.split('.')
+    parts = dotted_name.split(".")
     # Ensure every parent package exists
     for i in range(1, len(parts)):
-        parent = '.'.join(parts[:i])
+        parent = ".".join(parts[:i])
         if parent not in sys.modules:
             sys.modules[parent] = ModuleType(parent)
 
@@ -34,7 +35,7 @@ def _mock(dotted_name, **attrs):
 
     # Attach as attribute on parent so `from parent import child` works
     if len(parts) > 1:
-        parent_mod = sys.modules['.'.join(parts[:-1])]
+        parent_mod = sys.modules[".".join(parts[:-1])]
         setattr(parent_mod, parts[-1], mod)
 
     return mod
@@ -45,41 +46,43 @@ def _mock(dotted_name, **attrs):
 # comparisons inside views.py work correctly when we set field.type = TYPE_OBJECT.
 # ---------------------------------------------------------------------------
 class _CustomFieldTypeChoices:
-    TYPE_OBJECT = 'object'
-    TYPE_MULTIOBJECT = 'multiobject'
-    TYPE_TEXT = 'text'
-    TYPE_LONGTEXT = 'longtext'
+    TYPE_OBJECT = "object"
+    TYPE_MULTIOBJECT = "multiobject"
+    TYPE_TEXT = "text"
+    TYPE_LONGTEXT = "longtext"
 
 
 class _CustomFieldUIVisibleChoices:
-    HIDDEN = 'hidden'
+    HIDDEN = "hidden"
 
 
 # --- netbox.* ---
-_mock('netbox')
-_mock('netbox.registry', registry={"views": {}})
-_mock('netbox.plugins',
-      PluginConfig=type('PluginConfig', (), {}),
-      get_plugin_config=MagicMock(return_value=[]))
-_NetBoxModelFilterSetForm = type('NetBoxModelFilterSetForm', (), {})
-_mock('netbox.forms', NetBoxModelFilterSetForm=_NetBoxModelFilterSetForm)
-_mock('netbox.forms.mixins', SavedFiltersMixin=type('SavedFiltersMixin', (), {}))
+_mock("netbox")
+_mock("netbox.registry", registry={"views": {}})
+_mock("netbox.plugins", PluginConfig=type("PluginConfig", (), {}), get_plugin_config=MagicMock(return_value=[]))
+_NetBoxModelFilterSetForm = type("NetBoxModelFilterSetForm", (), {})
+_mock("netbox.forms", NetBoxModelFilterSetForm=_NetBoxModelFilterSetForm)
+_mock("netbox.forms.mixins", SavedFiltersMixin=type("SavedFiltersMixin", (), {}))
 
 # --- extras.* ---
-_mock('extras')
+_mock("extras")
 _mock(
-    'extras.choices',
+    "extras.choices",
     CustomFieldTypeChoices=_CustomFieldTypeChoices,
     CustomFieldUIVisibleChoices=_CustomFieldUIVisibleChoices,
 )
 
 # --- utilities.* ---
-_mock('utilities')
-_mock('utilities.views', ViewTab=MagicMock(), register_model_view=MagicMock())
-_mock('utilities.paginator', EnhancedPaginator=MagicMock(), get_paginate_count=MagicMock())
-_mock('utilities.htmx', htmx_partial=MagicMock())
-_mock('utilities.forms')
-_mock('utilities.forms.fields', TagFilterField=MagicMock())
+_mock("utilities")
+_mock("utilities.views", ViewTab=MagicMock(), register_model_view=MagicMock())
+_mock("utilities.paginator", EnhancedPaginator=MagicMock(), get_paginate_count=MagicMock())
+_mock("utilities.htmx", htmx_partial=MagicMock())
+_mock("utilities.forms")
+_mock("utilities.forms.fields", TagFilterField=MagicMock())
+_mock(
+    "utilities.permissions",
+    get_permission_for_model=MagicMock(return_value="netbox_custom_objects.add_customobject"),
+)
 
 
 class _FakeBaseTable(_tables2.Table):
@@ -119,12 +122,12 @@ def _set_columns(self, selected_columns):
         ]
 
 
-_mock('netbox.tables', BaseTable=_FakeBaseTable)
+_mock("netbox.tables", BaseTable=_FakeBaseTable)
 
 # --- netbox_custom_objects.* ---
-_mock('netbox_custom_objects')
-_mock('netbox_custom_objects.models', CustomObjectTypeField=MagicMock())
-_mock('netbox_custom_objects.field_types', FIELD_TYPE_CLASS={})
-_mock('netbox_custom_objects.filtersets', get_filterset_class=MagicMock())
-_CustomObjectTable = type('CustomObjectTable', (), {})
-_mock('netbox_custom_objects.tables', CustomObjectTable=_CustomObjectTable)
+_mock("netbox_custom_objects")
+_mock("netbox_custom_objects.models", CustomObjectTypeField=MagicMock())
+_mock("netbox_custom_objects.field_types", FIELD_TYPE_CLASS={})
+_mock("netbox_custom_objects.filtersets", get_filterset_class=MagicMock())
+_CustomObjectTable = type("CustomObjectTable", (), {})
+_mock("netbox_custom_objects.tables", CustomObjectTable=_CustomObjectTable)
diff --git a/tests/settings.py b/tests/settings.py
index 5ce0f13..00023e4 100644
--- a/tests/settings.py
+++ b/tests/settings.py
@@ -2,15 +2,15 @@
 # Only the packages needed to make ContentType importable are included.
 
 INSTALLED_APPS = [
-    'django.contrib.contenttypes',
-    'django.contrib.auth',
+    "django.contrib.contenttypes",
+    "django.contrib.auth",
 ]
 
 DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': ':memory:',
+    "default": {
+        "ENGINE": "django.db.backends.sqlite3",
+        "NAME": ":memory:",
     }
 }
 
-DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
+DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField"
diff --git a/tests/test_views_typed_smoke.py b/tests/test_views_typed_smoke.py
index a013bc1..20b8fe6 100644
--- a/tests/test_views_typed_smoke.py
+++ b/tests/test_views_typed_smoke.py
@@ -124,17 +124,22 @@ def test_visible_fields_included_hidden_excluded(self):
         ft_mock.return_value.get_table_column_field.return_value = MagicMock()
         ft_mock.return_value.render_table_column = MagicMock()
 
-        with patch.dict("netbox_custom_objects.field_types.FIELD_TYPE_CLASS", {
-            CustomFieldTypeChoices.TYPE_TEXT: ft_mock,
-        }):
-            cot, model = self._make_cot_and_model([
-                {"name": "visible_field", "type": CustomFieldTypeChoices.TYPE_TEXT, "ui_visible": "visible"},
-                {
-                    "name": "hidden_field",
-                    "type": CustomFieldTypeChoices.TYPE_TEXT,
-                    "ui_visible": CustomFieldUIVisibleChoices.HIDDEN,
-                },
-            ])
+        with patch.dict(
+            "netbox_custom_objects.field_types.FIELD_TYPE_CLASS",
+            {
+                CustomFieldTypeChoices.TYPE_TEXT: ft_mock,
+            },
+        ):
+            cot, model = self._make_cot_and_model(
+                [
+                    {"name": "visible_field", "type": CustomFieldTypeChoices.TYPE_TEXT, "ui_visible": "visible"},
+                    {
+                        "name": "hidden_field",
+                        "type": CustomFieldTypeChoices.TYPE_TEXT,
+                        "ui_visible": CustomFieldUIVisibleChoices.HIDDEN,
+                    },
+                ]
+            )
             table_cls = _build_typed_table_class(cot, model)
 
         assert "visible_field" in table_cls.Meta.fields
@@ -148,13 +153,18 @@ def test_get_table_column_field_called_per_visible_field(self):
         ft_instance.render_table_column = MagicMock()
         ft_mock = MagicMock(return_value=ft_instance)
 
-        with patch.dict("netbox_custom_objects.field_types.FIELD_TYPE_CLASS", {
-            CustomFieldTypeChoices.TYPE_TEXT: ft_mock,
-        }):
-            cot, model = self._make_cot_and_model([
-                {"name": "field_a", "type": CustomFieldTypeChoices.TYPE_TEXT},
-                {"name": "field_b", "type": CustomFieldTypeChoices.TYPE_TEXT},
-            ])
+        with patch.dict(
+            "netbox_custom_objects.field_types.FIELD_TYPE_CLASS",
+            {
+                CustomFieldTypeChoices.TYPE_TEXT: ft_mock,
+            },
+        ):
+            cot, model = self._make_cot_and_model(
+                [
+                    {"name": "field_a", "type": CustomFieldTypeChoices.TYPE_TEXT},
+                    {"name": "field_b", "type": CustomFieldTypeChoices.TYPE_TEXT},
+                ]
+            )
             _build_typed_table_class(cot, model)
 
         assert ft_instance.get_table_column_field.call_count == 2
@@ -167,12 +177,17 @@ def test_primary_text_field_gets_linkified_render(self):
         ft_instance.render_table_column_linkified = MagicMock()
         ft_mock = MagicMock(return_value=ft_instance)
 
-        with patch.dict("netbox_custom_objects.field_types.FIELD_TYPE_CLASS", {
-            CustomFieldTypeChoices.TYPE_TEXT: ft_mock,
-        }):
-            cot, model = self._make_cot_and_model([
-                {"name": "title", "type": CustomFieldTypeChoices.TYPE_TEXT, "primary": True},
-            ])
+        with patch.dict(
+            "netbox_custom_objects.field_types.FIELD_TYPE_CLASS",
+            {
+                CustomFieldTypeChoices.TYPE_TEXT: ft_mock,
+            },
+        ):
+            cot, model = self._make_cot_and_model(
+                [
+                    {"name": "title", "type": CustomFieldTypeChoices.TYPE_TEXT, "primary": True},
+                ]
+            )
             table_cls = _build_typed_table_class(cot, model)
 
         assert hasattr(table_cls, "render_title")
@@ -189,9 +204,11 @@ def test_not_implemented_column_logged_and_skipped(self, caplog):
             patch.dict("netbox_custom_objects.field_types.FIELD_TYPE_CLASS", {"custom_type": ft_mock}),
             caplog.at_level(logging.DEBUG, logger="netbox_custom_objects_tab"),
         ):
-            cot, model = self._make_cot_and_model([
-                {"name": "weird_field", "type": "custom_type"},
-            ])
+            cot, model = self._make_cot_and_model(
+                [
+                    {"name": "weird_field", "type": "custom_type"},
+                ]
+            )
             table_cls = _build_typed_table_class(cot, model)
 
         # Should still produce a valid class
@@ -241,13 +258,18 @@ def test_get_filterform_field_called_per_field(self):
         ft_instance.get_filterform_field.return_value = MagicMock()
         ft_mock = MagicMock(return_value=ft_instance)
 
-        with patch.dict("netbox_custom_objects.field_types.FIELD_TYPE_CLASS", {
-            CustomFieldTypeChoices.TYPE_TEXT: ft_mock,
-        }):
-            cot, model = self._make_cot_and_model([
-                {"name": "field_a", "type": CustomFieldTypeChoices.TYPE_TEXT},
-                {"name": "field_b", "type": CustomFieldTypeChoices.TYPE_TEXT},
-            ])
+        with patch.dict(
+            "netbox_custom_objects.field_types.FIELD_TYPE_CLASS",
+            {
+                CustomFieldTypeChoices.TYPE_TEXT: ft_mock,
+            },
+        ):
+            cot, model = self._make_cot_and_model(
+                [
+                    {"name": "field_a", "type": CustomFieldTypeChoices.TYPE_TEXT},
+                    {"name": "field_b", "type": CustomFieldTypeChoices.TYPE_TEXT},
+                ]
+            )
             _build_filterset_form(cot, model)
 
         assert ft_instance.get_filterform_field.call_count == 2
@@ -263,9 +285,11 @@ def test_not_implemented_filter_logged_and_skipped(self, caplog):
             patch.dict("netbox_custom_objects.field_types.FIELD_TYPE_CLASS", {"custom_type": ft_mock}),
             caplog.at_level(logging.DEBUG, logger="netbox_custom_objects_tab"),
         ):
-            cot, model = self._make_cot_and_model([
-                {"name": "weird_field", "type": "custom_type"},
-            ])
+            cot, model = self._make_cot_and_model(
+                [
+                    {"name": "weird_field", "type": "custom_type"},
+                ]
+            )
             form_cls = _build_filterset_form(cot, model)
 
         assert not hasattr(form_cls, "weird_field")
@@ -376,6 +400,193 @@ def test_models_not_in_model_classes_skipped(self):
         mock_register.assert_not_called()
 
 
+# ---------------------------------------------------------------------------
+# _build_add_links
+# ---------------------------------------------------------------------------
+class TestBuildAddLinks:
+    def test_returns_empty_when_url_cannot_be_reversed(self):
+        from django.urls import NoReverseMatch
+
+        from netbox_custom_objects_tab.views.typed import _build_add_links
+
+        with patch("netbox_custom_objects_tab.views.typed.reverse", side_effect=NoReverseMatch):
+            links = _build_add_links(
+                "server",
+                42,
+                [("device_ref", CustomFieldTypeChoices.TYPE_OBJECT, "Device Reference")],
+                "/dcim/devices/42/custom-objects-server/",
+            )
+        assert links == []
+
+    def test_single_field_builds_one_link_with_prefilled_querystring(self):
+        from netbox_custom_objects_tab.views.typed import _build_add_links
+
+        with patch(
+            "netbox_custom_objects_tab.views.typed.reverse",
+            return_value="/plugins/custom-objects/server/add/",
+        ):
+            links = _build_add_links(
+                "server",
+                42,
+                [("device_ref", CustomFieldTypeChoices.TYPE_OBJECT, "Device Reference")],
+                "/dcim/devices/42/custom-objects-server/",
+            )
+
+        assert len(links) == 1
+        link = links[0]
+        assert link["field_name"] == "device_ref"
+        assert link["label"] == "Device Reference"
+        assert link["url"].startswith("/plugins/custom-objects/server/add/?")
+        assert "device_ref=42" in link["url"]
+        # return_url must be URL-encoded (slashes -> %2F)
+        assert "return_url=%2Fdcim%2Fdevices%2F42%2Fcustom-objects-server%2F" in link["url"]
+
+    def test_label_falls_back_to_field_name_when_label_missing(self):
+        from netbox_custom_objects_tab.views.typed import _build_add_links
+
+        with patch(
+            "netbox_custom_objects_tab.views.typed.reverse",
+            return_value="/plugins/custom-objects/server/add/",
+        ):
+            # 2-tuple (no label) and 3-tuple with empty label -- both fall back to name
+            links = _build_add_links(
+                "server",
+                7,
+                [
+                    ("ref_a", CustomFieldTypeChoices.TYPE_OBJECT),
+                    ("ref_b", CustomFieldTypeChoices.TYPE_OBJECT, ""),
+                ],
+                "/dcim/sites/7/custom-objects-server/",
+            )
+
+        assert [link["label"] for link in links] == ["ref_a", "ref_b"]
+
+    def test_multiple_fields_produce_one_link_each(self):
+        from netbox_custom_objects_tab.views.typed import _build_add_links
+
+        with patch(
+            "netbox_custom_objects_tab.views.typed.reverse",
+            return_value="/plugins/custom-objects/server/add/",
+        ):
+            links = _build_add_links(
+                "server",
+                42,
+                [
+                    ("primary_device", CustomFieldTypeChoices.TYPE_OBJECT, "Primary Device"),
+                    ("backup_device", CustomFieldTypeChoices.TYPE_OBJECT, "Backup Device"),
+                ],
+                "/dcim/devices/42/custom-objects-server/",
+            )
+
+        assert len(links) == 2
+        assert {link["field_name"] for link in links} == {"primary_device", "backup_device"}
+        assert {link["label"] for link in links} == {"Primary Device", "Backup Device"}
+        urls = [link["url"] for link in links]
+        assert any("primary_device=42" in u for u in urls)
+        assert any("backup_device=42" in u for u in urls)
+
+    def test_duplicate_field_names_deduplicated(self):
+        from netbox_custom_objects_tab.views.typed import _build_add_links
+
+        with patch(
+            "netbox_custom_objects_tab.views.typed.reverse",
+            return_value="/plugins/custom-objects/server/add/",
+        ):
+            links = _build_add_links(
+                "server",
+                42,
+                [
+                    ("ref", CustomFieldTypeChoices.TYPE_OBJECT, "First"),
+                    ("ref", CustomFieldTypeChoices.TYPE_MULTIOBJECT, "Second"),
+                ],
+                "/dcim/devices/42/custom-objects-server/",
+            )
+
+        assert len(links) == 1
+        assert links[0]["label"] == "First"  # first occurrence wins
+
+    def test_return_url_with_querystring_is_encoded_not_double_encoded(self):
+        from netbox_custom_objects_tab.views.typed import _build_add_links
+
+        return_url = "/dcim/devices/42/custom-objects-server/?tag=production&q=foo"
+        with patch(
+            "netbox_custom_objects_tab.views.typed.reverse",
+            return_value="/plugins/custom-objects/server/add/",
+        ):
+            links = _build_add_links(
+                "server",
+                42,
+                [("device_ref", CustomFieldTypeChoices.TYPE_OBJECT, "Device")],
+                return_url,
+            )
+
+        url = links[0]["url"]
+        # No double-encoding: %25 would mean % got re-encoded
+        assert "%25" not in url
+        # The nested ? and & in return_url must be encoded as %3F and %26
+        assert "%3F" in url or "%3f" in url
+        assert "%26" in url
+
+
+# ---------------------------------------------------------------------------
+# register_typed_tabs -- label population + deterministic ordering
+# ---------------------------------------------------------------------------
+class TestRegisterTypedTabsLabelAndOrder:
+    def test_field_label_and_name_populated_in_field_infos_and_sorted(self):
+        from netbox_custom_objects_tab.views.typed import register_typed_tabs
+
+        model_class = MagicMock(__name__="Device")
+        model_class._meta.app_label = "dcim"
+        model_class._meta.model_name = "device"
+
+        ct = MagicMock()
+        ct.pk = 10
+
+        # Two fields on the same CustomObjectType; registered in order b, a; expect sorted a, b
+        field_b = MagicMock()
+        field_b.related_object_type_id = 10
+        field_b.custom_object_type_id = 100
+        field_b.custom_object_type = MagicMock(slug="server", pk=100)
+        field_b.name = "b_device"
+        field_b.label = "B Device"
+        field_b.type = CustomFieldTypeChoices.TYPE_OBJECT
+
+        field_a = MagicMock()
+        field_a.related_object_type_id = 10
+        field_a.custom_object_type_id = 100
+        field_a.custom_object_type = MagicMock(slug="server", pk=100)
+        field_a.name = "a_device"
+        field_a.label = ""  # blank label -> should fall back to name
+        field_a.type = CustomFieldTypeChoices.TYPE_MULTIOBJECT
+
+        captured_field_infos = {}
+
+        def fake_make_view(model_cls, cot, field_infos, weight):
+            captured_field_infos["infos"] = list(field_infos)
+            return MagicMock()
+
+        with (
+            patch("netbox_custom_objects_tab.views.typed.CustomObjectTypeField") as mock_cotf,
+            patch("netbox_custom_objects_tab.views.typed.ContentType") as mock_ct,
+            patch("netbox_custom_objects_tab.views.typed.register_model_view") as mock_register,
+            patch("netbox_custom_objects_tab.views.typed._make_typed_tab_view", side_effect=fake_make_view),
+        ):
+            mock_cotf.objects.filter.return_value.select_related.return_value = [field_b, field_a]
+            mock_ct.objects.get_for_model.return_value = ct
+            mock_register.return_value = lambda cls: cls
+
+            register_typed_tabs([model_class], weight=2100)
+
+        infos = captured_field_infos["infos"]
+        assert len(infos) == 2
+        # Sorted by field name ascending
+        assert infos[0][0] == "a_device"
+        assert infos[1][0] == "b_device"
+        # Labels: blank -> falls back to name; populated -> kept
+        assert infos[0][2] == "a_device"
+        assert infos[1][2] == "B Device"
+
+
 # ---------------------------------------------------------------------------
 # _get_base_template
 # ---------------------------------------------------------------------------
@@ -399,3 +610,140 @@ def test_non_co_model_returns_per_model_template(self):
 
         instance = self._make_instance("dcim", "device")
         assert _get_base_template(instance) == "dcim/device.html"
+
+
+# ---------------------------------------------------------------------------
+# _build_add_links
+# ---------------------------------------------------------------------------
+class TestBuildAddLinks:
+    def test_returns_empty_when_reverse_fails(self):
+        from django.urls import NoReverseMatch
+
+        from netbox_custom_objects_tab.views.typed import _build_add_links
+
+        with patch("netbox_custom_objects_tab.views.typed.reverse", side_effect=NoReverseMatch):
+            links = _build_add_links(
+                "server",
+                42,
+                [("device", CustomFieldTypeChoices.TYPE_OBJECT, "Device")],
+                "/dcim/devices/42/",
+            )
+        assert links == []
+
+    def test_single_field_produces_one_link_with_prefill_and_return_url(self):
+        from netbox_custom_objects_tab.views.typed import _build_add_links
+
+        with patch(
+            "netbox_custom_objects_tab.views.typed.reverse",
+            return_value="/plugins/custom-objects/server/add/",
+        ):
+            links = _build_add_links(
+                "server",
+                42,
+                [("device", CustomFieldTypeChoices.TYPE_OBJECT, "Device")],
+                "/dcim/devices/42/custom-objects-server/",
+            )
+
+        assert len(links) == 1
+        assert links[0]["field_name"] == "device"
+        assert links[0]["label"] == "Device"
+        # Query string contains both the field prefill and the return_url, in either order
+        url = links[0]["url"]
+        assert url.startswith("/plugins/custom-objects/server/add/?")
+        assert "device=42" in url
+        assert "return_url=%2Fdcim%2Fdevices%2F42%2Fcustom-objects-server%2F" in url
+
+    def test_multiple_fields_produce_multiple_links(self):
+        from netbox_custom_objects_tab.views.typed import _build_add_links
+
+        with patch(
+            "netbox_custom_objects_tab.views.typed.reverse",
+            return_value="/plugins/custom-objects/link/add/",
+        ):
+            links = _build_add_links(
+                "link",
+                7,
+                [
+                    ("primary_device", CustomFieldTypeChoices.TYPE_OBJECT, "Primary"),
+                    ("backup_device", CustomFieldTypeChoices.TYPE_OBJECT, "Backup"),
+                ],
+                "/dcim/devices/7/",
+            )
+
+        assert len(links) == 2
+        names = {link["field_name"] for link in links}
+        labels = {link["label"] for link in links}
+        assert names == {"primary_device", "backup_device"}
+        assert labels == {"Primary", "Backup"}
+        for link in links:
+            assert f"{link['field_name']}=7" in link["url"]
+
+    def test_duplicate_field_names_deduplicated(self):
+        from netbox_custom_objects_tab.views.typed import _build_add_links
+
+        with patch(
+            "netbox_custom_objects_tab.views.typed.reverse",
+            return_value="/plugins/custom-objects/x/add/",
+        ):
+            links = _build_add_links(
+                "x",
+                1,
+                [
+                    ("device", CustomFieldTypeChoices.TYPE_OBJECT, "Device"),
+                    ("device", CustomFieldTypeChoices.TYPE_MULTIOBJECT, "Device"),
+                ],
+                "/dcim/devices/1/",
+            )
+        assert len(links) == 1
+        assert links[0]["field_name"] == "device"
+
+    def test_label_falls_back_to_field_name_when_label_blank(self):
+        from netbox_custom_objects_tab.views.typed import _build_add_links
+
+        with patch(
+            "netbox_custom_objects_tab.views.typed.reverse",
+            return_value="/plugins/custom-objects/x/add/",
+        ):
+            links = _build_add_links(
+                "x",
+                1,
+                [("device_ref", CustomFieldTypeChoices.TYPE_OBJECT, "")],
+                "/dcim/devices/1/",
+            )
+        assert links[0]["label"] == "device_ref"
+
+    def test_two_tuple_field_infos_supported_label_defaults_to_name(self):
+        """Backward-compatible: 2-tuples (no label) work via star unpacking."""
+        from netbox_custom_objects_tab.views.typed import _build_add_links
+
+        with patch(
+            "netbox_custom_objects_tab.views.typed.reverse",
+            return_value="/plugins/custom-objects/x/add/",
+        ):
+            links = _build_add_links(
+                "x",
+                1,
+                [("device", CustomFieldTypeChoices.TYPE_OBJECT)],
+                "/dcim/devices/1/",
+            )
+        assert links[0]["label"] == "device"
+
+    def test_return_url_with_query_string_is_url_encoded(self):
+        """A return_url containing & and ? must be URL-encoded so it doesn't break the outer query string."""
+        from netbox_custom_objects_tab.views.typed import _build_add_links
+
+        with patch(
+            "netbox_custom_objects_tab.views.typed.reverse",
+            return_value="/plugins/custom-objects/x/add/",
+        ):
+            links = _build_add_links(
+                "x",
+                1,
+                [("device", CustomFieldTypeChoices.TYPE_OBJECT, "Device")],
+                "/dcim/devices/1/custom-objects-x/?tag=foo&q=bar",
+            )
+        url = links[0]["url"]
+        # The inner '?' and '&' must be percent-encoded inside the return_url value
+        assert "return_url=%2Fdcim%2Fdevices%2F1%2Fcustom-objects-x%2F%3Ftag%3Dfoo%26q%3Dbar" in url
+        # Outer URL must have exactly one literal '?'
+        assert url.count("?") == 1

From b123577f24a17fde12e4c8dab6f21512c4b8a855 Mon Sep 17 00:00:00 2001
From: Jan Krupa <jan.krupa@cesnet.cz>
Date: Wed, 22 Apr 2026 14:35:55 +0000
Subject: [PATCH 2/2] Remove accidental duplicate TestBuildAddLinks class

---
 tests/test_views_typed_smoke.py | 128 --------------------------------
 1 file changed, 128 deletions(-)

diff --git a/tests/test_views_typed_smoke.py b/tests/test_views_typed_smoke.py
index 20b8fe6..b2c2bb1 100644
--- a/tests/test_views_typed_smoke.py
+++ b/tests/test_views_typed_smoke.py
@@ -400,134 +400,6 @@ def test_models_not_in_model_classes_skipped(self):
         mock_register.assert_not_called()
 
 
-# ---------------------------------------------------------------------------
-# _build_add_links
-# ---------------------------------------------------------------------------
-class TestBuildAddLinks:
-    def test_returns_empty_when_url_cannot_be_reversed(self):
-        from django.urls import NoReverseMatch
-
-        from netbox_custom_objects_tab.views.typed import _build_add_links
-
-        with patch("netbox_custom_objects_tab.views.typed.reverse", side_effect=NoReverseMatch):
-            links = _build_add_links(
-                "server",
-                42,
-                [("device_ref", CustomFieldTypeChoices.TYPE_OBJECT, "Device Reference")],
-                "/dcim/devices/42/custom-objects-server/",
-            )
-        assert links == []
-
-    def test_single_field_builds_one_link_with_prefilled_querystring(self):
-        from netbox_custom_objects_tab.views.typed import _build_add_links
-
-        with patch(
-            "netbox_custom_objects_tab.views.typed.reverse",
-            return_value="/plugins/custom-objects/server/add/",
-        ):
-            links = _build_add_links(
-                "server",
-                42,
-                [("device_ref", CustomFieldTypeChoices.TYPE_OBJECT, "Device Reference")],
-                "/dcim/devices/42/custom-objects-server/",
-            )
-
-        assert len(links) == 1
-        link = links[0]
-        assert link["field_name"] == "device_ref"
-        assert link["label"] == "Device Reference"
-        assert link["url"].startswith("/plugins/custom-objects/server/add/?")
-        assert "device_ref=42" in link["url"]
-        # return_url must be URL-encoded (slashes -> %2F)
-        assert "return_url=%2Fdcim%2Fdevices%2F42%2Fcustom-objects-server%2F" in link["url"]
-
-    def test_label_falls_back_to_field_name_when_label_missing(self):
-        from netbox_custom_objects_tab.views.typed import _build_add_links
-
-        with patch(
-            "netbox_custom_objects_tab.views.typed.reverse",
-            return_value="/plugins/custom-objects/server/add/",
-        ):
-            # 2-tuple (no label) and 3-tuple with empty label -- both fall back to name
-            links = _build_add_links(
-                "server",
-                7,
-                [
-                    ("ref_a", CustomFieldTypeChoices.TYPE_OBJECT),
-                    ("ref_b", CustomFieldTypeChoices.TYPE_OBJECT, ""),
-                ],
-                "/dcim/sites/7/custom-objects-server/",
-            )
-
-        assert [link["label"] for link in links] == ["ref_a", "ref_b"]
-
-    def test_multiple_fields_produce_one_link_each(self):
-        from netbox_custom_objects_tab.views.typed import _build_add_links
-
-        with patch(
-            "netbox_custom_objects_tab.views.typed.reverse",
-            return_value="/plugins/custom-objects/server/add/",
-        ):
-            links = _build_add_links(
-                "server",
-                42,
-                [
-                    ("primary_device", CustomFieldTypeChoices.TYPE_OBJECT, "Primary Device"),
-                    ("backup_device", CustomFieldTypeChoices.TYPE_OBJECT, "Backup Device"),
-                ],
-                "/dcim/devices/42/custom-objects-server/",
-            )
-
-        assert len(links) == 2
-        assert {link["field_name"] for link in links} == {"primary_device", "backup_device"}
-        assert {link["label"] for link in links} == {"Primary Device", "Backup Device"}
-        urls = [link["url"] for link in links]
-        assert any("primary_device=42" in u for u in urls)
-        assert any("backup_device=42" in u for u in urls)
-
-    def test_duplicate_field_names_deduplicated(self):
-        from netbox_custom_objects_tab.views.typed import _build_add_links
-
-        with patch(
-            "netbox_custom_objects_tab.views.typed.reverse",
-            return_value="/plugins/custom-objects/server/add/",
-        ):
-            links = _build_add_links(
-                "server",
-                42,
-                [
-                    ("ref", CustomFieldTypeChoices.TYPE_OBJECT, "First"),
-                    ("ref", CustomFieldTypeChoices.TYPE_MULTIOBJECT, "Second"),
-                ],
-                "/dcim/devices/42/custom-objects-server/",
-            )
-
-        assert len(links) == 1
-        assert links[0]["label"] == "First"  # first occurrence wins
-
-    def test_return_url_with_querystring_is_encoded_not_double_encoded(self):
-        from netbox_custom_objects_tab.views.typed import _build_add_links
-
-        return_url = "/dcim/devices/42/custom-objects-server/?tag=production&q=foo"
-        with patch(
-            "netbox_custom_objects_tab.views.typed.reverse",
-            return_value="/plugins/custom-objects/server/add/",
-        ):
-            links = _build_add_links(
-                "server",
-                42,
-                [("device_ref", CustomFieldTypeChoices.TYPE_OBJECT, "Device")],
-                return_url,
-            )
-
-        url = links[0]["url"]
-        # No double-encoding: %25 would mean % got re-encoded
-        assert "%25" not in url
-        # The nested ? and & in return_url must be encoded as %3F and %26
-        assert "%3F" in url or "%3f" in url
-        assert "%26" in url
-
-
 # ---------------------------------------------------------------------------
 # register_typed_tabs -- label population + deterministic ordering
 # ---------------------------------------------------------------------------