nautobot 2.3.16__py3-none-any.whl → 2.4.0b1__py3-none-any.whl

nautobot/core/tables.py

@@ -14,8 +14,7 @@ from django.utils.http import urlencode
 from django.utils.safestring import mark_safe
 from django.utils.text import Truncator
 import django_tables2
-from django_tables2.data import TableData, TableQuerysetData
-from django_tables2.rows import BoundRows
+from django_tables2.data import TableQuerysetData
 from django_tables2.utils import Accessor, OrderBy, OrderByTuple
 from tree_queries.models import TreeNode
 
@@ -47,24 +46,8 @@ class BaseTable(django_tables2.Table):
         user=None,
         hide_hierarchy_ui=False,
         order_by=None,
-        data_transform_callback=None,
         **kwargs,
     ):
-        """
-        Instantiate a BaseTable.
-
-        Args:
-            *args (list, optional): Passed through to django_tables2.Table
-            table_changes_pending (bool): TODO
-            saved_view (SavedView, optional): TODO
-            user (User, optional): TODO
-            hide_hierarchy_ui (bool): Whether to display or hide hierarchy indentation of nested objects.
-            order_by (list, optional): Field(s) to sort by
-            data_transform_callback (function, optional): A function that takes the given `data` as an input and
-                returns new data. Runs after all of the queryset auto-optimization performed by this class.
-                Used for example in IPAM views to inject "fake" records for "available" Prefixes, IPAddresses, or VLANs.
-            **kwargs (dict, optional): Passed through to django_tables2.Table
-        """
         # Add custom field columns
         model = self._meta.model
 
@@ -106,14 +89,6 @@ class BaseTable(django_tables2.Table):
         # Init table
         super().__init__(*args, order_by=order_by, **kwargs)
 
-        if not isinstance(self.data, TableQuerysetData):
-            # LinkedCountColumns don't work properly if the data is a list of dicts instead of a queryset,
-            # as they rely on a `queryset.annotate()` call to gather the data.
-            self.exclude = [
-                *self.exclude,
-                *[column.name for column in self.columns if isinstance(column.column, LinkedCountColumn)],
-            ]
-
         # Don't show hierarchy if we're sorted
         if order_by is not None and hide_hierarchy_ui is None:
             hide_hierarchy_ui = True
@@ -147,7 +122,7 @@ class BaseTable(django_tables2.Table):
                 columns = user.get_config(f"tables.{self.__class__.__name__}.columns")
         if columns:
             for name, column in self.base_columns.items():
-                if name in columns and name not in self.exclude:
+                if name in columns:
                     self.columns.show(name)
                 else:
                     self.columns.hide(name)
@@ -186,8 +161,7 @@ class BaseTable(django_tables2.Table):
                         logger.error("Couldn't find model for %s", column.column.viewname)
                         continue
                     reverse_lookup = column.column.reverse_lookup or next(iter(column.column.url_params.keys()))
-                    distinct = column.column.distinct
-                    count_fields.append((column.name, column_model, reverse_lookup, distinct))
+                    count_fields.append((column.name, column_model, reverse_lookup))
                     try:
                         lookup = column.column.lookup or get_related_field_for_models(model, column_model).name
                         # For some reason get_related_field_for_models(Tag, DynamicGroup) gives a M2M with the name
@@ -199,8 +173,7 @@ class BaseTable(django_tables2.Table):
                     if lookup is not None:
                         # Also attempt to prefetch the first matching record for display - see LinkedCountColumn
                         prefetch_fields.append(
-                            # Use order_by() because we don't care about ordering here and it's potentially expensive
-                            Prefetch(lookup, column_model.objects.order_by()[:1], to_attr=f"{lookup}_list")
+                            Prefetch(lookup, column_model.objects.all()[:1], to_attr=f"{lookup}_list")
                         )
                     continue
 
@@ -283,34 +256,24 @@ class BaseTable(django_tables2.Table):
                         )
 
             if count_fields:
-                for column_name, column_model, lookup_name, distinct in count_fields:
+                for column_name, column_model, lookup_name in count_fields:
                     if hasattr(queryset.first(), column_name):
                         continue
                     try:
                         logger.debug(
-                            "Applying .annotate(%s=count_related(%s, %r, distinct=%s) to %s QuerySet",
+                            "Applying .annotate(%s=count_related(%s, %r) to %s QuerySet",
                             column_name,
                             column_model.__name__,
                             lookup_name,
-                            distinct,
                             model.__name__,
                         )
