nautobot 2.2.8__py3-none-any.whl → 2.3.0__py3-none-any.whl

nautobot/extras/tables.py

@@ -1,5 +1,5 @@
 from django.conf import settings
-from django.utils.html import format_html
+from django.utils.html import format_html, format_html_join
 import django_tables2 as tables
 from django_tables2.utils import Accessor
 from jsonschema.exceptions import ValidationError as JSONSchemaValidationError
@@ -15,8 +15,10 @@ from nautobot.core.tables import (
     TagColumn,
     ToggleColumn,
 )
-from nautobot.core.templatetags.helpers import render_boolean, render_markdown
+from nautobot.core.templatetags.helpers import render_boolean, render_json, render_markdown
+from nautobot.tenancy.tables import TenantColumn
 
+from .choices import MetadataTypeDataTypeChoices
 from .models import (
     ComputedField,
     ConfigContext,
@@ -36,14 +38,18 @@ from .models import (
     JobHook,
     JobLogEntry,
     JobResult,
+    MetadataType,
     Note,
     ObjectChange,
+    ObjectMetadata,
     Relationship,
     RelationshipAssociation,
     Role,
+    SavedView,
     ScheduledJob,
     Secret,
     SecretsGroup,
+    StaticGroupAssociation,
     Status,
     Tag,
     TaggedItem,
@@ -52,6 +58,11 @@ from .models import (
 )
 from .registry import registry
 
+ASSIGNED_OBJECT = """
+{% load helpers %}
+{{ record.assigned_object|hyperlinked_object }}
+"""
+
 CONTACT_OR_TEAM_ICON = """
 {% if record.contact %}
 <i class="mdi mdi-account" title="Contact"></i>
@@ -76,11 +87,8 @@ EMAIL = """
 """
 
 TAGGED_ITEM = """
-{% if value.get_absolute_url %}
-    <a href="{{ value.get_absolute_url }}">{{ value }}</a>
-{% else %}
-    {{ value }}
-{% endif %}
+{% load helpers %}
+{{ value|hyperlinked_object }}
 """
 
 GITREPOSITORY_PROVIDES = """
@@ -99,6 +107,7 @@ GITREPOSITORY_BUTTONS = """
 
 JOB_BUTTONS = """
 <a href="{% url 'extras:job' pk=record.pk %}" class="btn btn-default btn-xs" title="Details"><i class="mdi mdi-information-outline" aria-hidden="true"></i></a>
+<a href="{% url 'extras:jobresult_list' %}?job_model={{ record.name | urlencode }}" class="btn btn-default btn-xs" title="Job Results"><i class="mdi mdi-format-list-bulleted" aria-hidden="true"></i></a>
 """
 
 OBJECTCHANGE_OBJECT = """
@@ -113,6 +122,17 @@ OBJECTCHANGE_REQUEST_ID = """
 <a href="{% url 'extras:objectchange_list' %}?request_id={{ value }}">{{ value }}</a>
 """
 
+MEMBERS_COUNT = """
+{% load helpers %}
+{% with urlname=record.model|validated_viewname:"list" %}
+{% if urlname %}
+    <a href="{% url urlname %}?dynamic_groups={{ record.name }}">{{ record.members_count }}</a>
+{% else %}
+    {{ record.members_count }}
+{% endif %}
+{% endwith %}
+"""
+
 # TODO: Webhook content_types in table order_by
 WEBHOOK_CONTENT_TYPES = """
 {{ value.all|join:", "|truncatewords:15 }}
@@ -327,11 +347,24 @@ class DynamicGroupTable(BaseTable):
     pk = ToggleColumn()
     name = tables.Column(linkify=True)
     members = tables.Column(accessor="count", verbose_name="Group Members", orderable=False)
+    tenant = TenantColumn()
+    tags = TagColumn(url_name="extras:dynamicgroup_list")
     actions = ButtonsColumn(DynamicGroup)
 
     class Meta(BaseTable.Meta):  # pylint: disable=too-few-public-methods
         model = DynamicGroup
         fields = (
+            "pk",
+            "name",
+            "description",
+            "content_type",
+            "group_type",
+            "members",
+            "tenant",
+            "tags",
+            "actions",
+        )
+        default_columns = (
             "pk",
             "name",
             "description",
@@ -352,7 +385,7 @@ class DynamicGroupMembershipTable(DynamicGroupTable):
     """Hybrid table for displaying info for both group and membership."""
 
     description = tables.Column(accessor="group.description")
-    actions = ButtonsColumn(DynamicGroup, pk_field="pk", buttons=("edit",))
+    members = tables.Column(accessor="group.count", verbose_name="Group Members", orderable=False)
 
     class Meta(BaseTable.Meta):
         model = DynamicGroupMembership
@@ -363,9 +396,8 @@ class DynamicGroupMembershipTable(DynamicGroupTable):
             "weight",
             "members",
             "description",
-            "actions",
         )
-        exclude = ("content_type",)
+        exclude = ("content_type", "actions", "group_type")
 
 
 DESCENDANTS_LINK = """
@@ -438,6 +470,51 @@ class NestedDynamicGroupAncestorsTable(DynamicGroupTable):
         exclude = ["content_type"]
 
 
+class SavedViewTable(BaseTable):
+    name = tables.Column(linkify=True)
+    actions = ButtonsColumn(SavedView)
+    is_global_default = BooleanColumn()
+    is_shared = BooleanColumn()
+
+    class Meta(BaseTable.Meta):
+        model = SavedView
+        fields = (
+            "name",
+            "owner",
+            "view",
+            "config",
+            "is_global_default",
+            "is_shared",
+            "actions",
+        )
+        default_columns = (
+            "name",
+            "owner",
+            "view",
+            "is_global_default",
+            "actions",
+        )
+
+    def render_config(self, record):
+        if record.config:
+            return render_json(record.config, pretty_print=True)
+        return self.default
+
+
+class StaticGroupAssociationTable(BaseTable):
+    """Table for list view of `StaticGroupAssociation` objects."""
+
+    pk = ToggleColumn()
+    dynamic_group = tables.Column(linkify=True)
+    associated_object = tables.Column(linkify=True, verbose_name="Associated Object")
+    actions = ButtonsColumn(StaticGroupAssociation, buttons=["changelog", "delete"])
+
+    class Meta(BaseTable.Meta):
+        model = StaticGroupAssociation
+        fields = ["pk", "dynamic_group", "associated_object", "actions"]
+        default_columns = ["pk", "dynamic_group", "associated_object", "actions"]
+
+
 class ExportTemplateTable(BaseTable):
     pk = ToggleColumn()
     name = tables.Column(linkify=True)
@@ -588,7 +665,7 @@ class GraphQLQueryTable(BaseTable):
 
 
 def log_object_link(value, record):
-    return record.absolute_url
+    return record.absolute_url or None
 
 
 def log_entry_color_css(record):
@@ -639,7 +716,10 @@ class JobTable(BaseTable):
         return render_markdown(value)
 
     def render_name(self, value):
-        return format_html('<span class="btn btn-primary btn-xs"><i class="mdi mdi-play"></i></span>{}', value)
+        return format_html(
+            '<span class="btn btn-primary btn-xs"><i class="mdi mdi-play"></i></span>{}',
+            value,
+        )
 
     class Meta(BaseTable.Meta):
         model = JobModel
@@ -811,7 +891,16 @@ class JobResultTable(BaseTable):
             "summary",
             "actions",
         )
-        default_columns = ("pk", "date_created", "name", "job_model", "user", "status", "summary", "actions")
+        default_columns = (
+            "pk",
+            "date_created",
+            "name",
+            "job_model",
+            "user",
+            "status",
+            "summary",
+            "actions",
+        )
 
 
 class JobButtonTable(BaseTable):
@@ -848,6 +937,83 @@ class JobButtonTable(BaseTable):
         )
 
 
