nautobot 2.0.0a3__py3-none-any.whl → 2.0.0b1__py3-none-any.whl

nautobot/core/models/validators.py

@@ -2,7 +2,7 @@ import re
 
 from django.conf import settings
 from django.core.exceptions import ValidationError
-from django.core.validators import BaseValidator, URLValidator, _lazy_re_compile
+from django.core.validators import BaseValidator, RegexValidator, URLValidator, _lazy_re_compile
 
 
 class EnhancedURLValidator(URLValidator):
@@ -41,12 +41,21 @@ class ExclusionValidator(BaseValidator):
         return a in b
 
 
-def validate_regex(value):
+class ValidRegexValidator(RegexValidator):
     """
-    Checks that the value is a valid regular expression. (Don't confuse this with RegexValidator, which *uses* a regex
-    to validate a value.)
+    Checks that the value is a valid regular expression.
+
+    Don't confuse this with `RegexValidator`, which *uses* a regex to validate a value.
     """
-    try:
-        re.compile(value)
-    except re.error:
-        raise ValidationError(f"{value} is not a valid regular expression.")
+
+    message = "%(value)r is not a valid regular expression."
+    code = "regex_invalid"
+
+    def __call__(self, value):
+        try:
+            return re.compile(value)
+        except (re.error, TypeError):
+            raise ValidationError(self.message, code=self.code, params={"value": value})
+
+
+validate_regex = ValidRegexValidator()

nautobot/core/releases.py

@@ -1,6 +1,6 @@
 import logging
 
-from cacheops import CacheMiss, cache
+from django.core.cache import cache
 
 from nautobot.core.utils.config import get_settings_or_config
 from nautobot.core.tasks import get_releases
