nautobot 2.4.24__tar.gz → 2.4.26__tar.gz

{nautobot-2.4.24 → nautobot-2.4.26}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: nautobot
-Version: 2.4.24
+Version: 2.4.26
 Summary: Source of truth and network automation platform.
 License: Apache-2.0
 Keywords: Nautobot

{nautobot-2.4.24 → nautobot-2.4.26}/nautobot/core/api/views.py

@@ -635,7 +635,7 @@ class NautobotSpectacularAPIView(SpectacularAPIView):
         if not schema:
             generator = self.generator_class(urlconf=self.urlconf, api_version=version, patterns=self.patterns)
             schema = generator.get_schema(request=request, public=self.serve_public)
-            cache.set(cache_key, schema, 60 * 60 * 24 * 7)
+            cache.set(cache_key, schema, timeout=60 * 60 * 24 * 7)
 
         return Response(
             data=schema,

{nautobot-2.4.24 → nautobot-2.4.26}/nautobot/core/celery/schedulers.py

@@ -1,6 +1,5 @@
 from collections.abc import Mapping
 from datetime import datetime, timedelta
-import json
 import logging
 from pathlib import Path
 import sys
@@ -138,9 +137,7 @@ class NautobotDatabaseScheduler(DatabaseScheduler):
                         task_name=scheduled_job.job_model.class_path,
                         celery_kwargs=entry.options,
                     )
-                    job_result = run_kubernetes_job_and_return_job_result(
-                        job_queue, job_result, json.dumps(entry_kwargs)
-                    )
+                    job_result = run_kubernetes_job_and_return_job_result(job_result, entry_kwargs)
                     # Return an AsyncResult object to mimic the behavior of Celery tasks after the job is finished by Kubernetes Job Pod.
                     resp = AsyncResult(job_result.id)
                 else:

{nautobot-2.4.24 → nautobot-2.4.26}/nautobot/core/cli/__init__.py

@@ -3,7 +3,9 @@ Utilities and primitives for the `nautobot-server` CLI command.
 """
 
 import argparse
+from copy import deepcopy
 import importlib.util
+import logging
 import os
 import sys
 
@@ -34,43 +36,46 @@ USAGE = """%(prog)s --help
        %(prog)s [-c CONFIG_PATH] SUBCOMMAND ..."""
 
 
-def _preprocess_settings(settings, config_path):
+logger = logging.getLogger(__name__)
+
+
+def _preprocess_settings(settings_module, config_path):
     """
     After loading nautobot_config.py and nautobot.core.settings, but before starting Django, modify the settings module.
 
-    - Set settings.SETTINGS_PATH for ease of reference
+    - Set settings_module.SETTINGS_PATH for ease of reference
     - Handle `EXTRA_*` settings
     - Create Nautobot storage directories if they don't already exist
     - Change database backends to django-prometheus if appropriate
     - Set up 'job_logs' database mirror
     - Handle our custom `STORAGE_BACKEND` setting.
