fix(queries): use real bucket ids for synced hosts in single-host views

src/stores/buckets.ts

@@ -115,6 +115,16 @@ export const useBucketsStore = defineStore('buckets', {
           (id: string) => !id.startsWith('aw-watcher-android')
         );
     },
+    // The window/afk bucket ids to query for a desktop host. Buckets synced
+    // from another device carry a "-synced-from-<device>" suffix, so the
+    // "aw-watcher-window_<host>" id only exists for local buckets. Falls back
+    // to that conventional id when no matching bucket is loaded.
+    desktopBucketIds(): (host: string) => { bid_window: string; bid_afk: string } {
+      return host => ({
+        bid_window: this.bucketsWindow(host)[0] || 'aw-watcher-window_' + host,
+        bid_afk: this.bucketsAFK(host)[0] || 'aw-watcher-afk_' + host,
+      });
+    },
     bucketsAndroid(): (host: string) => string[] {
       return host => {
         const android = this.bucketsByType(host, 'currentwindow').filter((id: string) =>

src/views/Alerts.vue

@@ -155,8 +155,7 @@ export default {
     // Check current time of alert goals
     check: async function () {
       let query = canonicalEvents({
-        bid_window: 'aw-watcher-window_' + this.hostname,
-        bid_afk: 'aw-watcher-afk_' + this.hostname,
+        ...this.bucketsStore.desktopBucketIds(this.hostname),
         filter_afk: this.filter_afk,
         categories: useCategoryStore().classes_for_query,
         filter_categories: null, // classes.map(c => c[0]),

src/views/Graph.vue

@@ -68,6 +68,7 @@ import 'vue-awesome/icons/angle-double-down';
 import 'vue-awesome/icons/angle-double-up';
 
 import { canonicalEvents, querystr_to_array } from '~/queries';
+import { useBucketsStore } from '~/stores/buckets';
 
 import { useCategoryStore } from '~/stores/categories';
 
@@ -109,8 +110,7 @@ export default {
     fetchEvents: async function () {
       // TODO: use full query (one per day/timeperiod) instead of canonicalEvents
       let query = canonicalEvents({
-        bid_window: 'aw-watcher-window_' + this.queryOptions.hostname,
-        bid_afk: 'aw-watcher-afk_' + this.queryOptions.hostname,
+        ...useBucketsStore().desktopBucketIds(this.queryOptions.hostname),
         filter_afk: this.queryOptions.filter_afk,
         categories: this.categoryStore.classes_for_query,
         filter_categories: this.excludeUncategorized

src/views/Report.vue

@@ -133,8 +133,7 @@ export default {
     generate: async function () {
       // TODO: use full query (one per day/timeperiod) instead of canonicalEvents
       let query = canonicalEvents({
-        bid_window: 'aw-watcher-window_' + this.queryOptions.hostname,
-        bid_afk: 'aw-watcher-afk_' + this.queryOptions.hostname,
+        ...this.bucketsStore.desktopBucketIds(this.queryOptions.hostname),
         filter_afk: this.queryOptions.filter_afk,
         categories: this.filterCategories,
         filter_categories: this.filterCategories.map(c => c[0]),

src/views/Search.vue

@@ -42,6 +42,7 @@ div
 import _ from 'lodash';
 import moment from 'moment';
 import { canonicalEvents, querystr_to_array } from '~/queries';
+import { useBucketsStore } from '~/stores/buckets';
 
 import 'vue-awesome/icons/search';
 import 'vue-awesome/icons/spinner';
@@ -69,8 +70,7 @@ export default {
   methods: {
     search: async function () {
       let query = canonicalEvents({
-        bid_window: 'aw-watcher-window_' + this.queryOptions.hostname,
-        bid_afk: 'aw-watcher-afk_' + this.queryOptions.hostname,
+        ...useBucketsStore().desktopBucketIds(this.queryOptions.hostname),
         filter_afk: this.queryOptions.filter_afk,
         categories: [[['searched'], { type: 'regex', regex: this.pattern, ignore_case: true }]],
         filter_categories: [['searched']],

src/views/Trends.vue

@@ -364,8 +364,7 @@ export default {
       const cats = this.categoryStore.classes_for_query;
       const code =
         canonicalEvents({
-          bid_window: 'aw-watcher-window_' + this.host,
-          bid_afk: 'aw-watcher-afk_' + this.host,
+          ...this.bucketsStore.desktopBucketIds(this.host),
           filter_afk: true,
           categories: cats,
           filter_categories: null,

src/views/settings/CategoryBuilder.vue

@@ -269,8 +269,7 @@ export default {
         };
       } else {
         bucketParams = {
-          bid_window: 'aw-watcher-window_' + hostname,
-          bid_afk: 'aw-watcher-afk_' + hostname,
+          ...bucketsStore.desktopBucketIds(hostname),
           filter_afk: this.queryOptions.filter_afk,
         };
       }

test/unit/store/buckets.test.node.ts

@@ -134,3 +134,43 @@ describe('bucketsByDevice', () => {
     expect(device.device_ids).toHaveLength(2);
   });
 });
+
+describe('desktopBucketIds', () => {
+  beforeEach(() => {
+    setActivePinia(createPinia());
+  });
+
+  test('returns the real ids of buckets synced from another device', () => {
+    const store = useBucketsStore();
+    store.update_buckets([
+      bucket({ id: 'aw-watcher-window_erb-m2' }),
+      bucket({ id: 'aw-watcher-afk_erb-m2', type: 'afkstatus' }),
+      bucket({
+        id: 'aw-watcher-window_home-desktop-synced-from-home-desktop',
+        hostname: 'home-desktop',
+      }),
+      bucket({
+        id: 'aw-watcher-afk_home-desktop-synced-from-home-desktop',
+        hostname: 'home-desktop',
+        type: 'afkstatus',
+      }),
+    ]);
+
+    expect(store.desktopBucketIds('home-desktop')).toEqual({
+      bid_window: 'aw-watcher-window_home-desktop-synced-from-home-desktop',
+      bid_afk: 'aw-watcher-afk_home-desktop-synced-from-home-desktop',
+    });
+    expect(store.desktopBucketIds('erb-m2')).toEqual({
+      bid_window: 'aw-watcher-window_erb-m2',
+      bid_afk: 'aw-watcher-afk_erb-m2',
+    });
+  });
+
+  test('falls back to the conventional ids when no bucket is loaded', () => {
+    const store = useBucketsStore();
+    expect(store.desktopBucketIds('laptop')).toEqual({
+      bid_window: 'aw-watcher-window_laptop',
+      bid_afk: 'aw-watcher-afk_laptop',
+    });
+  });
+});