nautobot 2.4.18__py3-none-any.whl → 2.4.19__py3-none-any.whl

nautobot/apps/ui.py

@@ -3,9 +3,12 @@
 from nautobot.core.choices import ButtonColorChoices
 from nautobot.core.ui.base import PermissionsMixin
 from nautobot.core.ui.breadcrumbs import (
+    AncestorsBreadcrumbs,
     BaseBreadcrumbItem,
     Breadcrumbs,
+    context_object_attr,
     InstanceBreadcrumbItem,
+    InstanceParentBreadcrumbItem,
     ModelBreadcrumbItem,
     ViewNameBreadcrumbItem,
 )
@@ -49,6 +52,7 @@ from nautobot.extras.choices import BannerClassChoices
 from nautobot.extras.plugins import Banner, TemplateExtension
 
 __all__ = (
+    "AncestorsBreadcrumbs",
     "Banner",
     "BannerClassChoices",
     "BaseBreadcrumbItem",
@@ -66,6 +70,7 @@ __all__ = (
     "HomePageItem",
     "HomePagePanel",
     "InstanceBreadcrumbItem",
+    "InstanceParentBreadcrumbItem",
     "KeyValueTablePanel",
     "LayoutChoices",
     "ModelBreadcrumbItem",
@@ -89,5 +94,6 @@ __all__ = (
     "TextPanel",
     "Titles",
     "ViewNameBreadcrumbItem",
+    "context_object_attr",
     "render_component_template",
 )

nautobot/circuits/tables.py

@@ -18,7 +18,7 @@ CIRCUIT_TERMINATION_PARENT = """
 {% if value.provider_network %}
 {{ value.provider_network|hyperlinked_object }}
 {% elif value.location %}
-{{ value.location|hyperlinked_object }}
+{{ value.location|hyperlinked_object:"name" }}
 {% elif value.cloud_network %}
 {{ value.cloud_network|hyperlinked_object }}
 {% else %}

nautobot/circuits/templates/circuits/circuit_create.html

@@ -34,11 +34,11 @@
 {% endblock %}
 
 {% block javascript %}
-{{ block.super }}
-<script type="text/javascript">
-    $("a.set_speed").click(function(e) {
-        e.preventDefault();
-        $("#id_" + $(this).attr("target")).val($(this).attr("data"));
-    });
-</script>
+    {{ block.super }}
+    <script type="text/javascript">
+        $("a.set_speed").click(function(e) {
+            e.preventDefault();
+            $("#id_" + $(this).attr("target")).val($(this).attr("data"));
+        });
+    </script>
 {% endblock %}

nautobot/circuits/templates/circuits/circuit_retrieve.html

@@ -1,6 +1,2 @@
 {% extends 'generic/object_retrieve.html' %}
-{% load helpers %}
-
-{% block extra_breadcrumbs %}
-                <li><a href="{% url 'circuits:circuit_list' %}?provider={{ object.provider.pk }}">{{ object.provider }}</a></li>
-{% endblock extra_breadcrumbs %}
+{% comment %}3.0 TODO: remove this template, which only exists for backward compatibility with 2.4 and earlier{% endcomment %}

nautobot/circuits/templates/circuits/circuittermination_create.html

@@ -25,28 +25,28 @@
                     <p class="form-control-static">{{ form.term_side.value }}</p>
                 </div>
             </div>
-                {% with location_tab_active=form.initial.location %}
+            {% with location_tab_active=form.initial.location %}
                 {% with providernetwork_tab_active=form.initial.provider_network %}
-                {% with cloudnetwork_tab_active=form.initial.cloud_network %}
-                    <ul class="nav nav-tabs" role="tablist">
-                        <li role="presentation"{% if location_tab_active or not providernetwork_tab_active and not cloudnetwork_tab_active %} class="active"{% endif %}><a href="#location" role="tab" data-toggle="tab">Location</a></li>
-                        <li role="presentation"{% if providernetwork_tab_active %} class="active"{% endif %}><a href="#providernetwork" role="tab" data-toggle="tab">Provider Network</a></li>
-                        <li role="presentation"{% if cloudnetwork_tab_active %} class="active"{% endif %}><a href="#cloudnetwork" role="tab" data-toggle="tab">Cloud Network</a></li>
-                    </ul>
-                    <div class="tab-content">
-                        <div class="tab-pane{% if location_tab_active or not providernetwork_tab_active and not cloudnetwork_tab_active %} active{% endif %}" id="location">
-                            {% render_field form.location %}
+                    {% with cloudnetwork_tab_active=form.initial.cloud_network %}
+                        <ul class="nav nav-tabs" role="tablist">
+                            <li role="presentation"{% if location_tab_active or not providernetwork_tab_active and not cloudnetwork_tab_active %} class="active"{% endif %}><a href="#location" role="tab" data-toggle="tab">Location</a></li>
+                            <li role="presentation"{% if providernetwork_tab_active %} class="active"{% endif %}><a href="#providernetwork" role="tab" data-toggle="tab">Provider Network</a></li>
+                            <li role="presentation"{% if cloudnetwork_tab_active %} class="active"{% endif %}><a href="#cloudnetwork" role="tab" data-toggle="tab">Cloud Network</a></li>
+                        </ul>
+                        <div class="tab-content">
+                            <div class="tab-pane{% if location_tab_active or not providernetwork_tab_active and not cloudnetwork_tab_active %} active{% endif %}" id="location">
+                                {% render_field form.location %}
+                            </div>
+                            <div class="tab-pane{% if providernetwork_tab_active %} active{% endif %}" id="providernetwork">
+                                {% render_field form.provider_network %}
+                            </div>
+                            <div class="tab-pane{% if cloudnetwork_tab_active %} active{% endif %}" id="cloudnetwork">
+                                {% render_field form.cloud_network %}
+                            </div>
                         </div>
-                        <div class="tab-pane{% if providernetwork_tab_active %} active{% endif %}" id="providernetwork">
-                            {% render_field form.provider_network %}
-                        </div>
-                        <div class="tab-pane{% if cloudnetwork_tab_active %} active{% endif %}" id="cloudnetwork">
-                            {% render_field form.cloud_network %}
-                        </div>
-                    </div>
-                {% endwith %}
-                {% endwith %}
+                    {% endwith %}
                 {% endwith %}
+            {% endwith %}
         </div>
     </div>
     <div class="panel panel-default">
@@ -81,11 +81,11 @@
 {% endblock %}
 
 {% block javascript %}
-{{ block.super }}
-<script type="text/javascript">
-    $("a.set_speed").click(function(e) {
-        e.preventDefault();
-        $("#id_" + $(this).attr("target")).val($(this).attr("data"));
-    });
-</script>
+    {{ block.super }}
+    <script type="text/javascript">
+        $("a.set_speed").click(function(e) {
+            e.preventDefault();
+            $("#id_" + $(this).attr("target")).val($(this).attr("data"));
+        });
+    </script>
 {% endblock %}

nautobot/circuits/templates/circuits/inc/circuit_termination.html

@@ -12,28 +12,28 @@ In a future release, we should delete this file.
     {% if termination %}
         <table class="table table-hover panel-body attr-table">
             {% if termination.location %}
-            <tr>
-                <td>Location</td>
-                <td>
-                    {% include 'dcim/inc/location_hierarchy.html' with location=termination.location %}
-                </td>
-            </tr>
-            <tr>
-                <td>Cable</td>
-                <td>
-                    {% include 'circuits/inc/circuit_termination_cable_fragment.html' %}
-                </td>
-            </tr>
+                <tr>
+                    <td>Location</td>
+                    <td>
+                        {% include 'dcim/inc/location_hierarchy.html' with location=termination.location %}
+                    </td>
+                </tr>
+                <tr>
+                    <td>Cable</td>
+                    <td>
+                        {% include 'circuits/inc/circuit_termination_cable_fragment.html' %}
+                    </td>
+                </tr>
             {% elif termination.provider_network %}
-            <tr>
-                <td>Provider Network</td>
-                <td>{{ termination.provider_network|hyperlinked_object }}</td>
-            </tr>
+                <tr>
+                    <td>Provider Network</td>
+                    <td>{{ termination.provider_network|hyperlinked_object }}</td>
+                </tr>
             {% else %}
-            <tr>
-                <td>Cloud Network</td>
-                <td>{{ termination.cloud_network|hyperlinked_object }}</td>
-            </tr>
+                <tr>
+                    <td>Cloud Network</td>
+                    <td>{{ termination.cloud_network|hyperlinked_object }}</td>
+                </tr>
             {% endif %}
             <tr>
                 <td>Speed</td>

nautobot/circuits/templates/circuits/inc/circuit_termination_header_extra_content.html

@@ -19,8 +19,8 @@
         </a>
     {% endif %}
     {% if termination %}
-    <a href="{% url 'circuits:circuittermination' pk=termination.pk %}" class="btn btn-xs btn-default">
-        <span class="mdi mdi-information-outline" aria-hidden="true"></span> Detail
-    </a>
+        <a href="{% url 'circuits:circuittermination' pk=termination.pk %}" class="btn btn-xs btn-default">
+            <span class="mdi mdi-information-outline" aria-hidden="true"></span> Detail
+        </a>
     {% endif %}
 </div>

nautobot/circuits/templates/circuits/inc/circuit_termination_speed_fragment.html

@@ -1,9 +1,9 @@
 {% spaceless %}
-{% load helpers %}
-{% if termination.port_speed and termination.upstream_speed %}
-<i class="mdi mdi-arrow-down-bold" title="Downstream"></i>{{ termination.port_speed|humanize_speed }}&nbsp;
-<i class="mdi mdi-arrow-up-bold" title="Upstream"></i>{{ termination.upstream_speed|humanize_speed }}
-{% else %}
-{{ termination.port_speed|humanize_speed|placeholder }}
-{% endif %}
+    {% load helpers %}
+    {% if termination.port_speed and termination.upstream_speed %}
+        <i class="mdi mdi-arrow-down-bold" title="Downstream"></i>{{ termination.port_speed|humanize_speed }}&nbsp;
+        <i class="mdi mdi-arrow-up-bold" title="Upstream"></i>{{ termination.upstream_speed|humanize_speed }}
+    {% else %}
+        {{ termination.port_speed|humanize_speed|placeholder }}
+    {% endif %}
 {% endspaceless %}

nautobot/circuits/templates/circuits/providernetwork_retrieve.html

@@ -1,4 +1,2 @@
 {% extends 'generic/object_retrieve.html' %}
-{% block extra_breadcrumbs %}
-  <li><a href="{% url 'circuits:providernetwork_list' %}?provider={{ object.provider_id }}">{{ object.provider }}</a></li>
-{% endblock extra_breadcrumbs %}
+{% comment %}3.0 TODO: remove this template, which only exists for backward compatibility with 2.4 and earlier{% endcomment %}

nautobot/circuits/views.py

@@ -5,7 +5,13 @@ from django.utils.html import format_html, format_html_join
 
 from nautobot.core.forms import ConfirmationForm
 from nautobot.core.templatetags import helpers
-from nautobot.core.ui.breadcrumbs import Breadcrumbs, InstanceBreadcrumbItem, ModelBreadcrumbItem
+from nautobot.core.ui.breadcrumbs import (
+    Breadcrumbs,
+    context_object_attr,
+    InstanceBreadcrumbItem,
+    InstanceParentBreadcrumbItem,
+    ModelBreadcrumbItem,
+)
 from nautobot.core.ui.choices import SectionChoices
 from nautobot.core.ui.object_detail import (
     ObjectDetailContent,
@@ -101,17 +107,12 @@ class CircuitTerminationUIViewSet(NautobotUIViewSet):
     queryset = CircuitTermination.objects.all()
     serializer_class = serializers.CircuitTerminationSerializer
     table_class = tables.CircuitTerminationTable
-
     breadcrumbs = Breadcrumbs(
         items={
             "detail": [
-                ModelBreadcrumbItem(model=Circuit),
-                ModelBreadcrumbItem(
-                    model=Circuit,
-                    label=lambda c: c["object"].circuit.provider,
-                    reverse_query_params=lambda c: {"provider": c["object"].circuit.provider.pk},
-                ),
-                InstanceBreadcrumbItem(instance=lambda c: c["object"].circuit),
+                ModelBreadcrumbItem(),
+                InstanceParentBreadcrumbItem(instance=context_object_attr("circuit"), parent_key="provider"),
+                InstanceBreadcrumbItem(instance=context_object_attr("circuit")),
             ]
         }
     )
@@ -191,6 +192,14 @@ class CircuitUIViewSet(NautobotUIViewSet):
     queryset = Circuit.objects.all()
     serializer_class = serializers.CircuitSerializer
     table_class = tables.CircuitTable
+    breadcrumbs = Breadcrumbs(
+        items={
+            "detail": [
+                ModelBreadcrumbItem(),
+                InstanceParentBreadcrumbItem(parent_key="provider"),
+            ]
+        }
+    )
 
     class CircuitTerminationPanel(ObjectFieldsPanel):
         def __init__(self, **kwargs):
@@ -364,6 +373,14 @@ class ProviderNetworkUIViewSet(NautobotUIViewSet):
     queryset = ProviderNetwork.objects.all()
     serializer_class = serializers.ProviderNetworkSerializer
     table_class = tables.ProviderNetworkTable
+    breadcrumbs = Breadcrumbs(
+        items={
+            "detail": [
+                ModelBreadcrumbItem(),
+                InstanceParentBreadcrumbItem(parent_key="provider"),
+            ]
+        }
+    )
 
     object_detail_content = ObjectDetailContent(
         panels=(

nautobot/cloud/templates/cloud/cloudaccount_retrieve.html

@@ -1,5 +1,2 @@
 {% extends 'generic/object_retrieve.html' %}
-{% block extra_breadcrumbs %}
-    <li><a href="{% url 'cloud:cloudaccount_list' %}?provider={{ object.provider.pk }}">{{ object.provider }}</a></li>
-{% endblock extra_breadcrumbs %}
-{% comment %}3.0 TODO: remove this template, which only exists for backward compatibility with 2.4 and earlier{% endcomment %}
+{% comment %}3.0 TODO: remove this template, which only exists for backward compatibility with 2.4 and earlier{% endcomment %}

nautobot/cloud/templates/cloud/cloudnetwork_retrieve.html

@@ -1,8 +1,2 @@
 {% extends 'generic/object_retrieve.html' %}
-{% load helpers %}
-
-{% block extra_breadcrumbs %}
-    {% if object.parent %}
-        <li>{{ object.parent|hyperlinked_object:"name" }}</li>
-    {% endif %}
-{% endblock extra_breadcrumbs %}
+{% comment %}3.0 TODO: remove this template, which only exists for backward compatibility with 2.4 and earlier{% endcomment %}

nautobot/cloud/templates/cloud/cloudresourcetype_retrieve.html

@@ -1,4 +1,2 @@
 {% extends 'generic/object_retrieve.html' %}
-{% block extra_breadcrumbs %}
-    <li><a href="{% url 'cloud:cloudresourcetype_list' %}?provider={{ object.provider.pk }}">{{ object.provider }}</a></li>
-{% endblock extra_breadcrumbs %}
+{% comment %}3.0 TODO: remove this template, which only exists for backward compatibility with 2.4 and earlier{% endcomment %}

nautobot/cloud/templates/cloud/cloudservice_retrieve.html

@@ -1,6 +1,2 @@
 {% extends 'generic/object_retrieve.html' %}
-{% load helpers %}
-
-{% block extra_breadcrumbs %}
-    <li><a href="{% url 'cloud:cloudresourcetype' pk=object.cloud_resource_type.pk %}">{{ object.cloud_resource_type }}</a></li>
-{% endblock extra_breadcrumbs %}
+{% comment %}3.0 TODO: remove this template, which only exists for backward compatibility with 2.4 and earlier{% endcomment %}

nautobot/cloud/views.py

@@ -31,6 +31,13 @@ from nautobot.cloud.forms import (
 from nautobot.cloud.models import CloudAccount, CloudNetwork, CloudResourceType, CloudService
 from nautobot.cloud.tables import CloudAccountTable, CloudNetworkTable, CloudResourceTypeTable, CloudServiceTable
 from nautobot.core.ui import object_detail
+from nautobot.core.ui.breadcrumbs import (
+    Breadcrumbs,
+    context_object_attr,
+    InstanceBreadcrumbItem,
+    InstanceParentBreadcrumbItem,
+    ModelBreadcrumbItem,
+)
 from nautobot.core.ui.choices import SectionChoices
 from nautobot.core.views.viewsets import NautobotUIViewSet
 from nautobot.ipam.tables import PrefixTable
@@ -44,6 +51,16 @@ class CloudAccountUIViewSet(NautobotUIViewSet):
     serializer_class = CloudAccountSerializer
     table_class = CloudAccountTable
     form_class = CloudAccountForm
+    breadcrumbs = Breadcrumbs(
+        items={
+            "detail": [
+                ModelBreadcrumbItem(),
+                InstanceParentBreadcrumbItem(
+                    parent_key="provider",
+                ),
+            ]
+        }
+    )
 
     object_detail_content = object_detail.ObjectDetailContent(
         panels=(
@@ -64,6 +81,17 @@ class CloudNetworkUIViewSet(NautobotUIViewSet):
     table_class = CloudNetworkTable
     form_class = CloudNetworkForm
     bulk_update_form_class = CloudNetworkBulkEditForm
+    breadcrumbs = Breadcrumbs(
+        items={
+            "detail": [
+                ModelBreadcrumbItem(model_key="object"),
+                InstanceBreadcrumbItem(
+                    instance=context_object_attr("parent"), should_render=context_object_attr("parent")
+                ),
+            ]
+        }
+    )
+
     object_detail_content = object_detail.ObjectDetailContent(
         panels=(
             object_detail.ObjectFieldsPanel(
@@ -197,6 +225,15 @@ class CloudResourceTypeUIViewSet(NautobotUIViewSet):
     table_class = CloudResourceTypeTable
     form_class = CloudResourceTypeForm
     bulk_update_form_class = CloudResourceTypeBulkEditForm
+    breadcrumbs = Breadcrumbs(
+        items={
+            "detail": [
+                ModelBreadcrumbItem(),
+                InstanceParentBreadcrumbItem(parent_key="provider"),
+            ]
+        }
+    )
+
     object_detail_content = object_detail.ObjectDetailContent(
         panels=(
             object_detail.ObjectFieldsPanel(
@@ -277,6 +314,14 @@ class CloudServiceUIViewSet(NautobotUIViewSet):
     table_class = CloudServiceTable
     form_class = CloudServiceForm
     bulk_update_form_class = CloudServiceBulkEditForm
+    breadcrumbs = Breadcrumbs(
+        items={
+            "detail": [
+                ModelBreadcrumbItem(),
+                InstanceBreadcrumbItem(instance=context_object_attr("cloud_resource_type")),
+            ]
+        }
+    )
 
     object_detail_content = object_detail.ObjectDetailContent(
         panels=(

nautobot/core/graphql/generators.py

@@ -67,15 +67,18 @@ def generate_filter_resolver(schema_type, resolver_name, field_name):
     """
     filterset_class = schema_type._meta.filterset_class
 
+    @gql_optimizer.resolver_hints(model_field=field_name)
     def resolve_filter(self, info, **kwargs):
+        field = getattr(self, field_name)
+
         if not filterset_class or not kwargs:
-            return getattr(self, field_name).all()
+            return field.all()
 
         # Inverse of substitution logic from get_filtering_args_from_filterset() - transform "_type" back to "type"
         if "_type" in kwargs:
             kwargs["type"] = kwargs.pop("_type")
 
-        resolved_obj = filterset_class(kwargs, getattr(self, field_name).all())
+        resolved_obj = filterset_class(kwargs, field.all())
 
         # Check result filter for errors.
         if not resolved_obj.errors:

nautobot/core/jobs/bulk_actions.py

@@ -7,10 +7,9 @@ from django.core.exceptions import (
 )
 from django.db.models import ManyToManyField, ProtectedError
 
-from nautobot.core import exceptions
 from nautobot.core.forms.utils import restrict_form_fields
-from nautobot.core.utils.filtering import get_filterset_field
-from nautobot.core.utils.lookup import get_filterset_for_model, get_form_for_model
+from nautobot.core.utils.lookup import get_form_for_model
+from nautobot.core.views.utils import get_bulk_queryset_from_view
 from nautobot.extras.context_managers import deferred_change_logging_for_bulk_operation
 from nautobot.extras.jobs import (
     BooleanVar,
@@ -19,6 +18,7 @@ from nautobot.extras.jobs import (
     ObjectVar,
     RunJobTaskFailed,
 )
+from nautobot.extras.models import SavedView
 from nautobot.extras.utils import bulk_delete_with_bulk_change_logging, remove_prefix_from_cf_key
 
 name = "System Jobs"
@@ -32,8 +32,10 @@ class BulkEditObjects(Job):
         description="Type of objects to update",
     )
     form_data = JSONVar(description="BulkEditForm data")
+    pk_list = JSONVar(description="List of objects pks to edit", required=False)
     edit_all = BooleanVar(description="Bulk Edit all object / all filtered objects", required=False)
     filter_query_params = JSONVar(label="Filter Query Params", required=False)
+    saved_view = ObjectVar(model=SavedView, required=False)
 
     class Meta:
         name = "Bulk Edit Objects"
@@ -41,42 +43,14 @@ class BulkEditObjects(Job):
         has_sensitive_variables = False
         soft_time_limit = 1800
         time_limit = 2000
+        hidden = True
+
+    def _update_objects(self, model, form, filter_query_params, pk_list, edit_all, nullified_fields, saved_view_id):
+        base_queryset = model.objects.restrict(self.user, "change")
+        queryset = get_bulk_queryset_from_view(user=self.user, action="change", log=self.logger, **self.key_params)
 
-    def _update_objects(self, model, form, filter_query_params, edit_all, nullified_fields):
         with deferred_change_logging_for_bulk_operation():
-            base_queryset = model.objects.restrict(self.user, "change")
             updated_objects_pk = []
-            filterset_cls = get_filterset_for_model(model)
-
-            if filter_query_params:
-                if not filterset_cls:
-                    self.logger.error(f"Filterset not found for {model._meta.verbose_name}")
-                    raise RunJobTaskFailed(
-                        f"Filter query provided but {model._meta.verbose_name} does not have a filterset."
-                    )
-
-                # Discarding non-filter query params
-                new_filter_query_params = {}
-
-                for key, value in filter_query_params.items():
-                    try:
-                        get_filterset_field(filterset_cls(), key)
-                        new_filter_query_params[key] = value
-                    except exceptions.FilterSetFieldNotFound:
-                        self.logger.debug(
-                            f"Query parameter `{key}` not found in filterset for `{filterset_cls}`, discarding it"
-                        )
-
-                filter_query_params = new_filter_query_params
-
-            if edit_all:
-                if filter_query_params:
-                    queryset = filterset_cls(filter_query_params).qs.restrict(self.user, "change")
-                else:
-                    queryset = model.objects.restrict(self.user, "change")
-            else:
-                queryset = model.objects.restrict(self.user, "change").filter(pk__in=form.cleaned_data["pk"])
-
             form_custom_fields = getattr(form, "custom_fields", [])
             form_relationships = getattr(form, "relationships", [])
             standard_fields = [
@@ -130,14 +104,18 @@ class BulkEditObjects(Job):
                 if hasattr(form, "save_note") and callable(form.save_note):
                     form.save_note(instance=obj, user=self.user)
             total_updated_objs = len(updated_objects_pk)
-            # Enforce object-level permissions
+            # Enforce object-level permissions. This works because we used .restrict() above and if the user
+            # doesn't have permission to change one of the objects after the change, it won't be in base_queryset
+            # filtered to the pks of the objects we just changed.
             if base_queryset.filter(pk__in=updated_objects_pk).count() != total_updated_objs:
                 raise ObjectDoesNotExist
             return total_updated_objs
 
-    def _process_valid_form(self, model, form, filter_query_params, edit_all, nullified_fields):
+    def _process_valid_form(self, model, form, filter_query_params, pk_list, edit_all, nullified_fields, saved_view_id):
         try:
-            total_updated_objs = self._update_objects(model, form, filter_query_params, edit_all, nullified_fields)
+            total_updated_objs = self._update_objects(
+                model, form, filter_query_params, pk_list, edit_all, nullified_fields, saved_view_id
+            )
             msg = f"Updated {total_updated_objs} {model._meta.verbose_name_plural}"
             self.logger.info(msg)
             return msg
@@ -149,12 +127,24 @@ class BulkEditObjects(Job):
         raise RunJobTaskFailed("Bulk Edit not fully successful, see logs")
 
     def run(  # pylint: disable=arguments-differ
-        self, *, content_type, form_data, edit_all=False, filter_query_params=None
+        self, *, content_type, form_data, pk_list=None, edit_all=False, filter_query_params=None, saved_view=None
     ):
+        saved_view_id = saved_view.pk if saved_view is not None else None
+        if not filter_query_params:
+            filter_query_params = {}
+
         if not self.user.has_perm(f"{content_type.app_label}.change_{content_type.model}"):
             self.logger.error('User "%s" does not have permission to update %s objects', self.user, content_type.model)
             raise PermissionDenied("User does not have change permissions on the requested content-type")
 
+        self.key_params = {
+            "content_type": content_type,
+            "edit_all": edit_all,
+            "filter_query_params": filter_query_params,
+            "pk_list": pk_list,
+            "saved_view_id": saved_view_id,
+        }
+
         model = content_type.model_class()
         if model is None:
             self.logger.error(
@@ -178,7 +168,9 @@ class BulkEditObjects(Job):
         if form.is_valid():
             self.logger.debug("Form validation was successful")
             nullified_fields = form_data.get("_nullify")
-            return self._process_valid_form(model, form, filter_query_params, edit_all, nullified_fields)
+            return self._process_valid_form(
+                model, form, filter_query_params, pk_list, edit_all, nullified_fields, saved_view_id
+            )
         else:
             self.logger.error(f"Form validation unsuccessful: {form.errors.as_json()}")
 
@@ -197,6 +189,7 @@ class BulkDeleteObjects(Job):
     pk_list = JSONVar(description="List of objects pks to delete", required=False)
     delete_all = BooleanVar(description="Delete all (filtered) objects instead of a list of PKs", required=False)
     filter_query_params = JSONVar(label="Filter Query Params", required=False)
+    saved_view = ObjectVar(model=SavedView, required=False)
 
     class Meta:
         name = "Bulk Delete Objects"
@@ -204,14 +197,26 @@ class BulkDeleteObjects(Job):
         has_sensitive_variables = False
         soft_time_limit = 1800
         time_limit = 2000
+        hidden = True
 
     def run(  # pylint: disable=arguments-differ
-        self, *, content_type, pk_list=None, delete_all=False, filter_query_params=None
+        self, *, content_type, pk_list=None, delete_all=False, filter_query_params=None, saved_view=None
     ):
+        saved_view_id = saved_view.pk if saved_view is not None else None
+        if not filter_query_params:
+            filter_query_params = {}
         if not self.user.has_perm(f"{content_type.app_label}.delete_{content_type.model}"):
             self.logger.error('User "%s" does not have permission to delete %s objects', self.user, content_type.model)
             raise PermissionDenied("User does not have delete permissions on the requested content-type")
 
+        key_params = {
+            "content_type": content_type,
+            "delete_all": delete_all,
+            "filter_query_params": filter_query_params,
+            "pk_list": pk_list,
+            "saved_view_id": saved_view_id,
+        }
+
         model = content_type.model_class()
         if model is None:
             self.logger.error(
@@ -221,49 +226,7 @@ class BulkDeleteObjects(Job):
             )
             raise RunJobTaskFailed("Model not found")
 
-        filterset_cls = get_filterset_for_model(model)
-
-        if filter_query_params:
-            if not filterset_cls:
-                self.logger.error(f"Filterset not found for {model._meta.verbose_name}")
-                raise RunJobTaskFailed(
-                    f"Filter query provided but {model._meta.verbose_name} does not have a filterset."
-                )
-
-            # Discarding non-filter query params
-            new_filter_query_params = {}
-
-            for key, value in filter_query_params.items():
-                try:
-                    get_filterset_field(filterset_cls(), key)
-                    new_filter_query_params[key] = value
-                except exceptions.FilterSetFieldNotFound:
-                    self.logger.debug(f"Query parameter `{key}` not found in `{filterset_cls}`, discarding it")
-
-            filter_query_params = new_filter_query_params
-
-        if delete_all:
-            # Case for selecting all objects (or all filtered objects) to delete
-            if filter_query_params:
-                # If there is filter query params, we need to apply it to the queryset
-                queryset = filterset_cls(filter_query_params).qs.restrict(self.user, "delete")
-                # 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 = model.objects.filter(pk__in=queryset)
-            else:
-                # If there is not, we can just restrict the queryset to the user's permissions
-                queryset = model.objects.restrict(self.user, "delete")
-        elif pk_list:
-            # Case for selecting specific objects to delete, delete_all overrides this option
-            queryset = model.objects.restrict(self.user, "delete").filter(pk__in=pk_list)
-            if queryset.count() < len(pk_list):
-                # We do not check ObjectPermission error for `delete_all` case because user is trying to
-                # delete all objs they have permission to which would not raise any issue.
-                self.logger.error("You do not have permissions to delete some of the objects provided in `pk_list`.")
-                raise RunJobTaskFailed("Caught ObjectPermission error while attempting to delete objects")
-        elif not pk_list and not delete_all:
-            self.logger.error("You must select at least one object instance to delete.")
-            raise RunJobTaskFailed("Either `pk_list` or `delete_all` is required.")
+        queryset = get_bulk_queryset_from_view(user=self.user, action="delete", log=self.logger, **key_params)
 
         verbose_name_plural = model._meta.verbose_name_plural