nautobot 3.0.0a3__py3-none-any.whl → 3.0.0rc1__py3-none-any.whl

nautobot/extras/api/views.py

@@ -1,5 +1,6 @@
 from django.conf import settings
 from django.contrib.contenttypes.models import ContentType
+from django.db import transaction
 from django.db.models import ProtectedError
 from django.forms import ValidationError as FormsValidationError
 from django.http import FileResponse, Http404
@@ -897,55 +898,61 @@ class JobViewSetBase(
         if schedule_data is None:
             schedule_data = {"interval": JobExecutionType.TYPE_IMMEDIATELY, "start_time": timezone.now()}
 
-        schedule = ScheduledJob.create_schedule(
-            job_model,
-            request.user,
-            name=schedule_data.get("name"),
-            start_time=schedule_data.get("start_time"),
-            interval=schedule_data.get("interval"),
-            crontab=schedule_data.get("crontab", ""),
-            job_queue=job_queue,
-            validated_save=False,
-            **job_class.serialize_data(cleaned_data),
-        )
-
-        scheduled_job_has_approval_workflow = schedule.has_approval_workflow_definition()
-        if job_model.has_sensitive_variables:
-            if (
-                "schedule" in request.data
-                and "interval" in request.data["schedule"]
-                and request.data["schedule"]["interval"] != JobExecutionType.TYPE_IMMEDIATELY
-            ):
-                raise ValidationError(
-                    {"schedule": {"interval": ["Unable to schedule job: Job may have sensitive input variables"]}}
-                )
-            # check approval_required pointer
-            if scheduled_job_has_approval_workflow:
-                raise ValidationError(
-                    "Unable to run or schedule job: "
-                    "This job is flagged as possibly having sensitive variables but also has an applicable approval workflow definition."
-                    "Modify or remove the approval workflow definition or modify the job to set `has_sensitive_variables` to False."
-                )
-
-        # Approval is not required for dryrun
-        # TODO: remove this once we have the ability to configure an approval workflow to ignore jobs with specific parameters(including `dryrun`)
-        dryrun = data.get("dryrun", False) if job_class.supports_dryrun else False
-
-        if (not dryrun and scheduled_job_has_approval_workflow) or schedule_data[
-            "interval"
-        ] in JobExecutionType.SCHEDULE_CHOICES:
-            schedule.validated_save()
-            serializer = serializers.ScheduledJobSerializer(schedule, context={"request": request})
-            return Response({"scheduled_job": serializer.data, "job_result": None}, status=status.HTTP_201_CREATED)
-        else:
-            job_result = JobResult.enqueue_job(
+        with transaction.atomic():
+            schedule = ScheduledJob.create_schedule(
                 job_model,
                 request.user,
+                name=schedule_data.get("name"),
+                start_time=schedule_data.get("start_time"),
+                interval=schedule_data.get("interval"),
+                crontab=schedule_data.get("crontab", ""),
                 job_queue=job_queue,
                 **job_class.serialize_data(cleaned_data),
             )
-            serializer = serializers.JobResultSerializer(job_result, context={"request": request})
-            return Response({"scheduled_job": None, "job_result": serializer.data}, status=status.HTTP_201_CREATED)
+
+            scheduled_job_has_approval_workflow = schedule.has_approval_workflow_definition()
+            if job_model.has_sensitive_variables:
+                if (
+                    "schedule" in request.data
+                    and "interval" in request.data["schedule"]
+                    and request.data["schedule"]["interval"] != JobExecutionType.TYPE_IMMEDIATELY
+                ):
+                    schedule.delete()
+                    schedule = None
+                    raise ValidationError(
+                        {"schedule": {"interval": ["Unable to schedule job: Job may have sensitive input variables"]}}
+                    )
+                # check approval_required pointer
+                if scheduled_job_has_approval_workflow:
+                    schedule.delete()
+                    schedule = None
+                    raise ValidationError(
+                        "Unable to run or schedule job: "
+                        "This job is flagged as possibly having sensitive variables but also has an applicable approval workflow definition."
+                        "Modify or remove the approval workflow definition or modify the job to set `has_sensitive_variables` to False."
+                    )
+
+            # Approval is not required for dryrun
+            # TODO: remove this once we have the ability to configure an approval workflow to ignore jobs with specific parameters(including `dryrun`)
+            dryrun = data.get("dryrun", False) if job_class.supports_dryrun else False
+
+            if (not dryrun and scheduled_job_has_approval_workflow) or schedule_data[
+                "interval"
+            ] in JobExecutionType.SCHEDULE_CHOICES:
+                serializer = serializers.ScheduledJobSerializer(schedule, context={"request": request})
+                return Response({"scheduled_job": serializer.data, "job_result": None}, status=status.HTTP_201_CREATED)
+
+            schedule.delete()
+            schedule = None
+
+        job_result = JobResult.enqueue_job(
+            job_model,
+            request.user,
+            job_queue=job_queue,
+            **job_class.serialize_data(cleaned_data),
+        )
+        serializer = serializers.JobResultSerializer(job_result, context={"request": request})
+        return Response({"scheduled_job": None, "job_result": serializer.data}, status=status.HTTP_201_CREATED)
 
 
 class JobViewSet(

nautobot/extras/datasources/git.py

@@ -18,7 +18,7 @@ import yaml
 
 from nautobot.core.utils.git import GitRepo
 from nautobot.core.utils.module_loading import check_name_safe_to_import_privately, import_modules_privately
-from nautobot.dcim.models import Device, DeviceRedundancyGroup, DeviceType, Location, Platform
+from nautobot.dcim.models import Device, DeviceFamily, DeviceRedundancyGroup, DeviceType, Location, Platform
 from nautobot.extras.choices import (
     LogLevelChoices,
     SecretsGroupAccessTypeChoices,
@@ -274,6 +274,7 @@ def update_git_config_contexts(repository_record, job_result):
         for filter_type in (
             "locations",
             "device_types",
+            "device_families",
             "roles",
             "platforms",
             "cluster_groups",
@@ -408,6 +409,7 @@ def import_config_context(context_data, repository_record, job_result):
     for key, model_class in [
         ("locations", Location),
         ("device_types", DeviceType),
+        ("device_families", DeviceFamily),
         ("roles", Role),
         ("platforms", Platform),
         ("cluster_groups", ClusterGroup),

nautobot/extras/filters.py

@@ -23,8 +23,9 @@ from nautobot.core.filters import (
     RelatedMembershipBooleanFilter,
     SearchFilter,
 )
-from nautobot.dcim.models import DeviceRedundancyGroup, DeviceType, Location, Platform
+from nautobot.dcim.models import DeviceFamily, DeviceRedundancyGroup, DeviceType, Location, Platform
 from nautobot.extras.choices import (
+    ApprovalWorkflowStateChoices,
     JobQueueTypeChoices,
     JobResultStatusChoices,
     MetadataTypeDataTypeChoices,
@@ -386,6 +387,12 @@ class ConfigContextFilterSet(BaseFilterSet):
         to_field_name="model",
         label="Device Type (model or ID)",
     )
+    device_family = NaturalKeyOrPKMultipleChoiceFilter(
+        field_name="device_families",
+        queryset=DeviceFamily.objects.all(),
+        to_field_name="name",
+        label="Device Family (name or ID)",
+    )
     platform_id = ModelMultipleChoiceFilter(
         field_name="platforms",
         queryset=Platform.objects.all(),
@@ -1208,10 +1215,15 @@ class ScheduledJobFilterSet(BaseFilterSet):
         label="Time zone",
         null_value="",
     )
+    approval_state = django_filters.MultipleChoiceFilter(
+        field_name="associated_approval_workflows__current_state",
+        label="Approval state",
+        choices=ApprovalWorkflowStateChoices,
+    )
 
     class Meta:
         model = ScheduledJob
-        fields = ["id", "name", "total_run_count", "start_time", "last_run_at", "time_zone"]
+        fields = ["id", "name", "enabled", "total_run_count", "start_time", "last_run_at", "time_zone"]
 
 
 #
@@ -1471,6 +1483,11 @@ class SecretFilterSet(
             "name": "icontains",
         },
     )
+    secrets_groups = NaturalKeyOrPKMultipleChoiceFilter(
+        queryset=SecretsGroup.objects.all(),
+        label="Groups (ID or name)",
+        to_field_name="name",
+    )
     # TODO(Glenn): dynamic choices needed. The issue being that secrets providers are Python
     # classes, not database models.
     # provider = django_filters.MultipleChoiceFilter(choices=..., null_value=None)

nautobot/extras/forms/forms.py

@@ -42,7 +42,7 @@ from nautobot.core.forms.constants import BOOLEAN_WITH_BLANK_CHOICES
 from nautobot.core.forms.fields import MultiValueCharField
 from nautobot.core.forms.forms import ConfirmationForm
 from nautobot.core.forms.widgets import ClearableFileInput
-from nautobot.dcim.models import Device, DeviceRedundancyGroup, DeviceType, Location, Platform
+from nautobot.dcim.models import Device, DeviceFamily, DeviceRedundancyGroup, DeviceType, Location, Platform
 from nautobot.extras.choices import (
     ApprovalWorkflowStateChoices,
     ButtonClassChoices,
@@ -544,6 +544,7 @@ class ConfigContextForm(BootstrapMixin, NoteModelFormMixin, forms.ModelForm):
         required=False,
     )
     device_types = DynamicModelMultipleChoiceField(queryset=DeviceType.objects.all(), required=False)
+    device_families = DynamicModelMultipleChoiceField(queryset=DeviceFamily.objects.all(), required=False)
     platforms = DynamicModelMultipleChoiceField(queryset=Platform.objects.all(), required=False)
     cluster_groups = DynamicModelMultipleChoiceField(queryset=ClusterGroup.objects.all(), required=False)
     clusters = DynamicModelMultipleChoiceField(queryset=Cluster.objects.all(), required=False)
@@ -576,6 +577,7 @@ class ConfigContextForm(BootstrapMixin, NoteModelFormMixin, forms.ModelForm):
             "locations",
             "roles",
             "device_types",
+            "device_families",
             "platforms",
             "cluster_groups",
             "clusters",
@@ -609,7 +611,12 @@ class ConfigContextFilterForm(BootstrapMixin, forms.Form):
     role = DynamicModelMultipleChoiceField(
         queryset=Role.objects.get_for_models([Device, VirtualMachine]), to_field_name="name", required=False
     )
-    type = DynamicModelMultipleChoiceField(queryset=DeviceType.objects.all(), to_field_name="model", required=False)
+    device_type = DynamicModelMultipleChoiceField(
+        queryset=DeviceType.objects.all(), to_field_name="model", required=False
+    )
+    device_family = DynamicModelMultipleChoiceField(
+        queryset=DeviceFamily.objects.all(), to_field_name="name", required=False
+    )
     platform = DynamicModelMultipleChoiceField(queryset=Platform.objects.all(), to_field_name="name", required=False)
     cluster_group = DynamicModelMultipleChoiceField(
         queryset=ClusterGroup.objects.all(), to_field_name="name", required=False

nautobot/extras/jobs.py

@@ -468,6 +468,7 @@ class BaseJob:
             label="Profile job execution",
             help_text="Profiles the job execution using cProfile and outputs a report to /tmp/",
         )
+        form.fields["_profile"].widget.attrs["class"] = "form-check-input"
         # If the class already exists there may be overrides, so we have to check this.
         try:
             job_model = JobModel.objects.get(module_name=cls.__module__, job_class_name=cls.__name__)
@@ -484,6 +485,7 @@ class BaseJob:
                 label="Ignore singleton lock",
                 help_text="Allow this singleton job to run even when another instance is already running",
             )
+            form.fields["_ignore_singleton_lock"].widget.attrs["class"] = "form-check-input"
 
         if job_model is not None:
             job_queue_queryset = JobQueue.objects.filter(jobs=job_model)

nautobot/extras/jobs_ui.py

@@ -165,10 +165,11 @@ class JobKeyValueOverrideValueTablePanel(KeyValueTablePanel):
                 else:
                     value_tag = format_html(
                         """
-                            <span class="hover_copy">
+                            <span>
                                 <span id="{unique_id}_value_{key}">{value}</span>
-                                <button class="btn btn-inline btn-default hover_copy_button" data-clipboard-target="#{unique_id}_value_{key}">
-                                    <span class="mdi mdi-content-copy"></span>
+                                <button class="btn btn-secondary nb-btn-inline-hover" data-clipboard-target="#{unique_id}_value_{key}">
+                                    <span aria-hidden="true" class="mdi mdi-content-copy"></span>
+                                    <span class="visually-hidden">Copy</span>
                                 </button>
                             </span>
                         """,

nautobot/extras/management/__init__.py

@@ -10,6 +10,7 @@ from nautobot.core.choices import ColorChoices
 from nautobot.dcim import choices as dcim_choices
 from nautobot.extras import choices as extras_choices
 from nautobot.ipam import choices as ipam_choices
+from nautobot.load_balancers import choices as load_balancer_choices
 from nautobot.virtualization import choices as vm_choices
 from nautobot.vpn import choices as vpn_choices
 
@@ -35,6 +36,7 @@ STATUS_CHOICESET_MAP = {
     "ipam.Prefix": ipam_choices.PrefixStatusChoices,
     "ipam.VLAN": ipam_choices.VLANStatusChoices,
     "ipam.VRF": ipam_choices.VRFStatusChoices,
+    "load_balancers.LoadBalancerPoolMember": load_balancer_choices.LoadBalancerPoolMemberStatusChoices,
     "virtualization.VirtualMachine": vm_choices.VirtualMachineStatusChoices,
     "virtualization.VMInterface": vm_choices.VMInterfaceStatusChoices,
     "vpn.VPNTunnel": vpn_choices.VPNTunnelStatusChoices,

nautobot/extras/management/commands/refresh_dynamic_group_member_caches.py

@@ -14,4 +14,7 @@ class Command(BaseCommand):
         dynamic_groups = DynamicGroup.objects.all()
 
         for dynamic_group in dynamic_groups:
-            dynamic_group.update_cached_members()
+            try:
+                dynamic_group.update_cached_members()
+            except Exception as err:
+                self.stderr.write(self.style.ERROR(f"Error while refreshing {dynamic_group}: {err}"))

nautobot/extras/migrations/0131_configcontext_device_families.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.24 on 2025-09-26 19:15
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("dcim", "0074_alter_rack_u_height"),
+        ("extras", "0130_jobresult_generate_log_entry_counts"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="configcontext",
+            name="device_families",
+            field=models.ManyToManyField(blank=True, related_name="+", to="dcim.devicefamily"),
+        ),
+    ]

nautobot/extras/models/approvals.py

@@ -4,7 +4,7 @@ from django.conf import settings
 from django.contrib.auth.models import Group
 from django.contrib.contenttypes.fields import GenericForeignKey
 from django.contrib.contenttypes.models import ContentType
-from django.core.exceptions import ValidationError
+from django.core.exceptions import FieldError, ValidationError
 from django.db import models
 from django.utils import timezone
 
@@ -97,6 +97,16 @@ class ApprovalWorkflowDefinition(PrimaryModel):
         """Stringify instance."""
         return self.name
 
+    def clean(self):
+        super().clean()
+        model_class = self.model_content_type.model_class()
+        if model_class is None:
+            raise ValidationError({"model_content_type": "Couldn't find corresponding model class. Is it installed?"})
+        try:
+            model_class.objects.filter(**self.model_constraints)
+        except (FieldError, AttributeError) as exc:
+            raise ValidationError({"model_constraints": f"Invalid query filter: {exc}"})
+
 
 @extras_features(
     "custom_links",

nautobot/extras/models/change_logging.py

@@ -154,6 +154,10 @@ class ObjectChange(BaseModel):
     def __str__(self):
         return f"{self.changed_object_type} {self.object_repr} {self.get_action_display().lower()} by {self.user_name}"
 
+    @property
+    def page_title(self):
+        return f"{self.object_repr} - {self.time.strftime('%Y-%m-%d %H:%M')}"
+
     def save(self, *args, **kwargs):
         # Record the user's name and the object's representation as static strings
         if not self.user_name:

nautobot/extras/models/jobs.py

@@ -1413,7 +1413,6 @@ class ScheduledJob(ApprovableModelMixin, BaseModel):
         job_queue: Optional[JobQueue] = None,
         task_queue: Optional[str] = None,  # deprecated!
         ignore_singleton_lock: bool = False,
-        validated_save: bool = True,
         **job_kwargs,
     ):
         """
@@ -1503,8 +1502,7 @@ class ScheduledJob(ApprovableModelMixin, BaseModel):
             crontab=crontab,
             job_queue=job_queue,
         )
-        if validated_save:
-            scheduled_job.validated_save()
+        scheduled_job.validated_save()
         return scheduled_job
 
     create_schedule.__func__.alters_data = True

nautobot/extras/models/models.py

@@ -31,7 +31,13 @@ from nautobot.extras.choices import (
 )
 from nautobot.extras.constants import HTTP_CONTENT_TYPE_JSON
 from nautobot.extras.models import ChangeLoggedModel
-from nautobot.extras.models.mixins import ContactMixin, DynamicGroupsModelMixin, NotesMixin, SavedViewMixin
+from nautobot.extras.models.mixins import (
+    ContactMixin,
+    DataComplianceModelMixin,
+    DynamicGroupsModelMixin,
+    NotesMixin,
+    SavedViewMixin,
+)
 from nautobot.extras.models.relationships import RelationshipModel
 from nautobot.extras.querysets import ConfigContextQuerySet, NotesQuerySet
 from nautobot.extras.utils import extras_features, FeatureQuery, image_upload
@@ -127,6 +133,7 @@ class ConfigContext(
     tenant_groups = models.ManyToManyField(to="tenancy.TenantGroup", related_name="+", blank=True)
     tenants = models.ManyToManyField(to="tenancy.Tenant", related_name="+", blank=True)
     tags = models.ManyToManyField(to="extras.Tag", related_name="+", blank=True)
+    device_families = models.ManyToManyField("dcim.DeviceFamily", related_name="+", blank=True)
 
     # Due to feature flag CONFIG_CONTEXT_DYNAMIC_GROUPS_ENABLED this field will remain empty unless set to True.
     dynamic_groups = models.ManyToManyField(
@@ -687,6 +694,7 @@ class FileProxy(BaseModel):
 class GraphQLQuery(
     ChangeLoggedModel,
     ContactMixin,
+    DataComplianceModelMixin,
     DynamicGroupsModelMixin,
     NotesMixin,
     SavedViewMixin,
@@ -827,7 +835,7 @@ class ImageAttachment(BaseModel):
 
 
 @extras_features("graphql", "webhooks")
-class Note(ChangeLoggedModel, BaseModel):
+class Note(ChangeLoggedModel, DataComplianceModelMixin, BaseModel):
     """
     Notes allow anyone with proper permissions to add a note to an object.
     """

nautobot/extras/plugins/marketplace_manifest.yml

@@ -1,5 +1,29 @@
 ---
 "apps":
+- "name": "Ansible Automation"
+  "use_cases":
+  - "Network Automation"
+  - "Ansible Playbook Execution"
+  "requires": []
+  "docs": "https://docs.nautobot.com/projects/ansible-automation/en/stable/"
+  "headline": >-
+    Execute and monitor automation workflows from Redhat Ansible Automation Platform seamlessly without leaving
+    Nautobot.
+  "description": >-
+    Nautobot Ansible Automation seamlessly integrates automation workflows from Redhat Ansible Automation Platform
+    as Nautobot Jobs, allowing its users to run and visualize the output of such workflows directly within Nautobot.
+    The Nautobot App connects with Redhat AAP/AWX platforms in order to selectively import Job Templates and Workflows
+    so they can be triggered to run from Nautobot. Other features include: historical result synchronization, support
+    for input customization using surveys, and deeper integration using Nautobot inventory data.
+  "package_name": "nautobot_ansible_automation"
+  "author": "Network to Code (NTC)"
+  "display":
+    "cloud": true
+    "oss": true
+    "enterprise": true
+  "availability": "NTC License"
+  "icon": >-
+    data:image/png;base64,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
 - "name": "BGP Models"
   "use_cases":
   - "Routing"
@@ -112,7 +136,6 @@
   "availability": "Open Source"
   "icon": >-
     data:image/png;base64,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
-# TODO: remove data_validation_engine from marketplace repo so it doesn't get reintroduced here by accident
 - "name": "Design Builder"
   "use_cases":
   - "Network Design"
@@ -430,6 +453,31 @@
   "availability": "Open Source"
   "icon": >-
     data:image/png;base64,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
+- "name": "Version Control"
+  "use_cases":
+  - "Enterprise Governance"
+  - "Branching"
+  - "Approvals"
+  - "Data Management"
+  "requires": []
+  "docs": "https://docs.nautobot.com/projects/version-control/en/latest/"
+  "headline": >-
+    Allows users to have change (workflow) management with approvals when managing data within Nautobot ensuring
+    Enterprise can maintain governance of their data.
+  "description": >-
+    Version Control allows users to stage changes and have them reviewed by others before committing them. It offers
+    Git semantics when working with Nautobot using branch, commit, merge, and pull request concepts allowing users
+    to stage changes in a branch and have it be later merged after someone approves it in the UI or API. This app
+    requires a Dolt database.
+  "package_name": "nautobot_version_control"
+  "author": "Network to Code (NTC)"
+  "display":
+    "cloud": true
+    "oss": false
+    "enterprise": false
+  "availability": "NTC License"
+  "icon": >-
+    data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAMAAACdt4HsAAABoVBMVEUAAACvr6+wsLCxsbEAff8AfP8Ae/+BosVYlti1sq61sa7geAbmeADgeAe8oYPIlFvheAbheAiysrKvr6+wsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCvr6+wsLAAfP8AfP8Aff8Aff8Abf+xsbEAff8Aff8Cfv5Xlti7s6oAfP8AfP8kh++orrQAfP8jh++xsLACfv68tKsAef+wsLCwsLCwsLCvr6+xsbGwsLCvsLCxsLCvsLGrr7LCtqgPgfgAdP8Aff8Aff8AfP/CtagAdf8Aff/BtagAff8Aff+rrrL0eADueADfeAfgeAfgeAfuaADgeAbgeAfgeAffeQnIlFqss7vgeAbhdwTWgymyrajhdwSwsLHfeQnJlFqttLzjdQCwsLCwsLCwsLDfeAbheAawsLCwsLCwsLDheQawsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLBnm9FLkjVQAAAAiXRSTlMAAAAAAAAAAAAAAAAAAAAAAAAAAgkCeMLBhg72xfOVDRL8ls+eFggMCIcCCXjCAgL2xcQSCRLC88W/88LFCQmIwHoDA5oNlf6aDJoM+5YNDAz8DAINmgIJAnjCAgn2xcQSCRLC88W/wsUSCQn+Hd0CAk3X+AKM8EGTyAsza/2Qx+/cA6qLTKlqMjF60isAAAL+SURBVFjD7ZfbWxJBGMZlliV1tSgOu8ECghoJ0kpm2ZEsFEMp07IkpDLtqGVaeOhg2XH9q5uZZQ+4s7tDV174Xu3Dw/vb+Wa+eWe2peVQB0YuYCkXFQAAn5+oACUB+II8ScLJEB0B+PmwaPaLETkaoyJAgNhlLqBLkOMJKgIE8H7zBPqF7h46ggIg/Cr0RqkIlgD+VDJBQ7AG+EGMhmAHoCLYAmgIdgCGhmA/AgCSTmthCai31+nenngUdrUDwM02yGNocKFblvsCTgCWTaU1pVjWuMUEISL4HQGp/oym/jNHAJAM+0LknQHpzEBWsWcHzg6egzafvi94KkB2SClg6PyFYTTyoFo3LSCTViYwffHS8GVeDGumpgGZK4NXjXU3XUI2c63VaKIF6JMIx9I8oGEZU/8BaGgkNwngsjgqLDrRBIB+H/GosCtBeaf6HMrlSEeF5STi3QjfCf8hijidZJm0sUnLiADXI3A3iiOwHcGNkZGbKFnyeVI0EBrJCJAgAEgSGIXJlCTGtBVAKUGCJTAw2UbHCuO32nDA7Q8XqxLUSWTQ+sUShb3ihKcVJPNyLgCa60Tsj48XJ0u3Pe0IIIGmOlHxJ+5Mle6WJqYT5nxUG2lGb6QZQyfW/bE29l5psngfTyJDAHAdsw80zXZwKsClnQxudqq4V4ia/HVA58O5sqa5R0f1/q/7AWifHi+Mmf3qCCrl+apir84/fvJUCRSjHz0R3m8AVBcqWAvPFpd4JdL2+RMkvw4oVzisyvPFpRcoVCWGxk8AlF++eq00YYjCTyihWn5zDLsCueV80slPmkQ4FtwBK29lBWDnVwHvjMu46sVX2PfhtXVktPWrgM7ViqYPHIcBH2sbm/omZmxD9biX0+Xl8AhCW1vJ7c31eowwTV40oT7VcmB7Y01ejtr5La66MAvB5y9f+3a+hb/nbP3kyzbKwt0fcry28/PXimTrJ1/3URYGgr///I3VU8n2gyNA+NqQUB/tYvcJh7syikyS0M8u5vCT8KDrH3bO2ltvf7BdAAAAAElFTkSuQmCC
 - "name": "Welcome Wizard"
   "use_cases":
   - "Onboarding"

nautobot/extras/plugins/views.py

@@ -141,11 +141,6 @@ class InstalledAppDetailView(GenericView):
         items={
             "*": [
                 ViewNameBreadcrumbItem(view_name="apps:apps_list", label="Installed Apps"),
-                ViewNameBreadcrumbItem(
-                    view_name="apps:app_detail",
-                    reverse_kwargs=lambda context: {"app": context["app_data"]["package"]},
-                    label=lambda context: context["app_data"]["name"],
-                ),
             ]
         }
     )

nautobot/extras/querysets.py

@@ -19,6 +19,9 @@ class ConfigContextQuerySet(RestrictedQuerySet):
         # `device_type` for Device; `type` for VirtualMachine
         device_type = getattr(obj, "device_type", None)
 
+        # `device_family` for Device;
+        device_family = getattr(device_type, "device_family", None)
+
         device_redundancy_group = getattr(obj, "device_redundancy_group", None)
 
         # Get the group of the assigned tenant, if any
@@ -40,6 +43,7 @@ class ConfigContextQuerySet(RestrictedQuerySet):
             Q(locations__in=locations) | Q(locations=None),
             Q(roles=role) | Q(roles=None),
             Q(device_types=device_type) | Q(device_types=None),
+            Q(device_families=device_family) | Q(device_families=None),
             Q(platforms=obj.platform) | Q(platforms=None),
             Q(device_redundancy_groups=device_redundancy_group) | Q(device_redundancy_groups=None),
             Q(tenant_groups__in=tenant_groups) | Q(tenant_groups=None),
@@ -136,6 +140,7 @@ class ConfigContextModelQuerySet(RestrictedQuerySet):
         if self.model._meta.model_name == "device":
             location_query_string = "location"
             base_query.add((Q(device_types=OuterRef("device_type")) | Q(device_types=None)), Q.AND)
+            base_query.add((Q(device_families=OuterRef("device_type__device_family")) | Q(device_families=None)), Q.AND)
             base_query.add(
                 (Q(device_redundancy_groups=OuterRef("device_redundancy_group")) | Q(device_redundancy_groups=None)),
                 Q.AND,
@@ -145,6 +150,9 @@ class ConfigContextModelQuerySet(RestrictedQuerySet):
             base_query.add((Q(cluster_groups=OuterRef("clusters__cluster_group")) | Q(cluster_groups=None)), Q.AND)
         else:
             location_query_string = "cluster__location"
+            base_query.add(Q(device_types=None), Q.AND)
+            base_query.add(Q(device_families=None), Q.AND)
+            base_query.add(Q(device_redundancy_groups=None), Q.AND)
             # For virtual machines, handle cluster as ForeignKey relationship
             base_query.add((Q(clusters=OuterRef("cluster")) | Q(clusters=None)), Q.AND)
             base_query.add((Q(cluster_groups=OuterRef("cluster__cluster_group")) | Q(cluster_groups=None)), Q.AND)

nautobot/extras/tables.py

@@ -1161,6 +1161,7 @@ class JobTable(BaseTable):
 
 class JobHookTable(BaseTable):
     pk = ToggleColumn()
+    enabled = BooleanColumn()
     name = tables.Column(linkify=True)
     content_types = tables.TemplateColumn(WEBHOOK_CONTENT_TYPES)
     job = tables.Column(linkify=True)
@@ -1478,12 +1479,20 @@ class ScheduledJobTable(BaseTable):
     pk = ToggleColumn()
     name = tables.Column(linkify=True)
     job_model = tables.Column(verbose_name="Job", linkify=True)
+    enabled = BooleanColumn()
     interval = tables.Column(verbose_name="Execution Type")
     start_time = tables.DateTimeColumn(verbose_name="First Run", format=settings.SHORT_DATETIME_FORMAT)
     last_run_at = tables.DateTimeColumn(verbose_name="Most Recent Run", format=settings.SHORT_DATETIME_FORMAT)
     crontab = tables.Column()
     total_run_count = tables.Column(verbose_name="Total Run Count")
     actions = ButtonsColumn(ScheduledJob, buttons=("delete",), prepend_template=SCHEDULED_JOB_BUTTONS)
+    approval_state = tables.Column(empty_values=[], orderable=False)
+
+    def render_approval_state(self, record):
+        workflow = record.associated_approval_workflows.first()
+        if workflow is not None:
+            return format_html('<a href="{}">{}</a>', record.get_approval_workflow_url(), workflow.current_state)
+        return HTML_NONE
 
     class Meta(BaseTable.Meta):
         model = ScheduledJob
@@ -1492,6 +1501,7 @@ class ScheduledJobTable(BaseTable):
             "name",
             "total_run_count",
             "job_model",
+            "approval_state",
             "interval",
             "start_time",
             "last_run_at",
@@ -1503,6 +1513,8 @@ class ScheduledJobTable(BaseTable):
             "pk",
             "name",
             "job_model",
+            "enabled",
+            "approval_state",
             "interval",
             "last_run_at",
             "actions",

nautobot/extras/templates/django_ajax_tables/ajax_wrapper.html

@@ -38,6 +38,8 @@ Ref: https://github.com/nautobot/nautobot/issues/1289
 
                     _replace_links_{{ ajax_divname }}(url, div.getElementsByTagName('TH'));
                     _replace_links_{{ ajax_divname }}(url, div.getElementsByClassName('pagination'));
+                    /* Hook back up the JS for the "per_page" dropdown, if present for this table */
+                    initializeResultPerPageSelection(div);
                 }
             }
         };