+#
+# Metadata
+#
+
+
+class MetadataTypeTable(BaseTable):
+    pk = ToggleColumn()
+    name = tables.Column(linkify=True)
+    content_types = ContentTypesColumn(truncate_words=15)
+    actions = ButtonsColumn(MetadataType)
+
+    class Meta(BaseTable.Meta):
+        model = MetadataType
+        fields = (
+            "pk",
+            "name",
+            "description",
+            "content_types",
+            "data_type",
+            "actions",
+        )
+        default_columns = (
+            "pk",
+            "name",
+            "content_types",
+            "data_type",
+            "actions",
+        )
+
+
+class ObjectMetadataTable(BaseTable):
+    pk = ToggleColumn()
+    metadata_type = tables.Column(linkify=True)
+    assigned_object = tables.TemplateColumn(
+        template_code=ASSIGNED_OBJECT, verbose_name="Assigned object", orderable=False
+    )
+    # This is needed so that render_value method below does not skip itself
+    # when metadata_type.data_type is TYPE_CONTACT_TEAM and we need it to display either contact or team
+    value = tables.Column(empty_values=[])
+
+    class Meta(BaseTable.Meta):
+        model = ObjectMetadata
+        fields = (
+            "pk",
+            "assigned_object",
+            "metadata_type",
+            "scoped_fields",
+            "value",
+        )
+        default_columns = (
+            "pk",
+            "assigned_object",
+            "scoped_fields",
+            "value",
+            "metadata_type",
+        )
+
+    def render_scoped_fields(self, value):
+        if not value:
+            return "(all fields)"
+        return format_html_join(", ", "<code>{}</code>", ([v] for v in sorted(value)))
+
+    def render_value(self, record):
+        if record.value is not None and record.metadata_type.data_type == MetadataTypeDataTypeChoices.TYPE_JSON:
+            return render_json(record.value, pretty_print=True)
+        elif record.value is not None and record.metadata_type.data_type == MetadataTypeDataTypeChoices.TYPE_MARKDOWN:
+            return render_markdown(record.value)
+        elif record.value is not None and record.metadata_type.data_type == MetadataTypeDataTypeChoices.TYPE_BOOLEAN:
+            return render_boolean(record.value)
+        elif record.metadata_type.data_type == MetadataTypeDataTypeChoices.TYPE_CONTACT_TEAM:
+            if record.contact:
+                return format_html('<a href="{}">{}</a>', record.contact.get_absolute_url(), record.contact)
+            else:
+                return format_html('<a href="{}">{}</a>', record.team.get_absolute_url(), record.team)
+        return record.value
+
+
 #
 # Notes
 #
