Skip to content

Add prototype for tabular collection listing #1397

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danlamanna merged 1 commit into from
Jan 16, 2026
Merged

Add prototype for tabular collection listing #1397

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
132 changes: 132 additions & 0 deletions isic/core/templates/core/collection_table.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,132 @@
{% extends 'core/base.html' %}
{% load humanize %}
{% load partials %}

{% partialdef sortable-header %}
<th scope="col" class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
{% if current_sort == field %}
{% if current_order == "asc" %}
<a href="{% querystring sort=field order='desc' page=None %}" class="flex items-center gap-1 hover:text-gray-900">
{{ label }} <i class="ri-arrow-up-s-line"></i>
</a>
{% else %}
<a href="{% querystring sort=field order='asc' page=None %}" class="flex items-center gap-1 hover:text-gray-900">
{{ label }} <i class="ri-arrow-down-s-line"></i>
</a>
{% endif %}
{% else %}
<a href="{% querystring sort=field order='asc' page=None %}" class="hover:text-gray-900">
{{ label }}
</a>
{% endif %}
</th>
{% endpartialdef %}

{% block content %}
<header class="border-b border-gray-100 flex items-center justify-between py-2 pb-4">
<div class="flex-col">
<div class="heading-1">Collections ({{ page.paginator.count|intcomma }})</div>
</div>
</header>

<div class="my-4 flex gap-6">
<label class="flex items-center gap-2 text-sm text-gray-700 cursor-pointer">
<input type="checkbox" id="exclude-magic" {% if exclude_magic %}checked{% endif %} class="rounded border-gray-300">
Exclude magic collections
</label>
<label class="flex items-center gap-2 text-sm text-gray-700 cursor-pointer">
<input type="checkbox" id="exclude-empty" {% if exclude_empty %}checked{% endif %} class="rounded border-gray-300">
Exclude empty collections
</label>
<label class="flex items-center gap-2 text-sm text-gray-700 cursor-pointer">
<input type="checkbox" id="exclude-pinned" {% if exclude_pinned %}checked{% endif %} class="rounded border-gray-300">
Exclude pinned collections
</label>
</div>

<script>
function updateFilter(param, checked) {
const url = new URL(window.location.href);
url.searchParams.set(param, checked ? '1' : '0');
url.searchParams.delete('page');
window.location.href = url.href;
}
document.getElementById('exclude-magic').addEventListener('change', function() {
updateFilter('exclude_magic', this.checked);
});
document.getElementById('exclude-empty').addEventListener('change', function() {
updateFilter('exclude_empty', this.checked);
});
document.getElementById('exclude-pinned').addEventListener('change', function() {
updateFilter('exclude_pinned', this.checked);
});
</script>

<div class="flex flex-col">
<div class="-my-2 overflow-x-auto sm:-mx-6 lg:-mx-8">
<div class="py-2 align-middle inline-block min-w-full sm:px-6 lg:px-8">
<div class="shadow overflow-hidden border-b border-gray-200 sm:rounded-lg">
<table class="min-w-full divide-y divide-gray-200">
<thead class="bg-gray-50">
<tr>
{% with field="name" label="Name" %}{% partial sortable-header %}{% endwith %}
{% with field="public" label="Public" %}{% partial sortable-header %}{% endwith %}
<th scope="col" class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">DOI</th>
<th scope="col" class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Images</th>
<th scope="col" class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Lesions</th>
<th scope="col" class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Patients</th>
{% with field="created" label="Created" %}{% partial sortable-header %}{% endwith %}
<th scope="col" class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Description</th>
</tr>
</thead>
<tbody>
{% for collection in page %}
<tr class="{% cycle 'bg-white' 'bg-gray-50' %}">
<td class="px-6 py-4 whitespace-nowrap text-sm font-medium text-gray-900">
<a href="{{ collection.get_absolute_url }}" class="text-indigo-600 hover:text-indigo-900 flex items-center gap-1">
{% if collection.pinned %}<i class="ri-pushpin-2-fill text-gray-400"></i>{% endif %}
{{ collection.name }}
</a>
</td>
<td class="px-6 py-4 whitespace-nowrap text-sm text-gray-500">
{% if collection.public %}<i class="ri-check-line text-green-600"></i>{% else %}<i class="ri-close-line text-red-600"></i>{% endif %}
</td>
<td class="px-6 py-4 whitespace-nowrap text-sm text-gray-500">
{% if collection.doi %}
<a href="{{ collection.doi.url }}" class="text-indigo-600 hover:text-indigo-900">{{ collection.doi.id }}</a>
{% else %}
-
{% endif %}
</td>
<td class="px-6 py-4 whitespace-nowrap text-sm text-gray-500">
{% if collection.counts.image_count is not None %}{{ collection.counts.image_count|intcomma }}{% else %}-{% endif %}
</td>
<td class="px-6 py-4 whitespace-nowrap text-sm text-gray-500">
{% if collection.counts.lesion_count is not None %}{{ collection.counts.lesion_count|intcomma }}{% else %}-{% endif %}
</td>
<td class="px-6 py-4 whitespace-nowrap text-sm text-gray-500">
{% if collection.counts.patient_count is not None %}{{ collection.counts.patient_count|intcomma }}{% else %}-{% endif %}
</td>
<td class="px-6 py-4 whitespace-nowrap text-sm text-gray-500">
{{ collection.created|date:"Y-m-d" }}
</td>
<td class="px-6 py-4 text-sm text-gray-500 max-w-xs truncate">
{{ collection.description|truncatechars:50 }}
</td>
</tr>
{% empty %}
<tr>
<td colspan="8" class="px-6 py-4 text-sm text-gray-500 text-center">
No collections found.
</td>
</tr>
{% endfor %}
</tbody>
</table>
</div>
</div>
</div>
</div>

