From 4ff6737a815b606dab71d77a54b8e79c44df60b5 Mon Sep 17 00:00:00 2001
From: Ryan Lerch <rlerch@redhat.com>
Date: Aug 03 2018 08:07:07 +0000
Subject: add support for search_pattern on pull-request list


This adds support for filtering the list of pull requests
by search_pattern. This works in the same manner as the
search term for issues, just searching on the title of the
ticket.

Fixes #3179

Signed-off-by: Ryan Lerch <rlerch@redhat.com>

---

diff --git a/pagure/lib/__init__.py b/pagure/lib/__init__.py
index 4804a16..7da3788 100644
--- a/pagure/lib/__init__.py
+++ b/pagure/lib/__init__.py
@@ -2824,7 +2824,7 @@ def search_pull_requests(
         session, requestid=None, project_id=None, project_id_from=None,
         status=None, author=None, assignee=None, count=False,
         offset=None, limit=None, updated_after=None, branch_from=None,
-        order='desc', order_key=None):
+        order='desc', order_key=None, search_pattern=None):
     ''' Retrieve the specified pull-requests.
     '''
 
@@ -2915,6 +2915,11 @@ def search_pull_requests(
             model.PullRequest.branch_from == branch_from
         )
 
+    if search_pattern is not None:
+        query = query.filter(
+            model.PullRequest.title.ilike('%%%s%%' % search_pattern)
+        )
+
     # Depending on the order, the query is sorted(default is desc)
     if order == 'asc':
         query = query.order_by(asc(column))
diff --git a/pagure/templates/requests.html b/pagure/templates/requests.html
index 2dabb87..b88abb3 100644
--- a/pagure/templates/requests.html
+++ b/pagure/templates/requests.html
@@ -66,6 +66,7 @@
                           username=username,
                           namespace=repo.namespace, 
                           author=author,
+                          search_pattern=search_pattern,
                           assignee=assignee) }}">
                           {{open_cnt}} Open PRs
                     </a>
@@ -76,6 +77,7 @@
                           username=username,
                           namespace=repo.namespace,
                           author=author, status='Merged',
+                          search_pattern=search_pattern,
                           assignee=assignee) }}">
                           {{merged_cnt}} Merged PRs
                     </a>
@@ -86,6 +88,7 @@
                           username=username,
                           namespace=repo.namespace,
                           author=author, status='Closed',
+                          search_pattern=search_pattern,
                           assignee=assignee) }}">
                           {{closed_cnt}} Cancelled PRs
                     </a>
@@ -96,6 +99,7 @@
                           username=username,
                           namespace=repo.namespace,
                           author=author, status='all',
+                          search_pattern=search_pattern,
                           assignee=assignee) }}">
                           {{open_cnt+closed_cnt+merged_cnt}} All PRs
                     </a>
@@ -105,8 +109,13 @@
                   <button class="btn btn-sm btn-outline-secondary border-0 dropdown-toggle" data-flip="false" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                     <span class="font-weight-bold">Filter{%if 
                         author or
-                        assignee %}:{% endif %}
+                        assignee or
+                        search_pattern %}:{% endif %}
                     </span>
+                    {% if search_pattern %}
+                    <i class="fa fa-search pl-2 pr-1" title="search"></i>
+                    <span>{{ search_pattern }}</span>
+                    {% endif %}
                     {% if author %}
                     <i class="fa fa-user pl-2 pr-1" title="reported by"></i>
                       {{ author }} 
@@ -124,6 +133,18 @@
                             repo=repo.name ) }}" method="GET">
                         <input type="hidden" name="status" value="{{ status }}" />
 
+                        <div class="form-group row mb-2">
+                          <label for="search_pattern" class="col-auto align-self-center pl-1 pr-0"><i class="text-muted fa fa-fw fa-search"></i></label>
+                          <div class="col pl-1">
+                            <input type="text" class="form-control"
+                                    name="search_pattern" placeholder="Search"
+                                    value="{{ search_pattern or '' }}" />
+                          </div>
+                          <div class="col-auto pl-0 pr-1 pt-1">
+                            <i class="fa fa-times fa-fw text-muted" id="search_pattern-selectize-reset"></i>
+                          </div>
+                        </div>
+
                         <div class="form-group row mb-1" id="assignee-filter-group">
                           <label for="assignee" class="col-auto align-self-center pl-1 pr-0"><i class="text-muted fa fa-fw fa-user-plus"></i></label>
                           <div class="col pl-1">
@@ -187,13 +208,13 @@
                               <a class="btn {%if filter['key'] == order_key and order == 'asc' %}btn-primary{%else%}btn-outline-primary{%endif%}" 
                               href="{{ url_for('ui_ns.request_pulls',
                               repo=repo.name, username=username, namespace=repo.namespace,
-                              author=author, assignee=assignee,
+                              author=author, assignee=assignee, search_pattern=search_pattern,
                               status=status, order_key=filter['key'],
                               order='asc' )}}"><i class="fa fa-fw {{filter['sort_icon_prefix']}}asc"></i></a>
                               <a class="btn {%if filter['key'] == order_key and order == 'desc' %}btn-primary{%else%}btn-outline-primary{%endif%}"
                               href="{{ url_for('ui_ns.request_pulls',
                               repo=repo.name, username=username, namespace=repo.namespace,
-                              author=author, assignee=assignee,
+                              author=author, assignee=assignee, search_pattern=search_pattern,
                               status=status, order_key=filter['key'],
                               order='desc' )}}"><i class="fa fa-fw {{filter['sort_icon_prefix']}}desc"></i></a>
                         </div>
@@ -226,6 +247,7 @@
                                       username=username,
                                       namespace=repo.namespace,
                                       author=author,