@@ -953,7 +1119,15 @@ class RelationshipAssociationTable(BaseTable):
 
     class Meta(BaseTable.Meta):
         model = RelationshipAssociation
-        fields = ("pk", "relationship", "source_type", "source", "destination_type", "destination", "actions")
+        fields = (
+            "pk",
+            "relationship",
+            "source_type",
+            "source",
+            "destination_type",
+            "destination",
+            "actions",
+        )
         default_columns = ("pk", "relationship", "source", "destination", "actions")
 
 
@@ -1051,7 +1225,7 @@ class StatusTable(BaseTable):
 
     class Meta(BaseTable.Meta):
         model = Status
-        fields = ["pk", "name", "color", "content_types", "description"]
+        fields = ["pk", "name", "color", "content_types", "description", "actions"]
 
 
 class StatusTableMixin(BaseTable):
@@ -1069,7 +1243,15 @@ class TagTable(BaseTable):
 
     class Meta(BaseTable.Meta):
         model = Tag
-        fields = ("pk", "name", "items", "color", "content_types", "description", "actions")
+        fields = (
+            "pk",
+            "name",
+            "items",
+            "color",
+            "content_types",
+            "description",
+            "actions",
+        )
 
 
 class TaggedItemTable(BaseTable):
@@ -1149,7 +1331,9 @@ class WebhookTable(BaseTable):
 class AssociatedContactsTable(StatusTableMixin, RoleTableMixin, BaseTable):
     pk = ToggleColumn()
     contact_type = tables.TemplateColumn(
-        CONTACT_OR_TEAM_ICON, verbose_name="Type", attrs={"td": {"style": "width:20px;"}}
+        CONTACT_OR_TEAM_ICON,
+        verbose_name="Type",
+        attrs={"td": {"style": "width:20px;"}},
     )
     name = tables.TemplateColumn(CONTACT_OR_TEAM, verbose_name="Name")
     contact_or_team_phone = tables.TemplateColumn(PHONE, accessor="contact_or_team.phone", verbose_name="Phone")

