nautobot 3.0.0a2__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(
@@ -1093,7 +1100,15 @@ class JobButtonViewSet(NotesViewSetMixin, ModelViewSet):
 #
 
 
-class ScheduledJobViewSet(ReadOnlyModelViewSet):
+class ScheduledJobViewSet(
+    # DRF mixins:
+    # note no CreateModelMixin or UpdateModelMixin
+    mixins.DestroyModelMixin,
+    # Nautobot mixins:
+    BulkDestroyModelMixin,
+    # Base class
+    ReadOnlyModelViewSet,
+):
     """
     Retrieve a list of scheduled jobs
     """

nautobot/extras/choices.py

@@ -1,7 +1,6 @@
 from celery import states
 
 from nautobot.core.choices import ChoiceSet
-from nautobot.core.utils.deprecation import class_deprecated_in_favor_of
 
 #
 # Approval Workflows
@@ -159,7 +158,7 @@ class CustomFieldTypeChoices(ChoiceSet):
 
 
 class ButtonClassChoices(ChoiceSet):
-    CLASS_DEFAULT = "default"
+    CLASS_DEFAULT = "default"  # maps to "secondary" in v3 UI, but kept for backwards compatibility
     CLASS_PRIMARY = "primary"
     CLASS_SUCCESS = "success"
     CLASS_INFO = "info"
@@ -171,23 +170,13 @@ class ButtonClassChoices(ChoiceSet):
         (CLASS_DEFAULT, "Default"),
         (CLASS_PRIMARY, "Primary (blue)"),
         (CLASS_SUCCESS, "Success (green)"),
-        (CLASS_INFO, "Info (aqua)"),
+        (CLASS_INFO, "Info (blue)"),
         (CLASS_WARNING, "Warning (orange)"),
         (CLASS_DANGER, "Danger (red)"),
         (CLASS_LINK, "None (link)"),
     )
 
 
-#
-# CustomLinks
-#
-
-
-@class_deprecated_in_favor_of(ButtonClassChoices)
-class CustomLinkButtonClassChoices(ButtonClassChoices):
-    pass
-
-
 #
 # Dynamic Groups
 #

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/mixins.py → filter_mixins.py}

@@ -21,7 +21,7 @@ from nautobot.extras.choices import (
     CustomFieldTypeChoices,
     RelationshipSideChoices,
 )
