GHOST-625: Add some UI list filter

Author: Shr3ps

app.py

@@ -1027,16 +1027,26 @@ def web_deployment_redeploy(deployment_id):
 def web_webhook_list():
     query = request.args.get('where', None)
     page = request.args.get('page', '1')
-    webhooks = get_ghost_webhooks(query, page)
+    application_name = request.args.get('application') or None
+    module = request.args.get('module') or None
+    webhook_revision = request.args.get('revision') or None
+
+    query_values = {
+        'application_name': application_name,
+        'webhook_revision': webhook_revision,
+        'module': module,
+    }
+
+    webhooks = get_ghost_webhooks(query, page, application_name, module, webhook_revision)
 
     # Generate error message if at least one of the webhook configs is invalid
     if not ui_helpers.check_webhooks_validity(webhooks):
         flash('At least one of your webhooks is invalid: invalid app or module.', 'danger')
 
     if request.is_xhr:
-        return render_template('webhook_list_content.html', webhooks=webhooks, page=int(page))
+        return render_template('webhook_list_content.html', webhooks=webhooks, page=int(page), query_values=query_values)
 
-    return render_template('webhook_list.html', webhooks=webhooks, page=int(page))
+    return render_template('webhook_list.html', webhooks=webhooks, page=int(page), query_values=query_values)
 
 
 @app.route('/web/webhooks/all/invocations', methods=['GET'])

ghost_client.py

@@ -586,11 +586,30 @@ def normalize_app_object(app, embed_features_params_as_yml):
     return app
 
 
-def get_ghost_webhooks(query=None, page=None):
+def get_ghost_webhooks(query=None, page=None, application_name=None, module_name=None, webhook_rev=None):
     try:
         url = url_webhooks + API_QUERY_SORT_UPDATED_DESCENDING + '&embedded={"app_id": 1}'
         if query:
             url += "&where=" + query
+        else:
+            query = {}
+            if application_name:
+                applications = ['{{"app_id":"{app_id}"}}'.format(app_id=application['_id'])
+                                for application in get_ghost_apps(name=application_name)]
+                if len(applications) > 0:
+                    query['$or'] = '[{}]'.format(','.join(applications))
+                else:
+                    query['$or'] = '[{"app_id":"null"}]'
+
+            if module_name:
+                query['module'] = '"{}"'.format(module_name)
+
+            if webhook_rev:
+                query['rev'] = '"{}"'.format(webhook_rev)
+
+            querystr = '{{{query}}}'.format(query=','.join('"{key}":{value}'.format(key=key, value=value)
+                                                           for key, value in query.items()))
+            url += "&where=" + querystr
         if page:
             url += "&page=" + page
         result = requests.get(url, headers=headers, auth=current_user.auth)

templates/webhook_list.html

@@ -6,14 +6,40 @@
     {% include 'partial_list_top_right.html' %}
     <caption>Sorted by last modification date</caption>
 
-    <ul class="nav nav-stacked action-btns">
-        <li>
-            <a href="/web/webhooks/create" id="createWebhook"><button class="btn btn-raised btn-primary"><span class="glyphicon glyphicon-plus"></span> Create a Webhook</button></a>
-        </li>
-        <li>
-            <a href="/web/webhooks/all/invocations" id="webhookInvocations"><button class="btn btn-raised btn-success"><span class="glyphicon glyphicon-th-list"></span> See all invocations</button></a>
-        </li>
-    </ul>
+    <form method="get" class="filter-form">
+        <ul class="list-inline">
+            <li class="list-button">
+                <a href="/web/webhooks/create" id="createWebhook" class="btn btn-raised btn-primary"><span class="glyphicon glyphicon-plus"></span> Create a Webhook</a>
+            </li>
+            <li class="list-button">
+                <a href="/web/webhooks/all/invocations" id="webhookInvocations" class="btn btn-raised btn-success"><span class="glyphicon glyphicon-th-list"></span> See all invocations</a>
+            </li>
+            <li>
+                <ul class="nav nav-stacked action-btns-filter nav navbar-nav filter-group">
+                    <li role="presentation" class="filter">
+                        <div class="form-group filter-row">
+                            <input type="text" name="application" class="form-control" placeholder="Search application..." value="{{ query_values['application_name'] or '' }}"/>
+                        </div>
+                    </li>
+                    <li role="presentation" class="filter">
+                        <div class="form-group filter-row">
+                            <input type="text" name="module" class="form-control" placeholder="Search module..." value="{{ query_values['module'] or '' }}"/>
+                        </div>
+                    </li>
+                    <li role="presentation" class="filter">
+                        <div class="form-group filter-row">
+                            <input type="text" name="revision" class="form-control" placeholder="Search revision..." value="{{ query_values['webhook_revision'] or '' }}"/>
+                        </div>
+                    </li>
+                    <li class="filter">
+                        <div class="form-group filter-row">
+                            <button class="btn btn-default btn-simple btn-xs"><span class="glyphicon glyphicon-search" aria-hidden="true"></span></button>
+                        </div>
+                    </li>
+                </ul>
+            </li>
+        </ul>
+    </form>
 {% endblock %}"
 
 {% block page_content %}

ui_helpers.py

@@ -153,7 +153,7 @@ def get_app_module_by_name(app, name):
 
 def check_webhooks_validity(webhooks):
     for webhook in webhooks:
-        if not webhook['module_object']:
+        if not webhook.get('module_object'):
             return False
 
     return True