-    - Load plugins based on settings.PLUGINS (potentially affecting INSTALLED_APPS, MIDDLEWARE, and CONSTANCE_CONFIG)
-    - Load event brokers based on settings.EVENT_BROKERS
+    - Load plugins based on settings_module.PLUGINS (may affect INSTALLED_APPS, MIDDLEWARE, and CONSTANCE_CONFIG)
+    - Load event brokers based on settings_module.EVENT_BROKERS
     """
-    settings.SETTINGS_PATH = config_path
+    settings_module.SETTINGS_PATH = config_path
 
     # Any setting that starts with EXTRA_ and matches a setting that is a list or tuple
     # will automatically append the values to the current setting.
     # "It might make sense to make this less magical"
     extras = {}
-    for setting in dir(settings):
+    for setting in dir(settings_module):
         if setting == setting.upper() and setting.startswith("EXTRA_"):
             base_setting = setting[6:]
-            if isinstance(getattr(settings, base_setting), (list, tuple)):
-                extras[base_setting] = getattr(settings, setting)
+            if isinstance(getattr(settings_module, base_setting), (list, tuple)):
+                extras[base_setting] = getattr(settings_module, setting)
     for base_setting, extra_values in extras.items():
-        base_value = getattr(settings, base_setting)
-        setattr(settings, base_setting, base_value + type(base_value)(extra_values))
+        base_value = getattr(settings_module, base_setting)
+        setattr(settings_module, base_setting, base_value + type(base_value)(extra_values))
 
     #
     # Storage directories
     #
-    os.makedirs(settings.GIT_ROOT, exist_ok=True)
-    os.makedirs(settings.JOBS_ROOT, exist_ok=True)
-    os.makedirs(settings.MEDIA_ROOT, exist_ok=True)
-    os.makedirs(os.path.join(settings.MEDIA_ROOT, "devicetype-images"), exist_ok=True)
-    os.makedirs(os.path.join(settings.MEDIA_ROOT, "image-attachments"), exist_ok=True)
-    os.makedirs(settings.STATIC_ROOT, exist_ok=True)
+    os.makedirs(settings_module.GIT_ROOT, exist_ok=True)
+    os.makedirs(settings_module.JOBS_ROOT, exist_ok=True)
+    os.makedirs(settings_module.MEDIA_ROOT, exist_ok=True)
+    os.makedirs(os.path.join(settings_module.MEDIA_ROOT, "devicetype-images"), exist_ok=True)
+    os.makedirs(os.path.join(settings_module.MEDIA_ROOT, "image-attachments"), exist_ok=True)
+    os.makedirs(settings_module.STATIC_ROOT, exist_ok=True)
 
     #
     # Databases
@@ -78,62 +83,99 @@ def _preprocess_settings(settings, config_path):
 
     # If metrics are enabled and postgres is the backend, set the driver to the
     # one provided by django-prometheus.
-    if settings.METRICS_ENABLED:
-        if "postgres" in settings.DATABASES["default"]["ENGINE"]:
-            settings.DATABASES["default"]["ENGINE"] = "django_prometheus.db.backends.postgresql"
-        elif "mysql" in settings.DATABASES["default"]["ENGINE"]:
-            settings.DATABASES["default"]["ENGINE"] = "django_prometheus.db.backends.mysql"
+    if settings_module.METRICS_ENABLED:
+        # Avoid modifying nautobot.core.settings.DATABASES by accident!
+        settings_module.DATABASES = deepcopy(settings_module.DATABASES)
+
+        if "postgres" in settings_module.DATABASES["default"]["ENGINE"]:
+            settings_module.DATABASES["default"]["ENGINE"] = "django_prometheus.db.backends.postgresql"
+        elif "mysql" in settings_module.DATABASES["default"]["ENGINE"]:
+            settings_module.DATABASES["default"]["ENGINE"] = "django_prometheus.db.backends.mysql"
 
     # Create secondary db connection for job logging. This still writes to the default db, but because it's a separate
     # connection, it allows allows us to "escape" from transaction.atomic() and ensure that job log entries are saved
     # to the database even when the rest of the job transaction is rolled back.
-    settings.DATABASES["job_logs"] = settings.DATABASES["default"].copy()
+    settings_module.DATABASES["job_logs"] = deepcopy(settings_module.DATABASES["default"])
     # When running unit tests, treat it as a mirror of the default test DB, not a separate test DB of its own
-    settings.DATABASES["job_logs"]["TEST"] = {"MIRROR": "default"}
+    settings_module.DATABASES["job_logs"]["TEST"] = {"MIRROR": "default"}
 
     #
     # Media storage
     #
 
-    if hasattr(settings, "JOB_FILE_IO_STORAGE"):
-        settings.STORAGES.setdefault("nautobotjobfiles", {})["BACKEND"] = settings.JOB_FILE_IO_STORAGE
+    # Avoid modifying nautobot.core.settings.STORAGES by accident!
+    settings_module.STORAGES = deepcopy(settings_module.STORAGES)
 
-    if hasattr(settings, "STORAGE_BACKEND") and settings.STORAGE_BACKEND is not None:
-        settings.STORAGES["default"]["BACKEND"] = settings.STORAGE_BACKEND
+    if hasattr(settings_module, "JOB_FILE_IO_STORAGE"):
+        settings_module.STORAGES.setdefault("nautobotjobfiles", {})["BACKEND"] = settings_module.JOB_FILE_IO_STORAGE
+
+    if hasattr(settings_module, "STORAGE_BACKEND") and settings_module.STORAGE_BACKEND is not None:
+        settings_module.STORAGES["default"]["BACKEND"] = settings_module.STORAGE_BACKEND
 
         # django-storages
-        if hasattr(settings, "STORAGE_BACKEND") and settings.STORAGE_BACKEND.startswith("storages."):
+        if hasattr(settings_module, "STORAGE_BACKEND") and settings_module.STORAGE_BACKEND.startswith("storages."):
             try:
                 import storages.utils
             except ModuleNotFoundError as e:
                 if getattr(e, "name") == "storages":
                     raise ImproperlyConfigured(
-                        f"STORAGE_BACKEND is set to {settings.STORAGE_BACKEND} but django-storages is not present. It "
-                        f"can be installed by running 'pip install django-storages'."
+                        f"STORAGE_BACKEND is set to {settings_module.STORAGE_BACKEND} but django-storages is not present. "
+                        "It can be installed by running 'pip install django-storages'."
                     )
                 raise e
 
             # Monkey-patch django-storages to fetch settings from STORAGE_CONFIG or fall back to settings
             def _setting(name, default=None):
-                if name in settings.STORAGE_CONFIG:
-                    return settings.STORAGE_CONFIG[name]
-                return getattr(settings, name, default)
+                if name in settings_module.STORAGE_CONFIG:
+                    return settings_module.STORAGE_CONFIG[name]
+                return getattr(settings_module, name, default)
 
             storages.utils.setting = _setting
 
+    # Django 4.2 will throw an exception if both:
+    # - DEFAULT_FILE_STORAGE/STATICFILES_STORAGE is set in nautobot_config.py (recommended until Nautobot v2.4.24)
+    # - STORAGES is configured in nautobot.core.settings (which it is nowadays).
+    # Unfortunately, it's not implemented as a standard system check (which we could opt out of) but is instead
+    # hard-coded, so we hack around it instead by explicitly copying any non-default *_STORAGE to STORAGES
+    # and then unsetting *_STORAGE.
+    for setting_name, storages_key, default_value in [
+        ("DEFAULT_FILE_STORAGE", "default", "django.core.files.storage.FileSystemStorage"),
+        ("STATICFILES_STORAGE", "staticfiles", "django.contrib.staticfiles.storage.StaticFilesStorage"),
+    ]:
+        if hasattr(settings_module, setting_name):
+            # Make sure we don't clobber any existing explicit configuration in STORAGES:
+            if settings_module.STORAGES[storages_key]["BACKEND"] not in (
+                default_value,  # Nautobot/Django default
+                getattr(settings_module, setting_name),  # same as explicitly set value for setting_name
+            ):
+                raise ImproperlyConfigured(
+                    f"It looks like you've configured both {setting_name} and STORAGES['{storages_key}']['BACKEND'],"
+                    "but their values do not match."
+                )
+
+            # No clobbering, but undesired, so warn the user and handle it:
+            logger.warning(
+                f"It looks like you've configured {setting_name} in {settings_module.SETTINGS_PATH}. "
+                "This setting is deprecated since Nautobot v2.4.24, and support will be removed in Nautobot v3.1. "
+                f"You should migrate to configuring STORAGES['{storages_key}']['BACKEND'] instead. Refer to "
+                "https://docs.nautobot.com/projects/core/en/stable/user-guide/administration/configuration/settings/#storages for guidance."
+            )
+            settings_module.STORAGES[storages_key]["BACKEND"] = getattr(settings_module, setting_name)
+            delattr(settings_module, setting_name)
+
     #
     # Plugins
     #
 
     # Process the plugins and manipulate the specified config settings that are
     # passed in.
-    load_plugins(settings)
+    load_plugins(settings_module)
 
     #
     # Event Broker
     #
 
-    load_event_brokers(settings.EVENT_BROKERS)
+    load_event_brokers(settings_module.EVENT_BROKERS)
 
 
 def load_settings(config_path):
@@ -144,10 +186,10 @@ def load_settings(config_path):
             "Please provide a valid --config-path path, or use 'nautobot-server init' to create a new configuration."
         )
     spec = importlib.util.spec_from_file_location("nautobot_config", config_path)
-    module = importlib.util.module_from_spec(spec)
-    sys.modules["nautobot_config"] = module
-    spec.loader.exec_module(module)
-    _preprocess_settings(module, config_path)
+    settings_module = importlib.util.module_from_spec(spec)
+    sys.modules["nautobot_config"] = settings_module
+    spec.loader.exec_module(settings_module)
+    _preprocess_settings(settings_module, config_path)
 
 
 class _VerboseHelpFormatter(argparse.ArgumentDefaultsHelpFormatter, argparse.RawDescriptionHelpFormatter):

{nautobot-2.4.24 → nautobot-2.4.26}/nautobot/core/management/commands/refresh_content_type_cache.py

@@ -25,7 +25,7 @@ class Command(BaseCommand):
                     cache.set(
                         content_type.model_class()._content_type_cache_key,
                         content_type,
-                        settings.CONTENT_TYPE_CACHE_TIMEOUT,
+                        timeout=settings.CONTENT_TYPE_CACHE_TIMEOUT,
                     )
 
             except AttributeError:

{nautobot-2.4.24 → nautobot-2.4.26}/nautobot/core/models/tree_queries.py

@@ -1,5 +1,6 @@
 import uuid
 
+from django.conf import settings
 from django.core.cache import cache
 from django.db.models import Case, When
 from django.db.models.signals import post_delete, post_save
@@ -106,7 +107,8 @@ class TreeManager(TreeManager_, BaseManager.from_queryset(TreeQuerySet)):
         max_depth = cache.get(self.max_depth_cache_key)
         if max_depth is None:
             max_depth = self.max_tree_depth()
-            cache.set(self.max_depth_cache_key, max_depth)
+            # cache is explicitly invalidated by nautobot.core.signals.invalidate_max_depth_cache as needed
+            cache.set(self.max_depth_cache_key, max_depth, timeout=None)
         return max_depth
 
 
@@ -136,7 +138,9 @@ class TreeModel(TreeNode):
             if restrict_to_user:
                 queryset = queryset.restrict(restrict_to_user, "view")
             pk_list = list(queryset.values_list("pk", flat=True))
-            cache.set(cache_key, pk_list)
+            # cache is explicitly invalidated by TreeModel.save() and TreeModel.delete() methods
+            # However since this is a *per-instance* cache we don't want it to grow indefinitely over time.
+            cache.set(cache_key, pk_list, timeout=settings.CACHES["default"]["TIMEOUT"])
         return pk_list
 
     @property
@@ -162,7 +166,7 @@ class TreeModel(TreeNode):
             # Expected to occur at times during bulk-delete operations
             pass
         display_str += self.name  # pylint: disable=no-member  # we checked with hasattr() above
-        cache.set(cache_key, display_str, 5)
+        cache.set(cache_key, display_str, timeout=5)
         return display_str
 
     @classmethod

{nautobot-2.4.24 → nautobot-2.4.26}/nautobot/core/settings.py

@@ -1,4 +1,5 @@
 import datetime
+import json
 import os
 import os.path
 import platform
@@ -1179,7 +1180,7 @@ SILKY_INTERCEPT_FUNC = silk_request_logging_intercept_logic
 KUBERNETES_DEFAULT_SERVICE_ADDRESS = os.getenv("NAUTOBOT_KUBERNETES_DEFAULT_SERVICE_ADDRESS", "")
 
 # A dictionary that stores the kubernetes pod manifest used to create a job pod in the kubernetes cluster
-KUBERNETES_JOB_MANIFEST = {}
+KUBERNETES_JOB_MANIFEST = json.loads(os.getenv("NAUTOBOT_KUBERNETES_JOB_MANIFEST", "{}"))
 
 # Name of the kubernetes pod created in the kubernetes cluster
 KUBERNETES_JOB_POD_NAME = os.getenv("NAUTOBOT_KUBERNETES_JOB_POD_NAME", "")

{nautobot-2.4.24 → nautobot-2.4.26}/nautobot/core/settings.yaml

@@ -1098,6 +1098,7 @@ properties:
   KUBERNETES_JOB_MANIFEST:
     default: {}
     description: "A dictionary that contains the pod manifest used to create a job pod in the kubernetes cluster."
+    environment_variable: "NAUTOBOT_KUBERNETES_JOB_MANIFEST"
     type: "object"
     version_added: "2.4.0"
   KUBERNETES_JOB_POD_NAME:
@@ -1904,8 +1905,8 @@ properties:
           For an example of using `django-storages` with AWS S3 buckets, visit the
           [django-storages with S3](../guides/s3-django-storage.md) user-guide.
 
-      The configuration parameters for the specified storage backend are defined under the
-      [`STORAGE_CONFIG`](#storage_config) setting.
+      The configuration parameters for the specified storage backend are defined under the settings
+      [`STORAGE_CONFIG`](#storage_config) (deprecated) or [`STORAGES`](#storages) (recommended).
     see_also:
       "`STORAGES`": "#storages"
     type: "string"
@@ -1913,8 +1914,16 @@ properties:
     description: "(Deprecated) Dictionary of config parameters for the storage backend configured as STORAGE_BACKEND."
     details: |-
       !!! warning
-          This setting is deprecated and will be removed in Nautobot v3.1.
-          In its place, you should set [`STORAGES["default"]["OPTIONS"]`](#storages).
+          This setting is deprecated and will be removed in Nautobot v3.1. In its place, you should set
+          [`STORAGES["default"]["OPTIONS"]` and/or `STORAGES["staticfiles"]["OPTIONS"]`](#storages).
+
+          Note that `STORAGE_CONFIG` is implemented to provide a bit of configuration "magic" that
+          `STORAGES["..."]["OPTIONS"]` does not; specifically, when `STORAGE_BACKEND` is using any module from
+          `django-storages`, if `STATICFILES_STORAGE` is also using `django-storages`, the `STORAGE_CONFIG` will be
+          automatically applied to both file storage types. When using `STORAGES` instead of `STORAGE_CONFIG`, this is
+          not automatically the case, permitting the two types to be configured independently, but also potentially
+          requiring duplicate configuration under `STORAGES["default"]["OPTIONS"]` and
+          `STORAGES["staticfiles"]["OPTIONS"]` if both types are using the same backend.
 
       The specific parameters to be used here are specific to each backend.
 

{nautobot-2.4.24 → nautobot-2.4.26}/nautobot/core/templates/admin/config/config.html

@@ -11,6 +11,11 @@
 {% endblock %}
 
 {% block content %}
+    <style>
+        form label {
+            font-size: 1.3rem !important;
+        }
+    </style>
     <form action="" method="post" enctype="multipart/form-data" id="changelist-form" class="form form-horizontal">
         {% csrf_token %}
         <div class="row">

{nautobot-2.4.24 → nautobot-2.4.26}/nautobot/core/templates/admin/edit_inline/tabular.html

@@ -1,5 +1,31 @@
 {% load i18n static admin_urls admin_modify bootstrapped_goodies_tags %}
 
+<style>
+    tr.form-row {
+        font-size: 1.3rem !important;
+    }
+    td.original p {
+        height: auto !important;
+        min-height: 1.5em !important;
+        margin: 0;
+        padding: 0;
+        font-size: 1.3rem !important;
+        word-break: break-word;
+        overflow-wrap: break-word;
+    }
+    td.original p[style] {
+        height: auto !important;
+        min-height: 1.5em !important;
+    }
+    tr.add-row a {
+        font-size: 1.3rem !important;
+    }
+    .related-widget-wrapper-link img {
+        width: 24px !important;
+        vertical-align: middle;
+    }
+</style>
+
 <div class="js-inline-admin-formset inline-group" id="{{ inline_admin_formset.formset.prefix }}-group"
      data-inline-type="tabular"
      data-inline-formset="{{ inline_admin_formset.inline_formset_data }}">

{nautobot-2.4.24 → nautobot-2.4.26}/nautobot/core/templates/admin/includes/fieldset.html

@@ -1,4 +1,13 @@
 {% load bootstrapped_goodies_tags %}
+<style>
+    form label {
+        font-size: 1.3rem !important;
+    }
+    .controls.col-md-9,
+    .controls.col-md-9 * {
+        font-size: 1.3rem !important;
+    }
+</style>
 <fieldset class="panel panel-default" id="fieldset-{% if stacked_prefix %}{{ stacked_prefix }}-{% endif %}{{ forloop.counter }}" style="background:transparent">
     {% if fieldset.name %}
         <div class="panel-heading">

{nautobot-2.4.24 → nautobot-2.4.26}/nautobot/core/templates/graphene/graphiql.html

@@ -39,17 +39,12 @@ add "&raw" to the end of the URL within a browser.
   <!-- As Nautobot may be run without internet access, we source these files locally rather than from an online CDN -->
         <link rel="stylesheet"
               href="{% static 'graphiql-1.5.16/graphiql.min.css' %}"
-              onerror="window.location='{% url 'media_failure' %}?filename=graphiql-1.5.16/graphiql.min.css'">
-        <script src="{% static 'whatwg-fetch-3.6.2/fetch.umd.min.js' %}"
-                onerror="window.location='{% url 'media_failure' %}?filename=whatwg-fetch-3.6.2/fetch.umd.min.js'"></script>
-        <script src="{% static 'react-16.14.0/react.production.min.js' %}"
-                onerror="window.location='{% url 'media_failure' %}?filename=react-16.14.0/react.production.min.js'"></script>
-        <script src="{% static 'react-dom-16.14.0/react-dom.production.min.js' %}"
-                onerror="window.location='{% url 'media_failure' %}?filename=react-dom-16.14.0/react-dom.production.min.js'"></script>
-        <script src="{% static 'graphiql-1.5.16/graphiql.min.js' %}"
-                onerror="window.location='{% url 'media_failure' %}?filename=graphiql-1.5.16/graphiql.min.js'"></script>
-        <script src="{% static 'subscriptions-transport-ws-0.9.18/client.min.js' %}"
-                onerror="window.location='{% url 'media_failure' %}?filename=subscriptions-transport-ws-0.9.18/client.min.js'"></script>
+              onerror="nb.media.handleFailure(this)">
+        <script src="{% static 'whatwg-fetch-3.6.2/fetch.umd.min.js' %}" onerror="nb.media.handleFailure(this)"></script>
+        <script src="{% static 'react-16.14.0/react.production.min.js' %}" onerror="nb.media.handleFailure(this)"></script>
+        <script src="{% static 'react-dom-16.14.0/react-dom.production.min.js' %}" onerror="nb.media.handleFailure(this)"></script>
+        <script src="{% static 'graphiql-1.5.16/graphiql.min.js' %}" onerror="nb.media.handleFailure(this)"></script>
+        <script src="{% static 'subscriptions-transport-ws-0.9.18/client.min.js' %}" onerror="nb.media.handleFailure(this)"></script>
     </head>
     <body>
   <!-- Nautobot page contents -->

{nautobot-2.4.24 → nautobot-2.4.26}/nautobot/core/templates/home.html

@@ -125,6 +125,5 @@
 {% endblock %}
 {% block javascript %}
     {{ block.super }}
-    <script src="{% versioned_static 'js/homepage_layout.js' %}"
-            onerror="window.location='{% url 'media_failure' %}?filename=js/homepagelayout.js'"></script>
-{% endblock %}
+    <script src="{% versioned_static 'js/homepage_layout.js' %}" onerror="nb.media.handleFailure(this)"></script>
+{% endblock %}

nautobot-2.4.26/nautobot/core/templates/inc/javascript.html

@@ -0,0 +1,40 @@
+{% load helpers %}
+{% load plugins %}
+{% load static %}
+
+<script src="{% static 'jquery/jquery-3.7.1.min.js' %}" onerror="nb.media.handleFailure(this)"></script>
+<script src="{% static 'jquery-ui-1.13.2/jquery-ui.min.js' %}" onerror="nb.media.handleFailure(this)"></script>
+<script src="{% static 'bootstrap-3.4.1-dist/js/bootstrap.min.js' %}" onerror="nb.media.handleFailure(this)"></script>
+<script src="{% static 'select2-4.0.13/select2.min.js' %}" onerror="nb.media.handleFailure(this)"></script>
+<script src="{% static 'clipboard.js-2.0.9/clipboard.min.js' %}" onerror="nb.media.handleFailure(this)"></script>
+<script src="{% static 'flatpickr-4.6.9/flatpickr.min.js' %}" onerror="nb.media.handleFailure(this)"></script>
+<script src="{% static 'highlight.js-11.9.0/highlight.min.js' %}" onerror="nb.media.handleFailure(this)"></script>
+<script src="{% versioned_static 'js/forms.js' %}" onerror="nb.media.handleFailure(this)"></script>
+<script src="{% versioned_static 'js/nav_menu.js' %}" onerror="nb.media.handleFailure(this)"></script>
+<script src="{% versioned_static 'js/theme.js' %}" onerror="nb.media.handleFailure(this)"></script>
+<script src="{% versioned_static 'js/table_sorting_indicator.js' %}" onerror="nb.media.handleFailure(this)"></script>
+<script src="{% versioned_static 'js/dropdown.js' %}" onerror="nb.media.handleFailure(this)"></script>
+<script type="text/javascript">
+    var nautobot_static_url = "{% static '' %}";
+    var nautobot_api_path = "{% url 'api-root' %}";
+    var nautobot_csrf_token = "{{ csrf_token }}";
+    var loading = $(".loading");
+    $(document).ajaxStart(function() {
+        loading.show();
+    }).ajaxStop(function() {
+        loading.hide();
+    });
+    // Applies bootstrap tooltip to all elements with the title attribute.
+    // Button groups are "special" and require child tooltips to have
+    // `{ container: 'body' }` option not to break their styles:
+    // https://getbootstrap.com/docs/3.4/javascript/#markup-1
+    $("*:not(.btn-group) > [title]").tooltip();
+    $(".btn-group > [title]").tooltip({ container: 'body' });
+</script>
+<script type="text/javascript">
+    hljs.configure({ cssSelector: '.language-graphql, .language-json, .language-xml, .language-yaml' });
+    hljs.highlightAll();
+</script>
+{% if settings.BRANDING_FILEPATHS.javascript %}
+    <script src="{% custom_branding_or_static 'javascript' None %}"></script>
+{% endif %}

{nautobot-2.4.24 → nautobot-2.4.26}/nautobot/core/templates/inc/media.html

@@ -2,38 +2,39 @@
 {% load helpers %}
 {% load plugins %}
 
+{% include 'inc/media_failure.html' %}
 <link rel="stylesheet" id="template-theme"
       href="{% url 'template_css' %}">
 <link rel="stylesheet"
       href="{% static 'bootstrap-3.4.1-dist/css/bootstrap.min.css' %}"
-      onerror="window.location='{% url 'media_failure' %}?filename=bootstrap-3.4.1-dist/css/bootstrap.min.css'">
+      onerror="nb.media.handleFailure(this)">
 <link rel="stylesheet"
       href="{% static 'materialdesignicons-7.4.47/css/materialdesignicons.min.css' %}"
-      onerror="window.location='{% url 'media_failure' %}?filename=materialdesignicons-7.4.47/css/materialdesignicons.min.css'">
+      onerror="nb.media.handleFailure(this)">
 <link rel="stylesheet"
       href="{% static 'jquery-ui-1.13.2/jquery-ui.min.css' %}"
-      onerror="window.location='{% url 'media_failure' %}?filename=jquery-ui-1.13.2/jquery-ui.min.css'">
+      onerror="nb.media.handleFailure(this)">
 <link rel="stylesheet"
       href="{% static 'select2-4.0.13/select2.min.css' %}"
-      onerror="window.location='{% url 'media_failure' %}?filename=select2-4.0.13/select2.min.css'">
+      onerror="nb.media.handleFailure(this)">
 <link rel="stylesheet"
       href="{% static 'select2-bootstrap-0.1.0-beta.10/select2-bootstrap.min.css' %}"
-      onerror="window.location='{% url 'media_failure' %}?filename=select2-bootstrap-0.1.0-beta.10/select2-bootstrap.min.css'">
+      onerror="nb.media.handleFailure(this)">
 <link rel="stylesheet"
       href="{% static 'flatpickr-4.6.9/themes/light.min.css' %}"
-      onerror="window.location='{% url 'media_failure' %}?filename=flatpickr-4.6.9/themes/light.min.css'">
+      onerror="nb.media.handleFailure(this)">
 <link rel="stylesheet"
       href="{% static 'highlight.js-11.9.0/github.min.css' %}"
-      onerror="window.location='{% url 'media_failure' %}?filename=highlight.js-11.9.0/github.min.css'"{% if request.COOKIES|get_item:"theme" == 'dark' %} disabled="disabled"{% endif %} >
+      onerror="nb.media.handleFailure(this)"{% if request.COOKIES|get_item:"theme" == 'dark' %} disabled="disabled"{% endif %} >
 <link rel="stylesheet"
       href="{% static 'highlight.js-11.9.0/github-dark.min.css' %}"
-      onerror="window.location='{% url 'media_failure' %}?filename=highlight.js-11.9.0/github-dark.min.css'"{% if request.COOKIES|get_item:"theme" != 'dark' %} disabled="disabled"{% endif %} />
+      onerror="nb.media.handleFailure(this)"{% if request.COOKIES|get_item:"theme" != 'dark' %} disabled="disabled"{% endif %} />
 <link rel="stylesheet" id="dark-theme"
       href="{% versioned_static 'css/dark.css' %}"
-      onerror="window.location='{% url 'media_failure' %}?filename=css/dark.css'"{% if request.COOKIES|get_item:"theme" != 'dark' %} disabled="disabled"{% endif %} />
+      onerror="nb.media.handleFailure(this)"{% if request.COOKIES|get_item:"theme" != 'dark' %} disabled="disabled"{% endif %} />
 <link rel="stylesheet" id="base-theme"
       href="{% versioned_static 'css/base.css' %}"
-      onerror="window.location='{% url 'media_failure' %}?filename=css/base.css'">
+      onerror="nb.media.handleFailure(this)">
 {% if settings.BRANDING_FILEPATHS.css %}
     <link rel="stylesheet" id="custom-css" href="{% custom_branding_or_static 'css' None %}">
 {% endif %}

nautobot-2.4.26/nautobot/core/templates/inc/media_failure.html

@@ -0,0 +1,73 @@
+{% load static %}
+
+<script>
+    (function initMediaFailure() {
+        // Create React-style `ref` reference to the media failure alert element.
+        const failureAlertRef = { current: null };
+
+        // Store all media failures inside `Map` containing `Set` values to ensure uniqueness of all reported failures.
+        const failures = new Map();
+
+        function handleFailure(element) {
+            const url = element.href || element.src || '';
+
+            if (url) {
+                // Update `failures` with a proper entry corresponding to the current media failure and update media failure alert.
+                const elements = failures.get(url) || new Set();
+                elements.add(element);
+                failures.set(url, elements);
+                updateFailureAlert();
+            }
+        }
+
+        function updateFailureAlert() {
+            const count = Array.from(failures.values()).reduce((count, elements) => count + elements.size, 0);
+
+            const innerHTML = `
+                <div style="margin: auto; max-width: 800px;">
+                    <h2 style="margin-top: 0; text-align: center;">Static Media Failure</h2>
+                    <p><strong>${count}</strong> static media file${count > 1 ? 's' : ''} failed to load.</p>
+                    <p style="margin-bottom: 0;">
+                        Check whether
+                        <code><strong>nautobot-server collectstatic</strong></code>
+                        was run during the most recent upgrade and that the HTTP service (e.g. NGINX) is configured to serve static files.
+                        Refer to
+                        <a href="https://docs.nautobot.com/projects/core/en/v{{ settings.VERSION }}/installation/http-server/#static-media-failure" target="_blank">
+                            the installation documentation
+                        </a>
+                        for further guidance.
+                    </p>
+                </div>
+            `;
+
+            // If media failure alert already exists, just update its content and return early.
+            if (failureAlertRef.current) {
+                failureAlertRef.current.innerHTML = innerHTML;
+                return;
+            }
+
+            // If media failure alert does not exist yet, create one.
+            const alert = document.createElement('div');
+            alert.classList.add('alert', 'alert-danger', 'media-failure-banner');
+            alert.setAttribute('role', 'alert');
+            alert.innerHTML = innerHTML;
+
+            // Copy and hardcode Bootstrap `"alert alert-danger"` styles here to make the alert core styles independent of other CSS.
+            alert.style.setProperty('background-color', '#fce8e9');
+            alert.style.setProperty('border', '1px solid #f07162');
+            alert.style.setProperty('border-radius', '10px');
+            alert.style.setProperty('color', '#e01f1f');
+            alert.style.setProperty('margin', '20px');
+            alert.style.setProperty('margin-top', '0');
+            alert.style.setProperty('padding', '20px');
+
+            // Update React-style `ref` to simplify later alert updates if required and place the alert as the first child of document body.
+            failureAlertRef.current = alert;
+            document.body.prepend(alert);
+        }
+
+        // Export `media` "API" to `window` global object to enable accessing it from other scripts.
+        window.nb = window.nb || {};
+        window.nb.media = { failures, handleFailure }
+    })();
+</script>