nautobot 2.3.9__py3-none-any.whl → 2.3.11__py3-none-any.whl

nautobot/core/views/mixins.py

@@ -414,7 +414,7 @@ class NautobotViewSetMixin(GenericViewSet, AccessMixin, GetReturnURLMixin, FormV
         else:
             # render the form with the error message.
             data = {}
-            if self.action in ["bulk_update", "bulk_destroy"]:
+            if not request.POST.get("_all") and self.action in ["bulk_update", "bulk_destroy"]:
                 pk_list = self.pk_list
                 table_class = self.get_table_class()
                 table = table_class(queryset.filter(pk__in=pk_list), orderable=False)
@@ -578,6 +578,9 @@ class NautobotViewSetMixin(GenericViewSet, AccessMixin, GetReturnURLMixin, FormV
         if not form_class:
             if self.action == "bulk_destroy":
                 queryset = self.get_queryset()
+                bulk_delete_all = bool(self.request.POST.get("_all"))
+                if bulk_delete_all:
+                    return ConfirmationForm
 
                 class BulkDestroyForm(ConfirmationForm):
                     pk = ModelMultipleChoiceField(queryset=queryset, widget=MultipleHiddenInput)
@@ -909,7 +912,48 @@ class ObjectEditViewMixin(NautobotViewSetMixin, mixins.CreateModelMixin, mixins.
             return self.form_invalid(form)
 
 
-class ObjectBulkDestroyViewMixin(NautobotViewSetMixin, BulkDestroyModelMixin):
+class EditAndDeleteAllModelMixin:
+    """
+    UI mixin to bulk destroy all and bulk edit all model instances.
+    """
+
+    def _get_bulk_edit_delete_all_queryset(self, request):
+        """
+        Retrieve the queryset of model instances to be bulk-deleted or bulk-deleted, filtered based on request parameters.
+
+        This method handles the retrieval of a queryset of model instances that match the specified
+        filter criteria in the request parameters, allowing a bulk delete operation to be performed
+        on all matching instances.
+        """
+        model = self.queryset.model
+
+        # This Mixin is currently been used by both NautobotUIViewSet ObjectBulkDestroyViewMixin, ObjectBulkUpdateViewMixin
+        # BulkEditView, and BulkDeleteView which uses different keys for accessing filterset
+        filterset_class = getattr(self, "filterset", None)
+        if filterset_class is None:
+            filterset_class = getattr(self, "filterset_class", None)
+
+        if request.GET and filterset_class is not None:
+            queryset = filterset_class(request.GET, model.objects.all()).qs
+            # We take this approach because filterset.qs has already applied .distinct(),
+            # and performing a .delete directly on a queryset with .distinct applied is not allowed.
+            queryset = self.queryset.filter(pk__in=queryset)
+        else:
+            queryset = model.objects.all()
+        return queryset
+
+    def _bulk_delete_all_context(self, request, queryset):
+        model = queryset.model
+        return {
+            "obj_type_plural": model._meta.verbose_name_plural,
+            "return_url": self.get_return_url(request),
+            "total_objs_to_delete": queryset.count(),
+            "delete_all": True,
+            "table": None,
+        }
+
+
+class ObjectBulkDestroyViewMixin(NautobotViewSetMixin, BulkDestroyModelMixin, EditAndDeleteAllModelMixin):
     """
     UI mixin to bulk destroy model instances.
     """
@@ -923,7 +967,10 @@ class ObjectBulkDestroyViewMixin(NautobotViewSetMixin, BulkDestroyModelMixin):
         queryset = self.get_queryset()
         model = queryset.model
         # Delete objects
-        queryset = queryset.filter(pk__in=pk_list)
+        if self.request.POST.get("_all"):
+            queryset = self._get_bulk_edit_delete_all_queryset(self.request)
+        else:
+            queryset = queryset.filter(pk__in=pk_list)
 
         try:
             with transaction.atomic():
@@ -951,35 +998,33 @@ class ObjectBulkDestroyViewMixin(NautobotViewSetMixin, BulkDestroyModelMixin):
         request.POST "_confirm": Function to validate the table form/BulkDestroyConfirmationForm and to perform the action of bulk destroy. Render the form with errors if exceptions are raised.
         """
         queryset = self.get_queryset()
-        model = queryset.model
+        delete_all = bool(request.POST.get("_all"))
+        data = {}
         # Are we deleting *all* objects in the queryset or just a selected subset?
-        if request.POST.get("_all"):
-            if self.filterset_class is not None:
-                self.pk_list = list(
-                    self.filterset_class(request.GET, model.objects.only("pk")).qs.values_list("pk", flat=True)
-                )
-            else:
-                self.pk_list = list(model.objects.all().values_list("pk", flat=True))
+        if delete_all:
+            queryset = self._get_bulk_edit_delete_all_queryset(self.request)
+            data = self._bulk_delete_all_context(request, queryset)
         else:
             self.pk_list = list(request.POST.getlist("pk"))
+
         form_class = self.get_form_class(**kwargs)
-        data = {}
         if "_confirm" in request.POST:
             form = form_class(request.POST, initial=normalize_querydict(request.GET, form_class=form_class))
             if form.is_valid():
                 return self.form_valid(form)
             else:
                 return self.form_invalid(form)
-        table_class = self.get_table_class()
-        table = table_class(queryset.filter(pk__in=self.pk_list), orderable=False)
-        if not table.rows:
-            messages.warning(
-                request,
-                f"No {queryset.model._meta.verbose_name_plural} were selected for deletion.",
-            )
-            return redirect(self.get_return_url(request))
+        if not delete_all:
+            table_class = self.get_table_class()
+            table = table_class(queryset.filter(pk__in=self.pk_list), orderable=False)
+            if not table.rows:
+                messages.warning(
+                    request,
+                    f"No {queryset.model._meta.verbose_name_plural} were selected for deletion.",
+                )
+                return redirect(self.get_return_url(request))
 
-        data.update({"table": table})
+            data.update({"table": table})
         return Response(data)
 
 
@@ -1037,7 +1082,7 @@ class ObjectBulkCreateViewMixin(NautobotViewSetMixin):  # 3.0 TODO: remove, unus
             return self.form_invalid(form)
 
 
-class ObjectBulkUpdateViewMixin(NautobotViewSetMixin, BulkUpdateModelMixin):
+class ObjectBulkUpdateViewMixin(NautobotViewSetMixin, BulkUpdateModelMixin, EditAndDeleteAllModelMixin):
     """
     UI mixin to bulk update model instances.
     """
@@ -1062,7 +1107,13 @@ class ObjectBulkUpdateViewMixin(NautobotViewSetMixin, BulkUpdateModelMixin):
         nullified_fields = request.POST.getlist("_nullify")
         with deferred_change_logging_for_bulk_operation():
             updated_objects = []
-            for obj in queryset.filter(pk__in=form.cleaned_data["pk"]):
+            edit_all = self.request.POST.get("_all")
+
+            if edit_all:
+                queryset = self._get_bulk_edit_delete_all_queryset(self.request)
+            else:
+                queryset = queryset.filter(pk__in=form.cleaned_data["pk"])
+            for obj in queryset:
                 self.obj = obj
                 # Update standard fields. If a field is listed in _nullify, delete its value.
                 for name in standard_fields:
@@ -1133,38 +1184,41 @@ class ObjectBulkUpdateViewMixin(NautobotViewSetMixin, BulkUpdateModelMixin):
         request.POST "_edit": Function to render the user selection of objects in a table form/BulkUpdateForm via Response that is passed to NautobotHTMLRenderer.
         request.POST "_apply": Function to validate the table form/BulkUpdateForm and to perform the action of bulk update. Render the form with errors if exceptions are raised.
         """
-        queryset = self.get_queryset()
-        model = queryset.model
+        edit_all = request.POST.get("_all")
 
-        # If we are editing *all* objects in the queryset, replace the PK list with all matched objects.
-        if request.POST.get("_all"):
-            if self.filterset_class is not None:
-                self.pk_list = list(
-                    self.filterset_class(request.GET, model.objects.only("pk")).qs.values_list("pk", flat=True)
-                )
-            else:
-                self.pk_list = list(model.objects.all().values_list("pk", flat=True))
+        if edit_all:
+            self.pk_list = None
+            queryset = self._get_bulk_edit_delete_all_queryset(request)
         else:
             self.pk_list = list(request.POST.getlist("pk"))
+            queryset = self.get_queryset().filter(pk__in=self.pk_list)
+
         data = {}
         form_class = self.get_form_class()
         if "_apply" in request.POST:
             self.kwargs = kwargs
-            form = form_class(queryset.model, request.POST)
+            form = form_class(queryset.model, request.POST, edit_all=edit_all)
             restrict_form_fields(form, request.user)
             if form.is_valid():
                 return self.form_valid(form)
             else:
                 return self.form_invalid(form)
-        table_class = self.get_table_class()
-        table = table_class(queryset.filter(pk__in=self.pk_list), orderable=False)
-        if not table.rows:
-            messages.warning(
-                request,
-                f"No {queryset.model._meta.verbose_name_plural} were selected to update.",
-            )
-            return redirect(self.get_return_url(request))
-        data.update({"table": table})
+        table = None
+        if not edit_all:
+            table_class = self.get_table_class()
+            table = table_class(queryset, orderable=False)
+            if not table.rows:
+                messages.warning(
+                    request,
+                    f"No {queryset.model._meta.verbose_name_plural} were selected to update.",
+                )
+                return redirect(self.get_return_url(request))
+        data.update(
+            {
+                "table": table,
+                "objs_count": queryset.count(),
+            }
+        )
         return Response(data)
 
 

nautobot/core/views/renderers.py

@@ -249,19 +249,22 @@ class NautobotHTMLRenderer(renderers.BrowsableAPIRenderer):
                         "return_url": return_url,
                     }
                     form = form_class(initial=initial)
-                table = self.construct_table(view, pk_list=pk_list)
+                delete_all = request.POST.get("_all")
+                if not delete_all:
+                    table = self.construct_table(view, pk_list=pk_list)
             elif view.action == "bulk_create":  # 3.0 TODO: remove, replaced by ImportObjects system Job
                 form = view.get_form()
                 if request.data:
                     table = data.get("table")
             elif view.action == "bulk_update":
+                edit_all = request.POST.get("_all")
                 pk_list = getattr(view, "pk_list", [])
-                if pk_list:
+                if pk_list or edit_all:
                     initial_data = {"pk": pk_list}
-                    form = form_class(model, initial=initial_data)
-
+                    form = form_class(model, initial=initial_data, edit_all=edit_all)
                     restrict_form_fields(form, request.user)
-                table = self.construct_table(view, pk_list=pk_list)
+                if not edit_all:
+                    table = self.construct_table(view, pk_list=pk_list)
             elif view.action == "notes":
                 initial_data = {
                     "assigned_object_type": content_type,

nautobot/dcim/tables/devices.py

@@ -1277,6 +1277,9 @@ class SoftwareImageFileTable(StatusTableMixin, BaseTable):
 class SoftwareVersionTable(StatusTableMixin, BaseTable):
     pk = ToggleColumn()
     version = tables.Column(linkify=True)
+    platform = tables.Column(linkify=True)
+    release_date = tables.DateColumn()
+    end_of_support_date = tables.DateColumn()
     software_image_file_count = LinkedCountColumn(
         viewname="dcim:softwareimagefile_list",
         url_params={"software_version": "pk"},

nautobot/dcim/templates/dcim/device_component_add.html

@@ -7,7 +7,7 @@
 <form action="" method="post" class="form form-horizontal">
     {% csrf_token %}
     <div class="row">
-        <div class="col-md-6 col-md-offset-3">
+        <div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1">
             {% if form.non_field_errors %}
                 <div class="panel panel-danger">
                     <div class="panel-heading"><strong>Errors</strong></div>
@@ -25,13 +25,13 @@
                 </div>
             </div>
             {% include 'inc/extras_features_edit_form_fields.html' with form=model_form %}
-            <div class="form-group">
-                <div class="col-md-9 col-md-offset-3 text-right">
-                    <button type="submit" name="_create" class="btn btn-primary">Create</button>
-                    <button type="submit" name="_addanother" class="btn btn-primary">Create and Add More</button>
-                    <a href="{{ return_url }}" class="btn btn-default">Cancel</a>
-                </div>
-            </div>
+        </div>
+    </div>
+    <div class="row">
+        <div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1 text-right">
+            <button type="submit" name="_create" class="btn btn-primary">Create</button>
+            <button type="submit" name="_addanother" class="btn btn-primary">Create and Add More</button>
+            <a href="{{ return_url }}" class="btn btn-default">Cancel</a>
         </div>
     </div>
 </form>

nautobot/dcim/templates/dcim/modulebay_create.html

@@ -0,0 +1,39 @@
+{% extends 'dcim/device_component_add.html' %}
+
+{% block javascript %}
+{{ block.super }}
+<script>
+document.addEventListener('DOMContentLoaded', function() {
+    var position_field = document.getElementById('id_position_pattern');
+    var source_arr = position_field.getAttribute('source').split(" ");
+    var length = position_field.getAttribute('maxlength');
+    position_field.setAttribute('_changed', Boolean(position_field.value))
+    position_field.addEventListener('change', function() {
+        position_field.setAttribute('_changed', Boolean(position_field.value))
+    });
+    function repopulate() {
+        let str = "";
+        for (source_str of source_arr) {
+            if (str != "") {
+                str += " ";
+            }
+            let source_id = 'id_' + source_str;
+            let source = document.getElementById(source_id)
+            str += source.value;
+        }
+        position_field.value = str.slice(0, length ? length : 255);
+    };
+    for (source_str of source_arr) {
+        let source_id = 'id_' + source_str;
+        let source = document.getElementById(source_id);
+        source.addEventListener('keyup', function() {
+            if (position_field && position_field.getAttribute('_changed')=="false") {
+                repopulate();
+            }
+        });
+    }
+    document.getElementsByClassName('reslugify')[0].addEventListener('click', repopulate);
+    document.getElementsByClassName('reslugify')[0].setAttribute('data-original-title', "Regenerate position");
+});
+</script>
+{% endblock javascript %}

nautobot/dcim/templates/dcim/modulebay_update.html

@@ -0,0 +1,39 @@
+{% extends 'generic/object_create.html' %}
+
+{% block javascript %}
+{{ block.super }}
+<script>
+document.addEventListener('DOMContentLoaded', function() {
+    var position_field = document.getElementById('id_position');
+    var source_arr = position_field.getAttribute('source').split(" ");
+    var length = position_field.getAttribute('maxlength');
+    position_field.setAttribute('_changed', Boolean(position_field.value))
+    position_field.addEventListener('change', function() {
+        position_field.setAttribute('_changed', Boolean(position_field.value))
+    });
+    function repopulate() {
+        let str = "";
+        for (source_str of source_arr) {
+            if (str != "") {
+                str += " ";
+            }
+            let source_id = 'id_' + source_str;
+            let source = document.getElementById(source_id)
+            str += source.value;
+        }
+        position_field.value = str.slice(0, length ? length : 255);
+    };
+    for (source_str of source_arr) {
+        let source_id = 'id_' + source_str;
+        let source = document.getElementById(source_id);
+        source.addEventListener('keyup', function() {
+            if (position_field && position_field.getAttribute('_changed')=="false") {
+                repopulate();
+            }
+        });
+    }
+    document.getElementsByClassName('reslugify')[0].addEventListener('click', repopulate);
+    document.getElementsByClassName('reslugify')[0].setAttribute('data-original-title', "Regenerate position");
+});
+</script>
+{% endblock javascript %}

nautobot/dcim/templates/dcim/virtualchassis_add_member.html

@@ -5,7 +5,7 @@
     <form action="" method="post" enctype="multipart/form-data" class="form form-horizontal">
         {% csrf_token %}
         <div class="row">
-            <div class="col-md-6 col-md-offset-3">
+            <div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1">
                 <h3>{% block title %}Add New Member to Virtual Chassis {{ virtual_chassis }}{% endblock %}</h3>
                 {% if membership_form.non_field_errors %}
                     <div class="panel panel-danger">
@@ -25,7 +25,7 @@
             </div>
         </div>
         <div class="row">
-            <div class="col-md-6 col-md-offset-3 text-right">
+            <div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1 text-right">
                 <button type="submit" name="_save" class="btn btn-primary">Save</button>
                 <button type="submit" name="_addanother" class="btn btn-primary">Add Another</button>
                 <a href="{{ return_url }}" class="btn btn-default">Cancel</a>

nautobot/dcim/templates/dcim/virtualchassis_edit.html

@@ -8,7 +8,7 @@
         {{ pk_form.pk }}
         {{ formset.management_form }}
         <div class="row">
-            <div class="col-md-8 col-md-offset-2">
+            <div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1">
                 <h3>{% block title %}{% if vc_form.instance %}Editing {{ vc_form.instance }}{% else %}New Virtual Chassis{% endif %}{% endblock %}</h3>
                 {% if vc_form.non_field_errors %}
                     <div class="panel panel-danger">
@@ -84,7 +84,7 @@
             </div>
         </div>
         <div class="row">
-            <div class="col-md-8 col-md-offset-2 text-right">
+            <div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1 text-right">
                 <button type="submit" name="_update" class="btn btn-primary">Update</button>
                 <a href="{{ return_url }}" class="btn btn-default">Cancel</a>
             </div>

nautobot/dcim/tests/integration/test_create_device.py

@@ -0,0 +1,86 @@
+from django.urls import reverse
+
+from nautobot.core.testing.integration import SeleniumTestCase
+
+
+class CreateDeviceTestCase(SeleniumTestCase):
+    """
+    Create a device and all pre-requisite objects through the UI.
+    """
+
+    def test_create_device(self):
+        """
+        This test goes through the process of creating a device in the UI. All pre-requisite objects are created:
+        - Manufacturer
+        - Device Type
+        - LocationType
+        - Location
+        - Role
+        - Device
+
+        """
+        self.user.is_superuser = True
+        self.user.save()
+        self.login(self.user.username, self.password)
+
+        # Manufacturer
+        self.click_navbar_entry("Devices", "Manufacturers")
+        self.assertEqual(self.browser.url, self.live_server_url + reverse("dcim:manufacturer_list"))
+        self.click_list_view_add_button()
+        self.assertEqual(self.browser.url, self.live_server_url + reverse("dcim:manufacturer_add"))
+        self.browser.fill("name", "Test Manufacturer 1")
+        self.click_edit_form_create_button()
+
+        # Device Type
+        self.click_navbar_entry("Devices", "Device Types")
+        self.assertEqual(self.browser.url, self.live_server_url + reverse("dcim:devicetype_list"))
+        self.click_list_view_add_button()
+        self.assertEqual(self.browser.url, self.live_server_url + reverse("dcim:devicetype_add"))
+        self.fill_select2_field("manufacturer", "Test Manufacturer 1")
+        self.browser.fill("model", "Test Device Type 1")
+        self.click_edit_form_create_button()
+
+        # LocationType
+        self.click_navbar_entry("Organization", "Location Types")
+        self.assertEqual(self.browser.url, self.live_server_url + reverse("dcim:locationtype_list"))
+        self.click_list_view_add_button()
+        self.assertEqual(self.browser.url, self.live_server_url + reverse("dcim:locationtype_add"))
+        self.fill_select2_multiselect_field("content_types", "dcim | device")
+        self.browser.fill("name", "Test Location Type 1")
+        self.click_edit_form_create_button()
+
+        # Location
+        self.click_navbar_entry("Organization", "Locations")
+        self.assertEqual(self.browser.url, self.live_server_url + reverse("dcim:location_list"))
+        self.click_list_view_add_button()
+        self.assertEqual(self.browser.url, self.live_server_url + reverse("dcim:location_add"))
+        self.fill_select2_field("location_type", "Test Location Type 1")
+        self.fill_select2_field("status", "")  # pick first status
+        self.browser.fill("name", "Test Location 1")
+        self.click_edit_form_create_button()
+
+        # Role
+        self.click_navbar_entry("Organization", "Roles")
+        self.assertEqual(self.browser.url, self.live_server_url + reverse("extras:role_list"))
+        self.click_list_view_add_button()
+        self.assertEqual(self.browser.url, self.live_server_url + reverse("extras:role_add"))
+        self.browser.fill("name", "Test Role 1")
+        self.fill_select2_multiselect_field("content_types", "dcim | device")
+        self.click_edit_form_create_button()
+
+        # Device
+        self.click_navbar_entry("Devices", "Devices")
+        self.assertEqual(self.browser.url, self.live_server_url + reverse("dcim:device_list"))
+        self.click_list_view_add_button()
+        self.assertEqual(self.browser.url, self.live_server_url + reverse("dcim:device_add"))
+        self.browser.fill("name", "Test Device Integration Test 1")
+        self.fill_select2_field("role", "Test Role 1")
+        self.fill_select2_field("device_type", "Test Device Type 1")
+        self.fill_select2_field("location", "Test Location 1")
+        self.fill_select2_field("status", "")  # pick first status
+        self.click_edit_form_create_button()
+
+        # Assert that the device was created
+        self.assertTrue(self.browser.is_text_present("Created device Test Device Integration Test 1", wait_time=5))
+        self.assertTrue(self.browser.is_text_present("Test Location 1", wait_time=5))
+        self.assertTrue(self.browser.is_text_present("Test Device Type 1", wait_time=5))

nautobot/dcim/views.py

@@ -3241,7 +3241,7 @@ class ModuleBayUIViewSet(ModuleBayCommonViewSetMixin, NautobotUIViewSet):
     model_form_class = forms.ModuleBayForm
     serializer_class = serializers.ModuleBaySerializer
     table_class = tables.ModuleBayTable
-    create_template_name = "dcim/device_component_add.html"
+    create_template_name = "dcim/modulebay_create.html"
 
     def get_extra_context(self, request, instance):
         if instance:

nautobot/extras/api/customfields.py

@@ -40,15 +40,7 @@ class CustomFieldDefaultValues:
 class CustomFieldsDataField(Field):
     @property
     def custom_field_keys(self):
-        """
-        Cache CustomField keys assigned to this model to avoid redundant database queries
-        """
-        if not hasattr(self, "_custom_field_keys"):
-            content_type = ContentType.objects.get_for_model(self.parent.Meta.model)
-            self._custom_field_keys = CustomField.objects.filter(content_types=content_type).values_list(
-                "key", flat=True
-            )
-        return self._custom_field_keys
+        return CustomField.objects.keys_for_model(self.parent.Meta.model)
 
     def to_representation(self, obj):
         return {key: obj.get(key) for key in self.custom_field_keys}
@@ -58,7 +50,8 @@ class CustomFieldsDataField(Field):
 
         # Discard any entries in data that do not align with actual CustomFields - this matches the REST API behavior
         # for top-level serializer fields that do not exist or are not writable
-        data = {key: value for key, value in data.items() if key in self.custom_field_keys}
+        custom_field_keys = self.custom_field_keys
+        data = {key: value for key, value in data.items() if key in custom_field_keys}
 
         # If updating an existing instance, start with existing _custom_field_data
         if self.parent.instance:

nautobot/extras/context_managers.py

@@ -204,14 +204,34 @@ def web_request_context(
             yield request
     finally:
         jobs_reloaded = False
+        # In bulk operations, we are performing the same action (create/update/delete) on the same content-type.
+        # Save some repeated database queries by reusing the same evaluated querysets where applicable:
+        jobhook_queryset = None
+        webhook_queryset = None
+        last_action = None
+        last_content_type = None
         # enqueue jobhooks and webhooks, use change_context.change_id in case change_id was not supplied
         for object_change in (
-            ObjectChange.objects.filter(request_id=change_context.change_id).order_by("time").iterator()
+            ObjectChange.objects.select_related("changed_object_type", "user")
+            .filter(request_id=change_context.change_id)
+            .order_by("time")  # default ordering is -time but we want oldest first not newest first
+            .iterator()
         ):
+            if object_change.action != last_action or object_change.changed_object_type != last_content_type:
+                jobhook_queryset = None
+                webhook_queryset = None
+
             if context != ObjectChangeEventContextChoices.CONTEXT_JOB_HOOK:
                 # Make sure JobHooks are up to date (only once) before calling them
-                jobs_reloaded |= enqueue_job_hooks(object_change, may_reload_jobs=(not jobs_reloaded))
-            enqueue_webhooks(object_change)
+                did_reload_jobs, jobhook_queryset = enqueue_job_hooks(
+                    object_change, may_reload_jobs=(not jobs_reloaded), jobhook_queryset=jobhook_queryset
+                )
+                if did_reload_jobs:
+                    jobs_reloaded = True
+
+            webhook_queryset = enqueue_webhooks(object_change, webhook_queryset=webhook_queryset)
+            last_action = object_change.action
+            last_content_type = object_change.changed_object_type
 
 
 @contextmanager

nautobot/extras/jobs.py

@@ -1144,41 +1144,47 @@ def run_job(self, job_class_path, *args, **kwargs):
         raise
 
 
-def enqueue_job_hooks(object_change, may_reload_jobs=True):
+def enqueue_job_hooks(object_change, may_reload_jobs=True, jobhook_queryset=None):
     """
     Find job hook(s) assigned to this changed object type + action and enqueue them to be processed.
 
+    Args:
+        object_change (ObjectChange): The change that may trigger JobHooks to execute.
+        may_reload_jobs (bool): Whether to reload JobHook source code from disk to guarantee up-to-date code.
+        jobhook_queryset (QuerySet): Previously retrieved set of JobHooks to potentially enqueue
+
     Returns:
-        jobs_reloaded (bool): whether Jobs were reloaded to make this happen
+        result (tuple[bool, QuerySet]): whether Jobs were reloaded here, and the jobhooks that were considered
     """
     jobs_reloaded = False
 
     # Job hooks cannot trigger other job hooks
     if object_change.change_context == ObjectChangeEventContextChoices.CONTEXT_JOB_HOOK:
-        return jobs_reloaded
+        return jobs_reloaded, jobhook_queryset
 
     # Determine whether this type of object supports job hooks
     content_type = object_change.changed_object_type
     if content_type not in change_logged_models_queryset():
-        return jobs_reloaded
+        return jobs_reloaded, jobhook_queryset
 
     # Retrieve any applicable job hooks
-    action_flag = {
-        ObjectChangeActionChoices.ACTION_CREATE: "type_create",
-        ObjectChangeActionChoices.ACTION_UPDATE: "type_update",
-        ObjectChangeActionChoices.ACTION_DELETE: "type_delete",
-    }[object_change.action]
-    job_hooks = JobHook.objects.filter(content_types=content_type, enabled=True, **{action_flag: True})
+    if jobhook_queryset is None:
+        action_flag = {
+            ObjectChangeActionChoices.ACTION_CREATE: "type_create",
+            ObjectChangeActionChoices.ACTION_UPDATE: "type_update",
+            ObjectChangeActionChoices.ACTION_DELETE: "type_delete",
+        }[object_change.action]
+        jobhook_queryset = JobHook.objects.filter(content_types=content_type, enabled=True, **{action_flag: True})
 
-    if not job_hooks.exists():
-        return jobs_reloaded
+    if not jobhook_queryset:  # not .exists() as we *want* to populate the queryset cache
+        return jobs_reloaded, jobhook_queryset
 
     # Enqueue the jobs related to the job_hooks
     if may_reload_jobs:
         get_jobs(reload=True)
         jobs_reloaded = True
 
-    for job_hook in job_hooks:
+    for job_hook in jobhook_queryset:
         job_model = job_hook.job
         if not job_model.installed or not job_model.enabled:
             logger.warning(
@@ -1189,4 +1195,4 @@ def enqueue_job_hooks(object_change, may_reload_jobs=True):
         else:
             JobResult.enqueue_job(job_model, object_change.user, object_change=object_change.pk)
 
-    return jobs_reloaded
+    return jobs_reloaded, jobhook_queryset