From 61c2d2a36a8577b39654cd7ed3b56eba71dcd465 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 1 Nov 2022 18:45:03 -0700
Subject: [PATCH 1/4] Use elided page range on user admin view

---
 bookwyrm/views/admin/user_admin.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/views/admin/user_admin.py b/bookwyrm/views/admin/user_admin.py
index c6827dcb7..4611a388c 100644
--- a/bookwyrm/views/admin/user_admin.py
+++ b/bookwyrm/views/admin/user_admin.py
@@ -10,7 +10,7 @@ from bookwyrm import forms, models
 from bookwyrm.settings import PAGE_LENGTH
 
 
-# pylint: disable= no-self-use
+# pylint: disable=no-self-use
 @method_decorator(login_required, name="dispatch")
 @method_decorator(
     permission_required("bookwyrm.moderate_user", raise_exception=True),
@@ -55,8 +55,12 @@ class UserAdminList(View):
             users = users.order_by(sort)
 
         paginated = Paginator(users, PAGE_LENGTH)
+        page = paginated.get_page(request.GET.get("page"))
         data = {
-            "users": paginated.get_page(request.GET.get("page")),
+            "users": page,
+            "page_range": paginated.get_elided_page_range(
+                page.number, on_each_side=2, on_ends=1
+            ),
             "sort": sort,
             "server": server,
             "status": status,

From 6eab1fdd6d97fa05e0d307627f06aa3d0ebb3b5a Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 1 Nov 2022 18:59:04 -0700
Subject: [PATCH 2/4] Adds import admin view

---
 bookwyrm/models/import_job.py            |  9 +++
 bookwyrm/templates/settings/imports.html | 71 ++++++++++++++++++++++++
 bookwyrm/templates/settings/layout.html  |  6 ++
 bookwyrm/urls.py                         |  3 +
 bookwyrm/views/__init__.py               |  1 +
 bookwyrm/views/admin/imports.py          | 33 +++++++++++
 6 files changed, 123 insertions(+)
 create mode 100644 bookwyrm/templates/settings/imports.html
 create mode 100644 bookwyrm/views/admin/imports.py

diff --git a/bookwyrm/models/import_job.py b/bookwyrm/models/import_job.py
index 556f133f9..7547cfcd2 100644
--- a/bookwyrm/models/import_job.py
+++ b/bookwyrm/models/import_job.py
@@ -48,6 +48,15 @@ class ImportJob(models.Model):
         """items that haven't been processed yet"""
         return self.items.filter(fail_reason__isnull=True, book__isnull=True)
 
+    @property
+    def item_count(self):
+        """How many books do you want to import???"""
+        return self.items.count()
+
+    def pending_item_count(self):
+        """And how many pending items??"""
+        return self.pending_items.count()
+
 
 class ImportItem(models.Model):
     """a single line of a csv being imported"""
diff --git a/bookwyrm/templates/settings/imports.html b/bookwyrm/templates/settings/imports.html
new file mode 100644
index 000000000..b5936abba
--- /dev/null
+++ b/bookwyrm/templates/settings/imports.html
@@ -0,0 +1,71 @@
+{% extends 'settings/layout.html' %}
+{% load i18n %}
+{% load utilities %}
+
+{% block title %}{% trans "Imports" %}{% endblock %}
+
+{% block header %}
+{% trans "Imports" %}
+{% endblock %}
+
+{% block panel %}
+
+<div class="block">
+    <div class="tabs">
+        <ul>
+            {% url 'settings-imports' as url %}
+            <li {% if request.path in url %}class="is-active" aria-current="page"{% endif %}>
+                <a href="{{ url }}">{% trans "Active" %}</a>
+            </li>
+            {% url 'settings-imports' status="complete" as url %}
+            <li {% if url in request.path %}class="is-active" aria-current="page"{% endif %}>
+                <a href="{{ url }}">{% trans "Completed" %}</a>
+            </li>
+        </ul>
+    </div>
+</div>
+
+<div class="table-container block content">
+    <div class="notification is-warning">
+        <p>{% trans "Marking an import as complete will <em>not</em> stop it." %}</p>
+    </div>
+    <table class="table is-striped is-fullwidth">
+        <tr>
+            {% url 'settings-imports' as url %}
+            <th>
+                {% trans "ID" %}
+            </th>
+            <th>
+                {% trans "User" %}
+            </th>
+            <th>
+                {% trans "Date Created" %}
+            </th>
+            <th>
+                {% trans "Items" %}
+            </th>
+            <th>
+                {% trans "Pending items" %}
+            </th>
+            <th>{% trans "Actions" %}</th>
+        </tr>
+        {% for import in imports %}
+        <tr>
+            <td>{{ import.id }}</td>
+            <td class="overflow-wrap-anywhere">
+                <a href="{% url 'settings-user' user.id %}">{{ import.user|username }}</a>
+            </td>
+            <td>{{ import.created_date }}</td>
+            <td>{{ import.item_count }}</td>
+            <td>{{ import.pending_item_count }}</td>
+            <td>
+                <button class="button is-danger">{% trans "Mark as complete" %}</button>
+            </td>
+        </tr>
+        {% endfor %}
+    </table>
+</div>
+
+{% include 'snippets/pagination.html' with page=users path=request.path %}
+{% endblock %}
+
diff --git a/bookwyrm/templates/settings/layout.html b/bookwyrm/templates/settings/layout.html
index ffb21d4a6..f195bf754 100644
--- a/bookwyrm/templates/settings/layout.html
+++ b/bookwyrm/templates/settings/layout.html
@@ -76,6 +76,12 @@
         {% endif %}
         {% if perms.edit_instance_settings %}
         <h2 class="menu-label">{% trans "System" %}</h2>
+        <ul class="menu-list">
+            <li>
+                {% url 'settings-imports' as url %}
+                <a href="{{ url }}"{% if url in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Imports" %}</a>
+            </li>
+        </ul>
         <ul class="menu-list">
             <li>
                 {% url 'settings-celery' as url %}
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index 3838619e7..1f2efa5f3 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -291,6 +291,9 @@ urlpatterns = [
         views.Report.as_view(),
         name="report-link",
     ),
+    re_path(
+        r"^settings/imports/(?P<status>(complete|active))?/?$", views.ImportList.as_view(), name="settings-imports"
+    ),
     re_path(
         r"^settings/celery/?$", views.CeleryStatus.as_view(), name="settings-celery"
     ),
diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py
index f6ed9f4f5..dadb813a8 100644
--- a/bookwyrm/views/__init__.py
+++ b/bookwyrm/views/__init__.py
@@ -10,6 +10,7 @@ from .admin.federation import Federation, FederatedServer
 from .admin.federation import AddFederatedServer, ImportServerBlocklist
 from .admin.federation import block_server, unblock_server, refresh_server
 from .admin.email_blocklist import EmailBlocklist
+from .admin.imports import ImportList
 from .admin.ip_blocklist import IPBlocklist
 from .admin.invite import ManageInvites, Invite, InviteRequest
 from .admin.invite import ManageInviteRequests, ignore_invite_request
diff --git a/bookwyrm/views/admin/imports.py b/bookwyrm/views/admin/imports.py
new file mode 100644
index 000000000..25fc0c77f
--- /dev/null
+++ b/bookwyrm/views/admin/imports.py
@@ -0,0 +1,33 @@
+""" manage imports """
+from django.contrib.auth.decorators import login_required, permission_required
+from django.core.paginator import Paginator
+from django.template.response import TemplateResponse
+from django.utils.decorators import method_decorator
+from django.views import View
+
+from bookwyrm import models
+from bookwyrm.settings import PAGE_LENGTH
+
+
+# pylint: disable=no-self-use
+@method_decorator(login_required, name="dispatch")
+@method_decorator(
+    permission_required("bookwyrm.moderate_user", raise_exception=True),
+    name="dispatch",
+)
+class ImportList(View):
+    """admin view of imports on this server"""
+
+    def get(self, request, status="active"):
+        """list of imports"""
+        complete = status == "complete"
+        imports = models.ImportJob.objects.filter(complete=complete)
+        paginated = Paginator(imports, PAGE_LENGTH)
+        page = paginated.get_page(request.GET.get("page"))
+        data = {
+            "imports": page,
+            "page_range": paginated.get_elided_page_range(
+                page.number, on_each_side=2, on_ends=1
+            ),
+        }
+        return TemplateResponse(request, "settings/imports.html", data)

From a8424f61f2db337b2ff3e145b12a520873c79632 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 1 Nov 2022 19:26:23 -0700
Subject: [PATCH 3/4] Mark imports as complete

This will let the user debug the import, and should only be used when
the import is in a bad state (marked as incomplete but with no pending
tasks)
---
 bookwyrm/models/import_job.py                 |  1 +
 .../imports/complete_import_modal.html        | 23 +++++++++++++++++++
 .../settings/{ => imports}/imports.html       | 17 +++++++++++++-
 bookwyrm/urls.py                              |  3 +++
 bookwyrm/views/admin/imports.py               | 12 +++++++++-
 5 files changed, 54 insertions(+), 2 deletions(-)
 create mode 100644 bookwyrm/templates/settings/imports/complete_import_modal.html
 rename bookwyrm/templates/settings/{ => imports}/imports.html (75%)

diff --git a/bookwyrm/models/import_job.py b/bookwyrm/models/import_job.py
index 7547cfcd2..18aad6d88 100644
--- a/bookwyrm/models/import_job.py
+++ b/bookwyrm/models/import_job.py
@@ -53,6 +53,7 @@ class ImportJob(models.Model):
         """How many books do you want to import???"""
         return self.items.count()
 
+    @property
     def pending_item_count(self):
         """And how many pending items??"""
         return self.pending_items.count()
diff --git a/bookwyrm/templates/settings/imports/complete_import_modal.html b/bookwyrm/templates/settings/imports/complete_import_modal.html
new file mode 100644
index 000000000..64d571764
--- /dev/null
+++ b/bookwyrm/templates/settings/imports/complete_import_modal.html
@@ -0,0 +1,23 @@
+{% extends 'components/modal.html' %}
+{% load i18n %}
+
+{% block modal-title %}{% trans "Mark import as complete?" %}{% endblock %}
+
+{% block modal-body %}
+{% trans "This action cannot be un-done" %}
+{% endblock %}
+
+{% block modal-footer %}
+<form name="complete-import-{{ import.id }}" action="{% url 'settings-imports-complete' import.id %}" method="POST" class="is-flex-grow-1">
+    {% csrf_token %}
+    <input type="hidden" name="id" value="{{ list.id }}">
+    <div class="buttons is-right is-flex-grow-1">
+        <button type="button" class="button" data-modal-close>
+            {% trans "Cancel" %}
+        </button>
+        <button class="button is-danger" type="submit">
+            {% trans "Confirm" %}
+        </button>
+    </div>
+</form>
+{% endblock %}
diff --git a/bookwyrm/templates/settings/imports.html b/bookwyrm/templates/settings/imports/imports.html
similarity index 75%
rename from bookwyrm/templates/settings/imports.html
rename to bookwyrm/templates/settings/imports/imports.html
index b5936abba..f99e35209 100644
--- a/bookwyrm/templates/settings/imports.html
+++ b/bookwyrm/templates/settings/imports/imports.html
@@ -26,9 +26,11 @@
 </div>
 
 <div class="table-container block content">
+    {% if status == "active" %}
     <div class="notification is-warning">
         <p>{% trans "Marking an import as complete will <em>not</em> stop it." %}</p>
     </div>
+    {% endif %}
     <table class="table is-striped is-fullwidth">
         <tr>
             {% url 'settings-imports' as url %}
@@ -47,7 +49,9 @@
             <th>
                 {% trans "Pending items" %}
             </th>
+            {% if status == "active" %}
             <th>{% trans "Actions" %}</th>
+            {% endif %}
         </tr>
         {% for import in imports %}
         <tr>
@@ -58,11 +62,22 @@
             <td>{{ import.created_date }}</td>
             <td>{{ import.item_count }}</td>
             <td>{{ import.pending_item_count }}</td>
+            {% if status == "active" %}
             <td>
-                <button class="button is-danger">{% trans "Mark as complete" %}</button>
+                {% join "complete" import.id as modal_id %}
+                <button type="button" data-modal-open="{{ modal_id }}" class="button is-danger">{% trans "Mark as complete" %}</button>
+                {% include "settings/imports/complete_import_modal.html" with id=modal_id %}
             </td>
+            {% endif %}
         </tr>
         {% endfor %}
+        {% if not imports %}
+        <tr>
+            <td colspan="6">
+                <em>{% trans "No matching imports founds." %} </em>
+            </td>
+        </tr>
+        {% endif %}
     </table>
 </div>
 
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index 1f2efa5f3..397d12204 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -294,6 +294,9 @@ urlpatterns = [
     re_path(
         r"^settings/imports/(?P<status>(complete|active))?/?$", views.ImportList.as_view(), name="settings-imports"
     ),
+    re_path(
+        r"^settings/imports/(?P<import_id>\d+)/complete?$", views.ImportList.as_view(), name="settings-imports-complete"
+    ),
     re_path(
         r"^settings/celery/?$", views.CeleryStatus.as_view(), name="settings-celery"
     ),
diff --git a/bookwyrm/views/admin/imports.py b/bookwyrm/views/admin/imports.py
index 25fc0c77f..9ebfce41f 100644
--- a/bookwyrm/views/admin/imports.py
+++ b/bookwyrm/views/admin/imports.py
@@ -1,6 +1,7 @@
 """ manage imports """
 from django.contrib.auth.decorators import login_required, permission_required
 from django.core.paginator import Paginator
+from django.shortcuts import get_object_or_404, redirect
 from django.template.response import TemplateResponse
 from django.utils.decorators import method_decorator
 from django.views import View
@@ -29,5 +30,14 @@ class ImportList(View):
             "page_range": paginated.get_elided_page_range(
                 page.number, on_each_side=2, on_ends=1
             ),
+            "status": status,
         }
-        return TemplateResponse(request, "settings/imports.html", data)
+        return TemplateResponse(request, "settings/imports/imports.html", data)
+
+    # pylint: disable=unused-argument
+    def post(self, request, import_id):
+        """Mark an import as complete"""
+        import_job = get_object_or_404(models.ImportJob, id=import_id)
+        import_job.complete = True
+        import_job.save()
+        return redirect("settings-imports")

From 5af195de58708e3b93099febf4d731da3dd75777 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 1 Nov 2022 20:43:27 -0700
Subject: [PATCH 4/4] Python formatting

---
 bookwyrm/urls.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index 397d12204..95857faa4 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -292,10 +292,14 @@ urlpatterns = [
         name="report-link",
     ),
     re_path(
-        r"^settings/imports/(?P<status>(complete|active))?/?$", views.ImportList.as_view(), name="settings-imports"
+        r"^settings/imports/(?P<status>(complete|active))?/?$",
+        views.ImportList.as_view(),
+        name="settings-imports",
     ),
     re_path(
-        r"^settings/imports/(?P<import_id>\d+)/complete?$", views.ImportList.as_view(), name="settings-imports-complete"
+        r"^settings/imports/(?P<import_id>\d+)/complete?$",
+        views.ImportList.as_view(),
+        name="settings-imports-complete",
     ),
     re_path(
         r"^settings/celery/?$", views.CeleryStatus.as_view(), name="settings-celery"