Skip to content
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.

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

Fixes #4 - Added input to filter model list in dialog #14

Merged
merged 1 commit into from
Jun 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 7 additions & 7 deletions django_admin_keyboard_shortcuts/static/admin/css/shortcuts.css
Original file line number Diff line number Diff line change
Expand Up @@ -15,24 +15,20 @@ kbd {

dialog {
min-width: 20em;
padding: 0;
padding: 1em;
height: 50vh;
width: 40vw;

.dialog-heading {
align-items: center;
display: flex;
justify-content: space-between;
padding: 1em;

h2 {
margin: 0;
}
}

section {
border: 1px solid #000;
margin: 1em;
}

h3 {
background: #eee;
margin: 0;
Expand Down Expand Up @@ -64,3 +60,7 @@ dialog {
}
}
}

#model-list-dialog-search {
margin: 0.5em 0em;
}
46 changes: 45 additions & 1 deletion django_admin_keyboard_shortcuts/static/admin/js/shortcuts.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ function removePressedKey(key) {

function storeKeyCombo(key) {
pressedKeys.add(key);
console.log(pressedKeys);
setTimeout(function() { removePressedKey(key); }, 5000);
}

Expand Down Expand Up @@ -51,11 +50,56 @@ function replaceModifiers() {
}
}

// This overlaps a lot with the initSidebarQuickFilter function
// defined in django/contrib/admin/static/admin/js/nav_sidebar.js
// If/when merged into core, we could try to reuse some parts
function filterModelList() {
const options = [];
const modelListDialog = document.getElementById('model-list-dialog');
if (!modelListDialog) {
return;
}
modelListDialog.querySelectorAll('li a').forEach((container) => {
options.push({title: container.innerHTML, node: container});
});


function checkValue(event) {
let filterValue = event.target.value;
if (filterValue) {
filterValue = filterValue.toLowerCase();
}
if (event.key === 'Escape') {
filterValue = '';
event.target.value = ''; // clear input
}
for (const option of options) {
let displayValue = '';
if (!filterValue || option.title.toLowerCase().indexOf(filterValue) === -1) {
displayValue = 'none'
}
option.node.parentNode.style.display = displayValue;
}

}

const nav = document.getElementById('model-list-dialog-search');
nav.addEventListener('change', checkValue, false);
nav.addEventListener('input', checkValue, false);
nav.addEventListener('keyup', checkValue, false);

// We don't want to show anything on the list until the user starts typing
checkValue({ target: { value: ''} , key: ''})
}


if (document.readyState === "loading") {
document.addEventListener("DOMContentLoaded", showDialogOnClick);
document.addEventListener("DOMContentLoaded", replaceModifiers);
document.addEventListener("DOMContentLoaded", filterModelList);
} else {
showDialogOnClick();
replaceModifiers();
filterModelList();
}
document.addEventListener("keyup", handleKeyUp);
6 changes: 5 additions & 1 deletion django_admin_keyboard_shortcuts/templates/admin/base.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{% extends "admin/base.html" %}
{% load static %}
{% load i18n %}
{% load shortcuts %}

{% block extrahead %}
Expand All @@ -23,8 +24,11 @@ <h2>Models</h2>
<button aria-label="Close">✖️</button>
</form>
</div>
<input type="search" id="model-list-dialog-search"
placeholder="{% translate 'Start typing to search' %}"
aria-label="{% translate 'Search models' %}"
>
<section>
<h3>Models</h3>
<ul>
{% all_models as models %}
{% for model in models %}
Expand Down