Merge pull request #9344 from ever-co/develop

Stage

Author: evereq

.cspell.json

@@ -810,7 +810,8 @@
 		"Liskov",
 		"backoff",
 		"autodrain",
-		"pluginname"
+		"pluginname",
+		"Mobi"
 	],
 	"useGitignore": true,
 	"ignorePaths": [

.deploy/webapp/Dockerfile

@@ -100,6 +100,7 @@ COPY --chown=node:node packages/contracts/package.json ./packages/contracts/
 COPY --chown=node:node packages/auth/package.json ./packages/auth/
 COPY --chown=node:node packages/core/package.json ./packages/core/
 COPY --chown=node:node packages/plugin/package.json ./packages/plugin/
+COPY --chown=node:node packages/desktop-ui-lib/package.json ./packages/desktop-ui-lib/
 COPY --chown=node:node packages/plugins/integration-ai-ui/package.json ./packages/plugins/integration-ai-ui/
 COPY --chown=node:node packages/plugins/integration-ai/package.json ./packages/plugins/integration-ai/
 COPY --chown=node:node packages/plugins/integration-hubstaff-ui/package.json ./packages/plugins/integration-hubstaff-ui/

apps/agent/package.json

@@ -37,13 +37,13 @@
 		"electronmon": "^2.0.2"
 	},
 	"dependencies": {
-		"@angular/animations": "^19.2.17",
-		"@angular/cdk": "^19.2.17",
-		"@angular/common": "^19.2.17",
-		"@angular/core": "^19.2.17",
-		"@angular/forms": "^19.2.17",
-		"@angular/material": "^19.2.17",
-		"@angular/router": "^19.2.17",
+		"@angular/animations": "^19.2.18",
+		"@angular/cdk": "^19.2.18",
+		"@angular/common": "^19.2.18",
+		"@angular/core": "^19.2.18",
+		"@angular/forms": "^19.2.18",
+		"@angular/material": "^19.2.18",
+		"@angular/router": "^19.2.18",
 		"@datorama/akita": "^8.0.1",
 		"@datorama/akita-ngdevtools": "^7.0.0",
 		"@electron/remote": "^2.0.8",

apps/agent/src/app/app-routing.module.ts

@@ -27,13 +27,11 @@ const routes: Routes = [
 	{
 		path: 'plugins',
 		canActivate: [AuthConnectionGuard],
-		loadComponent: () => import('@gauzy/desktop-ui-lib').then((m) => m.PluginLayoutComponent),
-		loadChildren: () => import('@gauzy/desktop-ui-lib').then((m) => m.pluginRoutes)
+		loadChildren: () => import('@gauzy/desktop-ui-lib').then((m) => m.PluginsModule)
 	},
 	{
 		path: 'settings',
-		component: SettingsComponent,
-		loadChildren: () => import('@gauzy/desktop-ui-lib').then((m) => m.pluginRoutes)
+		component: SettingsComponent
 	},
 	{
 		path: 'updater',

apps/agent/src/app/app.module.ts

@@ -25,7 +25,6 @@ import {
 	NgxLoginModule,
 	NoAuthGuard,
 	OrganizationInterceptor,
-	PluginsModule,
 	RefreshTokenInterceptor,
 	ScreenCaptureModule,
 	ServerConnectionService,
@@ -120,8 +119,7 @@ if (environment.SENTRY_DSN) {
 		NbDatepickerModule.forRoot(),
 		AboutModule,
 		AgentDashboardModule,
-		AlwaysOnModule,
-		PluginsModule
+		AlwaysOnModule
 	],
 	providers: [
 		AppService,

apps/agent/src/constant.ts

@@ -14,7 +14,11 @@ const MAIN_EVENT_TYPE = {
 	INIT_SCREENSHOT: 'INIT_SCREENSHOT',
 	START_TIMER_API: 'START_TIMER_API',
 	CHECK_STATUS_TIMER: 'CHECK_STATUS_TIMER',
-	TRAY_TIMER_STATUS: 'TRAY_TIMER_STATUS'
+	TRAY_TIMER_STATUS: 'TRAY_TIMER_STATUS',
+	ACTIVITY_PAUSED: 'ACTIVITY_PAUSED',
+	ACTIVITY_RESUME: 'ACTIVITY_RESUME',
+	EXIT_APP: 'EXIT_APP',
+	STOP_N_EXIT: 'STOP_N_EXIT'
 }
 
 export type TMainEventType = typeof MAIN_EVENT_TYPE[keyof typeof MAIN_EVENT_TYPE];

apps/agent/src/index.ts

@@ -5,13 +5,8 @@ import { BrowserWindow, shell, app, ipcMain } from 'electron';
 import * as path from 'path';
 import { InitApplication } from './main/init';
 import {
-	AppError,
-	DesktopUpdater,
 	LocalStore,
 } from '@gauzy/desktop-lib';
-import PullActivities from './main/workers/pull-activities';
-import PushActivities from './main/workers/push-activities';
-import { getAuthConfig } from './main/util';
 
 let popupWin: BrowserWindow | null = null;
 
@@ -21,14 +16,8 @@ log.info(`Sqlite DB path: ${sqlite3filename}`);
 const ALLOWED_PROTOCOLS = new Set(['http:', 'https:']);
 
 const args = process.argv.slice(1);
-const updater = new DesktopUpdater({
-	repository: process.env.REPO_NAME,
-	owner: process.env.REPO_OWNER,
-	typeRelease: 'releases'
-});
 args.some((val) => val === '--serve');
 
-
 LocalStore.setFilePath({
 	iconPath: path.join(__dirname, 'assets', 'icons', 'menu', 'icon.png')
 });
@@ -44,30 +33,7 @@ app.commandLine.appendSwitch('disable-http2');
 
 ipcMain.on('quit', quit);
 
-async function stopAppActivity() {
-	const auth = getAuthConfig();
-	const pullActivities = PullActivities.getInstance();
-	pullActivities.updateAppUserAuth({
-		tenantId: auth?.user?.employee?.tenantId,
-		organizationId: auth?.user?.employee?.organizationId,
-		remoteId: auth?.user?.id
-	});
-	await pullActivities.stopTracking();
-	const pushActivities = PushActivities.getInstance();
-	await pushActivities.stopPooling();
-}
-
-app.on('before-quit', async (e) => {
-	e.preventDefault();
-	try {
-		await stopAppActivity();
-		updater.cancel();
-	} catch (e) {
-		log.error(`ERROR: Occurred while cancel update: ${e}`);
-		throw new AppError('MAINUPDTABORT', e);
-	}
-	app.exit(0);
-});
+// Removed: before-quit handler now managed by EventHandler.exitApp()
 
 // On OS X it is common for applications and their menu bar
 // to stay active until the user quits explicitly with Cmd + Q

apps/agent/src/main/api.ts

@@ -8,6 +8,7 @@ import { TimeLogSourceEnum, TimeLogType } from '@gauzy/desktop-activity';
 import MainEvent from './events/events';
 import { MAIN_EVENT, MAIN_EVENT_TYPE } from '../constant';
 import { TaskStatusEnum, IBaseTaskProperties, ITaskStatus, IPagination } from '@gauzy/contracts';
+import { AgentLogger } from './agent-logger';
 
 export interface ITimerResponse {
 	deletedAt: any
@@ -157,9 +158,11 @@ export class ApiService {
 	private mainEvent: MainEvent;
 	private isLogout: boolean;
 	private statusProgress: ITaskStatus;
+	private agentLogger: AgentLogger;
 
 	constructor() {
 		this.mainEvent = MainEvent.getInstance();
+		this.agentLogger = AgentLogger.getInstance();
 	}
 
 	get auth(): Partial<TAuthConfig> {
@@ -261,7 +264,8 @@ export class ApiService {
 			logType: TimeLogType.TRACKED,
 			source: TimeLogSourceEnum.DESKTOP,
 			tenantId: payload.tenantId,
-			organizationId: payload.organizationId
+			organizationId: payload.organizationId,
+			employeeId: payload.employeeId
 		}
 		return this.put(path, timeLogPayload);
 	}
@@ -443,7 +447,7 @@ export class ApiService {
 
 		try {
 			console.log('url', url);
-			console.log('options data', JSON.stringify(requestOptions));
+			// console.log('options data', JSON.stringify(requestOptions));
 			const response = await fetch(url, requestOptions);
 			console.log(`API ${options.method} ${path}: ${response.status} ${response.statusText}`);
 			if (!response.ok) {
@@ -467,6 +471,7 @@ export class ApiService {
 			const respJson = await response.json();
 			return respJson;
 		} catch (err) {
+			this.agentLogger.error(`Error API call, ${err.message}`);
 			console.error('[Network Error]', err);
 			const enhancedError = err instanceof Error ? err : new Error(String(err));
 			enhancedError['url'] = url;

apps/agent/src/main/auth.ts

@@ -48,7 +48,7 @@ async function handleCloseAuthWindow(appWindow: AppWindow) {
 	const authConfig = getAuthConfig();
 	if (!authConfig?.token) {
 		const DIALOG_TITLE = TranslateService.instant('TIMER_TRACKER.DIALOG.WARNING');
-		const DIALOG_MESSAGE = TranslateService.instant('TIMER_TRACKER.DIALOG.EXIT_AGENT_CONFIRM');
+		const DIALOG_MESSAGE = TranslateService.instant('TIMER_TRACKER.DIALOG.EXIT_AGENT_LOGIN_CONFIRM');
 
 		const dialog = new DesktopDialog(DIALOG_TITLE, DIALOG_MESSAGE, appWindow.authWindow.browserWindow);
 		dialog.options.buttons = [

apps/agent/src/main/events/event-handler.ts

@@ -1,3 +1,4 @@
+import { app } from 'electron';
 import { MAIN_EVENT, MAIN_EVENT_TYPE } from '../../constant';
 import PullActivities from '../workers/pull-activities';
 import PushActivities from '../workers/push-activities';
@@ -6,7 +7,21 @@ import MainEvent from './events';
 import * as path from 'node:path';
 import { TrayNotify } from './tray-notify';
 import { TEventArgs } from './event-types';
-import { getAuthConfig, delaySync, TAuthConfig, updateAgentSetting, getAppSetting } from '../util';
+import {
+	getAuthConfig,
+	delaySync,
+	TAuthConfig,
+	updateAgentSetting,
+	getAppSetting,
+	getInitialConfig
+} from '../util';
+import {
+	DesktopUpdater,
+	AppError,
+	TranslateService,
+	DesktopDialog
+} from '@gauzy/desktop-lib';
+import { logger as log } from '@gauzy/desktop-core';
 
 const appRootPath: string = path.join(__dirname, '../..');
 
@@ -17,11 +32,17 @@ export default class EventHandler {
 	private trayNotify: TrayNotify;
 	private pullActivities: PullActivities;
 	private pushActivities: PushActivities;
+	private updater: DesktopUpdater;
 
 	constructor() {
 		this.mainEvent = MainEvent.getInstance();
 		this.appWindow = AppWindow.getInstance(appRootPath);
 		this.trayNotify = TrayNotify.getInstance();
+		this.updater = new DesktopUpdater({
+			repository: process.env.REPO_NAME,
+			owner: process.env.REPO_OWNER,
+			typeRelease: 'releases'
+		});
 	}
 
 	static getInstance() {
@@ -132,6 +153,75 @@ export default class EventHandler {
 		}
 	}
 
+	private async resumeActivity() {
+		const authConfig = getAuthConfig();
+		this.getPullActivities(authConfig);
+		await this.pullActivities.recordIdleTime();
+		this.pullActivities.startedPausedDate = null;
+		await this.pullActivities.startTracking(this.pullActivities.isPaused);
+		this.pullActivities.isPaused = false;
+	}
+
+	private async pauseActivity() {
+		const authConfig = getAuthConfig();
+		this.getPullActivities(authConfig);
+		const isTimeRunning = this.pullActivities.running;
+		await this.pullActivities.stopTracking(true);
+		if (isTimeRunning) {
+			this.pullActivities.startedPausedDate = new Date();
+			this.pullActivities.isPaused = true;
+		}
+	}
+
+	async stopAppActivity() {
+		const authConfig = getAuthConfig();
+		this.getPullActivities(authConfig);
+		this.getPushActivities();
+		if (!authConfig?.token) {
+			await this.pushActivities.stopPooling();
+			return;
+		}
+
+		if (this.pullActivities.running) {
+			await this.pullActivities.stopTracking();
+		}
+		await this.pushActivities.stopPooling();
+
+	}
+
+	async exitDialog() {
+		const DIALOG_TITLE = TranslateService.instant('TIMER_TRACKER.DIALOG.WARNING');
+		const DIALOG_MESSAGE = TranslateService.instant('TIMER_TRACKER.DIALOG.EXIT_AGENT_PREVENT_CONFIRM');
+		const dialog = new DesktopDialog(DIALOG_TITLE, DIALOG_MESSAGE);
+		dialog.options.buttons = [
+			TranslateService.instant('OK'),
+		];
+		await dialog.show();
+	}
+
+	private async exitApp() {
+		try {
+			const appSetting = getAppSetting();
+			const appConfig = getInitialConfig();
+			const authConfig = getAuthConfig();
+			if (appSetting?.allowAgentAppExit || !appConfig?.isSetup || !authConfig?.token) {
+				await this.stopAppActivity();
+				this.updater.cancel();
+				app.quit();
+			} else {
+				await this.exitDialog();
+			}
+		} catch (e) {
+			log.error(`ERROR: Failed to exit app: ${e}`);
+			throw new AppError('MAINUPDTABORT', e);
+		}
+	}
+
+	private async stopAndExit() {
+		await this.stopAppTracking();
+		app.quit();
+	}
+
 	async handleEvent(args: TEventArgs) {
 		switch (args.type) {
 			case MAIN_EVENT_TYPE.LOGOUT_EVENT:
@@ -157,6 +247,14 @@ export default class EventHandler {
 				return this.checkStatusTimer();
 			case MAIN_EVENT_TYPE.TRAY_TIMER_STATUS:
 				return this.trayTimerStatus();
+			case MAIN_EVENT_TYPE.ACTIVITY_RESUME:
+				return this.resumeActivity();
+			case MAIN_EVENT_TYPE.ACTIVITY_PAUSED:
+				return this.pauseActivity();
+			case MAIN_EVENT_TYPE.EXIT_APP:
+				return this.exitApp();
+			case MAIN_EVENT_TYPE.STOP_N_EXIT:
+				return this.stopAndExit();
 			default: break;
 		}
 	}