Commit 38663fb
authored
feat(timeline): add 'Merge by app' filter to reduce event flooding (#782)
* feat(timeline): add 'Merge by app' filter to reduce event flooding
Apps like Adobe Illustrator generate hundreds of tiny events when
toggling UI panels (e.g. pressing TAB), flooding the Timeline view.
This adds a "Merge by app" toggle in the Filters panel that merges
adjacent events from the same application within a 30-second gap
window into single blocks.
Only affects `currentwindow` bucket events. Applied before AFK
filtering so the merge and AFK filters compose correctly.
Fixes: ActivityWatch/activitywatch#1165
* fix(timeline): apply AFK filter before merge-similar to prevent discard
When both filters are active, _applyAfkFilter replaces currentwindow
bucket events with fresh results from the backend query engine, which
silently discarded any merges performed by _applyMergeSimilar.
Reversing the order ensures merge-similar operates on already-filtered
events, so both filters compose correctly.
Fixes review feedback from Greptile.1 parent 2d3ce67 commit 38663fb
1 file changed
Lines changed: 60 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
38 | 38 | | |
39 | 39 | | |
40 | 40 | | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
41 | 47 | | |
42 | 48 | | |
43 | 49 | | |
| |||
110 | 116 | | |
111 | 117 | | |
112 | 118 | | |
| 119 | + | |
113 | 120 | | |
114 | 121 | | |
115 | 122 | | |
| |||
143 | 150 | | |
144 | 151 | | |
145 | 152 | | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
146 | 156 | | |
147 | 157 | | |
148 | 158 | | |
| |||
178 | 188 | | |
179 | 189 | | |
180 | 190 | | |
| 191 | + | |
| 192 | + | |
| 193 | + | |
| 194 | + | |
181 | 195 | | |
182 | 196 | | |
183 | 197 | | |
| |||
256 | 270 | | |
257 | 271 | | |
258 | 272 | | |
| 273 | + | |
| 274 | + | |
| 275 | + | |
| 276 | + | |
| 277 | + | |
| 278 | + | |
| 279 | + | |
| 280 | + | |
259 | 281 | | |
260 | 282 | | |
261 | 283 | | |
| 284 | + | |
| 285 | + | |
| 286 | + | |
| 287 | + | |
| 288 | + | |
| 289 | + | |
| 290 | + | |
| 291 | + | |
| 292 | + | |
| 293 | + | |
| 294 | + | |
| 295 | + | |
| 296 | + | |
| 297 | + | |
| 298 | + | |
| 299 | + | |
| 300 | + | |
| 301 | + | |
| 302 | + | |
| 303 | + | |
| 304 | + | |
| 305 | + | |
| 306 | + | |
| 307 | + | |
| 308 | + | |
| 309 | + | |
| 310 | + | |
| 311 | + | |
| 312 | + | |
| 313 | + | |
| 314 | + | |
| 315 | + | |
| 316 | + | |
| 317 | + | |
| 318 | + | |
| 319 | + | |
| 320 | + | |
| 321 | + | |
262 | 322 | | |
263 | 323 | | |
264 | 324 | | |
| |||
0 commit comments