Stage (#9196)

* Merge pull request #9183 from ever-co/dependabot/npm_and_yarn/typeorm-0.3.26

chore(deps): bump typeorm from 0.3.24 to 0.3.27

* fix: desktop-timer error message, offline timer (#9180)

* fix: desktop-timer error message, offline timer

* fix: cspell Behaviour

* fix: missing startedAt while update timer status synced

* fix: adding manual timelog when timer started and stopped in offline mode and already have another starting timer

* style: remove unused code

* fix: handle another condition offline timer

* fix: remove unnecessary options

* fix: change error plain text to internationalization

* fix: rename key and added NETWOR_ERROR translation

---------

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: syns <[email protected]>

Author: 3 people

.cspell.json

@@ -720,7 +720,8 @@
 		"soundshot",
 		"soundshots",
 		"runtimes",
-		"localtime"
+		"localtime",
+		"Behaviour"
 	],
 	"useGitignore": true,
 	"ignorePaths": [

apps/desktop-timer/src/assets/styles/_overrides.scss

@@ -735,3 +735,13 @@ angular2-smart-table > div {
 angular2-smart-table a:hover {
   text-decoration: auto !important;
 }
+
+nb-toastr-container {
+  position:  absolute !important;
+  top: 20px !important;        /* change this value to what you want */
+  right: 0px !important;      /* keep consistent with your toast position */
+}
+
+nb-toast {
+	width: 21rem !important;
+}

apps/desktop/package.json

@@ -84,7 +84,7 @@
 		"sound-play": "1.1.0",
 		"squirrelly": "^8.0.8",
 		"twing": "^5.0.2",
-		"typeorm": "^0.3.24",
+		"typeorm": "^0.3.27",
 		"undici": "^6.10.2",
 		"custom-electron-titlebar": "^4.2.8"
 	},

apps/server-api/package.json

@@ -82,7 +82,7 @@
 		"rxjs": "^7.8.2",
 		"squirrelly": "^8.0.8",
 		"twing": "^5.0.2",
-		"typeorm": "^0.3.24",
+		"typeorm": "^0.3.27",
 		"undici": "^6.10.2",
 		"custom-electron-titlebar": "^4.2.8"
 	},

apps/server/package.json

@@ -78,7 +78,7 @@
 		"rxjs": "^7.8.2",
 		"squirrelly": "^8.0.8",
 		"twing": "^5.0.2",
-		"typeorm": "^0.3.24",
+		"typeorm": "^0.3.27",
 		"undici": "^6.10.2",
 		"custom-electron-titlebar": "^4.2.8"
 	},

packages/common/package.json

@@ -37,7 +37,7 @@
 		"graphql": "^16.11.0",
 		"nest-knexjs": "^0.0.26",
 		"slugify": "^1.6.6",
