Added classification vis & settings, switched to vue-cli, massiv… by ErikBjare · Pull Request #145 · ActivityWatch/aw-webui

ErikBjare · 2019-09-21T11:02:14Z

Todo

Now

Fix issue with the summary not immediately showing when using/clicking the PeriodUsage bars to navigate (path needs /summary appended)
- An option is to go back to the old architecture (without subroutes), which should be easy now that everything is refactored out and subroutes are decoupled from $route.params.
Fix ErrorBoundary component (to avoid having alerts and error handlers in every component)
- Sort of fixed. Works as long as all methods are properly async/await-
  ed.
Set the default classes in local storage, let user modify themselves in the settings.
Finalize the category settings stuff ~~(adding/removing categories doesn't work right now, only editing)~~
When parent category is renamed also rename eventual children

After

Run eslint --fix on entire project in new PR that will be immediately merged. (Done in Lint it all #150)

Later (uncompleted moved to #151)

Add a category sunburst
Start using Vuex properly
Switch to Vue CLI 3 for easier config, better tooling, and future-proofing
Merge web watcher events into window events in the query? (to allow for classifying by url/domain)
Category Tree: If a category has children, but also activity attributed directly to the parent that does not belong to a child, then create a "Other" child containing the activity.
Should we have a way to filter on a specific event key? Right now the regexes are applied on every (string) data value.
Add a way to show how/which events are (un)categorized
Fix summary view to also use Vuex and all the new goodies

Depends on

How it looks (for now)

johan-bjareholt · 2019-09-22T10:48:46Z

There's a lot of nice changes here, but one primary thing missing here is the ability to do make your own tags and save them.

Could we focus on taking in the underlying aw-server changes here, then take in these aw-webui changes and then disable the view by default until we have solved that? I would hate to see this PR stagnate and need huge rebases in the future.

src/views/ActivityDaily.vue

johan-bjareholt · 2019-09-22T11:54:54Z

src/queries.js

    title_events  = limit_events(title_events, ${titlecount});
    duration = sum_durations(events);
-    RETURN  = {"app_events": app_events, "title_events": title_events, "app_chunks": app_chunks, "duration": duration};`;
+    RETURN  = {"app_events": app_events, "title_events": title_events, "cat_events": cat_events, "app_chunks": app_chunks, "duration": duration};`;


As we have learned from earlier when we didn't have proper queries, sending all events to the web-ui and computing it there is not scalable for more than a days worth of data.
You should instead for example utilize the merge_events_by_keys for categories and write some new transform in the server for tags.

But I am using merge_events_by_keys? I'm basically only sending one event per category in the cat_events.

johan-bjareholt · 2019-09-22T11:57:15Z

Set the default classes in local storage, let user modify themselves in the settings.

We should not use browser storage for this, we should have an API in the server to save this.

We don't want all tags to be forgotten if we switch to a different browser.

ErikBjare · 2019-09-22T16:22:21Z

We should not use browser storage for this, we should have an API in the server to save this.
We don't want all tags to be forgotten if we switch to a different browser.

Agreed, but just as with the next-day-start setting, I'm saying we could use browser storage until we have such a key/value store in aw-server for stuff like this.

ErikBjare · 2019-09-22T16:26:40Z

There's a lot of nice changes here, but one primary thing missing here is the ability to do make your own tags and save them.

Could we focus on taking in the underlying aw-server changes here, then take in these aw-webui changes and then disable the view by default until we have solved that? I would hate to see this PR stagnate and need huge rebases in the future.

As I said, I think it'll be perfectly fine to use local storage until we have a way to store settings in aw-server.

I also want to refactor ActivityDaily.vue (using nested routes for the tabs) which I'll probably do in this PR. If I end up doing that I'll probably end up moving this stuff to a new tab with a "work in progress" disclaimer, which should prevent stagnation of this PR.

johan-bjareholt · 2019-09-22T19:23:34Z

As I said, I think it'll be perfectly fine to use local storage until we have a way to store settings in aw-server.

Alright, but could we move it out to a separate view so it's clear that it's WIP? I don't want to add WIP features onto the primary view both because it gets cluttered but also because we want it to be very clear that it's WIP.

I also want to refactor ActivityDaily.vue (using nested routes for the tabs) which I'll probably do in this PR. If I end up doing that I'll probably end up moving this stuff to a new tab with a "work in progress" disclaimer, which should prevent stagnation of this PR.

I thought the plan was to refactor everything into the Summary view to then remove the daily view? Please don't waste time working on improving the daily view as that will just become duplicate work.

ErikBjare · 2019-10-01T13:09:42Z

I thought the plan was to refactor everything into the Summary view to then remove the daily view? Please don't waste time working on improving the daily view as that will just become duplicate work.

I did not know this? What makes the Summary view such a great replacement? I really don't see it.

Anyway, before you replied I had already refactored the daily view massively, which should make it much easier to work with. (see the latest commit)

johan-bjareholt · 2019-10-01T17:41:39Z

I did not know this? What makes the Summary view such a great replacement? I really don't see it.

Mostly because of the fact that if you implement something once you get it for free for all other time ranges.
The original plan was to slowly move more and more features from the daily view once we found performant ways to do it in both so we afterwards only needed a single view.

johan-bjareholt · 2019-10-01T18:25:48Z

Mostly because of the fact that if you implement something once you get it for free for all other time ranges.
The original plan was to slowly move more and more features from the daily view once we found performant ways to do it in both so we afterwards only needed a single view.

Now that you have splitted out each section to its own file though that idea is probably moot as now each section is modular. Nice

johan-bjareholt · 2019-10-01T18:27:04Z

Next time though please don't do massive linting like this in the same PR as actual code, it's really hard to read.

johan-bjareholt · 2019-10-01T18:38:30Z

src/views/Settings.vue

+      this.classes.push({name: "New class", re: "FILL ME"})
+    },
+    saveClasses: function() {
+      saveClasses(this.classes);


We should validate the regular expression before saving them. JS has built in re if i recall correctly.

The entire thing needs validation. This is probably not the final version of the UI anyway, but it works.

ErikBjare · 2019-10-01T19:48:40Z

Next time though please don't do massive linting like this in the same PR as actual code, it's really hard to read.

Yeah, sorry about that.

Mostly because of the fact that if you implement something once you get it for free for all other time ranges.
The original plan was to slowly move more and more features from the daily view once we found performant ways to do it in both so we afterwards only needed a single view.

Now that you have splitted out each section to its own file though that idea is probably moot as now each section is modular. Nice

It will be even nicer when I get the whole thing into vuex and refactor the query builder.

… vuex, added support for typescript, added tests with jest, and more I probably forgot about

ErikBjare · 2019-10-14T13:51:31Z

@johan-bjareholt It would be nice to have another review. The only thing missing is the ability to edit the categories/rules.

johan-bjareholt · 2019-10-14T15:17:30Z

src/views/Dev.vue

+      queryOptions: {
+        aw_client: this.$aw,
+        date: moment().format('YYYY-MM-DD'),
+        host: 'erb-laptop2-arch',


If you want this to go into master you should at least stop hardcoding this.
Just adding a text field or something as an input though should be good enough as i assume it's made to be a rough tool rather than for user debugging.

Ah right, I forgot. Will do.

lgtm-com · 2019-10-14T16:00:38Z

This pull request introduces 1 alert and fixes 1 when merging 663f61c into c29c1cc - view on LGTM.com

new alerts:

1 for Useless assignment to local variable

fixed alerts:

1 for Useless assignment to local variable

lgtm-com · 2019-10-14T18:36:53Z

This pull request introduces 1 alert and fixes 1 when merging a60ed2b into c29c1cc - view on LGTM.com

new alerts:

1 for Useless assignment to local variable

fixed alerts:

1 for Useless assignment to local variable

lgtm-com · 2019-10-14T19:28:33Z

This pull request introduces 1 alert and fixes 1 when merging 3a5a5c6 into c29c1cc - view on LGTM.com

new alerts:

1 for Useless assignment to local variable

fixed alerts:

1 for Useless assignment to local variable

lgtm-com · 2019-10-18T09:11:57Z

This pull request introduces 1 alert and fixes 1 when merging 2b8bcbd into c51e5f4 - view on LGTM.com

new alerts:

1 for Useless assignment to local variable

fixed alerts:

1 for Useless assignment to local variable

ErikBjare · 2019-10-18T21:31:54Z

I got a sunburst working!

lgtm-com · 2019-10-18T21:40:49Z

This pull request introduces 1 alert and fixes 1 when merging 53b5792 into c51e5f4 - view on LGTM.com

new alerts:

1 for Useless assignment to local variable

fixed alerts:

1 for Useless assignment to local variable

lgtm-com · 2019-10-19T15:38:51Z

This pull request introduces 1 alert and fixes 1 when merging 3ac9190 into c51e5f4 - view on LGTM.com

new alerts:

1 for Useless assignment to local variable

fixed alerts:

1 for Useless assignment to local variable

…ed up some css)

…ations in the daily view

lgtm-com · 2019-10-19T16:48:49Z

This pull request introduces 1 alert and fixes 2 when merging c0a66d4 into c51e5f4 - view on LGTM.com

new alerts:

1 for Useless assignment to local variable

fixed alerts:

1 for Useless assignment to local variable
1 for Unused variable, import, function or class

ErikBjare added 3 commits September 21, 2019 12:06

implemented basic classification visualization

5d89067

added prettierrc and ran it through some files

9536e63

fixed category hierarchy bug

a4952ce

ErikBjare requested a review from johan-bjareholt September 21, 2019 11:03

ErikBjare added 2 commits September 21, 2019 13:06

comments and changed default classes

05f89db

Merge branch 'master' into dev/classify

9e400b5

ErikBjare mentioned this pull request Sep 21, 2019

Implement tagging/annotation ActivityWatch/activitywatch#95

Closed

johan-bjareholt reviewed Sep 22, 2019

View reviewed changes

src/views/ActivityDaily.vue Outdated Show resolved Hide resolved

johan-bjareholt reviewed Sep 22, 2019

View reviewed changes

massive refactor, split up ActivityDaily into subroutes/views

7effc78

ErikBjare added 6 commits October 1, 2019 16:51

cleanup & refactoring

8ae6cd5

refactoring

8aa2463

created basic vuex store

199950d

fixed ErrorBoundary component

3e51020

added basic settings for editing classification rules

314da26

improved classifier settings

ba7ba26

fixed Summary view

3031ecd

johan-bjareholt reviewed Oct 1, 2019

View reviewed changes

ErikBjare added 2 commits October 2, 2019 15:41

lots of changes: improved look of settings for categories (WIP), more…

5f2a26f

… vuex, added support for typescript, added tests with jest, and more I probably forgot about

improved eslint setup (now with typescript support!)

fc950e7

johan-bjareholt reviewed Oct 14, 2019

View reviewed changes

added basic ability to edit categories

663f61c

switched to using vue cli for easier config and tooling

a60ed2b

ErikBjare added 2 commits October 14, 2019 20:54

config fixes

b95115d

improved vue cli support

3a5a5c6

Merge branch 'master' into dev/classify

2b8bcbd

added category sunburst

53b5792

finishing touches on category editor and other category stuff

3ac9190

ErikBjare added 4 commits October 19, 2019 17:58

fixed bug when clicking date in date browser in daily view (and clean…

de892d2

…ed up some css)

fixed bug and moved sunburst to same row as rest of category visualiz…

102f8f3

…ations in the daily view

removed no longer needed ./build/ and ./dist/ folders

205cb51

fixed broken vue.config.js

35f26bf

ErikBjare force-pushed the dev/classify branch from be528d5 to 35f26bf Compare October 19, 2019 16:28

fixed bug when renaming category with children

c0a66d4

ErikBjare changed the title ~~Added basic classification visualizations~~ Added classification visualizations & settings, switched to vue-cli, massive refactoring, etc. Oct 19, 2019

ErikBjare changed the title ~~Added classification visualizations & settings, switched to vue-cli, massive refactoring, etc.~~ Added classification visualizations & settings, switched to vue-cli, massive refactoring (vuex), etc. Oct 19, 2019

ErikBjare changed the title ~~Added classification visualizations & settings, switched to vue-cli, massive refactoring (vuex), etc.~~ Added classification vis & settings, switched to vue-cli, massive refactoring (vuex), etc. Oct 19, 2019

ErikBjare changed the title ~~Added classification vis & settings, switched to vue-cli, massive refactoring (vuex), etc.~~ Added classification vis & settings, switched to vue-cli, massiv… Oct 19, 2019

ErikBjare merged commit 8196f9b into master Oct 19, 2019

ErikBjare deleted the dev/classify branch October 19, 2019 16:57

ErikBjare mentioned this pull request Oct 19, 2019

Remaining tasks after categorization PR #151

Open

7 tasks

Uh oh!

Conversation

ErikBjare commented Sep 21, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Todo

Now

After

Later (uncompleted moved to #151)

Depends on

How it looks (for now)

Uh oh!

johan-bjareholt commented Sep 22, 2019

Uh oh!

Uh oh!

johan-bjareholt Sep 22, 2019

Choose a reason for hiding this comment

Uh oh!

ErikBjare Sep 22, 2019

Choose a reason for hiding this comment

Uh oh!

johan-bjareholt commented Sep 22, 2019

Uh oh!

ErikBjare commented Sep 22, 2019

Uh oh!

ErikBjare commented Sep 22, 2019

Uh oh!

johan-bjareholt commented Sep 22, 2019

Uh oh!

ErikBjare commented Oct 1, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

johan-bjareholt commented Oct 1, 2019

Uh oh!

johan-bjareholt commented Oct 1, 2019

Uh oh!

johan-bjareholt commented Oct 1, 2019

Uh oh!

johan-bjareholt Oct 1, 2019

Choose a reason for hiding this comment

Uh oh!

ErikBjare Oct 1, 2019

Choose a reason for hiding this comment

Uh oh!

ErikBjare commented Oct 1, 2019

Uh oh!

ErikBjare commented Oct 14, 2019

Uh oh!

johan-bjareholt Oct 14, 2019

Choose a reason for hiding this comment

Uh oh!

ErikBjare Oct 14, 2019

Choose a reason for hiding this comment

Uh oh!

lgtm-com bot commented Oct 14, 2019

Uh oh!

lgtm-com bot commented Oct 14, 2019

Uh oh!

lgtm-com bot commented Oct 14, 2019

Uh oh!

lgtm-com bot commented Oct 18, 2019

Uh oh!

ErikBjare commented Oct 18, 2019

Uh oh!

lgtm-com bot commented Oct 18, 2019

Uh oh!

lgtm-com bot commented Oct 19, 2019

Uh oh!

lgtm-com bot commented Oct 19, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

ErikBjare commented Sep 21, 2019 •

edited

Loading

ErikBjare commented Oct 1, 2019 •

edited

Loading