add support for filtering by event type

fix datetime as well
farmersbusinessnetwork · Oct 6, 2018 · d2e6919 · d2e6919
1 parent 5a4dc4a
commit d2e6919
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 8 deletions.
diff --git a/upvote/gae/cron.yaml b/upvote/gae/cron.yaml
@@ -27,11 +27,11 @@ cron:
 #~~~ 
 #### END:daily_backup ####
 #### BEGIN:groups ####
-#~~~ - description: Sync members of external groups to roles in Upvote.
-#~~~   url: /cron/roles/sync
-#~~~   schedule: every 1 hours
-#~~~   target: upvote-app
-#~~~ 
+- description: Sync members of external groups to roles in Upvote.
+  url: /cron/roles/sync
+  schedule: every 1 hours
+  target: upvote-app
+
 #### END:groups ####
 #### BEGIN:santa ####
 #~~~ - description: Lock down all hosts of users in lockdown group.

diff --git a/upvote/gae/index.yaml b/upvote/gae/index.yaml
@@ -194,6 +194,12 @@ indexes:
   - name: last_blocked_dt
     direction: desc
 
+- kind: Event
+  properties:
+  - name: event_type
+  - name: last_blocked_dt
+    direction: desc
+
 - kind: Event
   ancestor: yes
   properties:

diff --git a/upvote/gae/modules/upvote_app/frontend/admin_ui/eventpage/events.html b/upvote/gae/modules/upvote_app/frontend/admin_ui/eventpage/events.html
@@ -55,6 +55,9 @@
       <md-radio-button value="executingUser" class="md-primary">
         Executing User
       </md-radio-button>
+      <md-radio-button value="eventType" class="md-primary">
+        Event Type
+      </md-radio-button>
     </md-radio-group>
   </div>
 
@@ -63,7 +66,7 @@
     <uv-listing>
       <listing-header>
         <uv-listing-header flex-gt-md="15" flex="25">Name</uv-listing-header>
-        <uv-listing-header flex-gt-md="15" flex="25">Date</uv-listing-header>
+        <uv-listing-header flex-gt-md="15" flex="25">Last Blocked</uv-listing-header>
         <uv-listing-header flex-gt-md="15" flex="25">Type</uv-listing-header>
         <uv-listing-header flex-gt-md="15" flex="25">User</uv-listing-header>
         <uv-listing-header hide show-gt-md flex="15">Filename</uv-listing-header>
@@ -72,13 +75,13 @@
       <listing-body>
         <uv-listing-row on-select="eventCtrl.selectItem(item.key)" ng-repeat="item in eventCtrl.content">
           <uv-listing-cell>{{item.fileName}}</uv-listing-cell>
-          <uv-listing-cell>{{item.occurredDt | date:'mediumDate'}}</uv-listing-cell>
+          <uv-listing-cell>{{item.lastBlockedDt | date:'medium'}}</uv-listing-cell>
           <uv-listing-cell>{{item.eventType}}</uv-listing-cell>
           <uv-listing-cell>{{item.executingUser}}</uv-listing-cell>
           <uv-listing-cell>{{item.publisher}}</uv-listing-cell>
           <md-tooltip layout="column">
             Filename: {{item.fileName}},
-            Date: {{item.occurredDt | date:'mediumDate'}},
+            Date: {{item.lastBlockedDt | date:'medium'}},
             {{item.occurredDt | timeSince}},
             Type: {{item.eventType}},
             Host ID: {{item.hostId | prettifyUuid}},