nautobot/extras/templates/extras/dynamicgroup.html

@@ -3,7 +3,7 @@
 
 {% block extra_nav_tabs %}
         <li role="presentation"{% if request.GET.tab == 'members' %} class="active"{% endif %}>
-            <a href="{{ object.get_absolute_url }}#members" onclick="switch_tab(this.href, reload=true)" aria-controls="members" role="tab" data-toggle="tab">
+            <a href="{{ object.get_absolute_url }}#members" onclick="switch_tab(this.href, reload=false)" aria-controls="members" role="tab" data-toggle="tab">
                 Members {% badge object.count %}
             </a>
         </li>
@@ -11,6 +11,15 @@
 
 {% block extra_tab_content %}
         <div id="members" role="tabpanel" class="tab-pane {% if not active_tab and not request.GET.tab or request.GET.tab == "members" %}active{% else %}fade{% endif %}">
+            {% if members_list_url %}
+                <div class="row">
+                    <div class="col-md-12">
+                        <div class="alert alert-success" role="alert">
+                            You can bulk-add and bulk-remove members of this group from the <a href="{{ members_list_url }}">{{ members_verbose_name_plural|bettertitle }} list view</a>.
+                        </div>
+                    </div>
+                </div>
+            {% endif %}
             <div class="row">
                 <div class="col-md-12">
                     {% include 'utilities/obj_table.html' with table=members_table table_template='panel_table.html' heading='Dynamic Group members' %}
@@ -37,31 +46,49 @@
                 <td>Content Type</td>
                 <td><span>{{ object.content_type }}</span></td>
             </tr>
+            <tr>
+                <td>Group Type</td>
+                <td><span>{{ object.get_group_type_display }}</span></td>
+            </tr>
+            <tr>
+                <td>Tenant</td>
+                <td>
+                    {% if object.tenant and object.tenant.tenant_group %}
+                        {{ object.tenant.tenant_group|hyperlinked_object }} /
+                    {% endif %}
+                    {{ object.tenant|hyperlinked_object }}
+                </td>
+            </tr>
         </table>
     </div>
 {% endblock content_left_page %}
 
 {% block content_right_page %}
-    <div class="panel panel-default">
-        <div class="panel-heading">
-            <strong>Filter</strong>
-        </div>
-        <div class="panel-body">
-            <pre>{{ object.filter | render_json }}</pre>
+    {% if object.group_type == "dynamic-filter" %}
+        <div class="panel panel-default">
+            <div class="panel-heading">
+                <strong>Filter</strong>
+            </div>
+            <div class="panel-body">
+                <pre>{{ object.filter | render_json }}</pre>
+            </div>
         </div>
-    </div>
+    {% endif %}
 {% endblock content_right_page %}
 
 {% block content_full_width_page %}
+    {% if object.group_type != "static" %}
     <div class="panel panel-default">
         <div class="panel-heading">
             <strong>Filter Query Logic</strong>
         </div>
         <div class="panel-body">
