Skip to content
Open
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
13 changes: 12 additions & 1 deletion vulnerabilities/forms.py
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,18 @@ class AdvisoryToDoForm(forms.Form):
label=False,
widget=forms.TextInput(
attrs={
"placeholder": "Search ToDos...",
"placeholder": "Search aliases (CVE, GHSA, etc.)",
"class": "input",
},
),
)

avid = forms.CharField(
required=False,
label=False,
widget=forms.TextInput(
attrs={
"placeholder": "Lookup advisory by AVID",
"class": "input",
},
),
Expand Down
78 changes: 71 additions & 7 deletions vulnerabilities/templates/advisory_todos.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,11 @@
.column {
word-break: break-word;
}

.select.is-solid-info::after {
border-color: white !important;
}

</style>
{% endblock %}

Expand All @@ -40,21 +45,43 @@ <h1>Advisory To-Dos</h1>
<form method="get" class="box px-6 mx-0">

<div class="field has-addons">
<div class="control is-expanded has-icons-right">

<div class="control">
<div class="select is-solid-info">
<select id="search-mode" class="has-background-info has-text-white border-0">
<option value="search" class="has-background-white has-text-black">Search</option>
<option value="lookup" class="has-background-white has-text-black">Lookup</option>
</select>
</div>
</div>

<div class="control is-expanded has-icons-right" id="search-container">
{{ form.search }}

{% if form.search.value %}
<a href="?{% querystring request search='' %}"
class="icon is-right"
style="pointer-events: auto; cursor: pointer;">
</a>
<a href="?{% querystring request search='' avid='' %}"
class="icon is-right"
style="pointer-events: auto; cursor: pointer;">
<i class="fa fa-close" style="color:grey"></i>
</a>
{% endif %}
</div>

<div class="control is-expanded has-icons-right" id="lookup-container">
{{ form.avid }}

{% if form.avid.value %}
<a href="?{% querystring request search='' avid='' %}"
class="icon is-right"
style="pointer-events: auto; cursor: pointer;">
<i class="fa fa-close" style="color:gray"></i>
</a>
{% endif %}
</div>

<div class="control">
<button type="submit" class="button is-info">
<i class="fa fa-search mx-1"></i>
<i class="fa fa-arrow-right mx-1"></i>
</button>
</div>
</div>
Expand All @@ -80,6 +107,7 @@ <h1>Advisory To-Dos</h1>
<th colspan="4">
<form method="get">
<input type="hidden" name="search" value="{{ form.search.value|default:'' }}">
<input type="hidden" name="avid" value="{{ form.avid.value|default:'' }}">

<div class="columns is-vcentered px-1">
<div class="column has-text-left" style="flex: 0 0 20%;"></div>
Expand Down Expand Up @@ -169,3 +197,39 @@ <h1>Advisory To-Dos</h1>
</div>
{% endblock %}

{% block scripts %}
<script>
document.addEventListener('DOMContentLoaded', function () {

const mode = document.getElementById('search-mode');
const searchContainer = document.getElementById('search-container');
const lookupContainer = document.getElementById('lookup-container');
const params = new URLSearchParams(window.location.search);

const search = params.get('search');
const avid = params.get('avid');

if (search && search.trim() !== '') {
mode.value = 'search';
} else if (avid && avid.trim() !== '') {
mode.value = 'lookup';
}

function updateMode() {
if (mode.value === 'lookup') {
searchContainer.style.display = 'none';
lookupContainer.style.display = '';
searchContainer.querySelector('input').value = '';
} else {
searchContainer.style.display = '';
lookupContainer.style.display = 'none';
lookupContainer.querySelector('input').value = '';
}
}

mode.addEventListener('change', updateMode);
updateMode();
});
</script>

{% endblock %}
5 changes: 4 additions & 1 deletion vulnerabilities/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -1119,7 +1119,10 @@ def get_queryset(self):
qs = qs.filter(issue_type=issue_type)

qs.prefetch_related("advisories__aliases")
if form.is_valid() and (search := form.cleaned_data.get("search")):

if form.is_valid() and (avid := form.cleaned_data.get("avid")):
return qs.filter(advisories__avid=avid).distinct()
elif form.is_valid() and (search := form.cleaned_data.get("search")):
return qs.filter(advisories__aliases__alias__icontains=search).distinct()

return qs
Expand Down