[Fix] Activity Watch integration issue #8223
Conversation
☁️ Nx Cloud ReportCI is running/has finished running commands for commit 773f4fb. As they complete they will appear below. Click to see the status, the terminal output, and the build insights. 📂 See all runs for this CI Pipeline Execution
✅ Successfully ran 5 targetsSent with 💌 from NxCloud. |
| @@ -1703,34 +1703,24 @@ export class TimeTrackerComponent implements OnInit, AfterViewInit { | |||
| this.electronService.ipcRenderer.send('stop-capture-screen'); | |||
|
|
|||
| if (this._startMode === TimerStartMode.MANUAL) { | |||
| console.log('Stopping timer'); | |||
| const timer = await this.electronService.ipcRenderer.invoke('STOP_TIMER', config); | |||
| console.log('Taking screen capture'); | |||
There was a problem hiding this comment.
@adkif please cover (as it was before!) everything inside this IF statement into
asyncScheduler.schedule(async () => {
console.log('Taking screen capture');
const activities = await this.electronService.ipcRenderer.invoke('TAKE_SCREEN_CAPTURE', config);
console.log('Sending activities');
await this.sendActivities(activities);
}, 1000);
We discussed it before few times... We do NOT want to wait till that process finish, it can go in background (and can even potentially fail), we want to STOP timer right after user click "STOP" and do all other ops in the background. In the future we will have to put this as "work item" in the tasks QUEUE, but for now simple schedule with 1 sec delay is good.
There was a problem hiding this comment.
@evereq This code causes issues with activities when it sends after the timer stops. The timer needs to reset and close some processes. The best approach is to send the last activities and then stop. A major problem was uploading screenshot images, so I used asapScheduler to prevent blocking during activity sending.
There was a problem hiding this comment.
@adkif It takes considerable amount of time to send those activities and to make a screen capture! I do NOT want to do it in the main thread and block timer stop! And it WAS working VERY good after I added that asyncScheduler.schedule, is it causing issues for AW!?? I really don't understand why we need to remove this
There was a problem hiding this comment.
@adkif in addition, if something fails, it does NOT stop timer! I.e. it shows button as not active, but timer not stop! (if we remove that asyncScheduler.schedule). So again, I would like to KEEP it, unless you know what exactly it broke and NO other way to fix that!
| } | ||
|
|
||
| const timeSlotId = resActivities.id; | ||
| asapScheduler.schedule(async () => { |
evereq
merged commit 8e876ce
into
fix/offline-sync-and-permission
* feat: add hasAllPermissions and hasAnyPermissions utility function * fix: toggleApiStop method adding source and refactor * fix: added optional chaining operator to access `status.lastLog.id` * [Fix] Activity Watch integration issue (#8223) * feat: add timeout to upload Images method time tracker service * fix: speed up timer start/stop
* [Fix] Remove nested event listeners (#8211) * refactor: PowerManagerDetectInactivity, DesktopOsInactivityHandler, IntervalDAO, and TimeTrackerComponent classes; modify event listeners, method calls, and conditional statements; remove ipcMain and _clearIntervals references. * fix: missing await * fix: theme switch * fix: add .titlebar-space class with margin-top: 15px * refactor: rename `sort` to `isSortable` in Smart Table columns * fix: email template utils query optimization * fix: email templates rendering migrations * fix(cspell): typo spelling :-) * revert: fix: email templates rendering migrations * fix: favorite entity missing column indexing * fix: favorite entity missing column indexing (sqlite & mysql) * MySQL syntax error on Time Tracking Dashboard reload * [Fix] Offline sync and permission (#8222) * feat: add hasAllPermissions and hasAnyPermissions utility function * fix: toggleApiStop method adding source and refactor * fix: added optional chaining operator to access `status.lastLog.id` * [Fix] Activity Watch integration issue (#8223) * feat: add timeout to upload Images method time tracker service * fix: speed up timer start/stop --------- Co-authored-by: Kifungo A <[email protected]> Co-authored-by: Rahul R. <[email protected]> Co-authored-by: samuelmbabhazi <[email protected]>
PR
Please note: we will close your PR without comment if you do not check the boxes above and provide ALL requested information.