@@ -18,15 +18,13 @@ def get_latest_release(pre_releases=False):
     """
     if get_settings_or_config("RELEASE_CHECK_URL"):
         logger.debug("Checking for most recent release")
-        try:
-            latest_release = cache.get("latest_release")
-            if latest_release:
-                logger.debug(f"Found cached release: {latest_release}")
-                return latest_release
-        except CacheMiss:
-            # Get the releases in the background worker, it will fill the cache
-            logger.info("Initiating background task to retrieve updated releases list")
-            get_releases.delay(pre_releases=pre_releases)
+        latest_release = cache.get("latest_release")
+        if latest_release is not None:
+            logger.debug(f"Found cached release: {latest_release}")
+            return latest_release
+        # Get the releases in the background worker, it will fill the cache
+        logger.info("Initiating background task to retrieve updated releases list")
+        get_releases.delay(pre_releases=pre_releases)
 
     else:
         logger.debug("Skipping release check; RELEASE_CHECK_URL not defined")

nautobot/core/settings.py

@@ -13,7 +13,7 @@ from nautobot.core.settings_funcs import is_truthy, parse_redis_connection, Cons
 # Environment setup
 #
 
-# This is used for display in the UI.
+# This is used for display in the UI. There are also VERSION_MAJOR and VERSION_MINOR derived from this later.
 VERSION = __version__
 
 # Hostname of the system. This is displayed in the web UI footers along with the
@@ -59,6 +59,9 @@ ALLOWED_URL_SCHEMES = (
 # Base directory wherein all created files (jobs, git repositories, file uploads, static files) will be stored)
 NAUTOBOT_ROOT = os.getenv("NAUTOBOT_ROOT", os.path.expanduser("~/.nautobot"))
 
+# The directory where the Nautobot UI packaging is stored.
+NAUTOBOT_UI_DIR = os.path.join(NAUTOBOT_ROOT, "ui")
+
 # Disable linking of Config Context objects via Dynamic Groups by default. This could cause performance impacts
 # when a large number of dynamic groups are present
 CONFIG_CONTEXT_DYNAMIC_GROUPS_ENABLED = is_truthy(os.getenv("NAUTOBOT_CONFIG_CONTEXT_DYNAMIC_GROUPS_ENABLED", "False"))
@@ -110,7 +113,7 @@ SOCIAL_AUTH_BACKEND_PREFIX = "social_core.backends"
 SANITIZER_PATTERNS = [
     # General removal of username-like and password-like tokens
     (re.compile(r"(https?://)?\S+\s*@", re.IGNORECASE), r"\1{replacement}@"),
-    (re.compile(r"(username|password|passwd|pwd)(\s*i?s?\s*:?\s*)?\S+", re.IGNORECASE), r"\1\2{replacement}"),
+    (re.compile(r"(username|password|passwd|pwd)((?:\s+is.?|:)?\s+)\S+", re.IGNORECASE), r"\1\2{replacement}"),
 ]
 
 # Storage
@@ -161,11 +164,11 @@ STRICT_FILTERING = is_truthy(os.getenv("NAUTOBOT_STRICT_FILTERING", "True"))
 #
 
 REST_FRAMEWORK_VERSION = VERSION.rsplit(".", 1)[0]  # Use major.minor as API version
-current_major, current_minor = REST_FRAMEWORK_VERSION.split(".")
+VERSION_MAJOR, VERSION_MINOR = [int(v) for v in REST_FRAMEWORK_VERSION.split(".")]
 # We support all major.minor API versions from 2.0 to the present latest version.
 # Similar logic exists in tasks.py, please keep them in sync!
-assert current_major == "2", f"REST_FRAMEWORK_ALLOWED_VERSIONS needs to be updated to handle version {current_major}"
-REST_FRAMEWORK_ALLOWED_VERSIONS = [f"{current_major}.{minor}" for minor in range(0, int(current_minor) + 1)]
+assert VERSION_MAJOR == 2, f"REST_FRAMEWORK_ALLOWED_VERSIONS needs to be updated to handle version {VERSION_MAJOR}"
+REST_FRAMEWORK_ALLOWED_VERSIONS = [f"{VERSION_MAJOR}.{minor}" for minor in range(0, VERSION_MINOR + 1)]
 
 REST_FRAMEWORK = {
     "ALLOWED_VERSIONS": REST_FRAMEWORK_ALLOWED_VERSIONS,
@@ -173,20 +176,27 @@ REST_FRAMEWORK = {
         "rest_framework.authentication.SessionAuthentication",
         "nautobot.core.api.authentication.TokenAuthentication",
     ),
-    "DEFAULT_FILTER_BACKENDS": ("nautobot.core.api.filter_backends.NautobotFilterBackend",),
+    "DEFAULT_FILTER_BACKENDS": (
+        "nautobot.core.api.filter_backends.NautobotFilterBackend",
+        "rest_framework.filters.OrderingFilter",
+    ),
     "DEFAULT_METADATA_CLASS": "nautobot.core.api.metadata.NautobotMetadata",
     "DEFAULT_PAGINATION_CLASS": "nautobot.core.api.pagination.OptionalLimitOffsetPagination",
     "DEFAULT_PERMISSION_CLASSES": ("nautobot.core.api.authentication.TokenPermissions",),
     "DEFAULT_RENDERER_CLASSES": (
-        "rest_framework.renderers.JSONRenderer",
+        "nautobot.core.api.renderers.NautobotJSONRenderer",
         "nautobot.core.api.renderers.FormlessBrowsableAPIRenderer",
+        "nautobot.core.api.renderers.NautobotCSVRenderer",
+    ),
+    "DEFAULT_PARSER_CLASSES": (
+        "rest_framework.parsers.JSONParser",
+        "nautobot.core.api.parsers.NautobotCSVParser",
     ),
-    "DEFAULT_PARSER_CLASSES": ("rest_framework.parsers.JSONParser",),
     "DEFAULT_SCHEMA_CLASS": "nautobot.core.api.schema.NautobotAutoSchema",
-    # Version to use if the client doesn't request otherwise.
-    # This should only change (if at all) with Nautobot major (breaking) releases.
-    "DEFAULT_VERSION": "2.0",
+    # Version to use if the client doesn't request otherwise. Default to current (i.e. latest)
+    "DEFAULT_VERSION": REST_FRAMEWORK_VERSION,
     "DEFAULT_VERSIONING_CLASS": "nautobot.core.api.versioning.NautobotAPIVersioning",
+    "ORDERING_PARAM": "sort",  # This is not meant to be changed by users, but is used internally by the API
     "PAGE_SIZE": None,
     "SCHEMA_COERCE_METHOD_NAMES": {
         # Default mappings
@@ -266,7 +276,10 @@ DATABASES = {
         "HOST": os.getenv("NAUTOBOT_DB_HOST", "localhost"),
         "PORT": os.getenv("NAUTOBOT_DB_PORT", ""),
         "CONN_MAX_AGE": int(os.getenv("NAUTOBOT_DB_TIMEOUT", "300")),
-        "ENGINE": os.getenv("NAUTOBOT_DB_ENGINE", "django.db.backends.postgresql"),
+        "ENGINE": os.getenv(
+            "NAUTOBOT_DB_ENGINE",
+            "django_prometheus.db.backends.postgresql" if METRICS_ENABLED else "django.db.backends.postgresql",
+        ),
     }
 }
 
@@ -287,13 +300,18 @@ DEBUG = is_truthy(os.getenv("NAUTOBOT_DEBUG", "False"))
 INTERNAL_IPS = ("127.0.0.1", "::1")
 FORCE_SCRIPT_NAME = None
 
-TESTING = len(sys.argv) > 1 and sys.argv[1] == "test"
+TESTING = "test" in sys.argv
 
 LOG_LEVEL = "DEBUG" if DEBUG else "INFO"
 
 if TESTING:
-    # keep log quiet by default when running unit/integration tests
-    LOGGING = {}
+    # Log to null handler instead of stderr during testing
+    LOGGING = {
+        "version": 1,
+        "disable_existing_loggers": False,
+        "handlers": {"console": {"level": "INFO", "class": "logging.NullHandler"}},
+        "loggers": {"nautobot": {"handlers": ["console"], "level": "INFO"}},
+    }
 else:
     LOGGING = {
         "version": 1,
@@ -350,7 +368,6 @@ INSTALLED_APPS = [
     "django.contrib.messages",
     "django.contrib.staticfiles",
     "django.contrib.humanize",
-    "cacheops",  # v2 TODO(jathan); Remove cacheops.
     "corsheaders",
     "django_filters",
     "django_jinja",
@@ -465,7 +482,10 @@ X_FRAME_OPTIONS = "DENY"
 # Static files (CSS, JavaScript, Images)
 STATIC_ROOT = os.path.join(NAUTOBOT_ROOT, "static")
 STATIC_URL = "static/"
-STATICFILES_DIRS = (os.path.join(BASE_DIR, "project-static"),)
+STATICFILES_DIRS = (
+    os.path.join(BASE_DIR, "project-static"),
+    os.path.join(NAUTOBOT_UI_DIR, "build", "static"),
+)
 
 # Media
 MEDIA_URL = "media/"
@@ -629,31 +649,14 @@ GRAPHQL_COMPUTED_FIELD_PREFIX = "cpf"
 # Caching
 #
 
-# v2 TODO(jathan): Remove all cacheops settings.
-# The django-cacheops plugin is used to cache querysets. The built-in Django
-# caching is not used.
-CACHEOPS = {
-    "auth.user": {"ops": "get", "timeout": 60 * 15},
-    "auth.*": {"ops": ("fetch", "get")},
-    "auth.permission": {"ops": "all"},
-    "circuits.*": {"ops": "all"},
-    "dcim.*": {"ops": "all"},
-    "ipam.*": {"ops": "all"},
-    "extras.*": {"ops": "all"},
-    "users.*": {"ops": "all"},
-    "tenancy.*": {"ops": "all"},
-    "virtualization.*": {"ops": "all"},
-}
-CACHEOPS_DEGRADE_ON_FAILURE = True
-CACHEOPS_ENABLED = is_truthy(os.getenv("NAUTOBOT_CACHEOPS_ENABLED", "False"))
-CACHEOPS_REDIS = os.getenv("NAUTOBOT_CACHEOPS_REDIS", parse_redis_connection(redis_database=1))
-CACHEOPS_DEFAULTS = {"timeout": int(os.getenv("NAUTOBOT_CACHEOPS_TIMEOUT", "900"))}
-
 # The django-redis cache is used to establish concurrent locks using Redis.
 CACHES = {
     "default": {
-        "BACKEND": "django_redis.cache.RedisCache",
-        "LOCATION": parse_redis_connection(redis_database=0),
+        "BACKEND": os.getenv(
+            "NAUTOBOT_CACHES_BACKEND",
+            "django_prometheus.cache.backends.redis.RedisCache" if METRICS_ENABLED else "django_redis.cache.RedisCache",
+        ),
+        "LOCATION": parse_redis_connection(redis_database=1),
         "TIMEOUT": 300,
         "OPTIONS": {
             "CLIENT_CLASS": "django_redis.client.DefaultClient",
@@ -678,15 +681,18 @@ CELERY_RESULT_EXTENDED = True
 # A value of None or 0 means results will never expire (depending on backend specifications).
 CELERY_RESULT_EXPIRES = None
 
-# If set to True, result messages will be persistent. This means the messages won’t be lost after a broker restart.
-CELERY_RESULT_PERSISTENT = True
-
 # Instruct celery to report the started status of a job, instead of just `pending`, `finished`, or `failed`
 CELERY_TASK_TRACK_STARTED = True
 
 # If enabled, a `task-sent` event will be sent for every task so tasks can be tracked before they’re consumed by a worker.
 CELERY_TASK_SEND_SENT_EVENT = True
 
+# If enabled stdout and stderr of running jobs will be redirected to the task logger.
+CELERY_WORKER_REDIRECT_STDOUTS = is_truthy(os.getenv("NAUTOBOT_CELERY_WORKER_REDIRECT_STDOUTS", "True"))
+
+# The log level of log messages generated by redirected job stdout and stderr. Can be one of `DEBUG`, `INFO`, `WARNING`, `ERROR`, or `CRITICAL`.
+CELERY_WORKER_REDIRECT_STDOUTS_LEVEL = os.getenv("NAUTOBOT_CELERY_WORKER_REDIRECT_STDOUTS_LEVEL", "WARNING")
+
 # Send task-related events so that tasks can be monitored using tools like flower. Sets the default value for the workers -E argument.
 CELERY_WORKER_SEND_TASK_EVENTS = True
 
@@ -783,3 +789,35 @@ def UI_RACK_VIEW_TRUNCATE_FUNCTION(device_display_name):
     :type: str
     """
     return str(device_display_name).split(".")[0]
