Refactor resource search functionality: replace inline form with a dedicated search panel and improve result handling
This commit is contained in:
Ross
@@ -205,35 +205,7 @@
|
|||||||
<h5>Resources</h5>
|
<h5>Resources</h5>
|
||||||
|
|
||||||
<div class="mb-2">
|
<div class="mb-2">
|
||||||
<form id="resource-search-form" class="row g-2" hx-get="{% url 'atlas:resource_search_widget' %}" hx-target="#resource-search-results" hx-swap="innerHTML" hx-trigger="keyup changed delay:500ms from:#resource-search-q">
|
{% include 'atlas/partials/resource_search_panel.html' %}
|
||||||
<input type="hidden" name="case_id" value="{{ case.pk }}" />
|
|
||||||
<div class="col-auto" style="flex: 1 1 300px;">
|
|
||||||
<input type="search" id="resource-search-q" name="q" class="form-control form-control-sm" placeholder="Search resources by name, description or URL" />
|
|
||||||
</div>
|
|
||||||
<div class="col-auto">
|
|
||||||
<select name="site" class="form-select form-select-sm">
|
|
||||||
<option value="">All sites</option>
|
|
||||||
{% for s in site_queryset %}
|
|
||||||
<option value="{{ s.pk }}">{{ s.name }}</option>
|
|
||||||
{% endfor %}
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
<div class="col-auto">
|
|
||||||
<select name="subspecialty" class="form-select form-select-sm">
|
|
||||||
<option value="">All subspecialties</option>
|
|
||||||
{% for sp in subspecialty_queryset %}
|
|
||||||
<option value="{{ sp.pk }}">{{ sp.name }}</option>
|
|
||||||
{% endfor %}
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
<div class="col-auto">
|
|
||||||
<div class="form-check form-check-inline">
|
|
||||||
<input class="form-check-input" type="checkbox" id="resource-open-access-{{ case.pk }}" name="open_access" value="1">
|
|
||||||
<label class="form-check-label small" for="resource-open-access-{{ case.pk }}">Open</label>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</form>
|
|
||||||
<div id="resource-search-results" class="mt-2"></div>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div>
|
<div>
|
||||||
|
|||||||
@@ -1,77 +1,77 @@
|
|||||||
{% extends 'atlas/base.html' %}
|
{% extends 'atlas/base.html' %}
|
||||||
|
|
||||||
{% block content %}
|
{% block content %}
|
||||||
<div class="container my-4">
|
<div class="container my-4">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-12">
|
<div class="col-12">
|
||||||
<h2 class="mb-3">Atlas</h2>
|
<h2 class="mb-3">Atlas</h2>
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-12 col-md-8">
|
|
||||||
<div class="card mb-3">
|
|
||||||
<div class="card-body">
|
|
||||||
<h5 class="card-title">Collections</h5>
|
|
||||||
<p class="card-text">Quick access to collections you can view or take.</p>
|
|
||||||
<a href="{% url 'atlas:user_collections' %}" class="btn btn-primary">Collections to view / take</a>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="card">
|
|
||||||
<div class="card-body">
|
|
||||||
<h5 class="card-title">My cases / collections</h5>
|
|
||||||
<p>View my <a href="{% url 'atlas:case_view' %}?author={{ request.user.id }}">cases</a> or <a href="{% url 'atlas:collection_view' %}?author={{ request.user.id }}">my collections</a>.</p>
|
|
||||||
<p>
|
|
||||||
<a href="{% url 'atlas:user_uploads' %}" class="btn btn-outline-secondary">
|
|
||||||
<i class="bi bi-cloud-arrow-up me-1"></i> Uploads awaiting import
|
|
||||||
</a>
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="col-12 col-md-4">
|
<div class="row">
|
||||||
<div class="card">
|
<div class="col-12 col-md-8">
|
||||||
<div class="card-body">
|
<div class="card mb-3">
|
||||||
<h6 class="card-subtitle mb-2 text-muted">Quick links</h6>
|
<div class="card-body">
|
||||||
<ul class="list-unstyled mb-0">
|
<h5 class="card-title">Collections</h5>
|
||||||
<li><a href="{% url 'atlas:user_collections' %}">Collections to view / take</a></li>
|
<p class="card-text">Quick access to collections you can view or take.</p>
|
||||||
<li><a href="{% url 'atlas:case_view' %}?author={{ request.user.id }}">My cases</a></li>
|
<a href="{% url 'atlas:user_collections' %}" class="btn btn-primary">Collections to view / take</a>
|
||||||
<li><a href="{% url 'atlas:collection_view' %}?author={{ request.user.id }}">My collections</a></li>
|
</div>
|
||||||
<li><a href="{% url 'atlas:user_uploads' %}">Uploads awaiting import</a></li>
|
</div>
|
||||||
</ul>
|
|
||||||
|
<div class="card">
|
||||||
|
<div class="card-body">
|
||||||
|
<h5 class="card-title">My cases / collections</h5>
|
||||||
|
<p>View my <a href="{% url 'atlas:case_view' %}?author={{ request.user.id }}">cases</a> or <a href="{% url 'atlas:collection_view' %}?author={{ request.user.id }}">my collections</a>.</p>
|
||||||
|
<p>
|
||||||
|
<a href="{% url 'atlas:user_uploads' %}" class="btn btn-outline-secondary">
|
||||||
|
<i class="bi bi-cloud-arrow-up me-1"></i> Uploads awaiting import
|
||||||
|
</a>
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="card mb-3">
|
|
||||||
<div class="card-body">
|
<div class="col-12 col-md-4">
|
||||||
<h5 class="card-title">Search cases</h5>
|
<div class="card">
|
||||||
<div class="mb-2">
|
<div class="card-body">
|
||||||
<div class="input-group">
|
<h6 class="card-subtitle mb-2 text-muted">Quick links</h6>
|
||||||
<input class="form-control" id="case-search-input" name="q" type="search"
|
<ul class="list-unstyled mb-0">
|
||||||
placeholder="Search cases by title or description"
|
<li><a href="{% url 'atlas:user_collections' %}">Collections to view / take</a></li>
|
||||||
hx-get="{% url 'atlas:case_search_partial' %}"
|
<li><a href="{% url 'atlas:case_view' %}?author={{ request.user.id }}">My cases</a></li>
|
||||||
hx-trigger="input changed delay:500ms, keyup[key=='Enter']"
|
<li><a href="{% url 'atlas:collection_view' %}?author={{ request.user.id }}">My collections</a></li>
|
||||||
hx-target="#case-search-results"
|
<li><a href="{% url 'atlas:user_uploads' %}">Uploads awaiting import</a></li>
|
||||||
hx-indicator="#case-search-indicator" />
|
</ul>
|
||||||
<span class="input-group-text" id="case-search-indicator" aria-hidden="true">
|
</div>
|
||||||
<span class="spinner-border spinner-border-sm" role="status" aria-hidden="true"></span>
|
</div>
|
||||||
<span class="visually-hidden">Loading</span>
|
<div class="card mb-3">
|
||||||
</span>
|
<div class="card-body">
|
||||||
|
<h5 class="card-title">Search cases</h5>
|
||||||
|
<div class="mb-2">
|
||||||
|
<div class="input-group">
|
||||||
|
<input class="form-control" id="case-search-input" name="q" type="search"
|
||||||
|
placeholder="Search cases by title or description"
|
||||||
|
hx-get="{% url 'atlas:case_search_partial' %}"
|
||||||
|
hx-trigger="input changed delay:500ms, keyup[key=='Enter']"
|
||||||
|
hx-target="#case-search-results"
|
||||||
|
hx-indicator="#case-search-indicator" />
|
||||||
|
<span class="input-group-text" id="case-search-indicator" aria-hidden="true">
|
||||||
|
<span class="spinner-border spinner-border-sm" role="status" aria-hidden="true"></span>
|
||||||
|
<span class="visually-hidden">Loading</span>
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<style>
|
||||||
|
/* Hide indicator by default; HTMX will add the `htmx-request` class during requests */
|
||||||
|
#case-search-indicator { display: none; }
|
||||||
|
#case-search-indicator.htmx-request { display: inline-flex; align-items: center; }
|
||||||
|
</style>
|
||||||
|
<div id="case-search-results">
|
||||||
|
{% include 'atlas/partials/_case_search_results.html' with cases=None %}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<style>
|
|
||||||
/* Hide indicator by default; HTMX will add the `htmx-request` class during requests */
|
|
||||||
#case-search-indicator { display: none; }
|
|
||||||
#case-search-indicator.htmx-request { display: inline-flex; align-items: center; }
|
|
||||||
</style>
|
|
||||||
<div id="case-search-results">
|
|
||||||
{% include 'atlas/partials/_case_search_results.html' with cases=None %}
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
|
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
@@ -0,0 +1,41 @@
|
|||||||
|
<div id="resource-search-panel" class="mb-2">
|
||||||
|
<div id="resource-search-form" class="row g-2">
|
||||||
|
<input type="hidden" name="case_id" value="{{ case.pk }}" />
|
||||||
|
<div class="col-auto" style="flex: 1 1 300px;">
|
||||||
|
<input type="search" id="resource-search-q" name="q" class="form-control form-control-sm" placeholder="Search resources by name, description or URL"
|
||||||
|
hx-get="{% url 'atlas:resource_search_widget' %}"
|
||||||
|
hx-trigger="input changed delay:500ms, keyup[key=='Enter']"
|
||||||
|
hx-target="#resource-search-results"
|
||||||
|
hx-swap="innerHTML"
|
||||||
|
hx-include="#resource-search-panel"
|
||||||
|
hx-indicator=".htmx-indicator">
|
||||||
|
</div>
|
||||||
|
<div class="htmx-indicator col-auto">
|
||||||
|
<img src="/img/bars.svg" alt=""/> Searching...
|
||||||
|
</div>
|
||||||
|
<div class="col-auto">
|
||||||
|
<select name="site" class="form-select form-select-sm">
|
||||||
|
<option value="">All sites</option>
|
||||||
|
{% for s in site_queryset %}
|
||||||
|
<option value="{{ s.pk }}">{{ s.name }}</option>
|
||||||
|
{% endfor %}
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
<div class="col-auto">
|
||||||
|
<select name="subspecialty" class="form-select form-select-sm">
|
||||||
|
<option value="">All subspecialties</option>
|
||||||
|
{% for sp in subspecialty_queryset %}
|
||||||
|
<option value="{{ sp.pk }}">{{ sp.name }}</option>
|
||||||
|
{% endfor %}
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
<div class="col-auto">
|
||||||
|
<div class="form-check form-check-inline">
|
||||||
|
<input class="form-check-input" type="checkbox" id="resource-open-access-{{ case.pk }}" name="open_access" value="1">
|
||||||
|
<label class="form-check-label small" for="resource-open-access-{{ case.pk }}">Open</label>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div id="resource-search-results" class="mt-2"></div>
|
||||||
|
</div>
|
||||||
@@ -1,37 +1,39 @@
|
|||||||
{% if results %}
|
{% if results %}
|
||||||
<ul class="list-unstyled mb-0" id="resource_search_results_list_{{ field }}">
|
<div id="resource-search-results" hx-swap-oob="true">
|
||||||
{% for item in results %}
|
<ul class="list-unstyled mb-0" id="resource_search_results_list_{{ field }}">
|
||||||
<li class="py-1 d-flex justify-content-between align-items-center" data-resource-id="{{ item.id }}">
|
{% for item in results %}
|
||||||
<div class="flex-grow-1">
|
<li class="py-1 d-flex justify-content-between align-items-center" data-resource-id="{{ item.id }}">
|
||||||
<a href="{% url 'atlas:resource_detail' item.pk %}" target="_blank">{{ item.name|escape }}</a>
|
<div class="flex-grow-1">
|
||||||
<div class="small text-muted">{{ item.get_display|safe }}</div>
|
<a href="{% url 'atlas:resource_detail' item.pk %}" target="_blank">{{ item.name|escape }}</a>
|
||||||
</div>
|
<div class="small text-muted">{{ item.get_display|safe }}</div>
|
||||||
<div class="d-flex gap-2">
|
</div>
|
||||||
<button
|
<div class="d-flex gap-2">
|
||||||
type="button"
|
<button
|
||||||
class="btn btn-sm btn-success resource-attach-btn"
|
type="button"
|
||||||
hx-post="{% url 'atlas:case_attach_resource' pk=case_id %}"
|
class="btn btn-sm btn-success resource-attach-btn"
|
||||||
hx-vals='{"resource_id": "{{ item.id }}", "pre_review": "0"}'
|
hx-post="{% url 'atlas:case_attach_resource' pk=case_id %}"
|
||||||
hx-swap="outerHTML"
|
hx-vals='{"resource_id": "{{ item.id }}", "pre_review": "0"}'
|
||||||
hx-target="#case-resources-list">
|
hx-swap="outerHTML"
|
||||||
Attach
|
hx-target="#case-resources-list">
|
||||||
</button>
|
Attach
|
||||||
<button
|
</button>
|
||||||
type="button"
|
<button
|
||||||
class="btn btn-sm btn-outline-success resource-attach-pre-btn"
|
type="button"
|
||||||
hx-post="{% url 'atlas:case_attach_resource' pk=case_id %}"
|
class="btn btn-sm btn-outline-success resource-attach-pre-btn"
|
||||||
hx-vals='{"resource_id": "{{ item.id }}", "pre_review": "1"}'
|
hx-post="{% url 'atlas:case_attach_resource' pk=case_id %}"
|
||||||
hx-swap="outerHTML"
|
hx-vals='{"resource_id": "{{ item.id }}", "pre_review": "1"}'
|
||||||
hx-target="#case-resources-list">
|
hx-swap="outerHTML"
|
||||||
Attach (pre)
|
hx-target="#case-resources-list">
|
||||||
</button>
|
Attach (pre)
|
||||||
</div>
|
</button>
|
||||||
</li>
|
</div>
|
||||||
{% endfor %}
|
</li>
|
||||||
</ul>
|
{% endfor %}
|
||||||
<div class="mt-2 text-end">
|
</ul>
|
||||||
<small class="text-muted">{{ results|length }} results</small>
|
<div class="mt-2 text-end">
|
||||||
|
<small class="text-muted">{{ results|length }} results</small>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{% else %}
|
{% else %}
|
||||||
<div><em>No resources found</em></div>
|
<div id="resource-search-results" hx-swap-oob="true"><em>No resources found</em></div>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|||||||
Reference in New Issue
Block a user