-		"typeorm": "^0.3.24",
+		"typeorm": "^0.3.27",
 		"tslib": "^2.6.2"
 	},
 	"devDependencies": {

packages/config/package.json

@@ -45,7 +45,7 @@
 		"mikro-orm-soft-delete": "^1.0.0-alpha.1",
 		"nest-knexjs": "^0.0.26",
 		"tslib": "^2.6.2",
-		"typeorm": "^0.3.24"
+		"typeorm": "^0.3.27"
 	},
 	"devDependencies": {
 		"@types/jest": "29.5.14",

packages/core/package.json

@@ -176,7 +176,7 @@
 		"sql.js": "^1.5.0",
 		"streamifier": "^0.1.1",
 		"swagger-ui-express": "^5.0.0",
-		"typeorm": "^0.3.24",
+		"typeorm": "^0.3.27",
 		"underscore": "^1.13.3",
 		"unleash-client": "^3.16.1",
 		"unzipper": "^0.10.11",

packages/desktop-ui-lib/src/lib/interceptors/unauthorized.interceptor.ts

@@ -5,16 +5,17 @@ import { catchError } from 'rxjs/operators';
 import { AuthStrategy } from '../auth';
 import { ElectronService } from '../electron/services';
 import { Router } from '@angular/router';
-import { Store } from '../services';
+import { Store, ErrorMapping } from '../services';
 
 @Injectable()
 export class UnauthorizedInterceptor implements HttpInterceptor {
 	constructor(
 		private authStrategy: AuthStrategy,
 		private electronService: ElectronService,
 		private router: Router,
-		private store: Store
-	) {}
+		private store: Store,
+		private _errorMapping: ErrorMapping
+	) { }
 
 	intercept(
 		request: HttpRequest<any>,
@@ -24,7 +25,10 @@ export class UnauthorizedInterceptor implements HttpInterceptor {
 			catchError((error) => {
 				// Early return if offline is triggered.
 				if (this.store.isOffline) {
-					return;
+					return throwError(() => {
+						const message = this._errorMapping.mapErrorMessage(error);
+						return new Error(message);
+					});
 				}
 				// Unauthorized error occurred
 				if (error.status === HttpStatusCode.Unauthorized) {
@@ -39,7 +43,8 @@ export class UnauthorizedInterceptor implements HttpInterceptor {
 						})
 					);
 				}
-				return throwError(() => error);
+
+				return throwError(() => new Error(this._errorMapping.mapErrorMessage(error)));
 			})
 		);
 	}

packages/desktop-ui-lib/src/lib/offline-sync/concretes/sequence-queue.ts

@@ -47,12 +47,22 @@ export class SequenceQueue extends OfflineQueue<ISequence> {
 
 			let latest = null;
 
-			if (timer.isStartedOffline) {
+			if (timer.isStartedOffline && timer.timelogId) {
+				latest = await this._timeTrackerService.getTimeLogById(timer.timelogId);
+			} else if (timer.isStartedOffline && !timer.stoppedAt) {
 				console.log('⏱ - Silent start');
 				latest = await this._timeTrackerService.toggleApiStart({
 					...timer,
 					...params
 				});
+			} else if (timer.isStartedOffline && !timer.timelogId && timer.startedAt && timer.stoppedAt) {
+				latest = await this._timeTrackerService.addTimeLog({
+					startedAt: timer.startedAt,
+					stoppedAt: timer.stoppedAt,
+					taskId: timer.taskId,
+					projectId: timer.projectId,
+					description: timer.description
+				});
 			}
 
 			console.log('🛠 - Create queue');
@@ -78,10 +88,31 @@ export class SequenceQueue extends OfflineQueue<ISequence> {
 
 			if (timer.isStoppedOffline) {
 				console.log('⏱ - Silent stop');
-				latest = await this._timeTrackerService.toggleApiStop({
-					...timer,
-					...params
-				});
+				if (!latest && timer.timelogId) {
+					const currentTimeLog = await this._timeTrackerService.getTimeLogById(timer.timelogId);
+					if (currentTimeLog.id && currentTimeLog.isRunning) {
+						latest = await this._timeTrackerService.toggleApiStop({
+							...timer,
+							...params
+						});
+					} else if (currentTimeLog.id && timer.stoppedAt) {
+						latest = await this._timeTrackerService.updateTimeLog(
+							timer.timelogId,
+							{
+								startedAt: timer.startedAt || currentTimeLog.startedAt,
+								stoppedAt: timer.stoppedAt,
+								description: timer.description,
+								projectId: timer.projectId,
+								taskId: timer.taskId
+							}
+						)
+					}
+				} else if (latest && latest.id && latest.isRunning) {
+					latest = await this._timeTrackerService.toggleApiStop({
+						...timer,
+						...params
+					});
+				}
 			}
 
 			const status = await this._timeTrackerStatusService.status();
@@ -92,9 +123,9 @@ export class SequenceQueue extends OfflineQueue<ISequence> {
 						lastTimer: latest
 							? latest
 							: {
-									...timer,
-									id: status?.lastLog?.id
-							  },
+								...timer,
+								id: status?.lastLog?.id
+							},
 						...timer
 					});
 					console.log('⏱ - local database updated');