Merge pull request #341 from ishitatsuyuki/chartjs4

Co-authored-by: Erik Bjäreholt <erik@bjareho.lt>
ActivityWatch · Jun 8, 2022 · faf68e1 · faf68e1 · github-actions · Jun 8, 2022
2 parents 0770b2f + 6f5278a
commit faf68e1
Show file tree

Hide file tree

Showing 6 changed files with 116 additions and 177 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -1,14 +1,15 @@
 {
   "plugins": ["prettier", "vue", "jest", "@typescript-eslint"],
   "extends": [
-    "prettier",
     "plugin:vue/essential",
     "eslint:recommended",
     "plugin:vue/recommended",
     "@vue/typescript",
     "plugin:jest/recommended",
     "plugin:@typescript-eslint/recommended",
-    "plugin:@typescript-eslint/eslint-recommended"
+    "plugin:@typescript-eslint/eslint-recommended",
+    "prettier",
+    "prettier/vue"
   ],
   "rules": {
     "prettier/prettier": "warn",

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -32,7 +32,7 @@
     "aw-client": "^0.3.2",
     "bootstrap": "^4.6.1",
     "bootstrap-vue": "^2.15.0",
-    "chart.js": "^2.9.3",
+    "chart.js": "^3.8.0",
     "color": "^3.0.0",
     "component-emitter": "^1.3.0",
     "core-js": "^3.19.3",
@@ -58,7 +58,7 @@
     "vis-timeline": "^7.5.0",
     "vis-util": "^5.0.2",
     "vue-awesome": "^3.5.1",
-    "vue-chartjs": "^3.5.0",
+    "vue-chartjs": "^4.1.0",
     "vue-color": "^2.8.1",
     "vue-d3-sunburst": "^1.9.0",
     "vue-datetime": "^1.0.0-beta.13",

diff --git a/src/components/SelectableVisualization.vue b/src/components/SelectableVisualization.vue
@@ -239,10 +239,17 @@ export default {
       }
     },
     datasets: function () {
-      return buildBarchartDataset(
+      // Return empty array if not loaded
+      if (!this.activityStore.category.by_period) return [];
+
+      const datasets = buildBarchartDataset(
         this.activityStore.category.by_period,
         this.categoryStore.classes
       );
+
+      // Return dataset if data found, else return null (indicating no data)
+      if (datasets.length > 1) return datasets;
+      else return null;
     },
     date: function () {
       let date = this.activityStore.query_options.date;

diff --git a/src/stores/activity.ts b/src/stores/activity.ts
@@ -184,7 +184,7 @@ export const useActivityStore = defineStore('activity', {
 
         if (this.window.available) {
           // Perform this last, as it takes the longest
-          await this.query_category_time_by_period(query_options);
+          await this.query_category_time_by_period({ ...query_options, dontQueryInactive: true });
         }
       } else {
         console.warn(
@@ -305,7 +305,7 @@ export const useActivityStore = defineStore('activity', {
       filterCategories,
       filterAFK,
       dontQueryInactive,
-    }: QueryOptions & { dontQueryInactive: string }) {
+    }: QueryOptions & { dontQueryInactive: boolean }) {
       // TODO: Needs to be adapted for Android
       let periods: string[];
       if (timeperiod.length[1].startsWith('day')) {