fix: fixed filter by category on Android

Author: ErikBjare

src/queries.ts

@@ -75,18 +75,27 @@ export function windowQuery(
   return querystr_to_array(code);
 }
 
-export function appQuery(appbucket: string, classes, filterAFK): string[] {
+export function appQuery(
+  appbucket: string,
+  classes,
+  filterAFK: boolean,
+  filterCategories: string[][]
+): string[] {
   appbucket = appbucket.replace('"', '\\"');
   const params: AndroidQueryParams = {
     bid_android: appbucket,
     classes: classes,
     filter_afk: filterAFK,
   };
-  const code = `
+  const code =
+    `
     events = query_bucket("${params.bid_android}");
     events = merge_events_by_keys(events, ["app"]);
-    events = categorize(events, ${JSON.stringify(params.classes)});
-
+    events = categorize(events, ${JSON.stringify(params.classes)});` +
+    (filterCategories
+      ? `events = filter_keyvals(events, "$category", ${JSON.stringify(filterCategories)});`
+      : '') +
+    `
     title_events = sort_by_duration(merge_events_by_keys(events, ["app", "classname"]));
     app_events   = sort_by_duration(merge_events_by_keys(title_events, ["app"]));
     cat_events   = sort_by_duration(merge_events_by_keys(events, ["$category"]));

src/store/modules/activity.ts

@@ -193,7 +193,7 @@ const actions = {
   async query_android({ state, commit }, { timeperiod, filterCategories }: QueryOptions) {
     const periods = [timeperiodToStr(timeperiod)];
     const classes = loadClassesForQuery();
-    const q = queries.appQuery(state.buckets.android[0], classes, filterCategories);
+    const q = queries.appQuery(state.buckets.android[0], classes, true, filterCategories);
     const data = await this._vm.$aw.query(periods, q).catch(this.errorHandler);
     commit('query_window_completed', data[0]);
   },