Merge pull request #186 from ActivityWatch/dev/make-queries-less-dependent

See host even if only editor buckets exist

Author: johan-bjareholt

src/components/Header.vue

@@ -103,7 +103,7 @@ export default {
     //console.log(types_by_host);
 
     _.each(types_by_host, (types, hostname) => {
-      if (types.afk && types.window) {
+      if (hostname != 'unknown') {
         this.activityViews.push({
           name: hostname,
           hostname: hostname,

src/store/modules/activity_daily.ts

@@ -56,8 +56,12 @@ const _state = {
     browser_buckets: 'all',
     editor_buckets: 'all',
   },
-  editor_buckets_available: [],
-  browser_buckets_available: [],
+  buckets: {
+    afk_buckets: [],
+    window_buckets: [],
+    editor_buckets: [],
+    browser_buckets: [],
+  },
 };
 
 function timeperiodsAroundTimeperiod(timeperiod: TimePeriod): TimePeriod[] {
@@ -100,95 +104,144 @@ const actions = {
       if (!query_options.timeperiod) {
         query_options.timeperiod = dateToTimeperiod(query_options.date);
       }
+
+      await dispatch('buckets/ensureBuckets', null, { root: true });
       await dispatch('get_buckets', query_options);
 
       // TODO: These queries can actually run in parallel, but since server won't process them in parallel anyway we won't.
-      await dispatch('query_window', query_options);
-      await dispatch('query_browser', query_options);
-      await dispatch('query_editor', query_options);
-      await dispatch('query_active_history', query_options);
+
+      if (state.buckets.afk_buckets.length > 0 && state.buckets.window_buckets.length > 0) {
+        await dispatch('query_window', query_options);
+      } else {
+        console.log('Cannot call query_window as we are missing either an afk or window bucket');
+        await dispatch('query_window_empty', query_options);
+      }
+
+      if (
+        state.buckets.afk_buckets.length > 0 &&
+        state.buckets.window_buckets.length > 0 &&
+        state.buckets.browser_buckets.length > 0
+      ) {
+        await dispatch('query_browser', query_options);
+      } else {
+        console.log(
+          'Cannot call query_browser as we are missing either an afk, window or browser bucket'
+        );
+        await dispatch('query_browser_empty', query_options);
+      }
+
+      if (state.buckets.afk_buckets.length > 0) {
+        await dispatch('query_active_history', query_options);
+      } else {
+        console.log('Cannot call query_active_history as we do not have an afk bucket');
+        await dispatch('query_active_history_empty', query_options);
+      }
+
+      if (state.buckets.editor_buckets.length > 0) {
+        await dispatch('query_editor', query_options);
+      } else {
+        console.log('Cannot call query_editor as we do not have any editor buckets');
+        await dispatch('query_editor_empty', query_options);
+      }
     } else {
       console.warn(
         'ensure_loaded called twice with same query_options but without query_options.force = true, skipping...'
       );
     }
   },
 
-  async query_window({ commit }, { host, timeperiod, filterAFK, filterCategories }: QueryOptions) {
-    const start = moment();
+  async query_window({ state, commit }, { timeperiod, filterAFK, filterCategories }: QueryOptions) {
     const periods = [timeperiodToStr(timeperiod)];
     const classes = loadClassesForQuery();
-    const bucket_id_window = 'aw-watcher-window_' + host;
-    const bucket_id_afk = 'aw-watcher-afk_' + host;
     const q = queries.windowQuery(
-      bucket_id_window,
-      bucket_id_afk,
+      state.buckets.window_buckets[0],
+      state.buckets.afk_buckets[0],
       default_limit, // this.top_apps_count,
       default_limit, // this.top_windowtitles_count,
       filterAFK,
       classes,
       filterCategories
     );
     const data = await this._vm.$aw.query(periods, q);
-    console.info(`Completed window query in ${moment().diff(start)}ms`);
     commit('query_window_completed', data[0]);
   },
 
-  async query_browser({ state, commit }, { host, timeperiod, filterAFK }: QueryOptions) {
-    const start = moment();
-    if (state.browser_buckets_available) {
-      const periods = [timeperiodToStr(timeperiod)];
-      const bucket_id_window = 'aw-watcher-window_' + host;
-      const bucket_id_afk = 'aw-watcher-afk_' + host;
-      const q = queries.browserSummaryQuery(
-        state.browser_buckets_available,
-        bucket_id_window,
-        bucket_id_afk,
-        default_limit, // this.top_web_count
-        filterAFK
-      );
-      const data = await this._vm.$aw.query(periods, q);
-      console.info(`Completed browser query in ${moment().diff(start)}ms`);
-      commit('query_browser_completed', data[0]);
-    }
+  async query_window_empty({ commit }) {
+    const data = {
+      app_events: [],
+      title_events: [],
+      cat_events: [],
+      duration: 0,
+      active_events: [],
+    };
+    commit('query_window_completed', data);
+  },
+
+  async query_browser({ state, commit }, { timeperiod, filterAFK }: QueryOptions) {
+    const periods = [timeperiodToStr(timeperiod)];
+    const q = queries.browserSummaryQuery(
+      state.buckets.browser_buckets,
+      state.buckets.window_buckets[0],
+      state.buckets.afk_buckets[0],
+      default_limit, // this.top_web_count
+      filterAFK
+    );
+    const data = await this._vm.$aw.query(periods, q);
+    commit('query_browser_completed', data[0]);
+  },
+
+  async query_browser_empty({ commit }) {
+    const data = {
+      domains: [],
+      urls: [],
+      duration: 0,
+    };
+    commit('query_browser_completed', data);
   },
 
   async query_editor({ state, commit }, { timeperiod }) {
-    if (state.editor_buckets_available) {
-      const periods = [timeperiodToStr(timeperiod)];
-      const q = queries.editorActivityQuery(state.editor_buckets_available, 100);
-      const data = await this._vm.$aw.query(periods, q).catch(this.errorHandler);
-      commit('query_editor_completed', data[0]);
-    }
+    const periods = [timeperiodToStr(timeperiod)];
+    const q = queries.editorActivityQuery(state.buckets.editor_buckets, 100);
+    const data = await this._vm.$aw.query(periods, q);
+    commit('query_editor_completed', data[0]);
   },
 
-  async query_active_history({ commit, state }, { host, timeperiod }: QueryOptions) {
+  async query_editor_empty({ commit }) {
+    const data = {
+      files: [],
+      projects: [],
+      languages: [],
+    };
+    commit('query_editor_completed', data);
+  },
+
+  async query_active_history({ commit, state }, { timeperiod }: QueryOptions) {
     const periods = timeperiodStrsAroundTimeperiod(timeperiod).filter(tp_str => {
       return !_.includes(state.active_history, tp_str);
     });
-    const bucket_id_afk = 'aw-watcher-afk_' + host;
-    const queryStart = moment();
+    const bucket_id_afk = state.buckets.afk_buckets[0];
     const data = await this._vm.$aw.query(periods, queries.dailyActivityQuery(bucket_id_afk));
     const active_history = _.zipObject(
       periods,
       _.map(data, pair => _.filter(pair, e => e.data.status == 'not-afk'))
     );
-    console.info(`Completed history query in ${moment().diff(queryStart)}ms`);
     commit('query_active_history_completed', { active_history });
   },
 
-  async get_buckets({ commit }) {
-    const buckets = await this._vm.$aw.getBuckets();
-    const browser_buckets = _.map(
-      _.filter(buckets, bucket => bucket['type'] === 'web.tab.current'),
-      bucket => bucket['id']
-    );
-    const editor_buckets = _.map(
-      _.filter(buckets, bucket => bucket['type'] === 'app.editor.activity'),
-      bucket => bucket['id']
-    );
-    commit('browser_buckets', browser_buckets);
-    commit('editor_buckets', editor_buckets);
+  async query_active_history_empty({ commit }) {
+    const data = [];
+    commit('query_active_history_completed', data);
+  },
+
+  async get_buckets({ commit, rootGetters }, { host }) {
+    const buckets = {
+      afk_buckets: rootGetters['buckets/afkBucketsByHost'](host),
+      window_buckets: rootGetters['buckets/windowBucketsByHost'](host),
+      browser_buckets: rootGetters['buckets/browserBuckets'],
+      editor_buckets: rootGetters['buckets/editorBuckets'],
+    };
+    console.log('Available buckets: ', buckets);
+    commit('buckets', buckets);
   },
 
   async load_demo({ commit }) {
@@ -409,12 +462,8 @@ const mutations = {
     };
   },
 
-  browser_buckets(state, data) {
-    state.browser_buckets_available = data;
-  },
-
-  editor_buckets(state, data) {
-    state.editor_buckets_available = data;
+  buckets(state, data) {
+    state.buckets = data;
   },
 };
 

src/store/modules/buckets.js

@@ -3,13 +3,39 @@ const state = {
   buckets: [],
 };
 
+function get_buckets_by_type(buckets, type) {
+  return _.map(
+    _.filter(buckets, bucket => bucket['type'] === type),
+    bucket => bucket['id']
+  );
+}
+
+function get_buckets_by_host_and_type(buckets, host, type) {
+  return _.map(
+    _.filter(buckets, bucket => bucket['type'] === type && bucket['hostname'] == host),
+    bucket => bucket['id']
+  );
+}
+
 // getters
 const getters = {
+  afkBuckets(state) {
+    return get_buckets_by_type(state.buckets, 'afkstatus');
+  },
+  afkBucketsByHost: state => host => {
+    return get_buckets_by_host_and_type(state.buckets, host, 'afkstatus');
+  },
+  windowBuckets(state) {
+    return get_buckets_by_type(state.buckets, 'currentwindow');
+  },
+  windowBucketsByHost: state => host => {
+    return get_buckets_by_host_and_type(state.buckets, host, 'currentwindow');
+  },
+  editorBuckets(state) {
+    return get_buckets_by_type(state.buckets, 'app.editor.activity');
+  },
   browserBuckets(state) {
-    return _.map(
-      _.filter(state.buckets, bucket => bucket['type'] === 'web.tab.current'),
-      bucket => bucket['id']
-    );
+    return get_buckets_by_type(state.buckets, 'web.tab.current');
   },
   getBucket: state => id => _.filter(state.buckets, b => b.id === id)[0],
   bucketsByHostname: state => _.groupBy(state.buckets, 'hostname'),
@@ -25,7 +51,6 @@ const actions = {
 
   async loadBuckets({ commit }) {
     const buckets = await this._vm.$aw.getBuckets();
-    console.info('Received buckets: ', buckets);
     commit('update_buckets', buckets);
   },
 

src/views/activity/daily/ActivityDailyBrowser.vue

@@ -1,26 +1,31 @@
 <template lang="pug">
 div
   // TODO: Add back option to select a specific browser bucket
+  div(v-if="browserBuckets.length <= 0")
+    h6 No browser buckets available
+    small Make sure you have a browser watcher installed to use this feature
+  div(v-if="browserBuckets.length > 0")
 
-  h6 Active browser time: {{ $store.state.activity_daily.browser_duration | friendlyduration }}
+    h6 Active browser time: {{ $store.state.activity_daily.browser_duration | friendlyduration }}
 
-  div.row
-    div.col-md-6
-      h5 Top Browser Domains
-      div(v-if="browserBuckets")
-        aw-summary(:fields="$store.state.activity_daily.top_domains", :namefunc="e => e.data.$domain", :colorfunc="e => e.data.$domain", with_limit)
+    div.row
+      div.col-md-6
+        h5 Top Browser Domains
+        div(v-if="browserBuckets")
+          aw-summary(:fields="$store.state.activity_daily.top_domains", :namefunc="e => e.data.$domain", :colorfunc="e => e.data.$domain", with_limit)
 
-    div.col-md-6
-      h5 Top Browser URLs
-      div(v-if="browserBuckets")
-        aw-summary(:fields="$store.state.activity_daily.top_urls", :namefunc="e => e.data.url", :colorfunc="e => e.data.$domain", with_limit)
+      div.col-md-6
+        h5 Top Browser URLs
+        div(v-if="browserBuckets")
+          aw-summary(:fields="$store.state.activity_daily.top_urls", :namefunc="e => e.data.url", :colorfunc="e => e.data.$domain", with_limit)
 
   //div(v-if="periodLength === 'day'")
     br
     hr
     b-form-checkbox(v-model="timelineShowAFK")
       | Show AFK time
     aw-timeline-inspect(:chunks="$store.state.activity_daily.web_chunks", :show_afk='timelineShowAFK', :chunkfunc='e => e.data.$domain', :eventfunc='e => e.data.url')
+  br
 </template>
 
 <script>
@@ -44,7 +49,7 @@ export default {
   },
   computed: {
     browserBuckets: function() {
-      return this.$store.state.activity_daily.browser_buckets_available;
+      return this.$store.state.activity_daily.buckets.browser_buckets;
     },
   },
 };

src/views/activity/daily/ActivityDailyEditor.vue

@@ -63,7 +63,7 @@ export default {
 
   computed: {
     editorBuckets: function() {
-      return this.$store.state.activity_daily.editor_buckets_available;
+      return this.$store.state.activity_daily.buckets.editor_buckets;
     },
     dateEnd: function() {
       return moment(this.date)