+
+
+# Custom JSON schema serializer field type mappingss. These will be added to
+# `NautobotProcessingMixin.TYPE_MAP`.
+# Format: `{serializer_field_class.__name__}` => `{json_schema_type}`
+# See: https://github.com/yoyowallet/drf-react-template-framework#settings
+DRF_REACT_TEMPLATE_TYPE_MAP = {
+    "ContentTypeField": {"type": "string", "enum": "choices"},
+    "CustomFieldsDataField": {"type": "object", "widget": "textarea"},
+    "DateTimeField": {"type": "string", "format": "date-time", "widget": "date-time"},
+    "ImageField": {"type": "string", "format": "data-url"},
+    "IPFieldSerializer": {"type": "string"},
+    "JSONField": {"type": "string", "widget": "textarea"},
+    "MultipleChoiceJSONField": {"type": "array", "required": [], "enum": "choices"},
+    "ManyRelatedField": {"type": "array", "required": []},
+    #
+    # Foreign Key fields
+    #
+    # enum=choices is the one that works in the UI as a related field but it
+    # includes ALL related objects in the schema.
+    # "NautobotHyperlinkedRelatedField": {"type": "string", "enum": "choices"},
+    # readOnly=True disables the fields in the UI; not what we want.
+    # "NautobotHyperlinkedRelatedField": {"type": "string", "readOnly": True},
+    # type=string results in a free text field; also not what we want. For now,
+    # however, this will keep things moving so the unit tests pass.
+    "NautobotHyperlinkedRelatedField": {"type": "string", "format": "uuid"},
+    "PrimaryKeyRelatedField": {"type": "string", "enum": "choices"},
+    "RelationshipsDataField": {"type": "object"},
+    "SlugField": {"type": "string"},
+    "TimeZoneSerializerField": {"type": "string"},
+    "UUIDField": {"type": "string", "format": "uuid"},
+}

