Add audit filters.

Author: b4oshany

kotti_audit/__init__.py

@@ -37,6 +37,7 @@ def kotti_configure(settings):
     KOTTI_USER_NAV_LINKS.append(
         Link('audit-log', title=_(u'Audit Log'))
     )
+    settings['kotti.fanstatic.view_needed'] += ' kotti_audit.fanstatic.css_and_js'
 
     if 'kotti_controlpanel.kotti_configure' not in settings['kotti.configurators']:
         settings['kotti.configurators'] += '\nkotti_controlpanel.kotti_configure'

kotti_audit/static/scripts.js

@@ -1 +1,14 @@
 /* JS */
+
+window.datepicker = {
+    toDisplay: function (date, format, language) {
+        var d = new Date(date);
+        d.setDate(d.getDate() - 7);
+        return d.toISOString();
+    },
+    toValue: function (date, format, language) {
+        var d = new Date(date);
+        d.setDate(d.getDate() + 7);
+        return new Date(d);
+    }
+};

kotti_audit/templates/audit-log.pt

@@ -47,19 +47,25 @@
                     data-url="${data_url}?${data_search}"
                     data-page-size="50"
                     data-id-field="id"
+                    data-filter-control="true"
                     data-sort-name="modification_date"
-                    data-sort-order="asc">
+                    data-sort-order="desc">
                     <thead>
                         <tr>
                             <th data-sortable="true" data-field="id" >ID</th>
-                            <th data-sortable="true" data-formatter="urlFormatter" data-field="title" >Title</th>
-                            <th data-sortable="true" data-field="context" >Context</th>
+                            <th data-sortable="true" data-filter-control="input" data-formatter="urlFormatter" data-field="title" >Title</th>
+                            <th data-sortable="true" data-filter-control="select" data-field="type" >Context</th>
+                            <th data-sortable="true" data-filter-control="select" data-field="parent" >Container</th>
                             <th data-field='creation_date'
-                                data-sorter="dateSorter"  data-sortable="true">
+                                data-sorter="dateSorter"  data-sortable="true"
+                                data-filter-control="datepicker"
+                                data-filter-datepicker-options='{"format": "yyyy-mm-dd"}'>
                                 Created
                             </th>
                             <th data-field="modification_date"
-                                data-sorter="dateSorter"  data-sortable="true">
+                                data-sorter="dateSorter"  data-sortable="true"
+                                data-filter-control="datepicker"
+                                data-filter-datepicker-options='{"format": "yyyy-mm-dd"}'>
                                 Modified
                             </th>
                         </tr>

kotti_audit/utils.py

@@ -0,0 +1,12 @@
+from kotti.resources import Content
+from sqlalchemy import and_, func
+
+
+def date_query(query, column_name, value, cls=Content):
+    column = cls.__dict__.get(column_name)
+    return query.filter(
+        and_(
+            func.date(column) >= func.date(value),
+            func.date(column) <= func.date(value)
+        )
+    )

kotti_audit/views/view.py

@@ -4,11 +4,13 @@
 Created on 2020-03-21
 :author: Oshane Bailey (b4.oshany@gmail.com)
 """
-
+import json
 from pyramid.view import view_config
 from pyramid.view import view_defaults
+from sqlalchemy import or_
 
 from kotti_audit import _
+from kotti_audit import utils
 from kotti_audit.fanstatic import css_and_js
 from kotti_audit.views import BaseView
 from kotti.resources import Content
@@ -21,58 +23,97 @@ class AuditLogViews(BaseView):
     @view_config(name='audit-log', permission='view',
                  renderer='kotti_audit:templates/audit-log.pt')
     def default_view(self):
-        """ Default view for :class:`kotti_audit.resources.CustomContent`
+        """ Default view`
 
         :result: Dictionary needed to render the template.
         :rtype: dict
         """
 
-        return {
-            'foo': _(u'bar'),
-        }
+        return {}
 
     @view_config(name="audit-api", permission="admin",
                  renderer="json")
     def api_dropbox(self):