-                        queryset = queryset.annotate(
-                            **{column_name: count_related(column_model, lookup_name, distinct=distinct)}
-                        )
+                        queryset = queryset.annotate(**{column_name: count_related(column_model, lookup_name)})
                     except FieldError:
                         # No error message logged here as the above is *very much* best-effort
                         pass
 
             self.data.data = queryset
 
-        # TODO: it would be better if we could apply this transformation and the above queryset optimizations
-        #       **before** calling super().__init__(), but the current implementation works for now, though inelegant.
-        if data_transform_callback is not None:
-            self.data = TableData.from_data(data_transform_callback(self.data.data))
-            self.data.set_table(self)
-            self.rows = BoundRows(data=self.data, table=self, pinned_data=self.pinned_data)
-
     @property
     def configurable_columns(self):
         selected_columns = [
@@ -325,7 +288,7 @@ class BaseTable(django_tables2.Table):
 
     @property
     def visible_columns(self):
-        return [name for name in self.sequence if self.columns[name].visible and name not in self.exclude]
+        return [name for name in self.sequence if self.columns[name].visible]
 
     @property
     def order_by(self):
@@ -480,7 +443,7 @@ class ChoiceFieldColumn(django_tables2.Column):
     choices. The CSS class is derived by calling .get_FOO_class() on the row record.
     """
 
-    def render(self, *, record, bound_column, value):  # pylint: disable=arguments-differ  # tables2 varies its kwargs
+    def render(self, record, bound_column, value):  # pylint: disable=arguments-differ
         if value:
             name = bound_column.name
             css_class = getattr(record, f"get_{name}_class")()
@@ -527,7 +490,6 @@ class LinkedCountColumn(django_tables2.Column):
             TODO: this currently does *not* support nested lookups via `__`. That may be solvable in the future.
         reverse_lookup (str, optional): The reverse lookup parameter to use to derive the count.
             If not specified, the first key in `url_params` will be implicitly used as the `reverse_lookup` value.
-        distinct (bool, optional): Parameter passed through to `count_related()`.
         **kwargs (dict, optional): As the parent Column class.
 
     Examples:
@@ -552,37 +514,25 @@ class LinkedCountColumn(django_tables2.Column):
                 # We'd like to do the below but this module isn't currently smart enough to build the right Prefetch()
                 # for a nested lookup:
                 # lookup="circuit_terminations__circuit",
-                # For the count,
-                # .annotate(circuit_count=count_related(Circuit, "circuit_terminations__cloud_network", distinct=True))
+                # For the count, .annotate(circuit_count=count_related(Circuit, "circuit_terminations__cloud_network"))
                 reverse_lookup="circuit_terminations__cloud_network",
-                distinct=True,
                 verbose_name="Circuits",
             )
         ```
     """
 
     def __init__(
-        self,
-        viewname,
-        *args,
-        view_kwargs=None,
-        url_params=None,
-        lookup=None,
-        reverse_lookup=None,
-        distinct=False,
-        default=None,
-        **kwargs,
+        self, viewname, *args, view_kwargs=None, url_params=None, lookup=None, reverse_lookup=None, default=0, **kwargs
     ):
         self.viewname = viewname
         self.lookup = lookup
         self.view_kwargs = view_kwargs or {}
         self.url_params = url_params
         self.reverse_lookup = reverse_lookup or next(iter(url_params.keys()))
-        self.distinct = distinct
         self.model = get_model_for_view_name(self.viewname)
         super().__init__(*args, default=default, **kwargs)
 
-    def render(self, *, bound_column, record, value):  # pylint: disable=arguments-differ  # tables2 varies its kwargs
+    def render(self, bound_column, record, value):  # pylint: disable=arguments-differ
         related_record = None
         try:
             lookup = self.lookup or get_related_field_for_models(bound_column._table._meta.model, self.model).name
@@ -666,7 +616,7 @@ class ComputedFieldColumn(django_tables2.Column):
 
         super().__init__(*args, **kwargs)
 
-    def render(self, *, record):  # pylint: disable=arguments-differ  # tables2 varies its kwargs
+    def render(self, record):
         return self.computedfield.render({"obj": record})
 
 
@@ -685,7 +635,7 @@ class CustomFieldColumn(django_tables2.Column):
 
         super().__init__(*args, **kwargs)
 
-    def render(self, *, record, bound_column, value):  # pylint: disable=arguments-differ  # tables2 varies its kwargs
+    def render(self, record, bound_column, value):  # pylint: disable=arguments-differ
         if self.customfield.type == choices.CustomFieldTypeChoices.TYPE_BOOLEAN:
             template = helpers.render_boolean(value)
         elif self.customfield.type == choices.CustomFieldTypeChoices.TYPE_MULTISELECT:
@@ -716,7 +666,7 @@ class RelationshipColumn(django_tables2.Column):
         kwargs.setdefault("accessor", Accessor("associations"))
         super().__init__(orderable=False, *args, **kwargs)
 
-    def render(self, *, record, value):  # pylint: disable=arguments-differ  # tables2 varies its kwargs
+    def render(self, record, value):  # pylint: disable=arguments-differ
         # Filter the relationship associations by the relationship instance.
         # Since associations accessor returns all the relationship associations regardless of the relationship.
         value = [v for v in value if v.relationship == self.relationship]

nautobot/core/tasks.py

@@ -49,7 +49,7 @@ def get_releases(pre_releases=False):
     cache.set(
         "nautobot.core.releases.get_latest_release",
         max(releases),
-        config.get_settings_or_config("RELEASE_CHECK_TIMEOUT"),
+        config.get_settings_or_config("RELEASE_CHECK_TIMEOUT", fallback=24 * 3600),
     )
 
     # Since this is a Celery task, we can't return Version objects as they are not JSON serializable.

nautobot/core/templates/components/button/default.html

@@ -0,0 +1,7 @@
+{% if link %}<a href="{{ link }}"{% else %}<button type="button"{% endif %}
+    class="btn btn-{{ color }}"
+    {% for key, value in attributes.items %}{{ key }}="{{ value }}" {% endfor %}
+>
+    {% if icon %}<span class="mdi {{ icon }}" aria-hidden="true"></span>{% endif %}
+    {{ label }}
+{% if link %}</a>{% else %}</button>{% endif %}

nautobot/core/templates/components/button/dropdown.html

@@ -0,0 +1,20 @@
+<div class="btn-group">
+    <button type="button" class="btn btn-{{ color }} dropdown-toggle" data-toggle="dropdown"
+        aria-haspopup="true" aria-expanded="false"
+        {% for key, value in attributes.items %}{{ key }}="{{ value }}" {% endfor %}
+    >
+        {% if icon %}<span class="mdi {{ icon }}" aria-hidden="true"></span>{% endif %}
+        {{ label }}
+        <span class="caret"></span>
+    </button>
+    <ul class="dropdown-menu">
+        {% for child in children %}
+            <li><a href="{{ child.link }}" class="text-{{ child.color }}"
+                {% for key, value in child.attributes.items %}{{ key }}="{{ value }}" {% endfor %}
+            >
+                {% if child.icon %}<span class="mdi {{ child.icon }}" aria-hidden="true"></span>{% endif %}
+                {{ child.label }}
+            </a></li>
+        {% endfor %}
+    </ul>
+</div>

nautobot/core/templates/components/layout/one_over_two.html

@@ -0,0 +1,19 @@
+{% load ui_framework %}
+{% load plugins %}
+
+<div class="row">
+    <div class="col-md-12">
+        {% render_components full_width_panels %}
+        {% if include_plugin_content %}{% plugin_full_width_page object %}{% endif %}
+    </div>
+</div>
+<div class="row">
+    <div class="col-md-6">
+        {% render_components left_half_panels %}
+        {% if include_plugin_content %}{% plugin_left_page object %}{% endif %}
+    </div>
+    <div class="col-md-6">
+        {% render_components right_half_panels %}
+        {% if include_plugin_content %}{% plugin_right_page object %}{% endif %}
+    </div>
+</div>

nautobot/core/templates/components/layout/two_over_one.html

@@ -0,0 +1,19 @@
+{% load ui_framework %}
+{% load plugins %}
+
+<div class="row">
+    <div class="col-md-6">
+        {% render_components left_half_panels %}
+        {% if include_plugin_content %}{% plugin_left_page object %}{% endif %}
+    </div>
+    <div class="col-md-6">
+        {% render_components right_half_panels %}
+        {% if include_plugin_content %}{% plugin_right_page object %}{% endif %}
+    </div>
+</div>
+<div class="row">
+    <div class="col-md-12">
+        {% render_components full_width_panels %}
+        {% if include_plugin_content %}{% plugin_full_width_page object %}{% endif %}
+    </div>
+</div>

nautobot/core/templates/components/panel/body_content_data_table.html

@@ -0,0 +1,27 @@
+{% load helpers %}
+<table class="table table-hover table-headings">
+    {% if data %}
+        {% if column_headers %}
+            <thead>
+                <tr>
+                    {% for column_header in column_headers %}
+                        <th>{{ column_header }}</th>
+                    {% endfor %}
+                </tr>
+            </thead>
+        {% endif %}
+        <tbody>
+            {% for entry in data %}
+                <tr>
+                    {% for column in columns %}
+                        <td>{{ entry|get_item:column|placeholder }}</td>
+                    {% endfor %}
+                </tr>
+            {% endfor %}
+        </tbody>
+    {% else %}
+        <tr>
+            <td colspan="{{ columns|length }}" class="text-center text-muted">&mdash; No data &mdash;</td>
+        </td>
+    {% endif %}
+</table>

nautobot/core/templates/components/panel/body_content_objects_table.html

@@ -0,0 +1,4 @@
+{% load render_table from django_tables2 %}
+{% with table=body_content_table %}
+    {% render_table table 'inc/table.html' %}
+{% endwith %}

nautobot/core/templates/components/panel/body_content_tags.html

@@ -0,0 +1,6 @@
+{% load helpers %}
+{% for tag in tags %}
+    {% tag tag list_url_name %}
+{% empty %}
+    <span class="text-muted">No tags assigned</span>
+{% endfor %}

nautobot/core/templates/components/panel/body_content_text.html

@@ -0,0 +1,12 @@
+{% load helpers %}
+{% if render_as == 'json' %}
+    <pre>{{ value | render_json }}</pre>
+{% elif render_as == 'yaml' %}
+    <pre>{{ value | render_yaml }}</pre>
+{% elif render_as == 'markdown' %}
+    {{ value | render_markdown }}
+{% elif render_as == 'code' %}
+    <pre>{{ value }}</pre>
+{% else %}
+    {{ value }}
+{% endif %}

nautobot/core/templates/components/panel/body_wrapper_generic.html

@@ -0,0 +1,3 @@
+<div class="panel-body"{% if body_id %} id="{{ body_id }}"{% endif %}>
+    {{ body_content }}
+</div>

nautobot/core/templates/components/panel/body_wrapper_key_value_table.html

@@ -0,0 +1,3 @@
+<table class="table table-hover panel-body attr-table"{% if body_id %} id="{{ body_id }}"{% endif %}>
+    {{ body_content }}
+</table>

nautobot/core/templates/components/panel/body_wrapper_table.html

@@ -0,0 +1,3 @@
+<div class="table-responsive"{% if body_id %} id="{{ body_id }}"{% endif %}>
+    {{ body_content }}
+</div>

nautobot/core/templates/components/panel/footer_contacts_table.html

@@ -0,0 +1,20 @@
+{% with request.path|add:"?tab=contacts"|urlencode as return_url %}
+    {% if perms.extras.change_contactassociation %}
+        <button type="submit" name="_edit" formaction="{% url 'extras:contactassociation_bulk_edit' %}?return_url={{return_url}}" class="btn btn-warning btn-xs">
+            <span class="mdi mdi-pencil" aria-hidden="true"></span> Edit
+        </button>
+    {% endif %}
+    {% if perms.extras.delete_contactassociation %}
+        <button type="submit" formaction="{% url 'extras:contactassociation_bulk_delete' %}?return_url={{return_url}}" class="btn btn-danger btn-xs">
+            <span class="mdi mdi-trash-can-outline" aria-hidden="true"></span> Delete
+        </button>
+    {% endif %}
+    {% if perms.extras.add_contactassociation %}
+        <div class="pull-right">
+            <a href="{% url 'extras:object_contact_team_assign' %}?return_url={{return_url}}&associated_object_id={{object.id}}&associated_object_type={{content_type.id}}" class="btn btn-primary btn-xs">
+                <span class="mdi mdi-plus-thick" aria-hidden="true"></span> Add Contact
+            </a>
+        </div>
+    {% endif %}
+    <div class="clearfix"></div>
+{% endwith %}

nautobot/core/templates/components/panel/footer_content_table.html

@@ -0,0 +1,14 @@
+{% if body_content_table_list_url and more_queryset_count > 0 %}
+    <a href="{{ body_content_table_list_url }}">
+        <span class="mdi mdi-dots-horizontal" aria-hidden="true"></span> View {{ more_queryset_count }} more {{ body_content_table_verbose_name_plural }}
+    </a>
+{% endif %}
+
+{% if body_content_table_add_url %}
+    <div class="pull-right">
+        <a href="{{ body_content_table_add_url }}" class="btn btn-xs btn-primary">
+            <span class="mdi mdi-plus-thick" aria-hidden="true"></span> Add {{ body_content_table_verbose_name }}
+        </a>
+    </div>
+    <div class="clearfix"></div>
+{% endif %}

nautobot/core/templates/components/panel/grouping_toggle.html

@@ -0,0 +1,14 @@
+<tr>
+    <td colspan="2">
+        <strong>
+            <!-- TODO: this is not very consistent with other button styling -->
+            <button type="button"
+                    class="accordion-toggle mdi mdi-chevron-down"
+                    name="grouping.{{ grouping }}"
+                    data-toggle="collapse"
+                    data-target=".collapseme-{{ body_id }}-{{ counter }}">
+                {{ grouping }}
+            </button>
+        </strong>
+    </td>
+</tr>

nautobot/core/templates/components/panel/header_extra_content_table.html

@@ -0,0 +1,3 @@
+{% load helpers %}
+
+<strong>{{ body_content_table_verbose_name_plural|bettertitle }}</strong>  {% if body_content_table_list_url %}<a href="{{ body_content_table_list_url }}" class="badge badge-primary">{{ body_content_table.rows|length }}</a>{% endif %}

nautobot/core/templates/components/panel/panel.html

@@ -0,0 +1,16 @@
+<div class="panel panel-default">
+    {% if label.strip or header_extra_content.strip %}
+        <div class="panel-heading">
+            {% if label %}
+                <strong>{{ label }}</strong>
+            {% endif %}
+            {{ header_extra_content }}
+        </div>
+    {% endif %}
+    {{ body }}
+    {% if footer_content.strip %}
+        <div class="panel-footer">
+            {{ footer_content }}
+        </div>
+    {% endif %}
+</div>

nautobot/core/templates/components/panel/stats_panel_body.html

@@ -0,0 +1,8 @@
+<div class="panel-body">
+    {% for url, value, title in stats.values %}
+        <div class="col-md-4 text-center">
+            <h2><a href="{% url url %}?{{ filter_name }}={{ object.pk }}" class="btn {% if value > 0 %}btn-primary{% else %}btn-default{% endif %} btn-lg">{{ value }}</a></h2>
+            <p>{{ title }}</p>
+        </div>
+    {% endfor %}
+</div>

nautobot/core/templates/components/tab/content_wrapper.html

@@ -0,0 +1,3 @@
+<div id="{{ tab_id }}" role="tabpanel" class="tab-pane {% if request.GET.tab == tab_id %}active{% else %}fade{% endif %}">
+    {{ tab_content }}
+</div>

nautobot/core/templates/components/tab/label_wrapper.html

@@ -0,0 +1,5 @@
+<li role="presentation"{% if request.GET.tab == tab_id %} class="active"{% endif %}>
+    <a href="{{ object.get_absolute_url }}#{{ tab_id }}" onclick="switch_tab(this.href)" aria-controls="{{ tab_id }}" role="tab" data-toggle="tab">
+        {{ label }}
+    </a>
+</li>

nautobot/core/templates/components/tab/label_wrapper_distinct_view.html

@@ -0,0 +1,3 @@
+<li role="presentation"{% if request.GET.tab == tab_id %} class="active"{% endif %}>
+    <a href="{{ url }}?tab={{ tab_id }}">{{ label }}</a>
+</li>

nautobot/core/templates/generic/object_retrieve.html

@@ -8,6 +8,7 @@
 {% load plugins %}
 {% load static %}
 {% load tz %}
+{% load ui_framework %}
 
 {% block header %}
     <div class="row noprint">
@@ -38,13 +39,14 @@
                 </div>
             </form>
         </div>
-        {% endif%}
+        {% endif %}
         {% endwith %}
     </div>
 
     <div class="pull-right noprint">
     {% block buttons %}
         {% plugin_buttons object %}
+        {% render_detail_view_extra_buttons %}
         {% block extra_buttons %}{% endblock extra_buttons %}
         {% consolidate_detail_view_action_buttons %}
     {% endblock buttons %}
@@ -69,6 +71,9 @@
 
     <ul id="tabs" class="nav nav-tabs">
     {% block nav_tabs %}
+      {% if object_detail_content %}
+        {% render_tabs_labels object_detail_content.tabs %}
+      {% else %}
         <li role="presentation"{% if active_tab == "main" or request.GET.tab == "main" %} class="active"{% endif %}>
             <a href="{{ object.get_absolute_url }}#main" onclick="switch_tab(this.href)" aria-controls="main" role="tab" data-toggle="tab">
                 {{ verbose_name|bettertitle }}
@@ -86,14 +91,6 @@
                 </a>
             </li>
         {% endif %}
-        {% block extra_nav_tabs %}{% endblock extra_nav_tabs %}
-        {% if perms.extras.view_note %}
-            {% if active_tab != 'notes' and object.get_notes_url or active_tab == 'notes' %}
-                <li role="presentation"{% if active_tab == 'notes' %} class="active"{% endif %}>
-                    <a href="{{ object.get_notes_url }}">Notes</a>
-                </li>
-            {% endif %}
-        {% endif %}
         {% if object.is_dynamic_group_associable_model and perms.extras.view_dynamicgroup %}
             {% with object.dynamic_groups.count as dg_count %}
                 {% if dg_count %}
@@ -116,6 +113,14 @@
                 {% endif %}
             {% endwith %}
         {% endif %}
+      {% endif %}
+        {% if perms.extras.view_note %}
+            {% if active_tab != 'notes' and object.get_notes_url or active_tab == 'notes' %}
+                <li role="presentation"{% if active_tab == 'notes' %} class="active"{% endif %}>
+                    <a href="{{ object.get_notes_url }}">Notes</a>
+                </li>
+            {% endif %}
+        {% endif %}
         {% if perms.extras.view_objectchange %}
             {% if active_tab != 'changelog' and object.get_changelog_url or active_tab == 'changelog' %}
                 <li role="presentation"{% if active_tab == 'changelog' %} class="active"{% endif %}>
@@ -123,6 +128,7 @@
                 </li>
             {% endif %}
         {% endif %}
+        {% block extra_nav_tabs %}{% endblock extra_nav_tabs %}
     {% endblock nav_tabs %}
     {% plugin_object_detail_tabs object %}
     </ul>
@@ -130,11 +136,14 @@
 
 {% block content %}
     <div class="tab-content">
+      {% if object_detail_content %}
+        {% render_components object_detail_content.tabs %}
+      {% else %}
         <div id="main" role="tabpanel" class="tab-pane {% if active_tab == "main" or request.GET.tab == "main" %}active{% else %}fade{% endif %}">
             <div class="row">
                 <div class="col-md-6">
                     {% block content_left_page %}{% endblock content_left_page %}
-                    {% include 'inc/custom_fields/panel.html' with custom_fields=object.get_custom_field_groupings_basic computed_fields=object.get_computed_fields_grouping_basic computed_fields_advanced_ui=False %}
+                    {% include 'inc/custom_fields/panel.html' with custom_fields=object.get_custom_field_groupings_basic custom_fields_advanced_ui=False computed_fields=object.get_computed_fields_grouping_basic computed_fields_advanced_ui=False %}
                     {% include 'inc/relationships_panel.html' %}
                     {% include 'extras/inc/tags_panel.html' %}
                     {% plugin_left_page object %}
@@ -267,6 +276,8 @@
                 </div>
             </div>
         {% endif %}
+      {% endif %}
+        {% plugin_object_detail_tab_content object %}
         {% block extra_tab_content %}{% endblock extra_tab_content %}
     </div>
 {% endblock content %}
@@ -325,28 +336,28 @@
             $(`#tabs a[href="{{ object.get_absolute_url }}#${event.state.id}"]`).tab('show');
     }
     // Toggle v -. >
