Enhance case search functionality: display recent cases in search results and adjust initial load behavior

This commit is contained in:
Ross
2025-11-16 23:16:06 +00:00
parent 8c8d484dce
commit 279d6344f1
3 changed files with 70 additions and 22 deletions
@@ -1,5 +1,7 @@
{% if cases and cases.exists %} {# Search results #}
<div class="list-group"> {% if q %}
{% if cases and cases.exists %}
<div class="list-group mb-2">
{% for case in cases %} {% for case in cases %}
<div class="list-group-item d-flex justify-content-between align-items-center"> <div class="list-group-item d-flex justify-content-between align-items-center">
<div class="flex-fill me-3"> <div class="flex-fill me-3">
@@ -15,6 +17,29 @@
</div> </div>
{% endfor %} {% endfor %}
</div> </div>
{% else %} {% else %}
<div class="text-muted small">No cases found.</div> <div class="text-muted small mb-2">No cases found.</div>
{% endif %}
{% endif %}
{# Recent cases quick-add (rendered below search results) #}
{% if recent_cases and recent_cases|length > 0 %}
<div>
<div class="small text-muted mb-1">Recently created</div>
<div class="list-group">
{% for case in recent_cases %}
<div class="list-group-item d-flex justify-content-between align-items-center">
<div class="flex-fill me-3">
<div class="fw-semibold">{{ case.title }}</div>
<div class="small text-muted">{% if case.description %}{{ case.description|truncatechars:100 }}{% endif %}</div>
</div>
<form class="m-0" hx-post="{% url 'atlas:add_case_to_collection' collection.pk %}" hx-target="#full-question-list" hx-swap="beforeend">
{% csrf_token %}
<input type="hidden" name="case" value="{{ case.pk }}">
<button type="submit" class="btn btn-sm btn-outline-primary">Add</button>
</form>
</div>
{% endfor %}
</div>
</div>
{% endif %} {% endif %}
@@ -7,5 +7,9 @@
hx-trigger="keyup changed delay:400ms" hx-trigger="keyup changed delay:400ms"
autocomplete="off"> autocomplete="off">
<div id="case-search-results" class="mt-2"></div> <div id="case-search-results" class="mt-2">
{# Render initial results (search + recent) on initial GET; HTMX searches will replace this div with partial results #}
{% include 'atlas/partials/case_search_results.html' with cases=cases recent_cases=recent_cases collection=collection %}
</div>
</div> </div>
+23 -4
View File
@@ -1173,12 +1173,18 @@ def add_case_to_collection(request, collection_id):
# if request.method == "POST": # if request.method == "POST":
cases = get_cases_available_to_user(request.user) # don't show search results on initial load; the search partial will render only when a query exists
cases = Case.objects.none()
# Also compute recent cases for initial display (authored by current user and not in collection)
recent_qs = get_cases_available_to_user(request.user).filter(author=request.user)
recent_qs = recent_qs.exclude(pk__in=collection.cases.values_list("pk", flat=True))
recent_cases = recent_qs.order_by("-created_date")[:5]
return render( return render(
request, request,
"atlas/add_case_to_collection.html", "atlas/add_case_to_collection.html",
{"cases": cases, "collection": collection}, {"cases": cases, "collection": collection, "recent_cases": recent_cases, "q": ""},
) )
@@ -1201,9 +1207,22 @@ def case_search(request):
if q: if q:
qs = qs.filter(title__icontains=q) qs = qs.filter(title__icontains=q)
cases = qs.order_by("title")[:30] # Recent cases: last 5 created that are available to the user and not already in the collection
# Restrict recent cases to those authored by the current user and not already in the collection
recent_qs = get_cases_available_to_user(request.user).filter(author=request.user)
if collection is not None:
recent_qs = recent_qs.exclude(pk__in=collection.cases.values_list("pk", flat=True))
recent_cases = recent_qs.order_by("-created_date")[:5]
return render(request, "atlas/partials/case_search_results.html", {"cases": cases, "collection": collection}) # Exclude recent cases from the main search results to avoid duplication
recent_pks = [c.pk for c in recent_cases]
cases = qs.exclude(pk__in=recent_pks).order_by("title")[:30]
return render(
request,
"atlas/partials/case_search_results.html",
{"cases": cases, "collection": collection, "recent_cases": recent_cases, "q": q},
)
@login_required @login_required