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

nautobot/extras/plugins/__init__.py

@@ -5,9 +5,10 @@ import inspect
 from logging import getLogger
 
 from django.conf import settings
+from django.conf.urls import include
 from django.core.exceptions import ValidationError
 from django.template.loader import get_template
-from django.urls import get_resolver, URLPattern
+from django.urls import clear_url_caches, get_resolver, path, URLPattern
 from packaging import version
 
 from nautobot.core.apps import (
@@ -17,10 +18,9 @@ from nautobot.core.apps import (
     register_menu_items,
 )
 from nautobot.core.signals import nautobot_database_ready
-from nautobot.core.utils.deprecation import class_deprecated_in_favor_of
+from nautobot.core.utils.module_loading import import_string_optional
 from nautobot.extras.choices import BannerClassChoices
 from nautobot.extras.plugins.exceptions import PluginImproperlyConfigured
-from nautobot.extras.plugins.utils import import_object
 from nautobot.extras.registry import register_datasource_contents, registry
 from nautobot.extras.secrets import register_secrets_provider
 
@@ -105,9 +105,24 @@ class NautobotAppConfig(NautobotConfig):
         """Callback after plugin app is loaded."""
         # We don't call super().ready here because we don't need or use the on-ready behavior of a core Nautobot app
 
+        from nautobot.extras.plugins.urls import BASE_URL_TO_APP_LABEL, plugin_api_patterns, plugin_patterns
+
         # Introspect URL patterns and models to make available to the installed-plugins detail UI view.
-        urlpatterns = import_object(f"{self.__module__}.urls.urlpatterns")
-        api_urlpatterns = import_object(f"{self.__module__}.api.urls.urlpatterns")
+        urlpatterns = import_string_optional(f"{self.__module__}.urls.urlpatterns")
+        api_urlpatterns = import_string_optional(f"{self.__module__}.api.urls.urlpatterns")
+
+        base_url = self.base_url or self.label
+
+        if urlpatterns is not None:
+            plugin_patterns.append(path(f"{base_url}/", include((urlpatterns, self.label))))
+
+        if api_urlpatterns is not None:
+            plugin_api_patterns.append(path(f"{base_url}/", include((api_urlpatterns, f"{self.label}-api"))))
+
+        if any([urlpatterns, api_urlpatterns]):
+            clear_url_caches()
+
+        BASE_URL_TO_APP_LABEL[base_url] = self.label
 
         self.features = {
             "api_urlpatterns": sorted(
@@ -123,36 +138,31 @@ class NautobotAppConfig(NautobotConfig):
         }
 
         # Register banner function (if defined)
-        banner_function = import_object(f"{self.__module__}.{self.banner_function}")
-        if banner_function is not None:
+        if banner_function := import_string_optional(f"{self.__module__}.{self.banner_function}"):
             register_banner_function(banner_function)
             self.features["banner"] = True
 
         # Register model validators (if defined)
-        validators = import_object(f"{self.__module__}.{self.custom_validators}")
-        if validators is not None:
+        if validators := import_string_optional(f"{self.__module__}.{self.custom_validators}"):
             register_custom_validators(validators)
             self.features["custom_validators"] = sorted(set(validator.model for validator in validators))
 
         # Register datasource contents (if defined)
-        datasource_contents = import_object(f"{self.__module__}.{self.datasource_contents}")
-        if datasource_contents is not None:
+        if datasource_contents := import_string_optional(f"{self.__module__}.{self.datasource_contents}"):
             register_datasource_contents(datasource_contents)
             self.features["datasource_contents"] = datasource_contents
 
         # Register GraphQL types (if defined)
-        graphql_types = import_object(f"{self.__module__}.{self.graphql_types}")
-        if graphql_types is not None:
+        if graphql_types := import_string_optional(f"{self.__module__}.{self.graphql_types}"):
             register_graphql_types(graphql_types)
 
         # Import jobs (if present)
         # Note that we do *not* auto-call `register_jobs()` - the App is responsible for doing so when imported.
-        jobs = import_object(f"{self.__module__}.{self.jobs}")
-        if jobs is not None:
+        if jobs := import_string_optional(f"{self.__module__}.{self.jobs}"):
             self.features["jobs"] = jobs
 
         # Import metrics (if present)
-        metrics = import_object(f"{self.__module__}.{self.metrics}")
+        metrics = import_string_optional(f"{self.__module__}.{self.metrics}")
         if metrics is not None and self.name not in settings.METRICS_DISABLED_APPS:
             register_metrics(metrics)
             self.features["metrics"] = []  # Initialize as empty, to be filled by the signal handler
@@ -161,19 +171,16 @@ class NautobotAppConfig(NautobotConfig):
             nautobot_database_ready.connect(signal_callback, sender=self)
 
         # Register plugin navigation menu items (if defined)
-        menu_items = import_object(f"{self.__module__}.{self.menu_items}")
-        if menu_items is not None:
+        if menu_items := import_string_optional(f"{self.__module__}.{self.menu_items}"):
             register_plugin_menu_items(self.verbose_name, menu_items)
             self.features["nav_menu"] = menu_items
 
-        homepage_layout = import_object(f"{self.__module__}.{self.homepage_layout}")
-        if homepage_layout is not None:
+        if homepage_layout := import_string_optional(f"{self.__module__}.{self.homepage_layout}"):
             register_homepage_panels(self.path, self.label, homepage_layout)
             self.features["home_page"] = homepage_layout
 
         # Register template content (if defined)
-        template_extensions = import_object(f"{self.__module__}.{self.template_extensions}")
-        if template_extensions is not None:
+        if template_extensions := import_string_optional(f"{self.__module__}.{self.template_extensions}"):
             register_template_extensions(template_extensions)
             self.features["template_extensions"] = sorted(set(extension.model for extension in template_extensions))
 
@@ -185,15 +192,13 @@ class NautobotAppConfig(NautobotConfig):
             pass
 
         # Register secrets providers (if any)
-        secrets_providers = import_object(f"{self.__module__}.{self.secrets_providers}")
-        if secrets_providers is not None:
+        if secrets_providers := import_string_optional(f"{self.__module__}.{self.secrets_providers}"):
             for secrets_provider in secrets_providers:
                 register_secrets_provider(secrets_provider)
             self.features["secrets_providers"] = secrets_providers
 
         # Register custom filters (if any)
-        filter_extensions = import_object(f"{self.__module__}.{self.filter_extensions}")
-        if filter_extensions is not None:
+        if filter_extensions := import_string_optional(f"{self.__module__}.{self.filter_extensions}"):
             register_filter_extensions(filter_extensions, self.name)
             self.features["filter_extensions"] = {"filterset_fields": [], "filterform_fields": []}
             for filter_extension in filter_extensions:
@@ -207,8 +212,7 @@ class NautobotAppConfig(NautobotConfig):
                     )
 
         # Register override view (if any)
-        override_views = import_object(f"{self.__module__}.{self.override_views}")
-        if override_views is not None:
+        if override_views := import_string_optional(f"{self.__module__}.{self.override_views}"):
             for qualified_view_name, view in override_views.items():
                 view_class_name = view.view_class.__name__ if hasattr(view, "view_class") else view.cls.__name__
                 self.features.setdefault("overridden_views", []).append(
@@ -272,17 +276,11 @@ class NautobotAppConfig(NautobotConfig):
 
     def _register_table_extensions(self):
         """Register tables extensions (if any)."""
-        table_extensions = import_object(f"{self.__module__}.{self.table_extensions}")
-        if table_extensions is not None:
+        if table_extensions := import_string_optional(f"{self.__module__}.{self.table_extensions}"):
             register_table_extensions(table_extensions, self.name)
             self.features["table_extensions"] = get_table_extension_features(table_extensions)
 
 
-@class_deprecated_in_favor_of(NautobotAppConfig)
-class PluginConfig(NautobotAppConfig):
-    pass
-
-
 #
 # Template content injection
 #
@@ -413,11 +411,6 @@ class TemplateExtension:
         raise NotImplementedError
 
 
-@class_deprecated_in_favor_of(TemplateExtension)
-class PluginTemplateExtension(TemplateExtension):
-    pass
-
-
 def register_template_extensions(class_list):
     """
     Register a list of TemplateExtension classes
@@ -444,11 +437,6 @@ class Banner:
         self.banner_class = banner_class
 
 
-@class_deprecated_in_favor_of(Banner)
-class PluginBanner(Banner):
-    pass
-
-
 def register_banner_function(function):
     """
     Register a function that may return a Banner object.
@@ -494,11 +482,6 @@ class FilterExtension:
     filterform_fields = {}
 
 
-@class_deprecated_in_favor_of(FilterExtension)
-class PluginFilterExtension(FilterExtension):
-    pass
-
-
 def register_filter_extensions(filter_extensions, plugin_name):
     """
     Register a list of FilterExtension classes
@@ -789,11 +772,6 @@ class CustomValidator:
         raise NotImplementedError
 
 
-@class_deprecated_in_favor_of(CustomValidator)
-class PluginCustomValidator(CustomValidator):
-    pass
-
-
 def register_custom_validators(class_list):
     """
     Register a list of CustomValidator classes

nautobot/extras/plugins/tables.py

@@ -20,21 +20,21 @@ class InstalledAppsTable(tables.Table):
             {% if record.home_url %}
                 <a href="{% url record.home_url %}" class="btn btn-primary btn-xs" title="Home">
             {% else %}
-                <a href="" class="btn btn-primary btn-xs disabled" title="No home link provided">
+                <a class="btn btn-primary btn-xs disabled" aria-disabled="true" title="No home link provided">
             {% endif %}
                 <i class="mdi mdi-home"></i>
             </a>
             {% if record.config_url %}
                 <a href="{% url record.config_url %}" class="btn btn-warning btn-xs" title="Configure">
             {% else %}
-                <a href="" class="btn btn-warning btn-xs disabled" title="No configuration link provided">
+                <a class="btn btn-warning btn-xs disabled" aria-disabled="true" title="No configuration link provided">
             {% endif %}
                 <i class="mdi mdi-cog"></i>
             </a>
             {% if record.docs_url %}
                 <a href="{% url record.docs_url %}" class="btn btn-info btn-xs" title="Docs">
             {% else %}
-                <a href="" class="btn btn-info btn-xs disabled" title="No docs provided">
+                <a class="btn btn-info btn-xs disabled" aria-disabled="true" title="No docs provided">
             {% endif %}
                 <i class="mdi mdi-book-open-page-variant"></i>
             </a>

nautobot/extras/plugins/urls.py

@@ -1,12 +1,9 @@
-from django.apps import apps
-from django.conf import settings
-from django.conf.urls import include
 from django.urls import path
 
-from nautobot.extras.plugins.utils import import_object
-
 from . import views
 
+BASE_URL_TO_APP_LABEL = {}
+
 # Initialize URL base, API, and admin URL patterns for plugins
 apps_patterns = [
     path("installed-apps/", views.InstalledAppsView.as_view(), name="apps_list"),
@@ -30,19 +27,3 @@ plugin_api_patterns = [
     ),
 ]
 plugin_admin_patterns = []
-
-# Register base/API URL patterns for each plugin
-for plugin_path in settings.PLUGINS:
-    plugin_name = plugin_path.split(".")[-1]
-    app = apps.get_app_config(plugin_name)
-    base_url = app.base_url or app.label
-
-    # Check if the plugin specifies any base URLs
-    urlpatterns = import_object(f"{plugin_path}.urls.urlpatterns")
-    if urlpatterns is not None:
-        plugin_patterns.append(path(f"{base_url}/", include((urlpatterns, app.label))))
-
-    # Check if the plugin specifies any API URLs
-    urlpatterns = import_object(f"{plugin_path}.api.urls.urlpatterns")
-    if urlpatterns is not None:
-        plugin_api_patterns.append(path(f"{base_url}/", include((urlpatterns, f"{app.label}-api"))))

nautobot/extras/plugins/utils.py

@@ -4,7 +4,6 @@ Plugin utilities.
 
 import importlib.util
 import logging
-import sys
 
 from django.core.exceptions import ImproperlyConfigured
 from django.utils.module_loading import import_string
@@ -17,37 +16,6 @@ from .exceptions import PluginImproperlyConfigured, PluginNotFound
 logger = logging.getLogger(__name__)
 
 
-def import_object(module_and_object):
-    """
-    Import a specific object from a specific module by name, such as "nautobot.extras.plugins.utils.import_object".
-
-    Returns the imported object, or None if it doesn't exist.
-    """
-    target_module_name, object_name = module_and_object.rsplit(".", 1)
-    module_hierarchy = target_module_name.split(".")
-
-    # Iterate through the module hierarchy, checking for the existence of each successive submodule.
-    # We have to do this rather than jumping directly to calling find_spec(target_module_name)
-    # because find_spec will raise a ModuleNotFoundError if any parent module of target_module_name does not exist.
-    module_name = ""
-    for module_component in module_hierarchy:
-        module_name = f"{module_name}.{module_component}" if module_name else module_component
-        spec = importlib.util.find_spec(module_name)
-        if spec is None:
-            # No such module
-            return None
-
-    # Okay, target_module_name exists. Load it if not already loaded
-    if target_module_name in sys.modules:
-        module = sys.modules[target_module_name]
-    else:
-        module = importlib.util.module_from_spec(spec)
-        sys.modules[target_module_name] = module
-        spec.loader.exec_module(module)
-
-    return getattr(module, object_name, None)
-
-
 def load_plugins(settings):
     """Process plugins and log errors if they can't be loaded."""
     for plugin_name in settings.PLUGINS:
@@ -77,7 +45,7 @@ def load_plugin(plugin_name, settings):
     except AttributeError as err:
         raise PluginImproperlyConfigured(
             f"Plugin {plugin_name} does not provide a 'config' variable. This should be defined in the plugin's "
-            f"__init__.py file and point to the PluginConfig subclass."
+            f"__init__.py file and point to the NautobotAppConfig subclass."
         ) from err
 
     # Validate user-provided configuration settings and assign defaults. Plugin

nautobot/extras/plugins/views.py

@@ -86,7 +86,6 @@ class InstalledAppsView(GenericView):
     """
 
     table = InstalledAppsTable
-    breadcrumbs = Breadcrumbs(items={"*": [ViewNameBreadcrumbItem(view_name="apps:apps_list", label="Installed Apps")]})
     view_titles = Titles(titles={"*": "Installed Apps"})
 
     def get(self, request):
@@ -250,9 +249,6 @@ class MarketplaceView(GenericView):
     View for listing all available Apps.
     """
 
-    breadcrumbs = Breadcrumbs(
-        items={"generic": [ViewNameBreadcrumbItem(view_name="apps:apps_marketplace", label="Apps Marketplace")]}
-    )
     view_titles = Titles(titles={"generic": "Apps Marketplace"})
 
     def get(self, request):

nautobot/extras/signals.py

@@ -24,7 +24,7 @@ from nautobot.core.celery import app, import_jobs
 from nautobot.core.models import BaseModel
 from nautobot.core.utils.cache import construct_cache_key
 from nautobot.core.utils.logging import sanitize
-from nautobot.extras.choices import JobResultStatusChoices, ObjectChangeActionChoices
+from nautobot.extras.choices import ButtonClassChoices, JobResultStatusChoices, ObjectChangeActionChoices
 from nautobot.extras.constants import CHANGELOG_MAX_CHANGE_CONTEXT_DETAIL
 from nautobot.extras.models import (
     ComputedField,
@@ -557,24 +557,6 @@ m2m_changed.connect(dynamic_group_children_changed, sender=DynamicGroup.children
 pre_save.connect(dynamic_group_membership_created, sender=DynamicGroupMembership)
 
 
-def dynamic_group_update_cached_members(sender, instance, **kwargs):
-    """
-    When a DynamicGroup or DynamicGroupMembership is updated, update the cache of members for it and any parent groups.
-    """
-    if isinstance(instance, DynamicGroupMembership):
-        group = instance.parent_group
-    else:
-        group = instance
-
-    group.update_cached_members()
-    for ancestor in group.get_ancestors():
-        ancestor.update_cached_members()
-
-
-post_save.connect(dynamic_group_update_cached_members, sender=DynamicGroup)
-post_save.connect(dynamic_group_update_cached_members, sender=DynamicGroupMembership)
-
-
 #
 # Jobs
 #
@@ -659,6 +641,25 @@ def refresh_job_models(sender, *, apps, **kwargs):
             job_model.installed = False
             job_model.save()
 
+    # Wire up the JobButton for Dynamic Group member refresh
+    JobButton = apps.get_model("extras", "JobButton")
+    ContentType = apps.get_model("contenttypes", "ContentType")  # pylint: disable=redefined-outer-name
+    DynamicGroup = apps.get_model("extras", "DynamicGroup")  # pylint: disable=redefined-outer-name
+
+    dg_job_button, _ = JobButton.objects.get_or_create(
+        name="Refresh Dynamic Group Members Cache",
+        job=Job.objects.get(
+            module_name="nautobot.core.jobs.groups", job_class_name="RefreshDynamicGroupCacheJobButtonReceiver"
+        ),
+        defaults={
+            "enabled": True,
+            "text": "Refresh Members",
+            "button_class": ButtonClassChoices.CLASS_WARNING,
+            "confirmation": True,
+        },
+    )
+    dg_job_button.content_types.add(ContentType.objects.get_for_model(DynamicGroup))
+
 
 #
 # Metadata

nautobot/extras/tables.py

@@ -1,13 +1,13 @@
+import logging
+from textwrap import dedent
+
 from django.conf import settings
-from django.db.models import QuerySet
+from django.contrib.contenttypes.models import ContentType
 from django.utils.html import format_html, format_html_join
 import django_tables2 as tables
-from django_tables2.data import TableData
-from django_tables2.rows import BoundRows
 from django_tables2.utils import Accessor
 from jsonschema.exceptions import ValidationError as JSONSchemaValidationError
 
-from nautobot.core.models.querysets import count_related
 from nautobot.core.tables import (
     ApprovalButtonsColumn,
     BaseTable,
@@ -24,7 +24,7 @@ from nautobot.core.tables import (
 from nautobot.core.templatetags.helpers import HTML_NONE, render_boolean, render_json, render_markdown
 from nautobot.tenancy.tables import TenantColumn
 
-from .choices import LogLevelChoices, MetadataTypeDataTypeChoices
+from .choices import JobResultStatusChoices, MetadataTypeDataTypeChoices
 from .models import (
     ApprovalWorkflow,
     ApprovalWorkflowDefinition,
@@ -73,6 +73,8 @@ from .models import (
 )
 from .registry import registry
 
+logger = logging.getLogger(__name__)
+
 APPROVAL_WORKFLOW_OBJECT = """
 {% if record.object_under_review and record.object_under_review.get_absolute_url %}
     <a href="{{ record.object_under_review.get_absolute_url }}">{{ record.object_under_review }}</a>
@@ -129,7 +131,7 @@ GITREPOSITORY_BUTTONS = """
     <button
         data-url="{% url 'extras:gitrepository_sync' pk=record.pk %}"
         type="submit"
-        class="dropdown-item sync-repository{% if perms.extras.change_gitrepository %} text-primary"{% else %}" disabled="disabled"{% endif %}
+        class="dropdown-item sync-repository{% if perms.extras.change_gitrepository %} text-primary"{% else %}" disabled{% endif %}
     >
         <span class="mdi mdi-source-branch-sync" aria-hidden="true"></span>
         Sync
@@ -168,7 +170,7 @@ JOB_RESULT_BUTTONS = """
         </li>
     {% else %}
         <li>
-            <a href="#" class="dropdown-item disabled">
+            <a class="dropdown-item disabled" aria-disabled="true">
                 <span class="mdi mdi-repeat-off" aria-hidden="true"></span>
                 Job is not available, cannot be re-run
             </a>
@@ -220,7 +222,7 @@ SCHEDULED_JOB_APPROVAL_QUEUE_BUTTONS = """
             <button
                 type="button"
                 onClick="handleDetailPostAction('{% url 'extras:scheduledjob_approval_request_view' pk=record.pk %}', '_dry_run')"
-                class="dropdown-item{% if perms.extras.run_job and record.job_model.supports_dryrun %} text-primary"{% else %}" disabled="disabled"{% endif %}
+                class="dropdown-item{% if perms.extras.run_job and record.job_model.supports_dryrun %} text-primary"{% else %}" disabled{% endif %}
             >
                 <span class="mdi mdi-play" aria-hidden="true"></span>
                 Dry Run
@@ -230,7 +232,7 @@ SCHEDULED_JOB_APPROVAL_QUEUE_BUTTONS = """
             <button
                 type="button"
                 onClick="handleDetailPostAction('{% url 'extras:scheduledjob_approval_request_view' pk=record.pk %}', '_approve')"
-                class="dropdown-item{% if perms.extras.run_job %} text-success"{% else %}" disabled="disabled"{% endif %}
+                class="dropdown-item{% if perms.extras.run_job %} text-success"{% else %}" disabled{% endif %}
             >
                 <span class="mdi mdi-check" aria-hidden="true"></span>
                 Approve
@@ -240,7 +242,7 @@ SCHEDULED_JOB_APPROVAL_QUEUE_BUTTONS = """
             <button
                 type="button"
                 onClick="handleDetailPostAction('{% url 'extras:scheduledjob_approval_request_view' pk=record.pk %}', '_deny')"
-                class="dropdown-item{% if perms.extras.run_job %} text-danger"{% else %}" disabled="disabled"{% endif %}
+                class="dropdown-item{% if perms.extras.run_job %} text-danger"{% else %}" disabled{% endif %}
             >
                 <span class="mdi mdi-close" aria-hidden="true"></span>
                 Deny
@@ -294,7 +296,7 @@ class ApprovalWorkflowStageDefinitionTable(BaseTable):
         fields = (
             "pk",
             "approval_workflow_definition",
-            "weight",
+            "sequence",
             "name",
             "min_approvers",
             "denial_message",
@@ -303,7 +305,7 @@ class ApprovalWorkflowStageDefinitionTable(BaseTable):
         default_columns = (
             "pk",
             "approval_workflow_definition",
-            "weight",
+            "sequence",
             "name",
             "min_approvers",
             "denial_message",
@@ -1065,8 +1067,8 @@ def log_object_link(value, record):
 
 def log_entry_color_css(record):
     if record.log_level.lower() in ("failure", "error", "critical"):
-        return "danger"
-    return record.log_level.lower()
+        return "table-danger"
+    return "table-" + record.log_level.lower()
 
 
 class JobTable(BaseTable):
@@ -1270,62 +1272,20 @@ class JobResultTable(BaseTable):
     duration = tables.Column(orderable=False)
     actions = ButtonsColumn(JobResult, buttons=("delete",), prepend_template=JOB_RESULT_BUTTONS)
 
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        # Only calculate log counts for "summary" column if it's actually visible.
-        if "summary" in self.columns and self.columns["summary"].visible and isinstance(self.data.data, QuerySet):
-            self.data = TableData.from_data(
-                self.data.data.annotate(
-                    debug_log_count=count_related(
-                        JobLogEntry, "job_result", filter_dict={"log_level": LogLevelChoices.LOG_DEBUG}
-                    ),
-                    success_log_count=count_related(
-                        JobLogEntry, "job_result", filter_dict={"log_level": LogLevelChoices.LOG_SUCCESS}
-                    ),
-                    info_log_count=count_related(
-                        JobLogEntry, "job_result", filter_dict={"log_level": LogLevelChoices.LOG_INFO}
-                    ),
-                    warning_log_count=count_related(
-                        JobLogEntry, "job_result", filter_dict={"log_level": LogLevelChoices.LOG_WARNING}
-                    ),
-                    error_log_count=count_related(
-                        JobLogEntry,
-                        "job_result",
-                        filter_dict={
-                            "log_level__in": [
-                                LogLevelChoices.LOG_FAILURE,
-                                LogLevelChoices.LOG_ERROR,
-                                LogLevelChoices.LOG_CRITICAL,
-                            ],
-                        },
-                    ),
-                )
-            )
-            self.data.set_table(self)
-            self.rows = BoundRows(data=self.data, table=self, pinned_data=self.pinned_data)
-
     def render_summary(self, record):
         """
         Define custom rendering for the summary column.
         """
-        # Normally the *_log_count attributes will be generated efficiently via queryset annotation in the view,
-        # however, we cannot assume that will always be the case. Calculate them inefficiently as a fallback.
-        if not hasattr(record, "debug_log_count"):
-            record.debug_log_count = record.job_log_entries.filter(log_level=LogLevelChoices.LOG_DEBUG).count()
-        if not hasattr(record, "success_log_count"):
-            record.success_log_count = record.job_log_entries.filter(log_level=LogLevelChoices.LOG_SUCCESS).count()
-        if not hasattr(record, "info_log_count"):
-            record.info_log_count = record.job_log_entries.filter(log_level=LogLevelChoices.LOG_INFO).count()
-        if not hasattr(record, "warning_log_count"):
-            record.warning_log_count = record.job_log_entries.filter(log_level=LogLevelChoices.LOG_WARNING).count()
-        if not hasattr(record, "error_log_count"):
-            record.error_log_count = record.job_log_entries.filter(
-                log_level__in=[
-                    LogLevelChoices.LOG_FAILURE,
-                    LogLevelChoices.LOG_ERROR,
-                    LogLevelChoices.LOG_CRITICAL,
-                ]
-            ).count()
+        # The *_log_count attributes will be calculated and updated at the end of a Job run when JobResult is saved.
+        # If the values are not present due to a running Job or are missing in any field, skip display.
+        if record.status not in JobResultStatusChoices.READY_STATES or None in [
+            record.debug_log_count,
+            record.success_log_count,
+            record.info_log_count,
+            record.warning_log_count,
+            record.error_log_count,
+        ]:
+            return ""
 
         return format_html(
             """<label class="badge bg-secondary">{}</label>
@@ -1364,6 +1324,7 @@ class JobResultTable(BaseTable):
             "job_model",
             "user",
             "status",
+            "summary",
             "actions",
         )
 
@@ -1588,8 +1549,31 @@ class ObjectChangeTable(BaseTable):
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        # The `object_repr` column also uses the `changed_object` generic-foreign-key value
-        self.add_conditional_prefetch("object_repr", "changed_object")
+        # Only prefetch if all content types are valid
+        if all(ct.model_class() is not None for ct in ContentType.objects.all()):
+            self.add_conditional_prefetch("object_repr", "changed_object")
+        else:
+            error_message = dedent("""\
+                            One or more ContentType entries in the database are invalid.
+                            This will likely cause performance degradation when viewing the Object Change log.
+                            An administrator can follow these steps to resolve common issues:
+                             - Run `nautobot-server remove_stale_contenttypes`
+                             - Run `nautobot-server migrate <app_label> zero` for any app labels which no longer exist
+                             - Manually dropping tables for any models which have been removed from Nautobot or its plugins from your database
+                             - Run ```
+                                    from django.contrib.contenttypes.models import ContentType
+                                    qs = ContentType.objects.filter(
+                                        app_label__in=[
+                                            "<app_label_of_removed_plugin_1>",
+                                            "<app_label_of_removed_plugin_2>",
+                                        ]
+                                    ) | ContentType.objects.filter(model__icontains="<name_of_removed_model_1>")
+                                    # Review the queryset before running delete
+                                    qs.delete()
+                                   ```
+                            Please ensure you fully understand the implications of these actions before proceeding.
+                            """)
+            logger.warning(error_message)
 
 
 #

nautobot/extras/templates/extras/approval_dashboard.html

@@ -2,12 +2,14 @@
 {% load helpers %}
 
 {% block buttons %}
-    <div class="btn-group">
-        <a class="btn {% if approval_view %}btn-primary{% else %}btn-secondary{% endif %}" href="{% url 'extras:approver_dashboard' %}">
-            My Approvals
+    <div class="btn-group" role="group">
+        <a class="btn btn-primary{% if approval_view %} bg-primary nb-text-body-bg{% endif %}"
+           href="{% url 'extras:approver_dashboard' %}">
+            <span class="mdi mdi-checkbox-multiple-outline" aria-hidden="true"></span> My Approvals
         </a>
-        <a class="btn {% if not approval_view %}btn-primary{% else %}btn-secondary{% endif %}" href="{% url 'extras:approvee_dashboard' %}">
-            My Requests
+        <a class="btn btn-primary{% if not approval_view %} bg-primary nb-text-body-bg{% endif %}"
+           href="{% url 'extras:approvee_dashboard' %}">
+            <span class="mdi mdi-help-box-multiple-outline" aria-hidden="true"></span> My Requests
         </a>
     </div>
 {% endblock %}