-from nautobot.extras.filters.customfields import (
+from nautobot.extras.filter_mixins_customfields import (
     CustomFieldBooleanFilter,
     CustomFieldCharFilter,
     CustomFieldDateFilter,

nautobot/extras/{filters/customfields.py → filter_mixins_customfields.py}

@@ -1,3 +1,6 @@
+from functools import reduce
+import operator
+
 from django.db.models import Q
 from django.forms import IntegerField
 import django_filters
@@ -36,19 +39,52 @@ class CustomFieldFilterMixin:
         super().__init__(*args, **kwargs)
         self.field_name = f"_custom_field_data__{self.field_name}"
 
+    def generate_query(self, value):
+        # This method may be called from extras.models.DynamicGroup._generate_query_for_filter method
+        # to generate proper query for given field. But at this point, we don't know if the field will be negated or not
+        # That's why we're preparing query that works both: for positional filtering and negated one.
+        # For positional filtering, when we're expecting some value, the field must exists (key in custom field data JSONB)
+        # and value can't be None (null in db)
+        # For negated filtering we're expecting field without some value, but key may be missing or value can be None (null in db)
+        # Please refer to the filter method below, for more context.
+        if value == "null" or value == ["null"]:
+            return Q(**{f"{self.field_name}__exact": None}) & Q(**{f"{self.field_name}__isnull": False})
+
+        if isinstance(value, (list, tuple)):
+            value_match = reduce(operator.or_, [Q(**{f"{self.field_name}__{self.lookup_expr}": v}) for v in value])
+        else:
+            value_match = Q(**{f"{self.field_name}__{self.lookup_expr}": value})
+        value_is_not_none = ~Q(**{f"{self.field_name}__exact": None})
+        key_is_present_in_jsonb = Q(
+            **{f"{self.field_name}__isnull": False}
+        )  # __isnull and __has_key has same output in case of JSONB fields
+
+        return value_match & value_is_not_none & key_is_present_in_jsonb
+
     def filter(self, qs, value):
         if value in django_filters.constants.EMPTY_VALUES:
             return qs
 
-        if value == "null":
+        if value == "null" or value == ["null"]:
             return self.get_method(qs)(
-                Q(**{f"{self.field_name}__exact": None}) | Q(**{f"{self.field_name}__isnull": True})
+                Q(**{f"{self.field_name}__exact": None}) & Q(**{f"{self.field_name}__isnull": False})
             )
 
         # Custom fields require special handling for exclude filtering.
-        # Return custom fields that don't match the value and null custom fields
+        # Return custom fields that don't match the value, key is missing or value is set to null
+        # For JSONB fields, like `_custom_field_data`:
+        # __isnull and __has_key returns those records which has key
+        # __isnull is not checking the actual value in JSONB!
+        # to check for null value, we need to use exact
+        # With exclude filtering we need to take into account all cases:
+        # - no key - handled by __isnull check
+        # - key is present with null - handled by __exact=None
+        # - key is present with some value - handled by filter
+        # - key is present with empty str - handled by filter
         if self.exclude:
-            qs_null_custom_fields = qs.filter(**{f"{self.field_name}__isnull": True}).distinct()
+            qs_null_custom_fields = qs.filter(
+                Q(**{f"{self.field_name}__isnull": True}) | Q(**{f"{self.field_name}__exact": None})
+            ).distinct()
             return super().filter(qs, value).distinct() | qs_null_custom_fields
 
         return super().filter(qs, value)
@@ -58,7 +94,7 @@ class CustomFieldBooleanFilter(CustomFieldFilterMixin, django_filters.BooleanFil
     """Custom field single value filter for backwards compatibility"""
 
 
-class CustomFieldCharFilter(CustomFieldFilterMixin, django_filters.Filter):
+class CustomFieldCharFilter(CustomFieldFilterMixin, django_filters.CharFilter):
     """Custom field single value filter for backwards compatibility"""
 
 
@@ -92,7 +128,7 @@ class CustomFieldMultiSelectFilter(CustomFieldSelectFilter):
         super().__init__(*args, **kwargs)
 
 
-class CustomFieldNumberFilter(CustomFieldFilterMixin, django_filters.Filter):
+class CustomFieldNumberFilter(CustomFieldFilterMixin, django_filters.NumberFilter):
     """Custom field single value filter for backwards compatibility"""
 
     field_class = IntegerField

nautobot/extras/{filters/__init__.py → filters.py}

@@ -23,9 +23,9 @@ from nautobot.core.filters import (
     RelatedMembershipBooleanFilter,
     SearchFilter,
 )
-from nautobot.core.utils.deprecation import class_deprecated_in_favor_of
-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,
@@ -33,7 +33,18 @@ from nautobot.extras.choices import (
     SecretsGroupAccessTypeChoices,
     SecretsGroupSecretTypeChoices,
 )
-from nautobot.extras.filters.customfields import (
+from nautobot.extras.filter_mixins import (
+    ConfigContextRoleFilter,
+    CreatedUpdatedModelFilterSetMixin,
+    CustomFieldModelFilterSetMixin,
+    LocalContextModelFilterSetMixin,
+    RelationshipFilter,
+    RelationshipModelFilterSetMixin,
+    RoleModelFilterSetMixin,
+    StatusFilter,
+    StatusModelFilterSetMixin,
+)
+from nautobot.extras.filter_mixins_customfields import (
     CustomFieldBooleanFilter,
     CustomFieldCharFilter,
     CustomFieldDateFilter,
@@ -45,17 +56,6 @@ from nautobot.extras.filters.customfields import (
     CustomFieldMultiValueNumberFilter,
     CustomFieldNumberFilter,
 )
-from nautobot.extras.filters.mixins import (
-    ConfigContextRoleFilter,
-    CreatedUpdatedModelFilterSetMixin,
-    CustomFieldModelFilterSetMixin,
-    LocalContextModelFilterSetMixin,
-    RelationshipFilter,
-    RelationshipModelFilterSetMixin,
-    RoleModelFilterSetMixin,
-    StatusFilter,
-    StatusModelFilterSetMixin,
-)
 from nautobot.extras.models import (
     ApprovalWorkflow,
     ApprovalWorkflowDefinition,
@@ -126,14 +126,12 @@ __all__ = (
     "ContactFilterSet",
     "ContentTypeFilterSet",
     "ContentTypeMultipleChoiceFilter",
-    "CreatedUpdatedFilterSet",
     "CreatedUpdatedModelFilterSetMixin",
     "CustomFieldBooleanFilter",
     "CustomFieldCharFilter",
     "CustomFieldDateFilter",
     "CustomFieldFilterMixin",
     "CustomFieldJSONFilter",
-    "CustomFieldModelFilterSet",
     "CustomFieldModelFilterSetMixin",
     "CustomFieldMultiSelectFilter",
     "CustomFieldMultiValueCharFilter",
@@ -153,7 +151,6 @@ __all__ = (
     "JobQueueAssignmentFilterSet",
     "JobQueueFilterSet",
     "JobResultFilterSet",
-    "LocalContextFilterSet",
     "LocalContextModelFilterSetMixin",
     "MetadataChoiceFilterSet",
     "MetadataTypeFilterSet",
@@ -178,17 +175,6 @@ __all__ = (
 )
 
 
-# TODO: remove in 2.2
-@class_deprecated_in_favor_of(CreatedUpdatedModelFilterSetMixin)
-class CreatedUpdatedFilterSet(CreatedUpdatedModelFilterSetMixin):
-    pass
-
-
-@class_deprecated_in_favor_of(RelationshipModelFilterSetMixin)
-class RelationshipModelFilterSet(RelationshipModelFilterSetMixin):
-    pass
-
-
 #
 # Approval Workflows
 #
@@ -199,7 +185,7 @@ class ApprovalWorkflowStageDefinitionFilterSet(BaseFilterSet):
 
     q = SearchFilter(
         filter_predicates={
-            "weight": {
+            "sequence": {
                 "lookup_expr": "exact",
                 "preprocessor": int,
             },
@@ -401,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(),
@@ -572,12 +564,6 @@ class ContentTypeFilterSet(BaseFilterSet):
         return queryset.filter(FeatureQuery(value).get_query())
 
 
-# TODO: remove in 2.2
-@class_deprecated_in_favor_of(CustomFieldModelFilterSetMixin)
-class CustomFieldModelFilterSet(CustomFieldModelFilterSetMixin):
-    pass
-
-
 class CustomFieldFilterSet(BaseFilterSet):
     q = SearchFilter(
         filter_predicates={
@@ -787,7 +773,7 @@ class CustomLinkFilterSet(BaseFilterSet):
 #
 
 # Must be imported **after* NautobotFilterSet class is defined to avoid a circular import loop.
-from nautobot.tenancy.filters.mixins import TenancyModelFilterSetMixin  # noqa: E402
+from nautobot.tenancy.filter_mixins import TenancyModelFilterSetMixin  # noqa: E402
 
 
 class DynamicGroupFilterSet(TenancyModelFilterSetMixin, NautobotFilterSet):
@@ -1229,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"]
 
 
 #
@@ -1270,17 +1261,6 @@ class JobButtonFilterSet(BaseFilterSet):
         )
 
 
-#
-# Filter for Local Config Context Data
-#
-
-
-# TODO: remove in 2.2
-@class_deprecated_in_favor_of(LocalContextModelFilterSetMixin)
-class LocalContextFilterSet(LocalContextModelFilterSetMixin):
-    pass
-
-
 #
 # Metadata
 #
@@ -1503,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,8 +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.core.utils.deprecation import class_deprecated_in_favor_of
-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,
@@ -153,7 +152,6 @@ __all__ = (
     "ConfigContextSchemaBulkEditForm",
     "ConfigContextSchemaFilterForm",
     "ConfigContextSchemaForm",
-    "CustomFieldBulkCreateForm",  # 2.0 TODO remove this deprecated class
     "CustomFieldBulkDeleteForm",
     "CustomFieldBulkEditForm",
     "CustomFieldChoiceFormSet",
@@ -338,7 +336,7 @@ ApprovalWorkflowStageDefinitionFormSet = inlineformset_factory(
     extra=5,
     widgets={
         "name": forms.TextInput(attrs={"class": "form-control"}),
-        "weight": forms.NumberInput(attrs={"class": "form-control"}),
+        "sequence": forms.NumberInput(attrs={"class": "form-control"}),
         "min_approvers": forms.NumberInput(attrs={"class": "form-control"}),
         "denial_message": forms.TextInput(attrs={"class": "form-control"}),
         "approver_group": forms.Select(attrs={"class": "form-control"}),
@@ -352,8 +350,8 @@ class ApprovalWorkflowStageDefinitionBulkEditForm(TagsBulkEditFormMixin, Nautobo
     pk = forms.ModelMultipleChoiceField(
         queryset=ApprovalWorkflowStageDefinition.objects.all(), widget=forms.MultipleHiddenInput
     )
-    weight = forms.IntegerField(required=False, label="Weight")
-    min_approvers = forms.IntegerField(required=False, label="Min Approvers")
+    sequence = forms.IntegerField(required=False, label="Sequence")
+    min_approvers = forms.IntegerField(required=False, label="Minimum Approvers")
     denial_message = forms.CharField(required=False, label="Denial Message")
 
     class Meta:
@@ -374,8 +372,8 @@ class ApprovalWorkflowStageDefinitionFilterForm(NautobotFilterForm):
         required=False,
         label="Approval Workflow Definition",
     )
-    weight = forms.IntegerField(required=False, label="Weight")
-    min_approvers = forms.IntegerField(required=False, label="Min Approvers")
+    sequence = forms.IntegerField(required=False, label="Sequence")
+    min_approvers = forms.IntegerField(required=False, label="Minimum Approvers")
     approver_group = DynamicModelChoiceField(
         queryset=Group.objects.all(),
         required=False,
@@ -546,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)
@@ -578,6 +577,7 @@ class ConfigContextForm(BootstrapMixin, NoteModelFormMixin, forms.ModelForm):
             "locations",
             "roles",
             "device_types",
+            "device_families",
             "platforms",
             "cluster_groups",
             "clusters",
@@ -611,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
@@ -827,12 +832,6 @@ class CustomFieldModelCSVForm(CSVModelForm, CustomFieldModelFormMixin):
             self.custom_fields.append(field_name)
 
 
-# 2.0 TODO: remove this class
-@class_deprecated_in_favor_of(CustomFieldModelBulkEditFormMixin)
-class CustomFieldBulkCreateForm(CustomFieldModelBulkEditFormMixin):
-    """No longer needed as a separate class - use CustomFieldModelBulkEditFormMixin instead."""
-
-
 class CustomFieldBulkDeleteForm(ConfirmationForm):
     def __init__(self, *args, delete_all=False, **kwargs):
         super().__init__(*args, **kwargs)

nautobot/extras/forms/mixins.py

@@ -11,7 +11,6 @@ from nautobot.core.forms import (
     DynamicModelChoiceField,
     DynamicModelMultipleChoiceField,
 )
-from nautobot.core.utils.deprecation import class_deprecated_in_favor_of
 from nautobot.extras.choices import (
     DynamicGroupTypeChoices,
     RelationshipSideChoices,
@@ -48,17 +47,10 @@ __all__ = (  # noqa:RUF022
     "StatusModelBulkEditFormMixin",
     "StatusModelFilterFormMixin",
     "TagsBulkEditFormMixin",
-    # 2.0 TODO: remove the below deprecated aliases
-    "AddRemoveTagsForm",
-    "CustomFieldBulkEditForm",
-    "CustomFieldModelForm",
-    "RelationshipModelForm",
     "RoleModelBulkEditFormMixin",
     "RoleModelFilterFormMixin",
     "RoleNotRequiredModelFormMixin",
     "RoleRequiredModelFormMixin",
-    "StatusBulkEditFormMixin",
-    "StatusFilterFormMixin",
 )
 
 
@@ -854,36 +846,3 @@ class TagsBulkEditFormMixin(BulkEditForm):
             query_params={"content_types": self.model._meta.label_lower},
             required=False,
         )
-
-
-# 2.2 TODO: Names below are only for backward compatibility with Nautobot 1.3 and earlier. Remove in 2.2
-
-
-@class_deprecated_in_favor_of(TagsBulkEditFormMixin)
-class AddRemoveTagsForm(TagsBulkEditFormMixin):
-    pass
-
-
-@class_deprecated_in_favor_of(CustomFieldModelBulkEditFormMixin)
-class CustomFieldBulkEditForm(CustomFieldModelBulkEditFormMixin):
-    pass
-
-
-@class_deprecated_in_favor_of(CustomFieldModelFormMixin)
-class CustomFieldModelForm(CustomFieldModelFormMixin):
-    pass
-
-
-@class_deprecated_in_favor_of(RelationshipModelFormMixin)
-class RelationshipModelForm(RelationshipModelFormMixin):
-    pass
-
-
-@class_deprecated_in_favor_of(StatusModelBulkEditFormMixin)
-class StatusBulkEditFormMixin(StatusModelBulkEditFormMixin):
-    pass
-
-
-@class_deprecated_in_favor_of(StatusModelFilterFormMixin)
-class StatusFilterFormMixin(StatusModelFilterFormMixin):
-    pass

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>
                         """,