+        """ API view`
+
+        :result: Dictionary needed to render the template.
+        :rtype: dict
+        """
         limit = int(self.request.params.get("limit", 50))
         offset = int(self.request.params.get("offset", 0))
-        sort = self.request.params.get("sort", "creation_date")
+        sort = self.request.params.get("sort", "modification_date")
         order = self.request.params.get("order", "desc")
-        parent_id = self.context.id if self.context.__parent__ else 0
-        query = self.request.params.get("search", None)
+        filters = self.request.params.get("filter", None)
+        search = self.request.params.get("search", None)
 
-        nodes = Content.query;
+        query = Content.query;
 
+        # Use the current context as the base location of the search,
+        # otherwise, use root as the base location if no parent is found.
+        parent_id = self.context.id if self.context.__parent__ else 0
         if parent_id != 0:
-            nodes = nodes.filter(
+            query = query.filter(
                 Content.path.ilike('{}%'.format(self.context.path)),
                 Content.id != self.context.id
             )
 
-        if query is not None:
-            nodes = nodes.filter(Content.title.ilike("%{}%".format(query)))
+        if filters is not None:
+            filters = json.loads(filters)
+        
+            if 'creation_date' in filters:
+                creation_date = filters['creation_date']
+                query = utils.date_query(query, 'creation_date', creation_date)
+        
+            if 'modification_date' in filters:
+                modification_date = filters['modification_date']
+                query = utils.date_query(query, 'modification_date', modification_date)
+            
+            if 'title' in filters:
+                query = query.filter(
+                    Content.title.ilike("%{}%".format(filters['title'])))
+            
+            if 'type' in filters:
+                query = query.filter_by(type=filters['type'].lower())
+            
+            if 'parent' in filters:
+                query = query.filter(
+                    Content.parent.title.ilike(
+                        "%{}%".format(filters['parent'])))
+
+        
+        if search:
+            # TODO: Add an `or` statement to find content with similar (like)
+            # title and parent title.
+            query = query.filter(
+                or_(
+                    Content.title.ilike("%{}%".format(search)),
+                    Content.type==search.lower()
+                )
+            )
 
         if order == 'asc':
-            nodes = nodes.order_by(Content.__dict__.get(sort).asc())
+            query = query.order_by(Content.__dict__.get(sort).asc())
         else:
-            nodes = nodes.order_by(Content.__dict__.get(sort).desc())
+            query = query.order_by(Content.__dict__.get(sort).desc())
 
-        total_nodes = nodes.count()
+        total_query = query.count()
         if offset > 0:
-            nodes = nodes.offset(offset)
+            query = query.offset(offset)
         if limit > 0:
-            nodes = nodes.limit(limit)
+            query = query.limit(limit)
 
-        nodes_json = [{
+        # build bootstrap table response.
+        query_json = [{
             "title": f.title,
-            "context": f.parent.title if f.parent is not None else '',
+            "parent": f.parent.title if f.parent is not None else '',
             "path": f.path,
+            'type': f.type.title(),
             "url": f.path,
             "id": f.id,
             "creation_date": f.creation_date.strftime("%A %d. %B %Y - %I:%M%p %z ") or '',
             "modification_date": f.modification_date.strftime("%A %d. %B %Y - %I:%M%p %z ") or ''
-        } for f in nodes]
+        } for f in query]
         return {
-            "rows": nodes_json,
-            "total": total_nodes
+            "rows": query_json,
+            "total": total_query
         }

setup.py

@@ -14,13 +14,13 @@
 except IOError:
     CHANGES = ''
 
-version = '1.1.0'
+version = '1.1.1'
 
 install_requires = [
     'Kotti>=1.2.4',
     'kotti_tinymce',
     'kotti-controlpanel>=1.0.9',
-    'kotti_bstable'
+    'kotti_bstable>=1.0.1'
 ]
 
 tests_require = [