nautobot/core/tables.py

@@ -37,21 +37,21 @@ class BaseTable(django_tables2.Table):
             self.base_columns[name] = CustomFieldColumn(cf)
 
         for cpf in models.ComputedField.objects.filter(content_type=obj_type):
-            self.base_columns[f"cpf_{cpf.slug}"] = ComputedFieldColumn(cpf)
+            self.base_columns[f"cpf_{cpf.key}"] = ComputedFieldColumn(cpf)
 
         for relationship in models.Relationship.objects.filter(source_type=obj_type):
             if not relationship.symmetric:
-                self.base_columns[f"cr_{relationship.slug}_src"] = RelationshipColumn(
+                self.base_columns[f"cr_{relationship.key}_src"] = RelationshipColumn(
                     relationship, side=choices.RelationshipSideChoices.SIDE_SOURCE
                 )
             else:
-                self.base_columns[f"cr_{relationship.slug}_peer"] = RelationshipColumn(
+                self.base_columns[f"cr_{relationship.key}_peer"] = RelationshipColumn(
                     relationship, side=choices.RelationshipSideChoices.SIDE_PEER
                 )
 
         for relationship in models.Relationship.objects.filter(destination_type=obj_type):
             if not relationship.symmetric:
-                self.base_columns[f"cr_{relationship.slug}_dst"] = RelationshipColumn(
+                self.base_columns[f"cr_{relationship.key}_dst"] = RelationshipColumn(
                     relationship, side=choices.RelationshipSideChoices.SIDE_DESTINATION
                 )
             # symmetric relationships are already handled above in the source_type case
@@ -443,7 +443,7 @@ class RelationshipColumn(django_tables2.Column):
                 template += format_html(
                     '<a href="{}?relationship={}&{}_id={}">{} {}</a>',
                     reverse("extras:relationshipassociation_list"),
-                    self.relationship.slug,
+                    self.relationship.key,
                     self.side,
                     record.id,
                     len(value),

nautobot/core/tasks.py

@@ -1,7 +1,7 @@
 import logging
 
-from cacheops.simple import CacheMiss, cache
 from django.conf import settings
+from django.core.cache import cache
 from packaging import version
 import requests
 
@@ -21,12 +21,9 @@ def get_releases(pre_releases=False):
     releases = []
 
     # Check whether this URL has failed recently and shouldn't be retried yet
-    try:
-        if url == cache.get("latest_release_no_retry"):
-            logger.info(f"Skipping release check; URL failed recently: {url}")
-            return []
-    except CacheMiss:
-        pass
+    if url == cache.get("latest_release_no_retry"):
+        logger.info(f"Skipping release check; URL failed recently: {url}")
+        return []
 
     try:
         logger.debug(f"Fetching new releases from {url}")

nautobot/core/templates/base.html

@@ -1,49 +1 @@
-{% load static %}
-{% load helpers %}
-{% load plugins %}
-
-<!DOCTYPE html>
-<html lang="en"{% if request.COOKIES|get_item:"theme" == 'dark' %} data-theme="dark"{% endif %}>
-<head>
-    <title>{% block title %}Home{% endblock %} - {{ settings.BRANDING_TITLE }}</title>
-    {% include 'inc/media.html' %}
-    {% block extra_styles %}{% endblock %}
-</head>
-<body>
-    {% include 'inc/nav_menu.html' %}
-    <div class="container-fluid wrapper">
-        {% if "BANNER_TOP"|settings_or_config %}
-            <div class="alert alert-info text-center" role="alert">
-                {{ "BANNER_TOP"|settings_or_config|safe }}
-            </div>
-        {% endif %}
-        {% if settings.MAINTENANCE_MODE %}
-            <div class="alert alert-warning text-center" role="alert">
-                <h4><i class="mdi mdi-alert"></i> Maintenance Mode</h4>
-                <p>Nautobot is currently in maintenance mode. Functionality may be limited.</p>
-            </div>
-        {% endif %}
-        {% plugin_banners %}
-        {% for message in messages %}
-            <div class="alert alert-{{ message.tags }} alert-dismissable" role="alert">
-                <button type="button" class="close" data-dismiss="alert" aria-label="Close">
-                    <span>&times;</span>
-                </button>
-                {{ message }}
-            </div>
-        {% endfor %}
-        {% block header %}{% endblock header %}
-        {% block content %}{% endblock content %}
-        <div class="push"></div>
-        {% if "BANNER_BOTTOM"|settings_or_config %}
-            <div class="alert alert-info text-center banner-bottom" role="alert">
-                {{ "BANNER_BOTTOM"|settings_or_config|safe }}
-            </div>
-        {% endif %}
-    </div>
-    {% include 'modals/modal_theme.html' with name='theme'%}
-    {% include 'inc/footer.html' %}
-    {% include 'inc/javascript.html' %}
-{% block javascript %}{% endblock %}
-</body>
-</html>
+{% extends root_template|default:'base_django.html' %}

nautobot/core/templates/base_django.html

@@ -0,0 +1,49 @@
+{% load static %}
+{% load helpers %}
+{% load plugins %}
+
+<!DOCTYPE html>
+<html lang="en"{% if request.COOKIES|get_item:"theme" == 'dark' %} data-theme="dark"{% endif %}>
+<head>
+    <title>{% block title %}Home{% endblock %} - {{ settings.BRANDING_TITLE }}</title>
+    {% include 'inc/media.html' %}
+    {% block extra_styles %}{% endblock %}
+</head>
+<body>
+    {% include 'inc/nav_menu.html' %}
+    <div class="container-fluid wrapper">
+        {% if "BANNER_TOP"|settings_or_config %}
+            <div class="alert alert-info text-center" role="alert">
+                {{ "BANNER_TOP"|settings_or_config|safe }}
+            </div>
+        {% endif %}
+        {% if settings.MAINTENANCE_MODE %}
+            <div class="alert alert-warning text-center" role="alert">
+                <h4><i class="mdi mdi-alert"></i> Maintenance Mode</h4>
+                <p>Nautobot is currently in maintenance mode. Functionality may be limited.</p>
+            </div>
+        {% endif %}
+        {% plugin_banners %}
+        {% for message in messages %}
+            <div class="alert alert-{{ message.tags }} alert-dismissable" role="alert">
+                <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+                    <span>&times;</span>
+                </button>
+                {{ message }}
+            </div>
+        {% endfor %}
+        {% block header %}{% endblock header %}
+        {% block content %}{% endblock content %}
+        <div class="push"></div>
+        {% if "BANNER_BOTTOM"|settings_or_config %}
+            <div class="alert alert-info text-center banner-bottom" role="alert">
+                {{ "BANNER_BOTTOM"|settings_or_config|safe }}
+            </div>
+        {% endif %}
+    </div>
+    {% include 'modals/modal_theme.html' with name='theme'%}
+    {% include 'inc/footer.html' %}
+    {% include 'inc/javascript.html' %}
+{% block javascript %}{% endblock %}
+</body>
+</html>

nautobot/core/templates/base_react.html

@@ -0,0 +1,55 @@
+{% load static %}
+{% load helpers %}
+{% load plugins %}
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <link rel="icon" href="/static/img/favicon.ico" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <meta name="theme-color" content="#000000" />
+    <meta
+      name="description"
+      content="Web site created using create-react-app"
+    />
+    <link rel="apple-touch-icon" href="/logo192.png" />
+    <!--
+      manifest.json provides metadata used when your web app is installed on a
+      user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
+    -->
+    <link rel="manifest" href="{% static 'asset-manifest.json' %}" />
+    <link
+      href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&amp;display=swap"
+      rel="stylesheet"
+    />
+    <!--
+      Notice the use of %PUBLIC_URL% in the tags above.
+      It will be replaced with the URL of the `public` folder during the build.
+      Only files inside the `public` folder can be referenced from the HTML.
+
+      Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
+      work correctly both with client-side routing and a non-root public URL.
+      Learn how to configure a non-root public URL by running `npm run build`.
+    -->
+    <title>{{ settings.BRANDING_TITLE }}</title>
+    <script defer src="{% static 'js/main.js' %}"></script>
+    <link href="{% static 'css/main.css' %}" rel="stylesheet">
+  </head>
+  <body>
+    <noscript>You need to enable JavaScript to run this app.</noscript>
+    <div id="root"></div>
+    <div id="legacy-content" style="display:none">
+      {% block content %}{% endblock content %}
+    </div>
+    <!--
+      This HTML file is a template.
+      If you open it directly in the browser, you will see an empty page.
+
+      You can add webfonts, meta tags, or analytics to this file.
+      The build step will place the bundled scripts into the <body> tag.
+
+      To begin the development, run `npm start` or `yarn start`.
+      To create a production bundle, use `npm run build` or `yarn build`.
+    -->
+  </body>
+</html>

nautobot/core/templates/buttons/export.html

@@ -5,15 +5,17 @@
             Export <span class="caret"></span>
         </button>
         <ul class="dropdown-menu dropdown-menu-right">
-            <li><a href="?{% if url_params %}{{ url_params.urlencode }}&{% endif %}export">Default format</a></li>
+            {% if export_url %}
+                <li><a href="{{ export_url }}?{% if url_params %}{{ url_params.urlencode }}&{% endif %}format=csv">Default format</a></li>
+            {% endif %}
             <li class="divider"></li>
             {% for et in export_templates %}
                 <li><a href="?{% if url_params %}{{ url_params.urlencode }}&{% endif %}export={{ et.name }}"{% if et.description %} title="{{ et.description }}"{% endif %}>{{ et.name }}</a></li>
             {% endfor %}
         </ul>
     </div>
-{% else %}
-    <a href="?{% if url_params %}{{ url_params.urlencode }}&{% endif %}export" class="btn btn-success">
+{% elif export_url %}
+<a href="{{ export_url }}?{% if url_params %}{{ url_params.urlencode }}&{% endif %}format=csv" class="btn btn-success">
         <span class="mdi mdi-database-export" aria-hidden="true"></span> Export
     </a>
-{% endif %}
+{% endif %}

nautobot/core/templates/generic/object_bulk_create.html

@@ -80,37 +80,29 @@
                         <tr>
                             <th>Field</th>
                             <th>Required</th>
-                            <th>Accessor</th>
                             <th>Description</th>
                         </tr>
-                        {% for name, field in fields.items %}
+                        {% for field in fields %}
                             <tr>
                                 <td>
-                                    <code>{{ name }}</code>
+                                    <code>{{ field.name }}</code>
                                 </td>
                                 <td>{{ field.required | render_boolean }}</td>
                                 <td>
-                                    {% if field.to_field_name %}
-                                        <code>{{ field.to_field_name }}</code>
-                                    {% else %}
-                                        <span class="text-muted">&mdash;</span>
-                                    {% endif %}
-                                </td>
-                                <td>
-                                    {% if field.STATIC_CHOICES %}
-                                        <button type="button" class="btn btn-link btn-xs pull-right" data-toggle="modal" data-target="#{{ name }}_choices">
+                                    {% if field.choices %}
+                                        <button type="button" class="btn btn-link btn-xs pull-right" data-toggle="modal" data-target="#{{ field.name }}_choices">
                                             <i class="mdi mdi-help-circle"></i>
                                         </button>
-                                        <div class="modal fade" id="{{ name }}_choices" tabindex="-1" role="dialog">
+                                        <div class="modal fade" id="{{ field.name }}_choices" tabindex="-1" role="dialog">
                                             <div class="modal-dialog" role="document">
                                                 <div class="modal-content">
                                                     <div class="modal-header">
                                                         <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                                                        <h4 class="modal-title"><code>{{ name }}</code> Choices</h4>
+                                                        <h4 class="modal-title"><code>{{ field.name }}</code> Choices</h4>
                                                     </div>
                                                     <table class="table table-striped modal-body">
                                                         <tr><th>Import Value</th><th>Label</th></tr>
-                                                        {% for value, label in field.choices %}
+                                                        {% for value, label in field.choices.items %}
                                                             {% if value %}<tr><td><samp>{{ value }}</samp></td><td>{{ label }}</td></tr>{% endif %}
                                                         {% endfor %}
                                                     </table>
@@ -123,10 +115,8 @@
                                     {% elif field.label %}
                                         {{ field.label }}<br />
                                     {% endif %}
-                                    {% if field|widget_type == 'dateinput' %}
-                                        <small class="text-muted">Format: YYYY-MM-DD</small>
-                                    {% elif field|widget_type == 'checkboxinput' %}
-                                        <small class="text-muted">Specify "true" or "false"</small>
+                                    {% if field.format %}
+                                        <small class="text-muted">Format: {{ field.format }}</small>
                                     {% endif %}
                                 </td>
                             </tr>
@@ -138,8 +128,7 @@
                     objects.
                 </p>
                 <p class="small text-muted">
-                    <i class="mdi mdi-information-outline"></i> Related objects may be referenced by any unique attribute.
-                    For example, <code>vrf.rd</code> would identify a VRF by its route distinguisher.
+                    <i class="mdi mdi-information-outline"></i> Related objects must be referenced by their natural key slugs. You can find this information in the "Advanced" tab of any object's detail view.
                 </p>
             {% endif %}
         </div>

nautobot/core/templates/generic/object_list.html

@@ -49,7 +49,9 @@
         {% import_button content_type.model_class|validated_viewname:"import" %}
     {% endif %}
     {% if 'export' in action_buttons %}
-        {% export_button content_type %}
+        {% block export_button %}
+            {% export_button content_type %}
+        {% endblock export_button %}
     {% endif %}
 </div>
 <h1>{% block title %}{{ title }}{% endblock %}</h1>

nautobot/core/templates/generic/object_retrieve_plugin_full_width.html

@@ -0,0 +1,3 @@
+{% load helpers %}
+{% load plugins %}
+{% plugin_full_width_page object %}

nautobot/core/templates/inc/footer.html

@@ -16,6 +16,7 @@
                 </div>
                 <div class="col-xs-4 text-right noprint">
                     <p class="text-muted">
+                        <i class="mdi mdi-new-box text-primary"></i> <a href="#" onclick="viewNewUI();">View in New UI</a> &middot;
                         <a href="#theme_modal" data-toggle="modal" data-target="#theme_modal" id="btn-theme-modal"><i class="mdi mdi-theme-light-dark text-primary"></i>Theme</a> &middot;
                         <i class="mdi mdi-book-open-page-variant text-primary"></i>
                         {% if settings.BRANDING_URLS.docs %}

nautobot/core/templates/inc/javascript.html

@@ -37,18 +37,4 @@
     window.addEventListener("resize", setBodyPaddingTop);
     window.addEventListener("load", setBodyPaddingTop);
 
-    /*
-    Dropdown menu overflow screen view control
-    */
-    $(".dropdown .dropdown-toggle").on("click", function(){
-        var dropdown = $(this).next("ul");
-        var distanceOfDropDownFromNavStart = $(this).offset().left + dropdown.width();
-        var navBarWidth = $(".nav.navbar-nav").width();
-        var isEntirelyVisible = (distanceOfDropDownFromNavStart <= navBarWidth);
-
-        if (!isEntirelyVisible)
-            dropdown.addClass('edge');
-        else
-            dropdown.removeClass('edge');
-    })
 </script>