14729 background task delete

netbox/core/urls.py

@@ -29,6 +29,7 @@ urlpatterns = (
     path('background-queues/', views.BackgroundQueueListView.as_view(), name='background_queue_list'),
     path('background-queues/<int:queue_index>/<str:status>/', views.BackgroundTaskListView.as_view(), name='background_task_list'),
     path('background-tasks/<str:job_id>/', views.BackgroundTaskDetailView.as_view(), name='background_task'),
+    path('background-tasks/<str:job_id>/delete/', views.BackgroundTaskDeleteView.as_view(), name='background_task_delete'),
     path('background-workers/<int:queue_index>/', views.WorkerListView.as_view(), name='worker_list'),
     path('background-worker/<str:key>/', views.WorkerDetailView.as_view(), name='worker'),
 

netbox/core/views.py

@@ -4,6 +4,7 @@ from django.contrib import messages
 from django.contrib.auth.mixins import UserPassesTestMixin
 from django.core.cache import cache
 from django.http import HttpResponseForbidden, Http404
+from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
 from django_rq.queues import get_queue_by_index, get_redis_connection
 from django_rq.settings import QUEUES_MAP, QUEUES_LIST
@@ -27,6 +28,7 @@ from rq.registry import (
 )
 from rq.worker import Worker
 from rq.worker_registration import clean_worker_registry
+from utilities.forms import ConfirmationForm
 from utilities.htmx import is_embedded, is_htmx
 from utilities.utils import count_related
 from utilities.views import ContentTypePermissionRequiredMixin, register_model_view
@@ -418,6 +420,49 @@ class BackgroundTaskDetailView(UserPassesTestMixin, View):
         })
 
 
+class BackgroundTaskDeleteView(UserPassesTestMixin, View):
+    template_name = 'core_background_task_delete.html'
+
+    def test_func(self):
+        return self.request.user.is_staff
+
+    def get(self, request, job_id):
+        if not is_htmx(request):
+            return redirect('home')
+
+        form = ConfirmationForm(initial=request.GET)
+
+        return render(request, 'core/htmx/delete_form.html', {
+            'object_type': 'background task',
+            'object_name': job_id,
+            'form': form,
+            'form_url': reverse('core:background_task_delete', kwargs={'job_id': job_id})
+        })
+
+    def post(self, request, job_id):
+        form = ConfirmationForm(request.POST)
+
+        if form.is_valid():
+            # all the RQ queues should use the same connection
+            config = QUEUES_LIST[0]
+            try:
+                job = RQ_Job.fetch(job_id, connection=get_redis_connection(config['connection_config']),)
+            except NoSuchJobError:
+                raise Http404(_("Job {job_id} not found").format(job_id=job_id))
+
+            queue_index = QUEUES_MAP[job.origin]
+            queue = get_queue_by_index(queue_index)
+
+            # Remove job id from queue and delete the actual job
+            queue.connection.lrem(queue.key, 0, job.id)
+            job.delete()
+            messages.success(request, f'Deleted job {job_id}')
+        else:
+            messages.error(request, f'Error deleting job: {form.errors[0]}')
+
+        return redirect(reverse('core:background_queue_list'))
+
+
 class WorkerDetailView(UserPassesTestMixin, View):
 
     def test_func(self):

netbox/templates/core/background_task.html

@@ -1,5 +1,6 @@
 {% extends 'generic/object.html' %}
 {% load i18n %}
+{% load buttons %}
 {% load helpers %}
 {% load render_table from django_tables2 %}
 
@@ -13,10 +14,18 @@
 {% block object_identifier %}{% endblock %}
 
 {% block controls %}
-  <div class="controls">
+  <div class="btn-list mb-2">
-    <div class="control-group">
+    {% url 'core:background_task_delete' job_id=job.id as delete_url %}
-      {% block extra_controls %}{% endblock %}
+    {% include "buttons/delete.html" with url=delete_url %}
-    </div>
+    <a href="#"
+      hx-get="{% url 'extras:dashboardwidget_add' %}"
+      hx-target="#htmx-modal-content"
+      data-bs-toggle="modal"
+      data-bs-target="#htmx-modal"
+      class="btn btn-primary"
+    >
+      <i class="mdi mdi-sync"></i> {% trans "Requeue" %}
+    </a>
   </div>
 {% endblock controls %}