-            <span class="help-block">
-                This is a raw representation of the underlying filter that is derived
-                by aggregating the filters from all descendant groups.
-            </span>
+            {% if object.group_type == "dynamic-set" %}
+                <span class="help-block">
+                    This is a raw representation of the underlying filter that is derived
+                    by aggregating the filters from all descendant groups.
+                </span>
+            {% endif %}
             <pre>{{ raw_query }}</pre>
         </div>
     </div>
@@ -70,9 +97,11 @@
             <strong>Related Groups</strong>
         </div>
         <div class="panel-body">
-            {% include 'utilities/obj_table.html' with table=descendants_table table_template='panel_table.html' heading='Descendants' disable_pagination=True %}
-           {% include 'utilities/obj_table.html' with table=ancestors_table table_template='panel_table.html' heading='Ancestors' disable_pagination=True %}
+            {% if object.group_type == "dynamic-set" %}
+                {% include 'utilities/obj_table.html' with table=descendants_table table_template='panel_table.html' heading='Descendants' disable_pagination=True %}
+            {% endif %}
+            {% include 'utilities/obj_table.html' with table=ancestors_table table_template='panel_table.html' heading='Ancestors' disable_pagination=True %}
         </div>
     </div>
-
+    {% endif %}
 {% endblock content_full_width_page %}

nautobot/extras/templates/extras/dynamicgroup_edit.html

@@ -25,6 +25,8 @@
             {% render_field form.name %}
             {% render_field form.description %}
             {% render_field form.content_type %}
+            {% render_field form.group_type %}
+            {% render_field form.tenant %}
         </div>
     </div>
     <div class="panel panel-default">

nautobot/extras/templates/extras/job.html

@@ -28,7 +28,7 @@
     <div class="tab-content">
         <div role="tabpanel" class="tab-pane active" id="run">
             <div class="row">
-                <div class="col-md-6 col-md-offset-3">
+                <div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1">
                     {% if not perms.extras.run_job %}
                         <div class="alert alert-warning">
                             <i class="mdi mdi-alert"></i>

nautobot/extras/templates/extras/job_detail.html

@@ -115,6 +115,17 @@
                 <td>{{ object.enabled | render_boolean }}</td>
                 <td></td>
             </tr>
+            <tr>
+                <td>Job Results</td>
+                <td>
+                    {% if object.job_results.exists %}
+                        <a href="{% url 'extras:jobresult_list' %}?job_model={{ object.name | urlencode }}">{{ object.job_results.count }}</a>
+                    {% else %}
+                        {{ None|placeholder }}
+                    {% endif %}
+                </td>
+                <td></td>
+            </tr>
         </table>
     </div>
 {% endblock content_left_page %}

nautobot/extras/templates/extras/jobresult.html

@@ -66,9 +66,6 @@
 {% endblock %}
 
 {% block extra_nav_tabs %}
-    <li role="presentation">
-        <a href="#json" role="tab" data-toggle="tab">Additional Data</a>
-    </li>
     {% if result.data.output %}
         <li role="presentation">
             <a href="#output" role="tab" data-toggle="tab">Output</a>
@@ -80,79 +77,68 @@
     {% include 'extras/inc/jobresult.html' with result=result log_table=log_table %}
 {% endblock content_full_width_page %}
 
