Skip to content

Commit 8f7e8b5

Browse files
committed
fix icon and move search bar to a template
Signed-off-by: Aayush Kumar <code@aayushk.dev>
1 parent 7c48019 commit 8f7e8b5

3 files changed

Lines changed: 32 additions & 31 deletions

File tree

scanpipe/templates/scanpipe/tree/resource_left_pane.html

Lines changed: 1 addition & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,5 @@
11
{% include "scanpipe/tree/resource_left_pane_header.html" only %}
2-
<div class="mb-3 search-container" id="resource-search-container">
3-
<div class="field mb-0">
4-
<div class="control has-icons-left has-icons-right is-expanded">
5-
<input
6-
id="file-search-input"
7-
class="input is-small"
8-
type="text"
9-
placeholder="Go to file..."
10-
autocomplete="off"
11-
hx-get="{% url 'project_resource_tree_search' project.slug %}"
12-
hx-target="#search-results"
13-
hx-trigger="input changed delay:200ms"
14-
hx-include="this"
15-
name="search"
16-
>
17-
<span class="icon is-small is-left">
18-
<i class="fas fa-search"></i>
19-
</span>
20-
<button
21-
id="clear-search"
22-
class="icon is-small is-right is-hidden has-text-grey"
23-
type="button"
24-
aria-label="Clear search"
25-
>
26-
<i class="fas fa-times"></i>
27-
</button>
28-
</div>
29-
</div>
30-
<div id="search-results" class="search-dropdown is-hidden"></div>
31-
</div>
2+
{% include "scanpipe/tree/resource_search_bar.html" %}
323

334
<div id="resource-tree" class="resource-tree-scroll">
345
{% include "scanpipe/tree/resource_left_pane_tree.html" with children=children %}
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<div class="mb-3 search-container" id="resource-search-container">
2+
<div class="field mb-0">
3+
<div class="control has-icons-left has-icons-right is-expanded">
4+
<input
5+
id="file-search-input"
6+
class="input is-small"
7+
type="text"
8+
placeholder="Go to file..."
9+
autocomplete="off"
10+
hx-get="{% url 'project_resource_tree_search' project.slug %}"
11+
hx-target="#search-results"
12+
hx-trigger="input changed delay:200ms"
13+
hx-include="this"
14+
name="search"
15+
>
16+
<span class="icon is-small is-left">
17+
<i class="fas fa-search"></i>
18+
</span>
19+
<button
20+
id="clear-search"
21+
class="icon is-small is-right is-hidden has-text-grey"
22+
type="button"
23+
aria-label="Clear search"
24+
>
25+
<i class="fas fa-times-circle fa-lg"></i>
26+
</button>
27+
</div>
28+
</div>
29+
<div id="search-results" class="search-dropdown is-hidden"></div>
30+
</div>

scanpipe/views.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2859,7 +2859,7 @@ class ProjectResourceSearchView(
28592859
def get_queryset(self):
28602860
search_query = self.request.GET.get("search", "").strip()
28612861
if not search_query:
2862-
return CodebaseResource.objects.none()
2862+
return super().get_queryset().none()
28632863

28642864
return (
28652865
super()

0 commit comments

Comments
 (0)