12510 legacy jobs

netbox/extras/views.py

@@ -1163,11 +1163,23 @@ class ScriptResultView(ContentTypePermissionRequiredMixin, View):
         module = job.object
         script = module.scripts[job.name]()
 
+        if 'logs' in job.data:
+            legacy_script = False
+            legacy_report = False
+        elif 'log' in job.data:
+            legacy_script = True
+            legacy_report = False
+        else:
+            legacy_script = False
+            legacy_report = True
+
         # If this is an HTMX request, return only the result HTML
         if request.htmx:
             response = render(request, 'extras/htmx/script_result.html', {
                 'script': script,
                 'job': job,
+                'legacy_script': legacy_script,
+                'legacy_report': legacy_report,
             })
             if job.completed or not job.started:
                 response.status_code = 286
@@ -1176,6 +1188,8 @@ class ScriptResultView(ContentTypePermissionRequiredMixin, View):
         return render(request, 'extras/script_result.html', {
             'script': script,
             'job': job,
+            'legacy_script': legacy_script,
+            'legacy_report': legacy_report,
         })
 
 

netbox/templates/extras/htmx/legacy_report_result.html

@@ -0,0 +1,81 @@
+{% load humanize %}
+{% load helpers %}
+{% load i18n %}
+
+<p>
+  {% if job.started %}
+    {% trans "Started" %}: <strong>{{ job.started|annotated_date }}</strong>
+  {% elif job.scheduled %}
+    {% trans "Scheduled for" %}: <strong>{{ job.scheduled|annotated_date }}</strong> ({{ job.scheduled|naturaltime }})
+  {% else %}
+    {% trans "Created" %}: <strong>{{ job.created|annotated_date }}</strong>
+  {% endif %}
+  {% if job.completed %}
+    {% trans "Duration" %}: <strong>{{ job.duration }}</strong>
+  {% endif %}
+  <span id="pending-result-label">{% badge job.get_status_display job.get_status_color %}</span>
+</p>
+{% if job.completed %}
+  <div class="card">
+    <h5 class="card-header">{% trans "Report Methods" %}</h5>
+    <div class="card-body">
+      <table class="table table-hover">
+        {% for method, data in job.data.items %}
+          <tr>
+            <td class="font-monospace"><a href="#{{ method }}">{{ method }}</a></td>
+            <td class="text-end report-stats">
+              <span class="badge bg-success">{{ data.success }}</span>
+              <span class="badge bg-info">{{ data.info }}</span>
+              <span class="badge bg-warning">{{ data.warning }}</span>
+              <span class="badge bg-danger">{{ data.failure }}</span>
+            </td>
+          </tr>
+        {% endfor %}
+      </table>
+    </div>
+  </div>
+  <div class="card">
+    <h5 class="card-header">{% trans "Report Results" %}</h5>
+    <div class="card-body">
+      <table class="table table-hover report">
+        <thead>
+          <tr class="table-headings">
+            <th>{% trans "Time" %}</th>
+            <th>{% trans "Level" %}</th>
+            <th>{% trans "Object" %}</th>
+            <th>{% trans "Message" %}</th>
+          </tr>
+        </thead>
+        <tbody>
+          {% for method, data in job.data.items %}
+            <tr>
+              <th colspan="4" style="font-family: monospace">
+                <a name="{{ method }}"></a>{{ method }}
+              </th>
+            </tr>
+            {% for time, level, obj, url, message in data.log %}
+              <tr class="{% if level == 'failure' %}danger{% elif level %}{{ level }}{% endif %}">
+                <td>{{ time }}</td>
+                <td>
+                  <label class="badge bg-{% if level == 'failure' %}danger{% else %}{{ level }}{% endif %}">{{ level|title }}</label>
+                </td>
+                <td>
+                  {% if obj and url %}
+                    <a href="{{ url }}">{{ obj }}</a>
+                  {% elif obj %}
+                    {{ obj }}
+                  {% else %}
+                    {{ ''|placeholder }}
+                  {% endif %}
+                </td>
+                <td class="rendered-markdown">{{ message|markdown }}</td>
+              </tr>
+            {% endfor %}
+          {% endfor %}
+        </tbody>
+      </table>
+    </div>
+  </div>
+{% elif job.started %}
+  {% include 'extras/inc/result_pending.html' %}
+{% endif %}

netbox/templates/extras/htmx/legacy_script_result.html

@@ -0,0 +1,58 @@
+{% load humanize %}
+{% load helpers %}
+{% load log_levels %}
+{% load i18n %}
+
+<p>
+  {% if job.started %}
+    {% trans "Started" %}: <strong>{{ job.started|annotated_date }}</strong>
+  {% elif job.scheduled %}
+    {% trans "Scheduled for" %}: <strong>{{ job.scheduled|annotated_date }}</strong> ({{ job.scheduled|naturaltime }})
+  {% else %}
+    {% trans "Created" %}: <strong>{{ job.created|annotated_date }}</strong>
+  {% endif %}
+  {% if job.completed %}
+    {% trans "Duration" %}: <strong>{{ job.duration }}</strong>
+  {% endif %}
+  <span id="pending-result-label">{% badge job.get_status_display job.get_status_color %}</span>
+</p>
+{% if job.completed %}
+  <div class="card mb-3">
+    <h5 class="card-header">{% trans "Script Log" %}</h5>
+    <div class="card-body">
+      <table class="table table-hover panel-body">
+        <tr>
+          <th>{% trans "Line" %}</th>
+          <th>{% trans "Level" %}</th>
+          <th>{% trans "Message" %}</th>
+        </tr>
+        {% for log in job.data.log %}
+          <tr>
+            <td>{{ forloop.counter }}</td>
+            <td>{% log_level log.status %}</td>
+            <td class="rendered-markdown">{{ log.message|markdown }}</td>
+          </tr>
+        {% empty %}
+          <tr>
+            <td colspan="3" class="text-center text-muted">
+              {% trans "No log output" %}
+            </td>
+          </tr>
+        {% endfor %}
+      </table>
+    </div>
+    {% if execution_time %}
+      <div class="card-footer text-end text-muted">
+        <small>{% trans "Exec Time" %}: {{ execution_time|floatformat:3 }} {% trans "seconds" context "Unit of time" %}</small>
+      </div>
+    {% endif %}
+  </div>
+  <h4>{% trans "Output" %}</h4>
+  {% if job.data.output %}
+    <pre class="block">{{ job.data.output }}</pre>
+  {% else %}
+    <p class="text-muted">{% trans "None" %}</p>
+  {% endif %}
+{% elif job.started %}
+  {% include 'extras/inc/result_pending.html' %}
+{% endif %}

netbox/templates/extras/script_result.html

@@ -44,7 +44,13 @@
   <div role="tabpanel" class="tab-pane active" id="log">
     <div class="row">
       <div class="col col-md-12"{% if not job.completed %} hx-get="{% url 'extras:script_result' job_pk=job.pk %}" hx-trigger="load delay:0.5s, every 5s"{% endif %}>
+        {% if legacy_script %}
+          {% include 'extras/htmx/legacy_script_result.html' %}
+        {% elif legacy_report %}
+          {% include 'extras/htmx/legacy_report_result.html' %}
+        {% else %}
           {% include 'extras/htmx/script_result.html' %}
+        {% endif %}
       </div>
     </div>
   </div>