-    $("#accordion .accordion-toggle").click(function () {
+    $(".accordion-toggle").click(function () {
         $(this).toggleClass("mdi-chevron-down mdi-chevron-right");
     });
     // Dynamically collapse/expand all when clicking the "Collapse All" button, and then update the button text.
-    $('#accordion-toggle-all').click(function () {
+    $('.accordion-toggle-all').click(function () {
 
         if ($(this).data("lastState") === null || $(this).data("lastState") === 1) {
-            $('.collapse').collapse('show');
+            $($(this).data("target") + ' .collapse').collapse('show');
             $(this).data("lastState", 0);
 
-            $("#accordion .accordion-toggle").addClass("mdi-chevron-down").removeClass("mdi-chevron-right");
+            $($(this).data("target") + " .accordion-toggle").addClass("mdi-chevron-down").removeClass("mdi-chevron-right");
 
             $(this).text("Collapse All");
         }
         else {
-            $('[class^=collapseme]').removeData('bs.collapse').collapse({parent: false, toggle: false})
+            $($(this).data("target") + ' [class^=collapseme]').removeData('bs.collapse').collapse({parent: false, toggle: false})
             .collapse('hide')
             .removeData('bs.collapse')
-            .collapse({parent: '#accordion', toggle: false});
+            .collapse({parent: $(this).data("target"), toggle: false});
 
             $(this).data("lastState", 1);
-            $("#accordion .accordion-toggle").addClass("mdi-chevron-right").removeClass("mdi-chevron-down");
+            $($(this).data("target") + " .accordion-toggle").addClass("mdi-chevron-right").removeClass("mdi-chevron-down");
 
             $(this).text("Expand All");
         }

nautobot/core/templates/inc/computed_fields/panel_data.html

@@ -1,16 +1,13 @@
 {% load helpers %}
 {% if computed_fields %}
-<style>
-    .accordion-toggle {
-        font-size: 14px;
-    }
-</style>
     <div class="panel panel-default">
         <div class="panel-heading">
             <strong>Computed Fields</strong>
-            <button type="button" class="btn-xs btn-primary pull-right" id="accordion-toggle-all">Collapse All</button>
+            <button type="button"
+                    class="btn-xs btn-primary pull-right accordion-toggle-all"
+                    data-target="#computed_fields_accordion_{{ advanced_ui }}">Collapse All</button>
         </div>
-        <table id="accordion" class="table table-hover panel-body attr-table">
+        <table id="computed_fields_accordion_{{ advanced_ui }}" class="table table-hover panel-body attr-table">
             {% for grouping, fields in computed_fields.items %}
             {% with forloop.counter0 as count %}
                 {% if grouping != "" %}

nautobot/core/templates/inc/custom_fields/panel.html

@@ -1,3 +1,3 @@
 {% load helpers %}
-{% include 'inc/custom_fields/panel_data.html' %}
-{% include 'inc/computed_fields/panel_data.html' with advanced_ui=computed_fields_advanced_ui %}
+{% include 'inc/custom_fields/panel_data.html' with advanced_ui=custom_fields_advanced_ui %}
+{% include 'inc/computed_fields/panel_data.html' with advanced_ui=computed_fields_advanced_ui %}

nautobot/core/templates/inc/custom_fields/panel_data.html

@@ -1,16 +1,13 @@
 {% load helpers %}
 {% if custom_fields %}
-<style>
-    .accordion-toggle {
-        font-size: 14px;
-    }
-</style>
     <div class="panel panel-default">
         <div class="panel-heading">
             <strong>Custom Fields</strong>
-            <button type="button" class="btn-xs btn-primary pull-right" id="accordion-toggle-all">Collapse All</button>
+            <button type="button"
+                    class="btn-xs btn-primary pull-right accordion-toggle-all"
+                    data-target="#custom_fields_accordion_{{ advanced_ui }}">Collapse All</button>
         </div>
-        <table id="accordion" class="table table-hover panel-body attr-table">
+        <table id="custom_fields_accordion_{{ advanced_ui }}" class="table table-hover panel-body attr-table">
             {% for grouping, fields in custom_fields.items %}
             {% with forloop.counter0 as count %}
                 {% if grouping != "" %}