{% include 'studies/partials/pagination.html' with page_obj=page %}
{% endblock %}
17 changes: 17 additions & 0 deletions isic/core/tests/test_collection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,3 +162,20 @@ def test_collection_move_images_already_exist_in_collection(collection_factory,

assert collection_src.images.count() == 0
assert collection_dest.images.count() == 1


@pytest.mark.django_db
def test_collection_table_staff_only(
client, authenticated_client, staff_client, collection_factory
):
collection_factory(name="Test Collection")

r = client.get(reverse("core/collection-table"))
assert r.status_code == 302

r = authenticated_client.get(reverse("core/collection-table"))
assert r.status_code == 302

r = staff_client.get(reverse("core/collection-table") + "?exclude_empty=0")
assert r.status_code == 200
assert b"Test Collection" in r.content
6 changes: 6 additions & 0 deletions isic/core/urls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
collection_download_metadata,
collection_edit,
collection_list,
collection_table,
)
from isic.core.views.doi import doi_detail, draft_doi_edit
from isic.core.views.embargoed import embargoed_dashboard
Expand Down Expand Up @@ -37,6 +38,11 @@
collection_list,
name="core/collection-list",
),
path(
"collections/table/",
collection_table,
name="core/collection-table",
),
path(
"collections/<int:pk>/",
collection_detail,
Expand Down
45 changes: 44 additions & 1 deletion isic/core/views/collections.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@
from datetime import UTC, datetime

from django.contrib import messages
from django.contrib.admin.views.decorators import staff_member_required
from django.contrib.auth.decorators import login_required
from django.core.exceptions import ValidationError
from django.core.paginator import Paginator
from django.db.models import Count
from django.db.models.query_utils import Q
from django.http import StreamingHttpResponse
from django.http import HttpRequest, HttpResponse, StreamingHttpResponse
from django.http.response import HttpResponseRedirect
from django.shortcuts import get_object_or_404, render
from django.template.defaultfilters import slugify
Expand Down Expand Up @@ -208,3 +209,45 @@ def collection_detail(request, pk):
"show_shares": request.user.is_staff or request.user == collection.creator,
},
)


@staff_member_required
def collection_table(request: HttpRequest) -> HttpResponse:
collections = Collection.objects.select_related("cohort", "cached_counts", "doi").all()

exclude_magic = request.GET.get("exclude_magic", "1") == "1"
exclude_empty = request.GET.get("exclude_empty", "1") == "1"
exclude_pinned = request.GET.get("exclude_pinned", "0") == "1"

if exclude_magic:
collections = collections.regular()

if exclude_empty:
collections = collections.filter(cached_counts__image_count__gt=0)

if exclude_pinned:
collections = collections.filter(pinned=False)

sort = request.GET.get("sort", "name")
order = request.GET.get("order", "asc")
valid_sorts: set[str] = {"name", "created", "public"}

if sort in valid_sorts:
order_field = f"-{sort}" if order == "desc" else sort
collections = collections.order_by(order_field)

paginator = Paginator(collections, 50)
page = paginator.get_page(request.GET.get("page"))

return render(
request,
"core/collection_table.html",
{
"page": page,
"current_sort": sort,
"current_order": order,
"exclude_magic": exclude_magic,
"exclude_empty": exclude_empty,
"exclude_pinned": exclude_pinned,
},
)