-{% block extra_tab_content %}
-    <div role="tabpanel" class="tab-pane" id="json">
-        <div class="row">
-            <div class="col-md-6">
-                <div class="panel panel-default">
-                    <div class="panel-heading">
-                        <strong>Job Positional Arguments</strong>
-                    </div>
-                    <div class="panel-body">
-                        {% include 'extras/inc/json_data.html' with data=result.task_args format="json" %}
-                    </div>
-                </div>
-                <div class="panel panel-default">
-                    <div class="panel-heading">
-                        <strong>Job Keyword Arguments</strong>
-                    </div>
-                    <div class="panel-body">
-                        {% include 'extras/inc/json_data.html' with data=result.task_kwargs format="json" %}
-                    </div>
-                </div>
-                <div class="panel panel-default">
-                    <div class="panel-heading">
-                        <strong>Job Celery Keyword Arguments</strong>
-                    </div>
-                    <div class="panel-body">
-                        {% include 'extras/inc/json_data.html' with data=result.celery_kwargs format="json" %}
-                    </div>
-                </div>
-            </div>
-            <div class="col-md-6">
-                <div class="panel panel-default">
-                    <div class="panel-heading">
-                        <strong>Return Data</strong>
-                    </div>
-                    <div class="panel-body">
-                        {% include 'extras/inc/json_data.html' with data=result.result format="json" %}
-                    </div>
-                </div>
-                <div class="panel panel-default">
-                    <div class="panel-heading">
-                        <strong>File Output(s)</strong>
-                    </div>
-                    <div class="panel-body">
-                        <ul>
-                            {% for file_proxy in result.files.all %}
-                                {% if file_proxy.file %}
-                                    <li>
-                                        <a
-                                        {% if settings.JOB_FILE_IO_STORAGE == "db_file_storage.storage.DatabaseFileStorage" %}
-                                            href="{% url "db_file_storage.download_file" %}?name={{ file_proxy.file }}"
-                                        {% else %}
-                                            href="{{ file_proxy.file.url }}"
-                                        {% endif %}
-                                            download="{{ file_proxy.name }}">
-                                            {{ file_proxy.name }}
-                                        </a>
-                                    </li>
-                                {% endif %}
-                            {% endfor %}
-                        </ul>
-                    </div>
-                </div>
-                <div class="panel panel-default">
-                    <div class="panel-heading">
-                        <strong>Traceback</strong>
-                    </div>
-                    <div class="panel-body">
-                        {% include 'extras/inc/json_data.html' with data=result.traceback format="python" %}
-                    </div>
-                </div>
-            </div>
+{% block advanced_content_left_page %}
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <strong>Job Keyword Arguments</strong>
+        </div>
+        <div class="panel-body">
+            {% include 'extras/inc/json_data.html' with data=result.task_kwargs format="json" %}
+        </div>
+    </div>
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <strong>Job Positional Arguments</strong>
+        </div>
+        <div class="panel-body">
+            {% include 'extras/inc/json_data.html' with data=result.task_args format="json" %}
+        </div>
+    </div>
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <strong>Job Celery Keyword Arguments</strong>
+        </div>
+        <div class="panel-body">
+            {% include 'extras/inc/json_data.html' with data=result.celery_kwargs format="json" %}
         </div>
     </div>
+{% endblock advanced_content_left_page %}
+{% block advanced_content_right_page %}
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <strong>Worker</strong>
+        </div>
+        <table class="table table-hover panel-body attr-table">
+            <tbody>
+                <tr>
+                    <td>Worker Hostname</td>
+                    <td>{{ result.worker }}</td>
+                </tr>
+                <tr>
+                    <td>Queue</td>
+                    <td>{{ result.celery_kwargs.queue}}</td>
+                </tr>
+                <tr>
+                    <td>Task Name</td>
+                    <td>{{ result.task_name }}</td>
+                </tr>
+                <tr>
+                    <td>Meta</td>
+                    <td>{% include 'extras/inc/json_data.html' with data=result.meta format="json" %}</td>
+                </tr>
+            </tbody>
+        </table>
+    </div>
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <strong>Traceback</strong>
+        </div>
+        <div class="panel-body">
+            {% include 'extras/inc/json_data.html' with data=result.traceback format="python" %}
+        </div>
+    </div>
+{% endblock advanced_content_right_page %}
+{% block extra_tab_content %}
     {% if result.data.output %}
         <div role="tabpanel" class="tab-pane" id="output">
             <pre>{{ result.data.output }}</pre>
@@ -160,6 +146,7 @@
     {% endif %}
 {% endblock extra_tab_content %}
 
+
 {% block javascript %}
     {{ block.super }}
     {% include 'extras/inc/jobresult_js.html' with result=result %}