fix: reintroduced active events for barchart visualization

Author: ErikBjare

src/queries.ts

@@ -165,13 +165,12 @@ export function fullDesktopQuery(
     ${canonicalEvents(params)}
     events = categorize(events, ${classes_str});
     ` +
-    (filterCategories
-      ? `events = filter_keyvals(events, "$category", ${JSON.stringify(filterCategories)});`
-      : '') +
-    `
+      (filterCategories
+        ? `events = filter_keyvals(events, "$category", ${JSON.stringify(filterCategories)});`
+        : '') +
+      `
     title_events = sort_by_duration(merge_events_by_keys(events, ["app", "title"]));
     app_events   = sort_by_duration(merge_events_by_keys(title_events, ["app"]));
-    cat_events = [];
     cat_events   = sort_by_duration(merge_events_by_keys(events, ["$category"]));
 
     app_events  = limit_events(app_events, ${default_limit});
@@ -193,6 +192,7 @@ export function fullDesktopQuery(
             "app_events": app_events,
             "title_events": title_events,
             "cat_events": cat_events,
+            "active_events": not_afk,
             "duration": duration
         },
         "browser": {

src/store/modules/activity.ts

@@ -63,6 +63,9 @@ const _state = {
   active: {
     available: false,
     duration: 0,
+    // non-afk events (no detail data) for the current period
+    events: [],
+    // Aggregated events for current and past periods
     history: {},
   },
 
@@ -178,15 +181,16 @@ const actions = {
       app_events: [],
       title_events: [],
       cat_events: [],
+      active_events: [],
       duration: 0,
     };
     commit('query_window_completed', data);
   },
 
   async query_desktop_full(
     { state, commit },
-    { timeperiod, filterCategories, filterAFK }: QueryOptions)
-  {
+    { timeperiod, filterCategories, filterAFK }: QueryOptions
+  ) {
     const periods = [timeperiodToStr(timeperiod)];
     const classes = loadClassesForQuery();
     const q = queries.fullDesktopQuery(
@@ -411,6 +415,9 @@ const actions = {
       app_events,
       title_events,
       cat_events,
+      active_events: [
+        { timestamp: new Date().toISOString(), duration: 1.5 * 60 * 60, data: { afk: 'not-afk' } },
+      ],
     });
 
     commit('browser_buckets', ['aw-watcher-firefox']);
@@ -493,6 +500,7 @@ const mutations = {
     state.window.top_titles = data['title_events'];
     state.category.top = data['cat_events'];
     state.active.duration = data['duration'];
+    state.active.events = data['active_events'];
   },
 
   query_browser_completed(state, data) {