+                                      search_pattern=search_pattern,
                                       status='Merged',
                                       assignee=assignee) }}">
                               {{merged_cnt}} merged pull requests
@@ -246,6 +268,7 @@
                                       username=username,
                                       namespace=repo.namespace,
                                       author=author,
+                                      search_pattern=search_pattern,
                                       assignee=assignee) }}">
                               {{open_cnt}} open pull requests
                             </a> 
@@ -279,6 +302,10 @@
 <script type="text/javascript">
 $(document).ready(function() {
 
+    $("#search_pattern-selectize-reset").on('click', function(e){
+      $('input[name="search_pattern"]').val('');
+    });
+
     var $assignee_selectize = $('#assignee-selectize').selectize({
       valueField: 'user',
       labelField: 'user',
@@ -347,6 +374,10 @@ $("#author-selectize-reset").on('click', function(e){
 
   $( "#filters_form" ).submit(function( event ) {
 
+   if ($('input[name="search_pattern"]').val() == ''){
+    $('input[name="search_pattern"]').prop("disabled", true);
+   }
+
   if ($('select[name="assignee"]').val() == ''){
     $('select[name="assignee"]').prop("disabled", true);
    }
diff --git a/pagure/ui/fork.py b/pagure/ui/fork.py
index 84ab6d4..672e9dc 100644
--- a/pagure/ui/fork.py
+++ b/pagure/ui/fork.py
@@ -69,6 +69,7 @@ def request_pulls(repo, username=None, namespace=None):
     """
     status = flask.request.args.get('status', 'Open')
     assignee = flask.request.args.get('assignee', None)
+    search_pattern = flask.request.args.get('search_pattern', None)
     author = flask.request.args.get('author', None)
     order = flask.request.args.get('order', 'desc')
     order_key = flask.request.args.get('order_key', 'date_created')
@@ -100,6 +101,7 @@ def request_pulls(repo, username=None, namespace=None):
             order_key=order_key,
             assignee=assignee,
             author=author,
+            search_pattern=search_pattern,
             offset=flask.g.offset,
             limit=flask.g.limit)
     elif is_true(status, ['true', '1', 'open']):
@@ -112,6 +114,7 @@ def request_pulls(repo, username=None, namespace=None):
             order_key=order_key,
             assignee=assignee,
             author=author,
+            search_pattern=search_pattern,
             offset=flask.g.offset,
             limit=flask.g.limit)
     elif status.lower() == 'closed':
@@ -124,6 +127,7 @@ def request_pulls(repo, username=None, namespace=None):
             order_key=order_key,
             assignee=assignee,
             author=author,
+            search_pattern=search_pattern,
             offset=flask.g.offset,
             limit=flask.g.limit)
     else:
@@ -136,6 +140,7 @@ def request_pulls(repo, username=None, namespace=None):
             order_key=order_key,
             assignee=assignee,
             author=author,
+            search_pattern=search_pattern,
             offset=flask.g.offset,
             limit=flask.g.limit)
 
@@ -145,6 +150,7 @@ def request_pulls(repo, username=None, namespace=None):
         status='Open',
         assignee=assignee,
         author=author,
+        search_pattern=search_pattern,
         count=True)
 
     merged_cnt = pagure.lib.search_pull_requests(
@@ -153,6 +159,7 @@ def request_pulls(repo, username=None, namespace=None):
         status='Merged',
         assignee=assignee,
         author=author,
+        search_pattern=search_pattern,
         count=True)
 
     closed_cnt = pagure.lib.search_pull_requests(
@@ -161,6 +168,7 @@ def request_pulls(repo, username=None, namespace=None):
         status='Closed',
         assignee=assignee,
         author=author,
+        search_pattern=search_pattern,
         count=True)
 
     repo_obj = flask.g.repo_obj
@@ -188,6 +196,7 @@ def request_pulls(repo, username=None, namespace=None):
         status_filter=status_filter,
         assignee=assignee,
         author=author,
+        search_pattern=search_pattern,
         head=head,
         total_page=total_page,
         total_open=total_open,
diff --git a/tests/test_pagure_flask_ui_fork.py b/tests/test_pagure_flask_ui_fork.py
index 9e58f12..310d6fa 100644
--- a/tests/test_pagure_flask_ui_fork.py
+++ b/tests/test_pagure_flask_ui_fork.py
@@ -982,6 +982,21 @@ class PagureFlaskForktests(tests.Modeltests):
         self.assertIn('href="/test/pull-request/4"', tr_elements[1])
         self.assertIn('href="/test/pull-request/1"', tr_elements[2])
 
+        #check that search_pattern argument works
+        output = self.app.get('/test/pull-requests?search_pattern=feature')
+        output_text = output.get_data(as_text=True)
+        tr_elements = re.findall('<div class="request-row list-group-item list-group-item-action">(.*?)</div><!--end request-row-->', output_text, re.M | re.S)
+        self.assertIn('href="/test/pull-request/1"', tr_elements[0])
+        self.assertEqual(len(tr_elements), 1)
+
+        output = self.app.get('/test/pull-requests?search_pattern=PR')
+        output_text = output.get_data(as_text=True)
+        tr_elements = re.findall('<div class="request-row list-group-item list-group-item-action">(.*?)</div><!--end request-row-->', output_text, re.M | re.S)
+        self.assertIn('href="/test/pull-request/4"', tr_elements[0])
+        self.assertIn('href="/test/pull-request/2"', tr_elements[1])
+        self.assertIn('href="/test/pull-request/1"', tr_elements[2])
+        self.assertEqual(len(tr_elements), 3)
+
     @patch('pagure.lib.notify.send_email')
     def test_request_pulls(self, send_email):
         """ Test the request_pulls endpoint. """