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

nautobot/extras/templates/extras/job_detail.html

@@ -48,12 +48,10 @@
             <tr>
                 <td>Is Job Hook Receiver</td>
                 <td>{{ object.is_job_hook_receiver | render_boolean }}</td>
-                <td></td>
             </tr>
             <tr>
                 <td>Is Job Button Receiver</td>
                 <td>{{ object.is_job_button_receiver | render_boolean }}</td>
-                <td></td>
             </tr>
         </table>
     </div>
@@ -208,6 +206,22 @@
                     {% endif %}
                 </td>
             </tr>
+            <tr>
+                <td>Is Singleton</td>
+                <td>{{ object.is_singleton | render_boolean }}</td>
+                <td>
+                    {% if object.is_singleton_override %}
+                        <span class="text-muted">
+                            overridden; default is
+                            {% if object.installed %}
+                                {{ object.job_class.is_singleton | render_boolean }}
+                            {% else %}
+                                unknown (not currently installed)
+                            {% endif %}
+                        </span>
+                    {% endif %}
+                </td>
+            </tr>
             <tr>
                 <td>Execution Soft Time Limit</td>
                 <td>
@@ -261,10 +275,20 @@
                 </td>
             </tr>
             <tr>
-                <td>Task Queues</td>
-                <td colspan="2">
-                    {% include 'extras/inc/json_data.html' with data=object.task_queues format="json" %}
-                    {% if object.task_queues_override %}
+                <td>Job Queues</td>
+                <td>
+                    {% if object.job_queues.exists %}
+                        <ul>
+                            {% for queue in object.job_queues.all %}
+                                <li>{{ queue|hyperlinked_object }}</li>
+                            {% endfor %}
+                        </ul>
+                    {% else %}
+                        {{ None|placeholder }}
+                    {% endif %}
+                </td>
+                <td>
+                    {% if object.job_queues_override %}
                         <span class="text-muted">
                             overridden; default is:<br>
                             {% if object.installed %}
@@ -276,6 +300,28 @@
                     {% endif %}
                 </td>
             </tr>
+            <tr>
+                <td>Default Job Queue</td>
+                <td>
+                    {{ object.default_job_queue|hyperlinked_object }}
+                </td>
+                <td>
+                    {% if object.default_job_queue_override %}
+                        <span class="text-muted">
+                            overridden; default is:
+                            {% if object.installed %}
+                                {% if object.job_class.task_queues|length > 1 %}
+                                    {{ object.job_class.task_queues.0 }}
+                                {% else %}
+                                    {{ None|placeholder }}
+                                {% endif %}
+                            {% else %}
+                                unknown (not currently installed)
+                            {% endif %}
+                        </span>
+                    {% endif %}
+                </td>
+            </tr>
         </table>
     </div>
 {% endblock content_right_page %}

nautobot/extras/templates/extras/job_edit.html

@@ -92,7 +92,9 @@
             {% include "extras/inc/overridable_field.html" with field=form.soft_time_limit override_field=form.soft_time_limit_override %}
             {% include "extras/inc/overridable_field.html" with field=form.time_limit override_field=form.time_limit_override %}
             {% include "extras/inc/overridable_field.html" with field=form.has_sensitive_variables override_field=form.has_sensitive_variables_override %}
-            {% include "extras/inc/overridable_field.html" with field=form.task_queues override_field=form.task_queues_override %}
+            {% include "extras/inc/overridable_field.html" with field=form.job_queues override_field=form.job_queues_override %}
+            {% include "extras/inc/overridable_field.html" with field=form.default_job_queue override_field=form.default_job_queue_override %}
+            {% include "extras/inc/overridable_field.html" with field=form.is_singleton override_field=form.is_singleton_override %}
         </div>
     </div>
     {% include 'inc/extras_features_edit_form_fields.html' %}
