File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -575,8 +575,14 @@ body.full-screen #resource-viewer .message-header {
575575 background : var (--bulma-scheme-main );
576576 padding : .25rem 0 .5rem ;
577577}
578- # resource-tree-container .search-container .field {
579- margin-bottom : 0 ;
578+ # resource-tree-container # clear-search {
579+ display : inline-flex;
580+ align-items : center;
581+ justify-content : center;
582+ border : none;
583+ background : transparent;
584+ cursor : pointer;
585+ pointer-events : auto;
580586}
581587# resource-tree-container .search-dropdown {
582588 position : absolute;
@@ -614,10 +620,6 @@ body.full-screen #resource-viewer .message-header {
614620 font-weight : 400 ;
615621 white-space : nowrap;
616622}
617- # resource-tree-container .search-results ,
618- .search-dropdown .search-dropdown-portal .search-results {
619- margin : 0 ;
620- }
621623# resource-tree-container .search-result-item : hover ,
622624# resource-tree-container .search-result-item .is-active ,
623625.search-dropdown .search-dropdown-portal .search-result-item : hover ,
Original file line number Diff line number Diff line change 11{% include "scanpipe/tree/resource_left_pane_header.html" only %}
22< div class ="mb-3 search-container " id ="resource-search-container ">
3- < div class ="field has-addons ">
4- < div class ="control has-icons-left is-expanded ">
3+ < div class ="field mb-0 ">
4+ < div class ="control has-icons-left has-icons-right is-expanded ">
55 < input
66 id ="file-search-input "
77 class ="input is-small "
1717 < span class ="icon is-small is-left ">
1818 < i class ="fas fa-search "> </ i >
1919 </ span >
20- </ div >
21- < div class ="control ">
22- < button id ="clear-search " class ="button is-small is-hidden " type ="button " aria-label ="Clear search ">
23- < span class ="icon is-small ">
24- < i class ="fas fa-times "> </ i >
25- </ 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 >
2627 </ button >
2728 </ div >
2829 </ div >
Original file line number Diff line number Diff line change 11{% if search_results %}
2- < div class ="search-results ">
2+ < div class ="search-results m-0 ">
33 {% for resource in search_results %}
44 < a
55 class ="search-result-item px-4 py-2 is-clickable "
Original file line number Diff line number Diff line change @@ -1741,6 +1741,21 @@ def test_scanpipe_views_project_resource_tree_right_pane_view_empty_directory(se
17411741 resources = list (response .context ["resources" ])
17421742 self .assertEqual (0 , len (resources ))
17431743
1744+ def test_scanpipe_views_project_resource_tree_search_view_filters_results (self ):
1745+ make_resource_file (self .project1 , path = "src/FooBar.py" )
1746+ make_resource_file (self .project1 , path = "src/other.py" )
1747+
1748+ url = reverse (
1749+ "project_resource_tree_search" , kwargs = {"slug" : self .project1 .slug }
1750+ )
1751+ response = self .client .get (url , data = {"search" : "foobar" })
1752+
1753+ self .assertEqual (200 , response .status_code )
1754+ self .assertEqual ("foobar" , response .context ["query" ])
1755+ self .assertEqual (
1756+ ["src/FooBar.py" ], [r .path for r in response .context ["search_results" ]]
1757+ )
1758+
17441759 @mock .patch ("scanpipe.views.ProjectResourceTreeRightPaneView.paginate_by" , 2 )
17451760 def test_scanpipe_views_project_resource_tree_right_pane_view_pagination (self ):
17461761 make_resource_directory (self .project1 , path = "parent" )
You can’t perform that action at this time.
0 commit comments