@@ -133,7 +135,9 @@
             } else {
                 /* Do we have a job class object to derive properties from? */
                 if (job_class_properties != "") {
-                    field.val(job_class_properties[field_name]);
+                    if (field_name != "job_queues") {
+                        field.val(job_class_properties[field_name]);
+                    }
                 } else if (field_name != "description") {
                     /* No, we don't - it's probably not installed */
                     field.val(field.attr("value"));

nautobot/extras/templates/extras/job_list.html

@@ -3,11 +3,6 @@
 
 {% block extra_styles %}
     <style>
-        .accordion-toggle {
-            font-size: 14px;
-            font-weight: 700;
-        }
-
         tr a.job_run .btn {
             margin: -4px 10px 0 0;
         }
@@ -37,7 +32,7 @@
         </a>
     </div>
 
-    <button type="button" class="btn btn-default" id="accordion-toggle-all"{% if display == "tiles" %} disabled="disabled"{% endif %}>Collapse All</button>
+    <button type="button" class="btn btn-default accordion-toggle-all"{% if display == "tiles" %} disabled="disabled"{% endif %}>Collapse All</button>
 {% endblock %}
 
 {% block table_config_button %}
@@ -55,7 +50,7 @@
             $(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').on('click', function () {
+        $('.accordion-toggle-all').on('click', function () {
 
            if ($(this).data("lastState") === null || $(this).data("lastState") === 1) {
                 $('.collapse').collapse('show');

nautobot/extras/templates/extras/jobqueue_retrieve.html

@@ -0,0 +1,36 @@
+{% extends 'generic/object_retrieve.html' %}
+{% load helpers %}
+
+{% block content_left_page %}
+        <div class="panel panel-default">
+            <div class="panel-heading">
+                <strong>Job Queue</strong>
+            </div>
+
+            <table class="table table-hover panel-body attr-table">
+                <tr>
+                    <td>Name</td>
+                    <td>
+                        {{ object.name }}
+                    </td>
+                </tr>
+                <tr>
+                    <td>Queue Type</td>
+                    <td>
+                        {{ object.get_queue_type_display }}
+                    </td>
+                </tr>
+                <tr>
+                    <td>Description</td>
+                    <td>
+                        {{ object.description|placeholder }}
+                    </td>
+                </tr>
+                {% include 'inc/tenant_table_row.html' %}
+            </table>
+        </div>
+{% endblock %}
+
+{% block content_full_width_page %}
+    {% include 'panel_table.html' with table=jobs_table heading='Assigned Jobs' %}
+{% endblock %}

nautobot/extras/templates/extras/marketplace.html

@@ -0,0 +1,296 @@
+{% extends "base.html" %}
+{% load helpers %}
+{% load static %}
+
+{% block extra_styles %}
+<style>
+    .tile-header {
+        display: block;
+        min-height: 85px;  /* allow room for two rows of tags */
+    }
+
+    .tile-header h2 {
+        margin-bottom: 5px;
+        margin-top: 0;
+    }
+
+    .tile-actions-placeholder {
+        height: 30px;
+        margin-left: 3px;
+        width: 35px;
+    }
+
+    .tile-description {
+        margin-top: 10px;
+        min-height: 72px;  /* allow room for three rows of text */
+    }
+
+    .tile-actions {
+        position: absolute;
+        right: 21px;
+        top: 21px;
+    }
+
+    .tile-actions .btn {
+        padding: 3px 8px;  /* Enlarge action buttons to 32px x 32px */
+    }
+
+    .app-details {
+        column-gap: 20px;
+        display: flex;
+        flex-wrap: wrap;
+    }
+
+    .app-details dt {
+        margin-top: 20px;
+    }
+
+    .app-details ul {
+        list-style: none;
+        padding: 0;
+    }
+
+    .app-details > :last-child {
+        flex: 1;
+    }
+</style>
+{% endblock %}
+
+{% block content %}
+    <div class="row noprint">
+        <div class="col-md-12">
+            <ol class="breadcrumb">
+                {% block breadcrumbs %}
+                    <li><a href="{% url 'apps:apps_marketplace' %}">Apps Marketplace</a></li>
+                {% endblock breadcrumbs %}
+            </ol>
+        </div>
+    </div>
+
+    <div class="pull-right noprint">
+        <a class="btn btn-primary" href="{% url 'apps:apps_list' %}">See Installed Apps</a>
+    </div>
+
+    <h1>{% block title %}Apps Marketplace{% endblock %}</h1>
+
+    <div class="row">
+        <div class="col-md-12">
+            <section class="tiles">
+                {% for app in apps %}
+                    <div style="position: relative;">
+                        <a class="tile clickable" data-app="{{ app.package_name }}" href="?app={{ app.package_name }}">
+                            <header class="tile-header">
+                                <img
+                                    alt="{{ app.name }}"
+                                    src="{% if app.icon|default:None != None %}{{ app.icon }}{% else %}{% static 'img/nautobot_icon_192x192.png' %}{% endif %}"
+                                    height="64"
+                                    width="64"
+                                />
+
+                                <!--
+                                   Occupy `.tile-actions` dedicated space with `.tile-actions-placeholder`. See comment
+                                   above `.tile-actions` element for detailed explanation of this solution and why it
+                                   is required here.
+                                -->
+                                <div aria-hidden="true" class="tile-actions-placeholder pull-right"></div>
+
+                                <h2>{{ app.name }}</h2>
+
+                                {% for use_case in app.use_cases %}
+                                    <label class="label label-default">{{ use_case }}</label>
+                                {% endfor %}
+                            </header>
+
+                            <p class="tile-description">{{ app.headline }}</p>
+
+                            <footer class="tile-footer">
+                                <div>By: {{ app.author }}</div>
+                                <div>
+                                    {% if app.installed %}<label class="label label-success">Installed</label>{% endif %}
+                                    <label class="label label-transparent">{{ app.availability }}</label>
+                                </div>
+                            </footer>
+                        </a>
+
+                        <!--
+                            Place app action links outside the "main" `a` tile to adhere to HTML rule that forbid
+                            nesting anchors within anchors. Absolutely position the actions to make them appear inside
+                            the tile though. Fill their dedicated space with `.tile-actions-placeholder` element.
+                        -->
+                        <div class="tile-actions">
+                            {% if app.docs|default:None != None %}
+                                <a href="{{ app.docs }}" class="btn btn-info btn-xs" target="_blank" title="Docs">
+                            {% else %}
+                                <a href="" class="btn btn-info btn-xs disabled" target="_blank" title="No docs provided">
+                            {% endif %}
+                                <i class="mdi mdi-book-open-page-variant"></i>
+                            </a>
+                        </div>
+                    </div>
+
+                    <div class="modal fade" tabindex="-1" id="modal-{{ app.package_name }}">
+                        <div class="modal-dialog modal-lg" 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">
+                                        {{ app.name }}
+                                        {% if app.installed %}<label class="label label-success">Installed</label>{% endif %}
+                                    </h4>
+                                </div>
+
+                                <div class="modal-body">
+                                    <div class="app-details">
+                                        <div>
+                                            <img
+                                                alt="{{ app.name }}"
+                                                src="{% if app.icon|default:None != None %}{{ app.icon }}{% else %}{% static 'img/nautobot_icon_192x192.png' %}{% endif %}"
+                                                height="64"
+                                                width="64"
+                                            />
+
+                                            <dl>
+                                                <dt class="text-muted text-uppercase">By</dt>
+                                                <dd>{{ app.author }}</dd>
+
+                                                <dt class="text-muted text-uppercase">License</dt>
+                                                <dd><label class="label label-transparent">{{ app.availability }}</label></dd>
+
+                                                {% if app.requires|length > 0 %}
+                                                    <dt class="text-muted text-uppercase">Requirements</dt>
+                                                    <dd>
+                                                        <ul>
+                                                            {% for requirement in app.requires %}
+                                                                {% for required_app in apps %}
+                                                                    {% if required_app.package_name == requirement %}
+                                                                        <li>
+                                                                            <a
+                                                                                data-app="{{ required_app.package_name }}"
+                                                                                href="?app={{ required_app.package_name }}"
+                                                                            >
+                                                                                {{ required_app.name }}
+                                                                            </a>
+                                                                        </li>
+                                                                    {% endif %}
+                                                                {% endfor %}
+                                                            {% endfor %}
+                                                        </ul>
+                                                    </dd>
+                                                {% endif %}
+
+                                                <dt class="text-muted text-uppercase">Package name</dt>
+                                                <dd><code>{{ app.package_name }}</code></dd>
+                                            </dl>
+                                        </div>
+
+                                        <div>
+                                            <h5>{{ app.headline }}</h5>
+
+                                            <p>{{ app.description|render_markdown }}</p>
+
+                                            {% if app.docs|default:None != None %}
+                                                <p>
+                                                    <span>
+                                                        Docs:
+                                                        <a href="{{ app.docs }}" target="_blank">{{ app.docs }}</a>
+                                                    </span>
+                                                </p>
+                                            {% endif %}
+
+                                            {% if app.availability == "NTC License" %}
+                                                <p>
+                                                    <strong>
+                                                        This Nautobot App requires a license to use.
+                                                        <a href="https://networktocode.com/contact/" target="_blank">
+                                                            Reach out to Network to Code
+                                                        </a>
+                                                        for more information.
+                                                    </strong>
+                                                </p>
+                                            {% endif %}
+
+                                            <div>
+                                                {% for use_case in app.use_cases %}
+                                                    <label class="label label-default">{{ use_case }}</label>
+                                                {% endfor %}
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+
+                                <div class="modal-footer">
+                                    <button class="btn btn-primary" data-dismiss="modal" type="button">
+                                        Done
+                                    </button>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                {% endfor %}
+            </section>
+            <div class="clearfix"></div>
+        </div>
+    </div>
+{% endblock %}
+
+{% block javascript %}
+{{ block.super }}
+<script>
+    (function () {
+        let previousApp = new URLSearchParams(window.location.search).get("app");
+        function toggleAppModal(app, action) {
+            if (app) {
+                const appModal = app ? document.querySelector(`#modal-${app}`) : null;
+                const isShown = $(appModal).data("bs.modal")?.isShown;
+
+                if (action === "hide" ? isShown : !isShown) {
+                    $(appModal).modal(action);
+                }
+
+                previousApp = action === "hide" ? null : app;
+            }
+        }
+
+        const appTilesContainer = document.querySelector(".tiles");
+        const appModals = appTilesContainer.querySelectorAll(".modal");
+        const appModalLinks = appTilesContainer.querySelectorAll("a[data-app]");
+
+        for (const appModal of appModals) {
+            $(appModal).on("hide.bs.modal", function () {
+                const searchParams = new URLSearchParams(window.location.search);
+                if (searchParams.get('app') === appModal.id.replace(/^modal-/, '')) {
+                    searchParams.delete('app');
+                    const nextSearch = searchParams.size > 0 ? `?${searchParams.toString()}` : '';
+                    const nextURL = `${window.location.pathname}${nextSearch}${window.location.hash}`;
+                    history.pushState(history.state, "", nextURL);
+                }
+
+                previousApp = null;
+            });
+        }
+
+        for (const appModalLink of appModalLinks) {
+            appModalLink.addEventListener("click", (event) => {
+                event.preventDefault();
+                history.pushState(history.state, "", appModalLink.href);
+
+                toggleAppModal(previousApp, "hide");
+                toggleAppModal(new URL(appModalLink.href).searchParams.get("app"), "show");
+            });
+        }
+
+        window.addEventListener("popstate", function onPopState() {
+            const searchParams = new URLSearchParams(window.location.search);
+            const currentApp = searchParams.get("app");
+
+            toggleAppModal(previousApp, 'hide');
+            toggleAppModal(currentApp, 'show');
+        });
+
+        toggleAppModal(new URLSearchParams(window.location.search).get("app"), "show");
+    })();
+</script>
+{% endblock javascript %}

nautobot/extras/templates/extras/plugin_detail.html

@@ -7,27 +7,32 @@
             <ol class="breadcrumb">
                 {% block breadcrumbs %}
                     <li><a href="{% url 'apps:apps_list' %}">Installed Apps</a></li>
-                    <li><a href="{% url 'apps:app_detail' app=object.name %}">{{ object.verbose_name | bettertitle }}</a></li>
+                    <li><a href="{% url 'apps:app_detail' app=app_data.package %}">{{ app_data.name | bettertitle }}</a></li>
                 {% endblock breadcrumbs %}
             </ol>
         </div>
     </div>
     <div class="pull-right noprint">
         {% block buttons %}
-            {% if object.home_view_name %}
-                <a href="{% url object.home_view_name %}" class="btn btn-success">
+            {% if app_data.home_url %}
+                <a href="{% url app_data.home_url %}" class="btn btn-primary">
                     <i class="mdi mdi-home"></i> App Home
                 </a>
             {% endif %}
-            {% if object.config_view_name %}
-                <a href="{% url object.config_view_name %}" class="btn btn-warning">
+            {% if app_data.config_url %}
+                <a href="{% url app_data.config_url %}" class="btn btn-warning">
                     <i class="mdi mdi-cog"></i> App Configuration
                 </a>
             {% endif %}
+            {% if app_data.docs_url %}
+                <a href="{% url app_data.docs_url %}" class="btn btn-info">
+                    <i class="mdi mdi-cog"></i> App Documentation
+                </a>
+            {% endif %}
         {% endblock buttons %}
     </div>
     {% block masthead %}
-        <h1>{% block title %}{{ object.verbose_name | bettertitle }}{% endblock %}</h1>
+        <h1>{% block title %}{{ app_data.name | bettertitle }}{% endblock %}</h1>
     {% endblock masthead %}
 {% endblock header %}
 
@@ -42,25 +47,37 @@
                     <table class="table table-hover panel-body attr-table">
                         <tr>
                             <td>Package Name</td>
-                            <td><code>{{ object.name }}</code></td>
+                            <td><code>{{ app_data.package }}</code></td>
+                        </tr>
+                        <tr>
+                            <td>Headline</td>
+                            <td>{{ app_data.headline }}</td>
                         </tr>
+                        {% if app_data.description and app_data.headline != app_data.description %}
                         <tr>
                             <td>Description</td>
-                            <td>{{ object.description }}</td>
+                            <td>{{ app_data.description }}</td>
                         </tr>
+                        {% endif %}
                         <tr>
                             <td>Version</td>
-                            <td>{{ object.version }}</td>
+                            <td>v{{ app_data.version }}</td>
                         </tr>
                         <tr>
-                            <td>Author</td>
+                            <td>By</td>
                             <td>
-                                {{ object.author | placeholder }}
-                                {% if object.author_email %}
-                                    (<a href="mailto:{{ object.author_email }}">{{ object.author_email }}</a>)
+                                {{ app_data.author | placeholder }}
+                                {% if app_data.author_email %}
+                                    (<a href="mailto:{{ app_data.author_email }}">{{ app_data.author_email }}</a>)
                                 {% endif %}
                             </td>
                         </tr>
+                        {% if app_data.availability %}
+                        <tr>
+                            <td>License</td>
+                            <td><label class="label label-transparent">{{ app_data.availability }}</label></td>
+                        </tr>
+                        {% endif %}
                     </table>
                 </div>
                 <div class="panel panel-default">
@@ -70,11 +87,11 @@
                     <table class="table table-hover panel-body attr-table">
                         <tr>
                             <td>Min Nautobot Version</td>
-                            <td>{{ object.min_version | placeholder }}</td>
+                            <td>v{{ object.min_version | placeholder }}</td>
                         </tr>
                         <tr>
                             <td>Max Nautobot Version</td>
-                            <td>{{ object.max_version | placeholder }}</td>
+                            <td>v{{ object.max_version | placeholder }}</td>
                         </tr>
                     </table>
                 </div>

nautobot/extras/templates/extras/plugins_list.html

@@ -3,10 +3,35 @@
 {% load static %}
 
 {% block content %}
+    <div class="row noprint">
+        <div class="col-md-12">
+            <ol class="breadcrumb">
+                {% block breadcrumbs %}
+                    <li><a href="{% url 'apps:apps_list' %}">Installed Apps</a></li>
+                {% endblock breadcrumbs %}
+            </ol>
+        </div>
+    </div>
+
     <div class="pull-right noprint">
+        <div class="btn-group">
+            <a class="btn btn-default set-apps-display" data-display="tiles" href="" title="Tiles">
+                <i class="mdi mdi-view-grid{% if display == "list" %}-outline{% endif %}"></i>
+            </a>
+            <a class="btn btn-default set-apps-display" data-display="list" href="" title="List">
+                <i class="mdi mdi-view-sequential{% if display == "tiles" %}-outline{% endif %}"></i>
+            </a>
+        </div>
+
         {% if request.user.is_authenticated and table_config_form %}
-            {% table_config_button table table_name="ObjectTable" %}
+            {% if display == "tiles" %}
+                {% table_config_button table table_name="ObjectTable" disabled=True %}
+            {% else %}
+                {% table_config_button table table_name="ObjectTable" %}
+            {% endif %}
         {% endif %}
+
+        <a class="btn btn-primary" href="{% url 'apps:apps_marketplace' %}">Visit Apps Marketplace</a>
     </div>
 
     <h1>{% block title %}Installed Apps{% endblock %}</h1>
@@ -30,4 +55,13 @@
 {% block javascript %}
 {{ block.super }}
 <script src="{% static 'js/tableconfig.js' %}"></script>
+
+<script>
+    // Set display anchor links without losing other potentially active query params such as applied filters.
+    [...document.querySelectorAll('.set-apps-display')].forEach(button => {
+        const queryParams = new URLSearchParams(window.location.search);
+        queryParams.set('display', button.dataset.display);
+        button.setAttribute('href', `?${queryParams.toString()}`);
+    });
+</script>
 {% endblock %}