From da00531698f783fa2b55be6b50360d5b713bf0e1 Mon Sep 17 00:00:00 2001
From: RAHUL RATHORE <41804588+rahul-rocket@users.noreply.github.com>
Date: Sat, 2 Dec 2023 18:25:21 +0530
Subject: [PATCH 01/34] wip: Open AI API Key saved with integration

---
 .../services/gauzy-ai/gauzy-ai.service.ts     |  4 ++--
 .../authorization.component.html              | 13 +++++++++++++
 .../authorization/authorization.component.ts  | 19 +++++++++++++++----
 apps/gauzy/src/assets/i18n/en.json            |  2 ++
 packages/contracts/src/integration.model.ts   |  3 ++-
 .../gauzy-ai/integration-ai.controller.ts     |  4 ++--
 .../gauzy-ai/integration-ai.service.ts        | 10 +++++++---
 7 files changed, 43 insertions(+), 12 deletions(-)

diff --git a/apps/gauzy/src/app/@core/services/gauzy-ai/gauzy-ai.service.ts b/apps/gauzy/src/app/@core/services/gauzy-ai/gauzy-ai.service.ts
index 72c65f3b884..e6bc0ea4fc3 100644
--- a/apps/gauzy/src/app/@core/services/gauzy-ai/gauzy-ai.service.ts
+++ b/apps/gauzy/src/app/@core/services/gauzy-ai/gauzy-ai.service.ts
@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
 import { Observable } from 'rxjs/internal/Observable';
-import { IIntegrationKeySecretPairInput, IIntegrationTenant } from '@gauzy/contracts';
+import { IIntegrationAICreateInput, IIntegrationTenant } from '@gauzy/contracts';
 import { API_PREFIX } from '../../constants';
 
 @Injectable({
@@ -18,7 +18,7 @@ export class GauzyAIService {
 	 * @param input
 	 * @returns
 	 */
-	addIntegration(input: IIntegrationKeySecretPairInput): Observable<IIntegrationTenant> {
+	create(input: IIntegrationAICreateInput): Observable<IIntegrationTenant> {
 		return this._http.post<IIntegrationTenant>(`${API_PREFIX}/integration/gauzy-ai`, input);
 	}
 }
diff --git a/apps/gauzy/src/app/pages/integrations/gauzy-ai/components/authorization/authorization.component.html b/apps/gauzy/src/app/pages/integrations/gauzy-ai/components/authorization/authorization.component.html
index 0779dc76516..bb62b58a1c6 100644
--- a/apps/gauzy/src/app/pages/integrations/gauzy-ai/components/authorization/authorization.component.html
+++ b/apps/gauzy/src/app/pages/integrations/gauzy-ai/components/authorization/authorization.component.html
@@ -40,6 +40,19 @@ <h5>
 						fullWidth
 					/>
 				</div>
+				<div class="form-group">
+					<label for="client_secret" class="label">
+						{{ 'INTEGRATIONS.GAUZY_AI_PAGE.OPEN_AI_SECRET_KEY' | translate }}
+					</label>
+					<input
+						id="openai_api_secret_key"
+						formControlName="openai_api_secret_key"
+						nbInput
+						[placeholder]="'FORM.PLACEHOLDERS.OPEN_AI_SECRET_KEY' | translate"
+						required
+						fullWidth
+					/>
+				</div>
 				<button
 					type="submit"
 					nbButton
diff --git a/apps/gauzy/src/app/pages/integrations/gauzy-ai/components/authorization/authorization.component.ts b/apps/gauzy/src/app/pages/integrations/gauzy-ai/components/authorization/authorization.component.ts
index fe1979d49db..5fc635a51c7 100644
--- a/apps/gauzy/src/app/pages/integrations/gauzy-ai/components/authorization/authorization.component.ts
+++ b/apps/gauzy/src/app/pages/integrations/gauzy-ai/components/authorization/authorization.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit, OnDestroy, ViewChild } from '@angular/core';
+import { Component, OnInit, OnDestroy, ViewChild, AfterViewInit } from '@angular/core';
 import { ActivatedRoute, Data, Router } from '@angular/router';
 import { FormGroup, FormBuilder, Validators, FormGroupDirective } from '@angular/forms';
 import { filter, tap } from 'rxjs/operators';
@@ -12,7 +12,7 @@ import { GauzyAIService, Store } from './../../../../../@core/services';
 	templateUrl: './authorization.component.html',
 	styleUrls: ['./authorization.component.scss'],
 })
-export class GauzyAIAuthorizationComponent implements OnInit, OnDestroy {
+export class GauzyAIAuthorizationComponent implements AfterViewInit, OnInit, OnDestroy {
 
 	public organization: IOrganization;
 
@@ -21,6 +21,7 @@ export class GauzyAIAuthorizationComponent implements OnInit, OnDestroy {
 		return fb.group({
 			client_id: [null, Validators.required],
 			client_secret: [null, Validators.required],
+			openai_api_secret_key: [null]
 		});
 	}
 
@@ -34,6 +35,9 @@ export class GauzyAIAuthorizationComponent implements OnInit, OnDestroy {
 		private readonly _gauzyAIService: GauzyAIService
 	) { }
 
+	/**
+	 *
+	 */
 	ngOnInit(): void {
 		this._activatedRoute.data
 			.pipe(
@@ -45,6 +49,12 @@ export class GauzyAIAuthorizationComponent implements OnInit, OnDestroy {
 				untilDestroyed(this) // Ensure that subscriptions are automatically unsubscribed on component destruction.
 			)
 			.subscribe();
+	}
+
+	/**
+	 *
+	 */
+	ngAfterViewInit(): void {
 		this._store.selectedOrganization$
 			.pipe(
 				filter((organization: IOrganization) => !!organization),
@@ -72,12 +82,13 @@ export class GauzyAIAuthorizationComponent implements OnInit, OnDestroy {
 			return;
 		}
 		try {
-			const { client_id, client_secret } = this.form.value;
+			const { client_id, client_secret, openai_api_secret_key } = this.form.value;
 			const { id: organizationId, tenantId } = this.organization;
 
-			this._gauzyAIService.addIntegration({
+			this._gauzyAIService.create({
 				client_id,
 				client_secret,
+				openai_api_secret_key,
 				organizationId,
 				tenantId
 			}).pipe(
diff --git a/apps/gauzy/src/assets/i18n/en.json b/apps/gauzy/src/assets/i18n/en.json
index f8db85e0350..b58b3114afe 100644
--- a/apps/gauzy/src/assets/i18n/en.json
+++ b/apps/gauzy/src/assets/i18n/en.json
@@ -645,6 +645,7 @@
 			"UPWORK_SECRET": "Upwork Secret",
 			"GAUZY_API_KEY": "Gauzy AI Key",
 			"GAUZY_API_SECRET": "Gauzy AI Secret",
+			"OPEN_AI_SECRET_KEY": "Open AI Secret Key",
 			"SELECT_COMPANY": "Select Company",
 			"TYPE_SEARCH_REQUEST": "Type your search request here...",
 			"SELECT_ICON": "Select Icon",
@@ -1246,6 +1247,7 @@
 			"TITLE": "Gauzy AI Integration",
 			"API_KEY": "Gauzy AI key",
 			"API_SECRET": "Gauzy AI Secret",
+			"OPEN_AI_SECRET_KEY": "Open AI Secret Key",
 			"DESCRIPTION": "Activate Gauzy AI integration for smarter job hunting."
 		},
 		"GITHUB_PAGE": {
diff --git a/packages/contracts/src/integration.model.ts b/packages/contracts/src/integration.model.ts
index bb8529a6931..065fc0671b0 100644
--- a/packages/contracts/src/integration.model.ts
+++ b/packages/contracts/src/integration.model.ts
@@ -172,7 +172,8 @@ export interface IDateRangeActivityFilter {
 	end: Date;
 }
 
-export interface IIntegrationKeySecretPairInput extends IBasePerTenantAndOrganizationEntityModel {
+export interface IIntegrationAICreateInput extends IBasePerTenantAndOrganizationEntityModel {
 	client_id: string;
 	client_secret: string;
+	openai_api_secret_key: string;
 }
diff --git a/packages/core/src/integration/gauzy-ai/integration-ai.controller.ts b/packages/core/src/integration/gauzy-ai/integration-ai.controller.ts
index 8cc5089e66e..7375c73e694 100644
--- a/packages/core/src/integration/gauzy-ai/integration-ai.controller.ts
+++ b/packages/core/src/integration/gauzy-ai/integration-ai.controller.ts
@@ -1,6 +1,6 @@
 import { Body, Controller, Post, UseGuards } from '@nestjs/common';
 import { ApiTags } from '@nestjs/swagger';
-import { IIntegrationKeySecretPairInput, IIntegrationTenant, PermissionsEnum } from '@gauzy/contracts';
+import { IIntegrationAICreateInput, IIntegrationTenant, PermissionsEnum } from '@gauzy/contracts';
 import { Permissions } from './../../shared/decorators';
 import { PermissionGuard, TenantPermissionGuard } from './../../shared/guards';
 import { IntegrationAIService } from './integration-ai.service';
@@ -22,7 +22,7 @@ export class IntegrationAIController {
 	 */
 	@Post()
 	async create(
-		@Body() input: IIntegrationKeySecretPairInput
+		@Body() input: IIntegrationAICreateInput
 	): Promise<IIntegrationTenant> {
 		return await this._integrationAIService.create(input);
 	}
diff --git a/packages/core/src/integration/gauzy-ai/integration-ai.service.ts b/packages/core/src/integration/gauzy-ai/integration-ai.service.ts
index af692525b43..9eeb62e99f3 100644
--- a/packages/core/src/integration/gauzy-ai/integration-ai.service.ts
+++ b/packages/core/src/integration/gauzy-ai/integration-ai.service.ts
@@ -1,6 +1,6 @@
 import { Injectable, Logger } from '@nestjs/common';
 import { CommandBus } from '@nestjs/cqrs';
-import { IIntegrationKeySecretPairInput, IIntegrationTenant, IntegrationEnum } from '@gauzy/contracts';
+import { IIntegrationAICreateInput, IIntegrationTenant, IntegrationEnum } from '@gauzy/contracts';
 import { RequestContext } from '../../core/context';
 import { IntegrationTenantUpdateOrCreateCommand } from '../../integration-tenant/commands';
 import { IntegrationService } from './../../integration/integration.service';
@@ -21,12 +21,12 @@ export class IntegrationAIService {
 	 * @returns
 	 */
 	async create(
-		input: IIntegrationKeySecretPairInput
+		input: IIntegrationAICreateInput
 	): Promise<IIntegrationTenant> {
 
 		try {
 			const tenantId = RequestContext.currentTenantId();
-			const { client_id, client_secret, organizationId } = input;
+			const { client_id, client_secret, openai_api_secret_key, organizationId } = input;
 
 			const integration = await this._integrationService.findOneByOptions({
 				where: {
@@ -59,6 +59,10 @@ export class IntegrationAIService {
 							{
 								settingsName: 'apiSecret',
 								settingsValue: client_secret
+							},
+							{
+								settingsName: 'openaiApiSecretKey',
+								settingsValue: openai_api_secret_key
 							}
 						].map((setting) => ({
 							...setting,

From ca78837b5d7549c219c4303ba66d009ca9b87e0d Mon Sep 17 00:00:00 2001
From: CoderNadir <coder.nadir@gmail.com>
Date: Tue, 5 Dec 2023 23:29:11 +0100
Subject: [PATCH 02/34] fix: #7174 | translate auth pages

---
 .../login-workspace.component.html            | 18 ++---
 .../src/app/auth/login/login.component.html   | 38 +++++++---
 .../app/auth/register/register.component.html | 75 +++++++++----------
 apps/gauzy/src/assets/i18n/ar.json            | 65 +++++++++++++++-
 apps/gauzy/src/assets/i18n/bg.json            | 63 +++++++++++++++-
 apps/gauzy/src/assets/i18n/de.json            | 63 +++++++++++++++-
 apps/gauzy/src/assets/i18n/en.json            | 63 +++++++++++++++-
 apps/gauzy/src/assets/i18n/es.json            | 63 +++++++++++++++-
 apps/gauzy/src/assets/i18n/fr.json            | 63 +++++++++++++++-
 apps/gauzy/src/assets/i18n/he.json            | 63 +++++++++++++++-
 apps/gauzy/src/assets/i18n/it.json            | 63 +++++++++++++++-
 apps/gauzy/src/assets/i18n/nl.json            | 63 +++++++++++++++-
 apps/gauzy/src/assets/i18n/pl.json            | 63 +++++++++++++++-
 apps/gauzy/src/assets/i18n/pt.json            | 63 +++++++++++++++-
 apps/gauzy/src/assets/i18n/ru.json            | 63 +++++++++++++++-
 apps/gauzy/src/assets/i18n/zh.json            | 63 +++++++++++++++-
 16 files changed, 866 insertions(+), 86 deletions(-)

diff --git a/apps/gauzy/src/app/auth/login-workspace/login-workspace.component.html b/apps/gauzy/src/app/auth/login-workspace/login-workspace.component.html
index f5dfdae132d..f40cc39c597 100644
--- a/apps/gauzy/src/app/auth/login-workspace/login-workspace.component.html
+++ b/apps/gauzy/src/app/auth/login-workspace/login-workspace.component.html
@@ -9,7 +9,7 @@
 				<ngx-gauzy-logo [isAccordion]="false" class="ever-logo-svg"></ngx-gauzy-logo>
 			</div>
 
-			<h1 class="title">Sign in to Workspace</h1>
+			<h1 class="title">{{ "WORKSPACES.SIGN_IN_TITLE" | translate }}</h1>
 
 			<div class="hr-div-strong"></div>
 
@@ -19,13 +19,13 @@ <h1 class="title">Sign in to Workspace</h1>
 
 			<section class="sign-in-or-up" aria-label="Sign in or sign up">
 				<p class="redirect-link-p">
-					<span>Back to </span>
+					<span>{{ "WORKSPACES.BACK_TO" | translate }}</span>
 					<a class="text-link" [routerLink]="['/auth/login']">
-						<span>Log In</span>
+						<span>{{ "BUTTONS.LOGIN" | translate }}</span>
 					</a>
 				</p>
 				<p class="redirect-link-p">
-					<a [routerLink]="['/auth/register']" class="text-link">Register</a>
+					<a [routerLink]="['/auth/register']" class="text-link">{{ "BUTTONS.REGISTER" | translate }}</a>
 				</p>
 			</section>
 		</div>
@@ -42,14 +42,14 @@ <h1 class="title">Sign in to Workspace</h1>
 			<div class="col">
 				<div class="form-group">
 					<label class="label" for="email">
-						Enter your email address:
+						{{ "WORKSPACES.LABELS.EMAIL" | translate }}
 					</label>
 					<input
 						nbInput
 						id="email"
 						name="email"
 						type="email"
-						placeholder="name@workspace-email.com"
+						[placeholder]="'WORKSPACES.PLACEHOLDERS.EMAIL' | translate"
 						fullWidth
 						fieldSize="large"
 						formControlName="email"
@@ -58,8 +58,8 @@ <h1 class="title">Sign in to Workspace</h1>
 				</div>
 				<ngx-password-form-field
 					id="password"
-					label="Enter your password:"
-					placeholder="Password"
+					[label]="'WORKSPACES.LABELS.PASSWORD' | translate"
+					[placeholder]="'WORKSPACES.PLACEHOLDERS.PASSWORD' | translate"
 					autocomplete="password"
 					formControlName="password"
 				></ngx-password-form-field>
@@ -67,7 +67,7 @@ <h1 class="title">Sign in to Workspace</h1>
 		</div>
 		<div class="submit-btn-wrapper">
 			<button nbButton size="small" class="submit-btn" type="submit">
-				Sign In
+				{{ "BUTTONS.SIGNIN" | translate }}
 			</button>
 		</div>
 	</form>
diff --git a/apps/gauzy/src/app/auth/login/login.component.html b/apps/gauzy/src/app/auth/login/login.component.html
index 2e14547b8b9..3deb963e400 100644
--- a/apps/gauzy/src/app/auth/login/login.component.html
+++ b/apps/gauzy/src/app/auth/login/login.component.html
@@ -12,24 +12,36 @@ <h2 id="title" class="title">{{ 'LOGIN_PAGE.TITLE' | translate }}</h2>
           <nb-accordion-item class="demo-credentials-select-item">
             <nb-accordion-item-header class="demo-credentials-header">
               <div class="demo-credentials-head-text">
-                <div><span class="demo-text-span">Demo </span>Credentials</div>
+                <div [innerHTML]="'LOGIN_PAGE.DEMO.DEMO_CREDENTIALS_TITLE' | translate">
+                </div>
               </div>
             </nb-accordion-item-header>
             <nb-accordion-item-body class="demo-credentials-body">
-              <div>Super Admin</div>
+              <div>{{ "LOGIN_PAGE.DEMO.SUPER_ADMIN_TITLE" | translate }}</div>
               <br/>
-              <div>Email: admin@ever.co</div>
-              <div>Password: admin</div>
+              <div>
+                {{ "LOGIN_PAGE.DEMO.LABELS.EMAIL" | translate }} admin@ever.co
+              </div>
+              <div>
+                {{ "LOGIN_PAGE.DEMO.LABELS.PASSWORD" | translate }} admin
+              </div>
               <br/>
-              <div>Admin</div>
+              <div>{{ "LOGIN_PAGE.DEMO.ADMIN_TITLE" | translate }}</div>
               <br/>
-              <div>Email: local.admin@ever.co</div>
-              <div>Password: admin</div>
+              <div>
+                {{ "LOGIN_PAGE.DEMO.LABELS.EMAIL" | translate }} local.admin@ever.co
+              </div>
+              <div>
+                {{ "LOGIN_PAGE.DEMO.LABELS.PASSWORD" | translate }} admin
+              </div>
               <br/>
-              <div>Employee</div>
+              <div>{{ "LOGIN_PAGE.DEMO.EMPLOYEE_TITLE" | translate }}</div>
               <br/>
-              <div>Email: employee@ever.co</div>
-              <div>Password: 123456</div>
+              <div>
+                {{ "LOGIN_PAGE.DEMO.LABELS.EMAIL" | translate }} employee@ever.co</div>
+              <div>
+                {{ "LOGIN_PAGE.DEMO.LABELS.PASSWORD" | translate }} 123456
+              </div>
             </nb-accordion-item-body>
           </nb-accordion-item>
         </nb-accordion>
@@ -234,8 +246,10 @@ <h2 id="title" class="title">{{ 'LOGIN_PAGE.TITLE' | translate }}</h2>
     </section>
     <div class="hr-div-soft"></div>
     <section class="another-action" aria-label="Sign In Workspace">
-		Don’t know your workspace?
-		<a class="text-link" routerLink="/auth/login-workspace">Find your workspaces</a>
+		  {{ "WORKSPACES.UNKNOWN_WORKSPACE" | translate }}
+      <a class="text-link" routerLink="/auth/login-workspace">
+        {{ "WORKSPACES.FIND_WORKSPACE" | translate }}
+      </a>
     </section>
 
     <section class="another-action" aria-label="Register">
diff --git a/apps/gauzy/src/app/auth/register/register.component.html b/apps/gauzy/src/app/auth/register/register.component.html
index d9f6ad3e2ac..508917afe63 100644
--- a/apps/gauzy/src/app/auth/register/register.component.html
+++ b/apps/gauzy/src/app/auth/register/register.component.html
@@ -5,7 +5,7 @@
             <gauzy-switch-theme class="theme-switch" [hasText]="false"></gauzy-switch-theme>
         </div>
         <div class="title-wrapper">
-            <h1 id="title" class="title">Register</h1>
+            <h1 id="title" class="title">{{ "REGISTER_PAGE.TITLE" | translate }}</h1>
         </div>
         <div class="hr-div-strong"></div>
         <nb-alert *ngIf="showMessages?.error && errors?.length && !submitted" outline="danger" role="alert">
@@ -25,7 +25,7 @@ <h1 id="title" class="title">Register</h1>
         <form (ngSubmit)="register()" #form="ngForm" aria-labelledby="title" class="form">
 			<div class="form-control-group">
 				<label class="label" for="input-name">
-					Full name:
+					{{ "REGISTER_PAGE.LABELS.FULL_NAME" | translate }}
 				</label>
 				<input
 					nbInput
@@ -33,7 +33,7 @@ <h1 id="title" class="title">Register</h1>
 					#fullName="ngModel"
 					id="input-name"
 					name="fullName"
-					placeholder="Full name"
+					[placeholder]=" 'REGISTER_PAGE.PLACEHOLDERS.FULL_NAME' | translate "
 					autofocus
 					fullWidth
 					fieldSize="large"
@@ -43,25 +43,27 @@ <h1 id="title" class="title">Register</h1>
 					[maxlength]="getConfigValue('forms.validation.fullName.maxLength')"
 					[attr.aria-invalid]=" fullName.invalid && fullName.touched ? true : null"
 					autocomplete="full-name"
-				/>
+					/>
 				<ng-container *ngIf="fullName.invalid && fullName.touched">
 					<p class="caption status-danger" *ngIf="fullName.errors?.required">
-						Full name is required!
+						{{ "REGISTER_PAGE.VALIDATIONS.FULL_NAME_REQUIRED" | translate }}
 					</p>
 					<p
 						class="caption status-danger"
 						*ngIf="fullName.errors?.minlength || fullName.errors?.maxlength"
 						>
-						Full name should contains from
-						{{ getConfigValue('forms.validation.fullName.minLength') }} to
-						{{ getConfigValue('forms.validation.fullName.maxLength') }}
-						characters
+						{{ "REGISTER_PAGE.VALIDATIONS.FULL_NAME_SHOULD_CONTAIN" |
+							translate : {
+								minLength: getConfigValue('forms.validation.fullName.minLength'),
+								maxLength: getConfigValue('forms.validation.fullName.maxLength')
+							}
+						}}
 					</p>
 				</ng-container>
 			</div>
 			<div class="form-control-group" *ngIf="!(queryParams$ | async).email">
 				<label class="label" for="input-email">
-					Email address:
+					{{ "REGISTER_PAGE.LABELS.EMAIL" | translate }}
 				</label>
 				<input
 					nbInput
@@ -71,7 +73,7 @@ <h1 id="title" class="title">Register</h1>
 					name="email"
 					pattern=".+@.+..+"
 					noSpaceEdges
-					placeholder="Email address"
+					[placeholder]="'REGISTER_PAGE.PLACEHOLDERS.EMAIL' | translate"
 					fullWidth
 					fieldSize="large"
 					[status]=" email.dirty ? (email.invalid ? 'danger' : 'success') : 'basic'"
@@ -81,16 +83,16 @@ <h1 id="title" class="title">Register</h1>
 				/>
 				<ng-container *ngIf="email.invalid && email.touched">
 					<p class="caption status-danger" *ngIf="email.errors?.required">
-						Email is required!
+						{{ "REGISTER_PAGE.VALIDATIONS.EMAIL_REQUIRED" | translate }}
 					</p>
 					<p class="caption status-danger" *ngIf="email.errors?.pattern">
-						Email should be the real one!
+						{{ "REGISTER_PAGE.VALIDATIONS.EMAIL_SHOULD_BE_REAL" | translate }}
 					</p>
 				</ng-container>
 			</div>
 			<div class="form-control-group">
 				<label class="label" for="input-password">
-					Password:
+					{{ "REGISTER_PAGE.LABELS.PASSWORD" | translate }}
 				</label>
 				<nb-form-field>
 					<input
@@ -102,7 +104,7 @@ <h1 id="title" class="title">Register</h1>
 						type="password"
 						id="input-password"
 						name="password"
-						placeholder="Password"
+						[placeholder]=" 'REGISTER_PAGE.PLACEHOLDERS.PASSWORD' | translate "
 						fullWidth
 						fieldSize="large"
 						[status]="password.dirty ? password.invalid ? 'danger' : 'success' : 'basic'"
@@ -122,22 +124,22 @@ <h1 id="title" class="title">Register</h1>
 				</nb-form-field>
 				<ng-container *ngIf="password.invalid && password.touched">
 					<p class="caption status-danger" *ngIf="password.errors?.pattern">
-						Passwords must not begin or end with spaces.
+						{{ "REGISTER_PAGE.VALIDATIONS.PASSWORD_NO_SPACE_EDGES" | translate }}
 					</p>
 					<p class="caption status-danger" *ngIf="password.errors?.required">
-						Password is required!
+						{{ "REGISTER_PAGE.VALIDATIONS.PASSWORD_REQUIRED" | translate }}
 					</p>
 					<p class="caption status-danger" *ngIf="password.errors?.minlength || password.errors?.maxlength">
-						Password should contain from
-						{{ getConfigValue('forms.validation.password.minLength') }} to
-						{{ getConfigValue('forms.validation.password.maxLength') }}
-						characters
+						{{ "REGISTER_PAGE.VALIDATIONS.PASSWORD_SHOULD_CONTAIN" | translate : {
+							minLength: getConfigValue('forms.validation.password.minLength'),
+							maxLength: getConfigValue('forms.validation.password.maxLength')
+						} }}
 					</p>
 				</ng-container>
 			</div>
 			<div class="form-control-group">
 				<label class="label" for="input-re-password">
-					Repeat password:
+					{{ "REGISTER_PAGE.LABELS.CONFIRM_PASSWORD" | translate }}
 				</label>
 				<nb-form-field>
 					<input
@@ -148,7 +150,7 @@ <h1 id="title" class="title">Register</h1>
 						type="password"
 						id="input-re-password"
 						name="rePass"
-						placeholder="Confirm Password"
+						[placeholder]=" 'REGISTER_PAGE.PLACEHOLDERS.CONFIRM_PASSWORD' | translate"
 						fullWidth
 						fieldSize="large"
 						[status]="confirmPassword.dirty ? confirmPassword.invalid || password.value != confirmPassword.value ? 'danger' : 'success' : 'basic' "
@@ -166,10 +168,10 @@ <h1 id="title" class="title">Register</h1>
 				</nb-form-field>
 				<ng-container *ngIf="confirmPassword.touched">
 					<p class="caption status-danger" *ngIf="confirmPassword.errors?.required">
-						Password confirmation is required!
+						{{ "REGISTER_PAGE.VALIDATIONS.CONFIRM_PASSWORD_REQUIRED" | translate }}
 					</p>
 					<p class="caption status-danger" *ngIf="password.value != confirmPassword.value && !confirmPassword.errors?.required">
-						Password does not match the confirm password.
+						{{ "REGISTER_PAGE.VALIDATIONS.PASSWORDS_NOT_MATCH" | translate }}
 					</p>
 				</ng-container>
 			</div>
@@ -181,14 +183,7 @@ <h1 id="title" class="title">Register</h1>
 						[(ngModel)]="user.terms"
 						[required]="getConfigValue('forms.register.terms')"
 					>
-						<span class="normal-terms-text">Agree to </span>
-						<a routerLink="/legal/terms" target="_blank" class="terms-link">
-							<strong>Terms & Conditions</strong>
-						</a>
-						<span class="normal-terms-text"> and </span>
-						<a routerLink="/legal/privacy" target="_blank" class="terms-link">
-							<strong>Privacy Policy</strong>
-						</a>
+						<div [innerHTML]="'REGISTER_PAGE.VALIDATIONS.AGREE_TERMS_PRIVACY' | translate"></div>
 					</nb-checkbox>
 				</div>
 			</ng-container>
@@ -200,7 +195,7 @@ <h1 id="title" class="title">Register</h1>
 					[disabled]="submitted || !form.valid || !user.terms"
 					[class.btn-pulse]="submitted"
 				>
-					Register
+					{{ "BUTTONS.REGISTER" | translate }}
 				</button>
 			</div>
         </form>
@@ -211,13 +206,17 @@ <h1 id="title" class="title">Register</h1>
         <div class="hr-div-soft"></div>
 
 		<section class="another-action" aria-label="Sign In Workspace">
-            Don’t know your workspace?
-			<a class="text-link" routerLink="/auth/login-workspace">Find your workspaces</a>
+            {{ "WORKSPACES.UNKNOWN_WORKSPACE" | translate }}
+			<a class="text-link" routerLink="/auth/login-workspace">
+				{{ "WORKSPACES.FIND_WORKSPACE" | translate }}
+			</a>
         </section>
 
         <section class="another-action" aria-label="Sign in">
-            Already have an account?
-            <a class="text-link" routerLink="../login">Log in</a>
+            {{ "REGISTER_PAGE.HAVE_AN_ACCOUNT" | translate }}
+            <a class="text-link" routerLink="../login">
+				{{ "BUTTONS.LOGIN" | translate }}
+			</a>
         </section>
     </div>
     <div class="features-wrapper">
diff --git a/apps/gauzy/src/assets/i18n/ar.json b/apps/gauzy/src/assets/i18n/ar.json
index 7a892f51a24..4e2dd520b42 100644
--- a/apps/gauzy/src/assets/i18n/ar.json
+++ b/apps/gauzy/src/assets/i18n/ar.json
@@ -8,6 +8,7 @@
 		"REGISTER": "تسجيل",
 		"CHANGE_PASSWORD": "تغيير كلمة المرور",
 		"LOGIN": "تسجيل الدخول",
+		"SIGNIN": "تسجيل الدخول",
 		"SEND_CODE": "تسجيل الدخول بالبريد الإلكتروني",
 		"ADD_NOTE": "أضف ملاحظة",
 		"EDIT": "تعديل",
@@ -4397,6 +4398,34 @@
 			"receipt": "إيصال"
 		}
 	},
+	"REGISTER_PAGE": {
+		"TITLE": "تسجيل",
+		"HAVE_AN_ACCOUNT": "هل لديك حساب بالفعل؟",
+		"LABELS": {
+			"FULL_NAME": " :الاسم الكامل",
+			"EMAIL": " :عنوان البريد الإلكتروني",
+			"PASSWORD": " :كلمة المرور",
+			"CONFIRM_PASSWORD": " :تأكيد كلمة المرور"
+		},
+		"PLACEHOLDERS": {
+			"FULL_NAME": "الاسم الكامل",
+			"EMAIL": "عنوان البريد الإلكتروني",
+			"PASSWORD": "كلمة المرور",
+			"CONFIRM_PASSWORD": "تأكيد كلمة المرور"
+		},
+		"VALIDATIONS": {
+			"FULL_NAME_REQUIRED": "!الاسم الكامل مطلوب",
+			"FULL_NAME_SHOULD_CONTAIN": "يجب أن يحتوي الاسم الكامل على عدد من {{ minLength }} إلى {{ maxLength }} حرفًا",
+			"EMAIL_REQUIRED": "!البريد الإلكتروني مطلوب",
+			"EMAIL_SHOULD_BE_REAL": "!يجب أن يكون البريد الإلكتروني حقيقيًا",
+			"PASSWORD_NO_SPACE_EDGES": "!يجب ألا تبدأ أو تنتهي كلمات المرور بمسافات",
+			"PASSWORD_REQUIRED": "!كلمة المرور مطلوبة",
+			"PASSWORD_SHOULD_CONTAIN": "يجب أن تحتوي كلمة المرور على عدد من {{ minLength }} إلى {{ maxLength }} حرفًا",
+			"CONFIRM_PASSWORD_REQUIRED": "!تأكيد كلمة المرور مطلوب",
+			"PASSWORDS_NOT_MATCH": "!كلمة المرور لا تتطابق مع تأكيد كلمة المرور",
+			"AGREE_TERMS_PRIVACY": "<span class=\"normal-terms-text\"> موافق على </span><a routerLink=\"/legal/terms\" target=\"_blank\" class=\"terms-link\"><strong> الشروط و الأحكام </strong></a><span class=\"normal-terms-text\"> و </span><a routerLink=\"/legal/privacy\" target=\"_blank\" class=\"terms-link\"><strong> سياسة الخصوصية </strong></a>"
+		}
+	},
 	"LOGIN_PAGE": {
 		"TITLE": "تسجيل الدخول",
 		"SUB_TITLE": "مرحبًا! قم بتسجيل الدخول باستخدام بريدك الإلكتروني.",
@@ -4435,7 +4464,15 @@
 		},
 		"DEMO": {
 			"TITLE": "تسجيل الدخول تلقائيًا إلى حسابات التجريبية",
-			"SUB_TITLE": "يرجى تحديد نوع الحساب أدناه."
+			"SUB_TITLE": ".يرجى تحديد نوع الحساب أدناه",
+			"SUPER_ADMIN_TITLE": "مشرف عام",
+			"ADMIN_TITLE": "مسؤول",
+			"EMPLOYEE_TITLE": "موظف",
+			"DEMO_CREDENTIALS_TITLE": "<span class=\"demo-text-span\">بيانات</span> العرض",
+			"LABELS": {
+				"EMAIL": " :البريد الإلكتروني",
+				"PASSWORD": " :كلمة المرور"
+			}
 		}
 	},
 	"FORGOT_PASSWORD_PAGE": {
@@ -4503,14 +4540,36 @@
 			"CREATE_NEW_WORKSPACE": "أنشئ مساحة عمل جديدة",
 			"FIND_WORKSPACE": "ابحث عن مساحة عمل"
 		},
+		"LABELS": {
+			"EMAIL": ":أدخل عنوان بريدك الإلكتروني",
+			"PASSWORD": ":أدخل كلمة المرور الخاصة بك"
+		},
+		"PLACEHOLDERS": {
+			"EMAIL": "name@workspace-email.com",
+			"PASSWORD": "كلمة المرور"
+		},
+		"SIGN_IN_TITLE": "تسجيل الدخول إلى مساحة العمل",
+		"BACK_TO": "العودة إلى ",
 		"SUCCESS_SIGNIN_TITLE": ".تهانينا! لقد قمت بتسجيل الدخول بنجاح إلى مساحة العمل الخاصة بك",
 		"SUCCESS_SIGNIN_SUB_TITLE": "...يرجى أن تكون صبورًا بينما نقوم بإعداد مساحة العمل",
 		"FAIL_SIGNIN_TITLE": ".خطأ! رمز السحر أو الرابط الذي قدمته منتهي الصلاحية أو غير صالح",
 		"FAIL_SIGNIN_SUB_TITLE": ".يرجى بدء العملية من جديد",
-		"THANKING_TEXT": ".شكرًا لاختيارك لنا"
+		"THANKING_TEXT": ".شكرًا لاختيارك لنا",
+		"UNKNOWN_WORKSPACE": "لا تعرف مساحة العمل الخاصة بك؟",
+		"FIND_WORKSPACE": "ابحث عن مساحتك الخاصة"
+	},
+	"DEMO": {
+		"SUPER_ADMIN_TITLE": "مشرف عام",
+		"ADMIN_TITLE": "مسؤول",
+		"EMPLOYEE_TITLE": "موظف",
+		"DEMO_CREDENTIALS_TITLE": "<span class=\"demo-text-span\">بيانات</span> العرض",
+		"LABELS": {
+			"EMAIL": ":البريد الإلكتروني",
+			"PASSWORD": ":كلمة المرور"
+		}
 	},
 	"NO_IMAGE": {
 		"ADD_DROP": "أضف أو أزل الصورة",
-		"AVAILABLE": "الصورة غير متاحة."
+		"AVAILABLE": "الصورة غير متاحة"
 	}
 }
diff --git a/apps/gauzy/src/assets/i18n/bg.json b/apps/gauzy/src/assets/i18n/bg.json
index f3eea21944a..56a20738b90 100644
--- a/apps/gauzy/src/assets/i18n/bg.json
+++ b/apps/gauzy/src/assets/i18n/bg.json
@@ -8,6 +8,7 @@
 		"REGISTER": "Регистриране",
 		"CHANGE_PASSWORD": "Промяна на паролата",
 		"LOGIN": "Log In",
+		"SIGNIN": "Вход",
 		"SEND_CODE": "Вход с имейл",
 		"ADD_NOTE": "Добави бележка",
 		"EDIT": "Редактиране",
@@ -4324,6 +4325,34 @@
 			"receipt": "Receipt"
 		}
 	},
+	"REGISTER_PAGE": {
+		"TITLE": "Регистрация",
+		"HAVE_AN_ACCOUNT": "Вече имате акаунт?",
+		"LABELS": {
+			"FULL_NAME": "Пълно име:",
+			"EMAIL": "Имейл адрес:",
+			"PASSWORD": "Парола",
+			"CONFIRM_PASSWORD": "Потвърдете паролата:"
+		},
+		"PLACEHOLDERS": {
+			"FULL_NAME": "Пълно име",
+			"EMAIL": "Имейл адрес",
+			"PASSWORD": "Парола",
+			"CONFIRM_PASSWORD": "Потвърдете паролата"
+		},
+		"VALIDATIONS": {
+			"FULL_NAME_REQUIRED": "Името е задължително!",
+			"FULL_NAME_SHOULD_CONTAIN": "Името трябва да съдържа от {{ minLength }} до {{ maxLength }} знака",
+			"EMAIL_REQUIRED": "Имейлът е задължителен!",
+			"EMAIL_SHOULD_BE_REAL": "Имейлът трябва да е реален!",
+			"PASSWORD_NO_SPACE_EDGES": "Паролите не трябва да започват или завършват с интервали!",
+			"PASSWORD_REQUIRED": "Паролата е задължителна!",
+			"PASSWORD_SHOULD_CONTAIN": "Паролата трябва да съдържа от {{ minLength }} до {{ maxLength }} знака",
+			"CONFIRM_PASSWORD_REQUIRED": "Изисква се потвърждение на паролата!",
+			"PASSWORDS_NOT_MATCH": "Паролата не съвпада с потвърждението на паролата!",
+			"AGREE_TERMS_PRIVACY": "<span class=\"normal-terms-text\">Съгласен съм с </span><a routerLink=\"/legal/terms\" target=\"_blank\" class=\"terms-link\"><strong>Общи условия и правила</strong></a><span class=\"normal-terms-text\"> и </span><a routerLink=\"/legal/privacy\" target=\"_blank\" class=\"terms-link\"><strong>Политика за поверителност</strong></a>"
+		}
+	},
 	"LOGIN_PAGE": {
 		"TITLE": "Login",
 		"SUB_TITLE": "Hello! Log in with your email.",
@@ -4362,7 +4391,15 @@
 		},
 		"DEMO": {
 			"TITLE": "Login Automatically into Demo accounts",
-			"SUB_TITLE": "Please select account type below."
+			"SUB_TITLE": "Please select account type below.",
+			"SUPER_ADMIN_TITLE": "Супер администратор",
+			"ADMIN_TITLE": "Администратор",
+			"EMPLOYEE_TITLE": "Служител",
+			"DEMO_CREDENTIALS_TITLE": "<span class=\"demo-text-span\">Демо</span> данни",
+			"LABELS": {
+				"EMAIL": "Имейл: ",
+				"PASSWORD": "Парола: "
+			}
 		}
 	},
 	"FORGOT_PASSWORD_PAGE": {
@@ -4429,11 +4466,33 @@
 			"CREATE_NEW_WORKSPACE": "Create a new workspace",
 			"FIND_WORKSPACE": "Find workspace"
 		},
+		"LABELS": {
+			"EMAIL": "Въведете вашия имейл адрес:",
+			"PASSWORD": "Въведете вашата парола:"
+		},
+		"PLACEHOLDERS": {
+			"EMAIL": "name@workspace-email.com",
+			"PASSWORD": "Парола"
+		},
+		"SIGN_IN_TITLE": "Вход в Работното пространство",
+		"BACK_TO": "Назад към",
 		"SUCCESS_SIGNIN_TITLE": "Поздравления! Влезли сте успешно в работното си пространство.",
 		"SUCCESS_SIGNIN_SUB_TITLE": "Моля, бъдете търпеливи, докато подготвяме работното пространство...",
 		"FAIL_SIGNIN_TITLE": "Грешка! Магическият код или връзката, която предоставихте, е изтекъл или невалиден.",
 		"FAIL_SIGNIN_SUB_TITLE": "Моля, инициирайте процеса отново.",
-		"THANKING_TEXT": "Благодарим ви, че ни избрахте."
+		"THANKING_TEXT": "Благодарим ви, че ни избрахте.",
+		"UNKNOWN_WORKSPACE": "Не знаете работното си пространство?",
+		"FIND_WORKSPACE": "Намерете вашето работно пространство"
+	},
+	"DEMO": {
+		"SUPER_ADMIN_TITLE": "Супер администратор",
+		"ADMIN_TITLE": "Администратор",
+		"EMPLOYEE_TITLE": "Служител",
+		"DEMO_CREDENTIALS_TITLE": "<span class=\"demo-text-span\">Демо</span> данни",
+		"LABELS": {
+			"EMAIL": "Имейл: ",
+			"PASSWORD": "Парола: "
+		}
 	},
 	"NO_IMAGE": {
 		"ADD_DROP": "Add or Drop Image",
diff --git a/apps/gauzy/src/assets/i18n/de.json b/apps/gauzy/src/assets/i18n/de.json
index 495ac5665dd..f28cd24404a 100644
--- a/apps/gauzy/src/assets/i18n/de.json
+++ b/apps/gauzy/src/assets/i18n/de.json
@@ -8,6 +8,7 @@
 		"REGISTER": "Registrieren",
 		"CHANGE_PASSWORD": "Passwort ändern",
 		"LOGIN": "Einloggen",
+		"SIGNIN": "Anmelden",
 		"SEND_CODE": "Mit E-Mail anmelden",
 		"ADD_NOTE": "Notiz hinzufügen",
 		"EDIT": "Bearbeiten",
@@ -4394,6 +4395,34 @@
 			"receipt": "Quittung"
 		}
 	},
+	"REGISTER_PAGE": {
+		"TITLE": "Registrieren",
+		"HAVE_AN_ACCOUNT": "Haben Sie bereits ein Konto?",
+		"LABELS": {
+			"FULL_NAME": "Vollständiger Name:",
+			"EMAIL": "E-Mail-Adresse:",
+			"PASSWORD": "Passwort",
+			"CONFIRM_PASSWORD": "Passwort bestätigen:"
+		},
+		"PLACEHOLDERS": {
+			"FULL_NAME": "Vollständiger Name",
+			"EMAIL": "E-Mail-Adresse",
+			"PASSWORD": "Passwort",
+			"CONFIRM_PASSWORD": "Passwort bestätigen"
+		},
+		"VALIDATIONS": {
+			"FULL_NAME_REQUIRED": "Der Name ist erforderlich!",
+			"FULL_NAME_SHOULD_CONTAIN": "Der Name sollte zwischen {{ minLength }} und {{ maxLength }} Zeichen enthalten",
+			"EMAIL_REQUIRED": "Die E-Mail ist erforderlich!",
+			"EMAIL_SHOULD_BE_REAL": "Die E-Mail sollte echt sein!",
+			"PASSWORD_NO_SPACE_EDGES": "Passwörter dürfen nicht mit Leerzeichen beginnen oder enden!",
+			"PASSWORD_REQUIRED": "Das Passwort ist erforderlich!",
+			"PASSWORD_SHOULD_CONTAIN": "Das Passwort sollte zwischen {{ minLength }} und {{ maxLength }} Zeichen enthalten",
+			"CONFIRM_PASSWORD_REQUIRED": "Die Bestätigung des Passworts ist erforderlich!",
+			"PASSWORDS_NOT_MATCH": "Das Passwort stimmt nicht mit der Passwortbestätigung überein!",
+			"AGREE_TERMS_PRIVACY": "<span class=\"normal-terms-text\">Ich stimme den </span><a routerLink=\"/legal/terms\" target=\"_blank\" class=\"terms-link\"><strong>Allgemeinen Geschäftsbedingungen</strong></a><span class=\"normal-terms-text\"> und der </span><a routerLink=\"/legal/privacy\" target=\"_blank\" class=\"terms-link\"><strong>Datenschutzrichtlinie</strong></a> zu"
+		}
+	},
 	"LOGIN_PAGE": {
 		"TITLE": "Anmeldung",
 		"SUB_TITLE": "Hallo! Melde dich mit deiner E-Mail an.",
@@ -4432,7 +4461,15 @@
 		},
 		"DEMO": {
 			"TITLE": "Automatisch in Demo-Konten einloggen",
-			"SUB_TITLE": "Bitte wählen Sie unten den Kontotyp aus."
+			"SUB_TITLE": "Bitte wählen Sie unten den Kontotyp aus.",
+			"SUPER_ADMIN_TITLE": "Super-Administrator",
+			"ADMIN_TITLE": "Administrator",
+			"EMPLOYEE_TITLE": "Mitarbeiter",
+			"DEMO_CREDENTIALS_TITLE": "<span class=\"demo-text-span\">Demo</span> Anmeldedaten",
+			"LABELS": {
+				"EMAIL": "E-Mail: ",
+				"PASSWORD": "Passwort: "
+			}
 		}
 	},
 	"FORGOT_PASSWORD_PAGE": {
@@ -4500,11 +4537,33 @@
 			"CREATE_NEW_WORKSPACE": "Erstelle einen neuen Arbeitsbereich",
 			"FIND_WORKSPACE": "Finde Arbeitsplatz"
 		},
+		"LABELS": {
+			"EMAIL": "Geben Sie Ihre E-Mail-Adresse ein:",
+			"PASSWORD": "Geben Sie Ihr Passwort ein:"
+		},
+		"PLACEHOLDERS": {
+			"EMAIL": "name@workspace-email.com",
+			"PASSWORD": "Passwort"
+		},
+		"SIGN_IN_TITLE": "Anmeldung im Arbeitsbereich",
+		"BACK_TO": "Zurück zu",
 		"SUCCESS_SIGNIN_TITLE": "Herzlichen Glückwunsch! Sie haben sich erfolgreich in Ihren Arbeitsbereich eingeloggt.",
 		"SUCCESS_SIGNIN_SUB_TITLE": "Bitte haben Sie Geduld, während wir den Arbeitsbereich vorbereiten...",
 		"FAIL_SIGNIN_TITLE": "Fehler! Der magische Code oder Link, den Sie bereitgestellt haben, ist abgelaufen oder ungültig.",
 		"FAIL_SIGNIN_SUB_TITLE": "Bitte starten Sie den Prozess erneut.",
-		"THANKING_TEXT": "Vielen Dank, dass Sie uns gewählt haben."
+		"THANKING_TEXT": "Vielen Dank, dass Sie uns gewählt haben.",
+		"UNKNOWN_WORKSPACE": "Kennen Sie Ihren Arbeitsbereich nicht?",
+		"FIND_WORKSPACE": "Finden Sie Ihren Arbeitsbereich"
+	},
+	"DEMO": {
+		"SUPER_ADMIN_TITLE": "Super-Administrator",
+		"ADMIN_TITLE": "Administrator",
+		"EMPLOYEE_TITLE": "Mitarbeiter",
+		"DEMO_CREDENTIALS_TITLE": "<span class=\"demo-text-span\">Demo</span> Anmeldedaten",
+		"LABELS": {
+			"EMAIL": "E-Mail: ",
+			"PASSWORD": "Passwort: "
+		}
 	},
 	"NO_IMAGE": {
 		"ADD_DROP": "Bild hinzufügen oder entfernen",
diff --git a/apps/gauzy/src/assets/i18n/en.json b/apps/gauzy/src/assets/i18n/en.json
index f8db85e0350..6aa7c242b23 100644
--- a/apps/gauzy/src/assets/i18n/en.json
+++ b/apps/gauzy/src/assets/i18n/en.json
@@ -10,6 +10,7 @@
 		"REGISTER": "Register",
 		"CHANGE_PASSWORD": "Change password",
 		"LOGIN": "Log In",
+		"SIGNIN": "Sign in",
 		"SEND_CODE": "Send code",
 		"SENDING_CODE": "Sending code...",
 		"ADD_NOTE": "Add note",
@@ -4479,6 +4480,34 @@
 			"receipt": "Receipt"
 		}
 	},
+	"REGISTER_PAGE": {
+		"TITLE": "Register",
+		"HAVE_AN_ACCOUNT": "Already have an account?",
+		"LABELS": {
+			"FULL_NAME": "Full name:",
+			"EMAIL": "Email address:",
+			"PASSWORD": "Password",
+			"CONFIRM_PASSWORD":"Confirm Password:"
+		},
+		"PLACEHOLDERS": {
+			"FULL_NAME": "Full name",
+			"EMAIL": "Email address",
+			"PASSWORD": "Password",
+			"CONFIRM_PASSWORD": "Confirm password"
+		},
+		"VALIDATIONS": {
+			"FULL_NAME_REQUIRED": "Full name is required!",
+			"FULL_NAME_SHOULD_CONTAIN": "Full name should contain from {{ minLength }} to {{ maxLength }} characters",
+			"EMAIL_REQUIRED": "Email is required!",
+			"EMAIL_SHOULD_BE_REAL":"Email should be a real one!",
+			"PASSWORD_NO_SPACE_EDGES": "Passwords must not begin or end with spaces!",
+			"PASSWORD_REQUIRED": "Password is required!",
+			"PASSWORD_SHOULD_CONTAIN": "Password should contain from {{ minLength }} to {{ maxLength }} characters!",
+			"CONFIRM_PASSWORD_REQUIRED": "Password confirmation is required!",
+			"PASSWORDS_NOT_MATCH": "Password does not match the confirm password!",
+			"AGREE_TERMS_PRIVACY": "<span class=\"normal-terms-text\">Agree to </span><a routerLink=\"/legal/terms\" target=\"_blank\" class=\"terms-link\"><strong>Terms & Conditions</strong></a><span class=\"normal-terms-text\"> and </span><a routerLink=\"/legal/privacy\" target=\"_blank\" class=\"terms-link\"><strong>Privacy Policy</strong></a>"
+		}
+	},
 	"LOGIN_PAGE": {
 		"TITLE": "Login",
 		"SUB_TITLE": "Hello! Log in with your email.",
@@ -4517,7 +4546,15 @@
 		},
 		"DEMO": {
 			"TITLE": "Login Automatically into Demo accounts",
-			"SUB_TITLE": "Please select account type below."
+			"SUB_TITLE": "Please select account type below.",
+			"SUPER_ADMIN_TITLE": "Super Admin",
+			"ADMIN_TITLE": "Admin",
+			"EMPLOYEE_TITLE": "Employee",
+			"DEMO_CREDENTIALS_TITLE": "<span class=\"demo-text-span\">Demo</span> Credentials",
+			"LABELS": {
+				"EMAIL":"Email: ",
+				"PASSWORD": "Password: "
+			}
 		}
 	},
 	"FORGOT_PASSWORD_PAGE": {
@@ -4585,11 +4622,33 @@
 			"CREATE_NEW_WORKSPACE": "Create a new workspace",
 			"FIND_WORKSPACE": "Find workspace"
 		},
+		"LABELS": {
+			"EMAIL": "Enter your email address:",
+			"PASSWORD": "Enter your password:"
+		},
+		"PLACEHOLDERS": {
+			"EMAIL": "name@workspace-email.com",
+			"PASSWORD": "Password"
+		},
+		"SIGN_IN_TITLE": "Sign in to Workspace",
+		"BACK_TO": "Back to ",
 		"SUCCESS_SIGNIN_TITLE": "Congrats! you’ve successfully signed in to your workspace.",
 		"SUCCESS_SIGNIN_SUB_TITLE": "Please be patient while we are preparing the workspace...",
 		"FAIL_SIGNIN_TITLE": "Error! the magic code or link you provided is expired or invalid.",
 		"FAIL_SIGNIN_SUB_TITLE": "Please initiate the process again.",
-		"THANKING_TEXT": "Thank you for choosing us."
+		"THANKING_TEXT": "Thank you for choosing us.",
+		"UNKNOWN_WORKSPACE": "Don't know your workspace?",
+		"FIND_WORKSPACE": "Find your workspaces"
+	},
+	"DEMO": {
+		"SUPER_ADMIN_TITLE": "Super Admin",
+		"ADMIN_TITLE": "Admin",
+		"EMPLOYEE_TITLE": "Employee",
+		"DEMO_CREDENTIALS_TITLE": "<span class=\"demo-text-span\">Demo</span> Credentials",
+		"LABELS": {
+			"EMAIL":"Email: ",
+			"PASSWORD": "Password: "
+		}
 	},
 	"NO_IMAGE": {
 		"ADD_DROP": "Add or Drop Image",
diff --git a/apps/gauzy/src/assets/i18n/es.json b/apps/gauzy/src/assets/i18n/es.json
index 8c29ec4e674..9d1b2e0f54e 100644
--- a/apps/gauzy/src/assets/i18n/es.json
+++ b/apps/gauzy/src/assets/i18n/es.json
@@ -8,6 +8,7 @@
 		"REGISTER": "Registrar",
 		"CHANGE_PASSWORD": "Cambiar contraseña",
 		"LOGIN": "Iniciar sesión",
+		"SIGNIN": "Iniciar sesión",
 		"SEND_CODE": "Iniciar sesión con correo electrónico",
 		"ADD_NOTE": "Añadir nota",
 		"EDIT": "Editar",
@@ -4400,6 +4401,34 @@
 			"receipt": "Recibo"
 		}
 	},
+	"REGISTER_PAGE": {
+		"TITLE": "Registrarse",
+		"HAVE_AN_ACCOUNT": "¿Ya tienes una cuenta?",
+		"LABELS": {
+			"FULL_NAME": "Nombre completo:",
+			"EMAIL": "Dirección de correo electrónico:",
+			"PASSWORD": "Contraseña",
+			"CONFIRM_PASSWORD": "Confirmar contraseña:"
+		},
+		"PLACEHOLDERS": {
+			"FULL_NAME": "Nombre completo",
+			"EMAIL": "Dirección de correo electrónico",
+			"PASSWORD": "Contraseña",
+			"CONFIRM_PASSWORD": "Confirmar contraseña"
+		},
+		"VALIDATIONS": {
+			"FULL_NAME_REQUIRED": "¡Se requiere el nombre completo!",
+			"FULL_NAME_SHOULD_CONTAIN": "El nombre completo debe contener entre {{ minLength }} y {{ maxLength }} caracteres",
+			"EMAIL_REQUIRED": "¡Se requiere el correo electrónico!",
+			"EMAIL_SHOULD_BE_REAL": "¡El correo electrónico debe ser real!",
+			"PASSWORD_NO_SPACE_EDGES": "¡Las contraseñas no deben comenzar ni terminar con espacios!",
+			"PASSWORD_REQUIRED": "¡Se requiere la contraseña!",
+			"PASSWORD_SHOULD_CONTAIN": "La contraseña debe contener entre {{ minLength }} y {{ maxLength }} caracteres",
+			"CONFIRM_PASSWORD_REQUIRED": "¡Se requiere la confirmación de la contraseña!",
+			"PASSWORDS_NOT_MATCH": "La contraseña no coincide con la confirmación de la contraseña!",
+			"AGREE_TERMS_PRIVACY": "<span class=\"normal-terms-text\">Acepto los </span><a routerLink=\"/legal/terms\" target=\"_blank\" class=\"terms-link\"><strong>Términos y condiciones</strong></a><span class=\"normal-terms-text\"> y la </span><a routerLink=\"/legal/privacy\" target=\"_blank\" class=\"terms-link\"><strong>Política de privacidad</strong></a>"
+		}
+	},
 	"LOGIN_PAGE": {
 		"TITLE": "Acceso",
 		"SUB_TITLE": "¡Hola! Inicia sesión con tu correo electrónico.",
@@ -4438,7 +4467,15 @@
 		},
 		"DEMO": {
 			"TITLE": "Iniciar sesión automáticamente en cuentas de demostración",
-			"SUB_TITLE": "Por favor, selecciona el tipo de cuenta a continuación."
+			"SUB_TITLE": "Por favor, selecciona el tipo de cuenta a continuación.",
+			"SUPER_ADMIN_TITLE": "Superadministrador",
+			"ADMIN_TITLE": "Administrador",
+			"EMPLOYEE_TITLE": "Empleado",
+			"DEMO_CREDENTIALS_TITLE": "<span class=\"demo-text-span\">Credenciales de demostración</span>",
+			"LABELS": {
+				"EMAIL": "Correo electrónico: ",
+				"PASSWORD": "Contraseña: "
+			}
 		}
 	},
 	"FORGOT_PASSWORD_PAGE": {
@@ -4506,11 +4543,33 @@
 			"CREATE_NEW_WORKSPACE": "Crear un nuevo espacio de trabajo",
 			"FIND_WORKSPACE": "Encuentra espacio de trabajo."
 		},
+		"LABELS": {
+			"EMAIL": "Ingrese su dirección de correo electrónico:",
+			"PASSWORD": "Ingrese su contraseña:"
+		},
+		"PLACEHOLDERS": {
+			"EMAIL": "nombre@correo-electronico.com",
+			"PASSWORD": "Contraseña"
+		},
+		"SIGN_IN_TITLE": "Iniciar sesión en el espacio de trabajo",
+		"BACK_TO": "Volver a",
 		"SUCCESS_SIGNIN_TITLE": "¡Felicidades! Has iniciado sesión con éxito en tu espacio de trabajo.",
 		"SUCCESS_SIGNIN_SUB_TITLE": "Por favor, ten paciencia mientras preparamos el espacio de trabajo...",
 		"FAIL_SIGNIN_TITLE": "¡Error! El código mágico o el enlace que proporcionaste ha expirado o no es válido.",
 		"FAIL_SIGNIN_SUB_TITLE": "Por favor, inicia el proceso de nuevo.",
-		"THANKING_TEXT": "Gracias por elegirnos."
+		"THANKING_TEXT": "Gracias por elegirnos.",
+		"UNKNOWN_WORKSPACE": "¿No conoces tu espacio de trabajo?",
+		"FIND_WORKSPACE": "Encuentra tu espacio de trabajo"
+	},
+	"DEMO": {
+		"SUPER_ADMIN_TITLE": "Superadministrador",
+		"ADMIN_TITLE": "Administrador",
+		"EMPLOYEE_TITLE": "Empleado",
+		"DEMO_CREDENTIALS_TITLE": "<span class=\"demo-text-span\">Credenciales de demostración</span>",
+		"LABELS": {
+			"EMAIL": "Correo electrónico: ",
+			"PASSWORD": "Contraseña: "
+		}
 	},
 	"NO_IMAGE": {
 		"ADD_DROP": "Agregar o Eliminar Imagen",
diff --git a/apps/gauzy/src/assets/i18n/fr.json b/apps/gauzy/src/assets/i18n/fr.json
index 45678a6c719..bb97161ff02 100644
--- a/apps/gauzy/src/assets/i18n/fr.json
+++ b/apps/gauzy/src/assets/i18n/fr.json
@@ -8,6 +8,7 @@
 		"REGISTER": "S'inscrire",
 		"CHANGE_PASSWORD": "Changer le mot de passe",
 		"LOGIN": "Se connecter",
+		"SIGNIN": "Se connecter",
 		"SEND_CODE": "Se connecter avec un e-mail",
 		"ADD_NOTE": "Ajouter une note",
 		"EDIT": "Éditer",
@@ -4399,6 +4400,34 @@
 			"receipt": "Reçu"
 		}
 	},
+	"REGISTER_PAGE": {
+		"TITLE": "S'inscrire",
+		"HAVE_AN_ACCOUNT": "Vous avez déjà un compte ?",
+		"LABELS": {
+			"FULL_NAME": "Nom complet :",
+			"EMAIL": "Adresse e-mail :",
+			"PASSWORD": "Mot de passe",
+			"CONFIRM_PASSWORD": "Confirmer le mot de passe :"
+		},
+		"PLACEHOLDERS": {
+			"FULL_NAME": "Nom complet",
+			"EMAIL": "Adresse e-mail",
+			"PASSWORD": "Mot de passe",
+			"CONFIRM_PASSWORD": "Confirmer le mot de passe"
+		},
+		"VALIDATIONS": {
+			"FULL_NAME_REQUIRED": "Le nom complet est requis !",
+			"FULL_NAME_SHOULD_CONTAIN": "Le nom complet doit contenir entre {{ minLength }} et {{ maxLength }} caractères",
+			"EMAIL_REQUIRED": "L'e-mail est requis !",
+			"EMAIL_SHOULD_BE_REAL": "L'e-mail doit être réel !",
+			"PASSWORD_NO_SPACE_EDGES": "Les mots de passe ne doivent pas commencer ou finir par des espaces !",
+			"PASSWORD_REQUIRED": "Le mot de passe est requis !",
+			"PASSWORD_SHOULD_CONTAIN": "Le mot de passe doit contenir entre {{ minLength }} et {{ maxLength }} caractères",
+			"CONFIRM_PASSWORD_REQUIRED": "La confirmation du mot de passe est requise !",
+			"PASSWORDS_NOT_MATCH": "Le mot de passe ne correspond pas à la confirmation du mot de passe !",
+			"AGREE_TERMS_PRIVACY": "<span class=\"normal-terms-text\">J'accepte les </span><a routerLink=\"/legal/terms\" target=\"_blank\" class=\"terms-link\"><strong>Conditions générales</strong></a><span class=\"normal-terms-text\"> et la </span><a routerLink=\"/legal/privacy\" target=\"_blank\" class=\"terms-link\"><strong>Politique de confidentialité</strong></a>"
+		}
+	},
 	"LOGIN_PAGE": {
 		"TITLE": "Connexion",
 		"SUB_TITLE": "Salut ! Connectez-vous avec votre adresse e-mail.",
@@ -4437,7 +4466,15 @@
 		},
 		"DEMO": {
 			"TITLE": "Connectez-vous automatiquement aux comptes de démonstration",
-			"SUB_TITLE": "Veuillez sélectionner le type de compte ci-dessous."
+			"SUB_TITLE": "Veuillez sélectionner le type de compte ci-dessous.",
+			"SUPER_ADMIN_TITLE": "Super administrateur",
+			"ADMIN_TITLE": "Administrateur",
+			"EMPLOYEE_TITLE": "Employé",
+			"DEMO_CREDENTIALS_TITLE": "<span class=\"demo-text-span\">Identifiants de démonstration</span>",
+			"LABELS": {
+				"EMAIL": "E-mail : ",
+				"PASSWORD": "Mot de passe : "
+			}
 		}
 	},
 	"FORGOT_PASSWORD_PAGE": {
@@ -4505,11 +4542,33 @@
 			"CREATE_NEW_WORKSPACE": "Créez un nouvel espace de travail.",
 			"FIND_WORKSPACE": "Trouver un espace de travail"
 		},
+		"LABELS": {
+			"EMAIL": "Entrez votre adresse e-mail :",
+			"PASSWORD": "Entrez votre mot de passe :"
+		},
+		"PLACEHOLDERS": {
+			"EMAIL": "nom@adresse-mail.com",
+			"PASSWORD": "Mot de passe"
+		},
+		"SIGN_IN_TITLE": "Se connecter à l'espace de travail",
+		"BACK_TO": "Retour à",
 		"SUCCESS_SIGNIN_TITLE": "Félicitations ! Vous avez réussi à vous connecter à votre espace de travail.",
 		"SUCCESS_SIGNIN_SUB_TITLE": "Veuillez patienter pendant que nous préparons l'espace de travail...",
 		"FAIL_SIGNIN_TITLE": "Erreur ! Le code magique ou le lien que vous avez fourni a expiré ou n'est pas valide.",
 		"FAIL_SIGNIN_SUB_TITLE": "Veuillez initier le processus à nouveau.",
-		"THANKING_TEXT": "Merci de nous avoir choisis."
+		"THANKING_TEXT": "Merci de nous avoir choisis.",
+		"UNKNOWN_WORKSPACE": "Vous ne connaissez pas votre espace de travail ?",
+		"FIND_WORKSPACE": "Trouver votre espace de travail"
+	},
+	"DEMO": {
+		"SUPER_ADMIN_TITLE": "Super administrateur",
+		"ADMIN_TITLE": "Administrateur",
+		"EMPLOYEE_TITLE": "Employé",
+		"DEMO_CREDENTIALS_TITLE": "<span class=\"demo-text-span\">Identifiants de démonstration</span>",
+		"LABELS": {
+			"EMAIL": "E-mail: ",
+			"PASSWORD": "Mot de passe: "
+		}
 	},
 	"NO_IMAGE": {
 		"ADD_DROP": "Ajouter ou supprimer une image",
diff --git a/apps/gauzy/src/assets/i18n/he.json b/apps/gauzy/src/assets/i18n/he.json
index 46d042315cd..e70f5d58921 100644
--- a/apps/gauzy/src/assets/i18n/he.json
+++ b/apps/gauzy/src/assets/i18n/he.json
@@ -8,6 +8,7 @@
 		"REGISTER": "Register",
 		"CHANGE_PASSWORD": "שנה סיסמה",
 		"LOGIN": "Log In",
+		"SIGNIN": "התחברות",
 		"SEND_CODE": "התחבר עם דואר אלקטרוני",
 		"ADD_NOTE": "Add note",
 		"EDIT": "ערוך",
@@ -4322,6 +4323,34 @@
 			"receipt": "Receipt"
 		}
 	},
+	"REGISTER_PAGE": {
+		"TITLE": "הרשמה",
+		"HAVE_AN_ACCOUNT": "כבר יש לך חשבון?",
+		"LABELS": {
+			"FULL_NAME": "שם מלא:",
+			"EMAIL": "כתובת דוא\"ל:",
+			"PASSWORD": "סיסמה",
+			"CONFIRM_PASSWORD": "אשר סיסמה:"
+		},
+		"PLACEHOLDERS": {
+			"FULL_NAME": "שם מלא",
+			"EMAIL": "כתובת דוא\"ל",
+			"PASSWORD": "סיסמה",
+			"CONFIRM_PASSWORD": "אשר סיסמה"
+		},
+		"VALIDATIONS": {
+			"FULL_NAME_REQUIRED": "שם מלא נדרש!",
+			"FULL_NAME_SHOULD_CONTAIN": "שם מלא צריך להכיל בין {{ minLength }} ל-{{ maxLength }} תווים",
+			"EMAIL_REQUIRED": "כתובת דוא\"ל נדרשת!",
+			"EMAIL_SHOULD_BE_REAL": "כתובת דוא\"ל צריכה להיות אמיתית!",
+			"PASSWORD_NO_SPACE_EDGES": "סיסמאות לא יכולות להתחיל או להסתיים עם רווחים!",
+			"PASSWORD_REQUIRED": "סיסמה נדרשת!",
+			"PASSWORD_SHOULD_CONTAIN": "סיסמה צריכה להכיל בין {{ minLength }} ל-{{ maxLength }} תווים",
+			"CONFIRM_PASSWORD_REQUIRED": "אישור סיסמה נדרש!",
+			"PASSWORDS_NOT_MATCH": "הסיסמה לא תואמת לאישור הסיסמה!",
+			"AGREE_TERMS_PRIVACY": "<span class=\"normal-terms-text\">מסכים ל </span><a routerLink=\"/legal/terms\" target=\"_blank\" class=\"terms-link\"><strong>תנאי השימוש</strong></a><span class=\"normal-terms-text\"> ול </span><a routerLink=\"/legal/privacy\" target=\"_blank\" class=\"terms-link\"><strong>מדיניות הפרטיות</strong></a>"
+		}
+	},
 	"LOGIN_PAGE": {
 		"TITLE": "Login",
 		"SUB_TITLE": "Hello! Log in with your email.",
@@ -4360,7 +4389,15 @@
 		},
 		"DEMO": {
 			"TITLE": "Login Automatically into Demo accounts",
-			"SUB_TITLE": "Please select account type below."
+			"SUB_TITLE": "Please select account type below.",
+			"SUPER_ADMIN_TITLE": "מנהל ראשי",
+			"ADMIN_TITLE": "מנהל",
+			"EMPLOYEE_TITLE": "עובד",
+			"DEMO_CREDENTIALS_TITLE": "<span class=\"demo-text-span\">פרטי דמו</span>",
+			"LABELS": {
+				"EMAIL": "אימייל: ",
+				"PASSWORD": "סיסמה: "
+			}
 		}
 	},
 	"FORGOT_PASSWORD_PAGE": {
@@ -4427,11 +4464,33 @@
 			"CREATE_NEW_WORKSPACE": "Create a new workspace",
 			"FIND_WORKSPACE": "Find workspace"
 		},
+		"LABELS": {
+			"EMAIL": "הזן את כתובת הדוא\"ל שלך:",
+			"PASSWORD": "הזן את הסיסמה שלך:"
+		},
+		"PLACEHOLDERS": {
+			"EMAIL": "name@workspace-email.com",
+			"PASSWORD": "סיסמה"
+		},
+		"SIGN_IN_TITLE": "התחבר למרחב העבודה",
+		"BACK_TO": "חזרה אל",
 		"SUCCESS_SIGNIN_TITLE": ".מזל טוב! נכנסת למערכת בהצלחה",
 		"SUCCESS_SIGNIN_SUB_TITLE": "...אנא התאזרי בסבלנות בזמן שאנו מכינים את המערכת",
 		"FAIL_SIGNIN_TITLE": ".שגיאה! קוד הקסם או הקישור שסיפקת פג או אינו תקף",
 		"FAIL_SIGNIN_SUB_TITLE": ".אנא התחל/י את התהליך מחדש",
-		"THANKING_TEXT": ".תודה על בחירתך בנו"
+		"THANKING_TEXT": ".תודה על בחירתך בנו",
+		"UNKNOWN_WORKSPACE": "אין לך מושג מה המרחב שלך?",
+		"FIND_WORKSPACE": "מצא את המרחב שלך"
+	},
+	"DEMO": {
+		"SUPER_ADMIN_TITLE": "מנהל ראשי",
+		"ADMIN_TITLE": "מנהל",
+		"EMPLOYEE_TITLE": "עובד",
+		"DEMO_CREDENTIALS_TITLE": "<span class=\"demo-text-span\">פרטי דמו</span>",
+		"LABELS": {
+			"EMAIL": "אימייל: ",
+			"PASSWORD": "סיסמה: "
+		}
 	},
 	"NO_IMAGE": {
 		"ADD_DROP": "Add or Drop Image",
diff --git a/apps/gauzy/src/assets/i18n/it.json b/apps/gauzy/src/assets/i18n/it.json
index dcb5f566aa5..f2902cb22a5 100644
--- a/apps/gauzy/src/assets/i18n/it.json
+++ b/apps/gauzy/src/assets/i18n/it.json
@@ -8,6 +8,7 @@
 		"REGISTER": "Registrazione",
 		"CHANGE_PASSWORD": "Cambia password",
 		"LOGIN": "Accedi",
+		"SIGNIN": "Accedi",
 		"SEND_CODE": "Accedi con l'email",
 		"ADD_NOTE": "Aggiungi nota",
 		"EDIT": "Modifica",
@@ -4398,6 +4399,34 @@
 			"receipt": "Ricevuta"
 		}
 	},
+	"REGISTER_PAGE": {
+		"TITLE": "Registra",
+		"HAVE_AN_ACCOUNT": "Hai già un account?",
+		"LABELS": {
+			"FULL_NAME": "Nome completo:",
+			"EMAIL": "Indirizzo email:",
+			"PASSWORD": "Password",
+			"CONFIRM_PASSWORD": "Conferma password:"
+		},
+		"PLACEHOLDERS": {
+			"FULL_NAME": "Nome completo",
+			"EMAIL": "Indirizzo email",
+			"PASSWORD": "Password",
+			"CONFIRM_PASSWORD": "Conferma password"
+		},
+		"VALIDATIONS": {
+			"FULL_NAME_REQUIRED": "Il nome completo è obbligatorio!",
+			"FULL_NAME_SHOULD_CONTAIN": "Il nome completo deve contenere tra {{ minLength }} e {{ maxLength }} caratteri",
+			"EMAIL_REQUIRED": "L'indirizzo email è obbligatorio!",
+			"EMAIL_SHOULD_BE_REAL": "L'indirizzo email deve essere reale!",
+			"PASSWORD_NO_SPACE_EDGES": "Le password non devono iniziare o finire con spazi!",
+			"PASSWORD_REQUIRED": "La password è obbligatoria!",
+			"PASSWORD_SHOULD_CONTAIN": "La password deve contenere tra {{ minLength }} e {{ maxLength }} caratteri",
+			"CONFIRM_PASSWORD_REQUIRED": "La conferma della password è obbligatoria!",
+			"PASSWORDS_NOT_MATCH": "La password non corrisponde alla conferma della password!",
+			"AGREE_TERMS_PRIVACY": "<span class=\"normal-terms-text\">Accetto </span><a routerLink=\"/legal/terms\" target=\"_blank\" class=\"terms-link\"><strong>Termini e Condizioni</strong></a><span class=\"normal-terms-text\"> e </span><a routerLink=\"/legal/privacy\" target=\"_blank\" class=\"terms-link\"><strong>Informativa sulla privacy</strong></a>"
+		}
+	},
 	"LOGIN_PAGE": {
 		"TITLE": "Accesso",
 		"SUB_TITLE": "Ciao! Accedi con la tua email",
@@ -4436,7 +4465,15 @@
 		},
 		"DEMO": {
 			"TITLE": "Accedi automaticamente agli account di prova",
-			"SUB_TITLE": "Seleziona il tipo di account qui sotto"
+			"SUB_TITLE": "Seleziona il tipo di account qui sotto",
+			"SUPER_ADMIN_TITLE": "Super Admin",
+			"ADMIN_TITLE": "Admin",
+			"EMPLOYEE_TITLE": "Impiegato",
+			"DEMO_CREDENTIALS_TITLE": "<span class=\"demo-text-span\">Credenziali Demo</span>",
+			"LABELS": {
+				"EMAIL": "Email: ",
+				"PASSWORD": "Password: "
+			}
 		}
 	},
 	"FORGOT_PASSWORD_PAGE": {
@@ -4504,11 +4541,33 @@
 			"CREATE_NEW_WORKSPACE": "Crea un nuovo spazio di lavoro",
 			"FIND_WORKSPACE": "Trova uno spazio di lavoro"
 		},
+		"LABELS": {
+			"EMAIL": "Inserisci il tuo indirizzo email:",
+			"PASSWORD": "Inserisci la tua password:"
+		},
+		"PLACEHOLDERS": {
+			"EMAIL": "nome@workspace-email.com",
+			"PASSWORD": "Password"
+		},
+		"SIGN_IN_TITLE": "Accedi a Workspace",
+		"BACK_TO": "Torna a",
 		"SUCCESS_SIGNIN_TITLE": "Congratulazioni! Hai effettuato l'accesso con successo al tuo spazio di lavoro.",
 		"SUCCESS_SIGNIN_SUB_TITLE": "Per favore, sii paziente mentre prepariamo lo spazio di lavoro...",
 		"FAIL_SIGNIN_TITLE": "Errore! Il codice magico o il link che hai fornito è scaduto o non è valido.",
 		"FAIL_SIGNIN_SUB_TITLE": "Per favore, inizia il processo di nuovo.",
-		"THANKING_TEXT": "Grazie per averci scelto."
+		"THANKING_TEXT": "Grazie per averci scelto.",
+		"UNKNOWN_WORKSPACE": "Non conosci il tuo spazio di lavoro?",
+		"FIND_WORKSPACE": "Trova i tuoi spazi di lavoro"
+	},
+	"DEMO": {
+		"SUPER_ADMIN_TITLE": "Super Admin",
+		"ADMIN_TITLE": "Admin",
+		"EMPLOYEE_TITLE": "Impiegato",
+		"DEMO_CREDENTIALS_TITLE": "<span class=\"demo-text-span\">Credenziali Demo</span>",
+		"LABELS": {
+			"EMAIL": "Email: ",
+			"PASSWORD": "Password: "
+		}
 	},
 	"NO_IMAGE": {
 		"ADD_DROP": "Aggiungi o Rimuovi Immagine",
diff --git a/apps/gauzy/src/assets/i18n/nl.json b/apps/gauzy/src/assets/i18n/nl.json
index 5080ae749df..6884c568882 100644
--- a/apps/gauzy/src/assets/i18n/nl.json
+++ b/apps/gauzy/src/assets/i18n/nl.json
@@ -8,6 +8,7 @@
 		"REGISTER": "Registreren",
 		"CHANGE_PASSWORD": "Wachtwoord wijzigen",
 		"LOGIN": "Inloggen",
+		"SIGNIN": "Aanmelden",
 		"SEND_CODE": "Inloggen met e-mail",
 		"ADD_NOTE": "Voeg een opmerking toe",
 		"EDIT": "Bewerken",
@@ -4398,6 +4399,34 @@
 			"receipt": "Ontvangstbewijs"
 		}
 	},
+	"REGISTER_PAGE": {
+		"TITLE": "Registreren",
+		"HAVE_AN_ACCOUNT": "Heb je al een account?",
+		"LABELS": {
+			"FULL_NAME": "Volledige naam:",
+			"EMAIL": "E-mailadres:",
+			"PASSWORD": "Wachtwoord",
+			"CONFIRM_PASSWORD": "Bevestig wachtwoord:"
+		},
+		"PLACEHOLDERS": {
+			"FULL_NAME": "Volledige naam",
+			"EMAIL": "E-mailadres",
+			"PASSWORD": "Wachtwoord",
+			"CONFIRM_PASSWORD": "Bevestig wachtwoord"
+		},
+		"VALIDATIONS": {
+			"FULL_NAME_REQUIRED": "Volledige naam is verplicht!",
+			"FULL_NAME_SHOULD_CONTAIN": "Volledige naam moet tussen {{ minLength }} en {{ maxLength }} tekens bevatten",
+			"EMAIL_REQUIRED": "E-mailadres is verplicht!",
+			"EMAIL_SHOULD_BE_REAL": "E-mailadres moet echt zijn!",
+			"PASSWORD_NO_SPACE_EDGES": "Wachtwoorden mogen niet beginnen of eindigen met spaties!",
+			"PASSWORD_REQUIRED": "Wachtwoord is verplicht!",
+			"PASSWORD_SHOULD_CONTAIN": "Wachtwoord moet tussen {{ minLength }} en {{ maxLength }} tekens bevatten",
+			"CONFIRM_PASSWORD_REQUIRED": "Bevestiging van wachtwoord is verplicht!",
+			"PASSWORDS_NOT_MATCH": "Wachtwoord komt niet overeen met de bevestiging van het wachtwoord!",
+			"AGREE_TERMS_PRIVACY": "<span class=\"normal-terms-text\">Akkoord met </span><a routerLink=\"/legal/terms\" target=\"_blank\" class=\"terms-link\"><strong>Algemene voorwaarden</strong></a><span class=\"normal-terms-text\"> en </span><a routerLink=\"/legal/privacy\" target=\"_blank\" class=\"terms-link\"><strong>Privacybeleid</strong></a>"
+		}
+	},
 	"LOGIN_PAGE": {
 		"TITLE": "Inloggen",
 		"SUB_TITLE": "Hallo! Log in met je e-mail.",
@@ -4436,7 +4465,15 @@
 		},
 		"DEMO": {
 			"TITLE": "Automatisch inloggen op demorekeningen",
-			"SUB_TITLE": "Selecteer hieronder het type account."
+			"SUB_TITLE": "Selecteer hieronder het type account.",
+			"SUPER_ADMIN_TITLE": "Superbeheerder",
+			"ADMIN_TITLE": "Beheerder",
+			"EMPLOYEE_TITLE": "Werknemer",
+			"DEMO_CREDENTIALS_TITLE": "<span class=\"demo-text-span\">Demo-inloggegevens</span>",
+			"LABELS": {
+				"EMAIL": "E-mail: ",
+				"PASSWORD": "Wachtwoord: "
+			}
 		}
 	},
 	"FORGOT_PASSWORD_PAGE": {
@@ -4504,11 +4541,33 @@
 			"CREATE_NEW_WORKSPACE": "Maak een nieuwe werkruimte",
 			"FIND_WORKSPACE": "Vind een werkruimte"
 		},
+		"LABELS": {
+			"EMAIL": "Voer je e-mailadres in:",
+			"PASSWORD": "Voer je wachtwoord in:"
+		},
+		"PLACEHOLDERS": {
+			"EMAIL": "naam@workspace-email.com",
+			"PASSWORD": "Wachtwoord"
+		},
+		"SIGN_IN_TITLE": "Aanmelden bij Workspace",
+		"BACK_TO": "Terug naar",
 		"SUCCESS_SIGNIN_TITLE": "Gefeliciteerd! Je bent succesvol ingelogd op je werkruimte.",
 		"SUCCESS_SIGNIN_SUB_TITLE": "Wees geduldig terwijl we de werkruimte voorbereiden...",
 		"FAIL_SIGNIN_TITLE": "Fout! De magische code of de link die je hebt opgegeven is verlopen of ongeldig.",
 		"FAIL_SIGNIN_SUB_TITLE": "Start het proces opnieuw a.u.b.",
-		"THANKING_TEXT": "Bedankt dat je voor ons hebt gekozen."
+		"THANKING_TEXT": "Bedankt dat je voor ons hebt gekozen.",
+		"UNKNOWN_WORKSPACE": "Weet je niet waar je werkruimte is?",
+		"FIND_WORKSPACE": "Vind je werkruimtes"
+	},
+	"DEMO": {
+		"SUPER_ADMIN_TITLE": "Superbeheerder",
+		"ADMIN_TITLE": "Beheerder",
+		"EMPLOYEE_TITLE": "Werknemer",
+		"DEMO_CREDENTIALS_TITLE": "<span class=\"demo-text-span\">Demo-inloggegevens</span>",
+		"LABELS": {
+			"EMAIL": "E-mail: ",
+			"PASSWORD": "Wachtwoord: "
+		}
 	},
 	"NO_IMAGE": {
 		"ADD_DROP": "Afbeelding toevoegen of verwijderen",
diff --git a/apps/gauzy/src/assets/i18n/pl.json b/apps/gauzy/src/assets/i18n/pl.json
index b7c867da3a5..164a222b8a0 100644
--- a/apps/gauzy/src/assets/i18n/pl.json
+++ b/apps/gauzy/src/assets/i18n/pl.json
@@ -8,6 +8,7 @@
 		"REGISTER": "Rejestracja",
 		"CHANGE_PASSWORD": "Zmień hasło",
 		"LOGIN": "Zaloguj się",
+		"SIGNIN": "Zaloguj się",
 		"SEND_CODE": "Zaloguj się za pomocą e-maila",
 		"ADD_NOTE": "Dodaj notatkę",
 		"EDIT": "Edytuj",
@@ -4398,6 +4399,34 @@
 			"receipt": "Paragon"
 		}
 	},
+	"REGISTER_PAGE": {
+		"TITLE": "Zarejestruj się",
+		"HAVE_AN_ACCOUNT": "Masz już konto?",
+		"LABELS": {
+			"FULL_NAME": "Pełna nazwa:",
+			"EMAIL": "Adres e-mail:",
+			"PASSWORD": "Hasło",
+			"CONFIRM_PASSWORD": "Potwierdź hasło:"
+		},
+		"PLACEHOLDERS": {
+			"FULL_NAME": "Pełna nazwa",
+			"EMAIL": "Adres e-mail",
+			"PASSWORD": "Hasło",
+			"CONFIRM_PASSWORD": "Potwierdź hasło"
+		},
+		"VALIDATIONS": {
+			"FULL_NAME_REQUIRED": "Pełna nazwa jest wymagana!",
+			"FULL_NAME_SHOULD_CONTAIN": "Pełna nazwa powinna zawierać od {{ minLength }} do {{ maxLength }} znaków",
+			"EMAIL_REQUIRED": "Adres e-mail jest wymagany!",
+			"EMAIL_SHOULD_BE_REAL": "Adres e-mail powinien być prawdziwy!",
+			"PASSWORD_NO_SPACE_EDGES": "Hasła nie mogą zaczynać się ani kończyć spacjami!",
+			"PASSWORD_REQUIRED": "Hasło jest wymagane!",
+			"PASSWORD_SHOULD_CONTAIN": "Hasło powinno zawierać od {{ minLength }} do {{ maxLength }} znaków",
+			"CONFIRM_PASSWORD_REQUIRED": "Potwierdzenie hasła jest wymagane!",
+			"PASSWORDS_NOT_MATCH": "Hasło nie pasuje do potwierdzenia hasła!",
+			"AGREE_TERMS_PRIVACY": "<span class=\"normal-terms-text\">Zgadzam się z </span><a routerLink=\"/legal/terms\" target=\"_blank\" class=\"terms-link\"><strong>Warunki korzystania</strong></a><span class=\"normal-terms-text\"> oraz </span><a routerLink=\"/legal/privacy\" target=\"_blank\" class=\"terms-link\"><strong>Polityką prywatności</strong></a>"
+		}
+	},
 	"LOGIN_PAGE": {
 		"TITLE": "Logowanie",
 		"SUB_TITLE": "Cześć! Zaloguj się za pomocą swojego adresu e-mail",
@@ -4436,7 +4465,15 @@
 		},
 		"DEMO": {
 			"TITLE": "Logowanie automatyczne do kont demo",
-			"SUB_TITLE": "Proszę wybrać typ konta poniżej"
+			"SUB_TITLE": "Proszę wybrać typ konta poniżej",
+			"SUPER_ADMIN_TITLE": "Superadministrator",
+			"ADMIN_TITLE": "Administrator",
+			"EMPLOYEE_TITLE": "Pracownik",
+			"DEMO_CREDENTIALS_TITLE": "<span class=\"demo-text-span\">Dane do logowania w wersji demonstracyjnej</span>",
+			"LABELS": {
+				"EMAIL": "E-mail: ",
+				"PASSWORD": "Hasło: "
+			}
 		}
 	},
 	"FORGOT_PASSWORD_PAGE": {
@@ -4504,11 +4541,33 @@
 			"CREATE_NEW_WORKSPACE": "Utwórz nową przestrzeń roboczą",
 			"FIND_WORKSPACE": "Znajdź miejsce do pracy"
 		},
+		"LABELS": {
+			"EMAIL": "Wprowadź swój adres e-mail:",
+			"PASSWORD": "Wprowadź swoje hasło:"
+		},
+		"PLACEHOLDERS": {
+			"EMAIL": "nazwa@adres-email-firmy.com",
+			"PASSWORD": "Hasło"
+		},
+		"SIGN_IN_TITLE": "Zaloguj się do Przestrzeni Roboczej",
+		"BACK_TO": "Powrót do",
 		"SUCCESS_SIGNIN_TITLE": "Gratulacje! Pomyślnie zalogowałeś się do swojej przestrzeni roboczej.",
 		"SUCCESS_SIGNIN_SUB_TITLE": "Proszę o cierpliwość podczas przygotowywania przestrzeni roboczej...",
 		"FAIL_SIGNIN_TITLE": "Błąd! Magiczny kod lub link, który podałeś, jest przeterminowany lub nieprawidłowy.",
 		"FAIL_SIGNIN_SUB_TITLE": "Proszę rozpocznij proces ponownie.",
-		"THANKING_TEXT": "Dziękujemy, że nas wybrałeś."
+		"THANKING_TEXT": "Dziękujemy, że nas wybrałeś.",
+		"UNKNOWN_WORKSPACE": "Nie wiesz, gdzie jest twoja przestrzeń robocza?",
+		"FIND_WORKSPACE": "Znajdź swoje przestrzenie robocze"
+	},
+	"DEMO": {
+		"SUPER_ADMIN_TITLE": "Superadministrator",
+		"ADMIN_TITLE": "Administrator",
+		"EMPLOYEE_TITLE": "Pracownik",
+		"DEMO_CREDENTIALS_TITLE": "<span class=\"demo-text-span\">Dane do logowania w wersji demonstracyjnej</span>",
+		"LABELS": {
+			"EMAIL": "E-mail: ",
+			"PASSWORD": "Hasło: "
+		}
 	},
 	"NO_IMAGE": {
 		"ADD_DROP": "Dodaj lub usuń obraz",
diff --git a/apps/gauzy/src/assets/i18n/pt.json b/apps/gauzy/src/assets/i18n/pt.json
index 02a330fd194..c554ca0bba0 100644
--- a/apps/gauzy/src/assets/i18n/pt.json
+++ b/apps/gauzy/src/assets/i18n/pt.json
@@ -8,6 +8,7 @@
 		"REGISTER": "Registre-se.",
 		"CHANGE_PASSWORD": "Alterar Senha",
 		"LOGIN": "Entrar",
+		"SIGNIN": "Entrar",
 		"SEND_CODE": "Entrar com e-mail",
 		"ADD_NOTE": "Adicione uma nota",
 		"EDIT": "Editar",
@@ -4398,6 +4399,34 @@
 			"receipt": "Recibo"
 		}
 	},
+	"REGISTER_PAGE": {
+		"TITLE": "Registrar",
+		"HAVE_AN_ACCOUNT": "Já tem uma conta?",
+		"LABELS": {
+			"FULL_NAME": "Nome completo:",
+			"EMAIL": "Endereço de e-mail:",
+			"PASSWORD": "Senha",
+			"CONFIRM_PASSWORD": "Confirmar senha:"
+		},
+		"PLACEHOLDERS": {
+			"FULL_NAME": "Nome completo",
+			"EMAIL": "Endereço de e-mail",
+			"PASSWORD": "Senha",
+			"CONFIRM_PASSWORD": "Confirmar senha"
+		},
+		"VALIDATIONS": {
+			"FULL_NAME_REQUIRED": "Nome completo é obrigatório!",
+			"FULL_NAME_SHOULD_CONTAIN": "O nome completo deve conter de {{ minLength }} a {{ maxLength }} caracteres",
+			"EMAIL_REQUIRED": "E-mail é obrigatório!",
+			"EMAIL_SHOULD_BE_REAL": "O e-mail deve ser real!",
+			"PASSWORD_NO_SPACE_EDGES": "As senhas não devem começar nem terminar com espaços!",
+			"PASSWORD_REQUIRED": "Senha é obrigatória!",
+			"PASSWORD_SHOULD_CONTAIN": "A senha deve conter de {{ minLength }} a {{ maxLength }} caracteres",
+			"CONFIRM_PASSWORD_REQUIRED": "Confirmação de senha é obrigatória!",
+			"PASSWORDS_NOT_MATCH": "A senha não coincide com a confirmação de senha!",
+			"AGREE_TERMS_PRIVACY": "<span class=\"normal-terms-text\">Concordo com </span><a routerLink=\"/legal/terms\" target=\"_blank\" class=\"terms-link\"><strong>Termos de Uso</strong></a><span class=\"normal-terms-text\"> e </span><a routerLink=\"/legal/privacy\" target=\"_blank\" class=\"terms-link\"><strong>Política de Privacidade</strong></a>"
+		}
+	},
 	"LOGIN_PAGE": {
 		"TITLE": "Acessar",
 		"SUB_TITLE": "Olá! Faça login com seu e-mail.",
@@ -4436,7 +4465,15 @@
 		},
 		"DEMO": {
 			"TITLE": "Faça login automaticamente nas contas de demonstração.",
-			"SUB_TITLE": "Por favor, selecione o tipo de conta abaixo."
+			"SUB_TITLE": "Por favor, selecione o tipo de conta abaixo.",
+			"SUPER_ADMIN_TITLE": "Super Administrador",
+			"ADMIN_TITLE": "Administrador",
+			"EMPLOYEE_TITLE": "Funcionário",
+			"DEMO_CREDENTIALS_TITLE": "<span class=\"demo-text-span\">Credenciais de Demonstração</span>",
+			"LABELS": {
+				"EMAIL": "E-mail: ",
+				"PASSWORD": "Senha: "
+			}
 		}
 	},
 	"FORGOT_PASSWORD_PAGE": {
@@ -4504,11 +4541,33 @@
 			"CREATE_NEW_WORKSPACE": "Criar um novo espaço de trabalho",
 			"FIND_WORKSPACE": "Encontrar espaço de trabalho"
 		},
+		"LABELS": {
+			"EMAIL": "Insira seu endereço de e-mail:",
+			"PASSWORD": "Insira sua senha:"
+		},
+		"PLACEHOLDERS": {
+			"EMAIL": "nome@e-mail-da-empresa.com",
+			"PASSWORD": "Senha"
+		},
+		"SIGN_IN_TITLE": "Entrar na Área de Trabalho",
+		"BACK_TO": "Voltar para",
 		"SUCCESS_SIGNIN_TITLE": "Parabéns! Você fez login com sucesso em seu espaço de trabalho.",
 		"SUCCESS_SIGNIN_SUB_TITLE": "Por favor, seja paciente enquanto preparamos o espaço de trabalho...",
 		"FAIL_SIGNIN_TITLE": "Erro! O código mágico ou o link fornecido expirou ou é inválido.",
 		"FAIL_SIGNIN_SUB_TITLE": "Por favor, inicie o processo novamente.",
-		"THANKING_TEXT": "Obrigado por nos escolher."
+		"THANKING_TEXT": "Obrigado por nos escolher.",
+		"UNKNOWN_WORKSPACE": "Não conhece a sua área de trabalho?",
+		"FIND_WORKSPACE": "Encontre suas áreas de trabalho"
+	},
+	"DEMO": {
+		"SUPER_ADMIN_TITLE": "Super Administrador",
+		"ADMIN_TITLE": "Administrador",
+		"EMPLOYEE_TITLE": "Funcionário",
+		"DEMO_CREDENTIALS_TITLE": "<span class=\"demo-text-span\">Credenciais de Demonstração</span>",
+		"LABELS": {
+			"EMAIL": "E-mail: ",
+			"PASSWORD": "Senha: "
+		}
 	},
 	"NO_IMAGE": {
 		"ADD_DROP": "Adicionar ou Remover Imagem",
diff --git a/apps/gauzy/src/assets/i18n/ru.json b/apps/gauzy/src/assets/i18n/ru.json
index 7ea01e7b035..1b43ccff12e 100644
--- a/apps/gauzy/src/assets/i18n/ru.json
+++ b/apps/gauzy/src/assets/i18n/ru.json
@@ -8,6 +8,7 @@
 		"REGISTER": "Регистрация",
 		"CHANGE_PASSWORD": "Изменить пароль",
 		"LOGIN": "Войти",
+		"SIGNIN": "Вход",
 		"SEND_CODE": "Войти по электронной почте",
 		"ADD_NOTE": "Добавить заметку",
 		"EDIT": "Редактировать",
@@ -4323,6 +4324,34 @@
 			"receipt": "Квитанция"
 		}
 	},
+	"REGISTER_PAGE": {
+		"TITLE": "Регистрация",
+		"HAVE_AN_ACCOUNT": "Уже есть аккаунт?",
+		"LABELS": {
+			"FULL_NAME": "Полное имя:",
+			"EMAIL": "Адрес электронной почты:",
+			"PASSWORD": "Пароль",
+			"CONFIRM_PASSWORD": "Подтвердите пароль:"
+		},
+		"PLACEHOLDERS": {
+			"FULL_NAME": "Полное имя",
+			"EMAIL": "Адрес электронной почты",
+			"PASSWORD": "Пароль",
+			"CONFIRM_PASSWORD": "Подтвердите пароль"
+		},
+		"VALIDATIONS": {
+			"FULL_NAME_REQUIRED": "Полное имя обязательно!",
+			"FULL_NAME_SHOULD_CONTAIN": "Полное имя должно содержать от {{ minLength }} до {{ maxLength }} символов",
+			"EMAIL_REQUIRED": "Требуется адрес электронной почты!",
+			"EMAIL_SHOULD_BE_REAL": "Адрес электронной почты должен быть реальным!",
+			"PASSWORD_NO_SPACE_EDGES": "Пароль не должен начинаться или заканчиваться пробелами!",
+			"PASSWORD_REQUIRED": "Требуется пароль!",
+			"PASSWORD_SHOULD_CONTAIN": "Пароль должен содержать от {{ minLength }} до {{ maxLength }} символов",
+			"CONFIRM_PASSWORD_REQUIRED": "Требуется подтверждение пароля!",
+			"PASSWORDS_NOT_MATCH": "Пароли не совпадают!",
+			"AGREE_TERMS_PRIVACY": "<span class=\"normal-terms-text\">Соглашаюсь с </span><a routerLink=\"/legal/terms\" target=\"_blank\" class=\"terms-link\"><strong>Условиями использования</strong></a><span class=\"normal-terms-text\"> и </span><a routerLink=\"/legal/privacy\" target=\"_blank\" class=\"terms-link\"><strong>Политикой конфиденциальности</strong></a>"
+		}
+	},
 	"LOGIN_PAGE": {
 		"TITLE": "Логин",
 		"SUB_TITLE": "Привет! Войдите с помощью электронной почты.",
@@ -4361,7 +4390,15 @@
 		},
 		"DEMO": {
 			"TITLE": "Автоматически входить в демо-аккаунты",
-			"SUB_TITLE": "Пожалуйста, выберите тип счета ниже."
+			"SUB_TITLE": "Пожалуйста, выберите тип счета ниже.",
+			"SUPER_ADMIN_TITLE": "Супер Администратор",
+			"ADMIN_TITLE": "Администратор",
+			"EMPLOYEE_TITLE": "Сотрудник",
+			"DEMO_CREDENTIALS_TITLE": "<span class=\"demo-text-span\">Демонстрационные учетные данные</span>",
+			"LABELS": {
+				"EMAIL": "Электронная почта: ",
+				"PASSWORD": "Пароль: "
+			}
 		}
 	},
 	"FORGOT_PASSWORD_PAGE": {
@@ -4428,11 +4465,33 @@
 			"CREATE_NEW_WORKSPACE": "Создать новую рабочую область",
 			"FIND_WORKSPACE": "Найти рабочую область"
 		},
+		"LABELS": {
+			"EMAIL": "Введите ваш адрес электронной почты:",
+			"PASSWORD": "Введите ваш пароль:"
+		},
+		"PLACEHOLDERS": {
+			"EMAIL": "name@workspace-email.com",
+			"PASSWORD": "Пароль"
+		},
+		"SIGN_IN_TITLE": "Вход в Рабочее пространство",
+		"BACK_TO": "Назад к",
 		"SUCCESS_SIGNIN_TITLE": "Поздравляю! Вы успешно вошли в свое рабочее пространство.",
 		"SUCCESS_SIGNIN_SUB_TITLE": "Пожалуйста, будьте терпеливы, пока мы готовим рабочее пространство...",
 		"FAIL_SIGNIN_TITLE": "Ошибка! Магический код или ссылка, которую вы предоставили, устарели или недействительны.",
 		"FAIL_SIGNIN_SUB_TITLE": "Пожалуйста, начните процесс заново.",
-		"THANKING_TEXT": "Спасибо, что выбрали нас."
+		"THANKING_TEXT": "Спасибо, что выбрали нас.",
+		"UNKNOWN_WORKSPACE": "Не знаете своего рабочего пространства?",
+		"FIND_WORKSPACE": "Найти ваши рабочие пространства"
+	},
+	"DEMO": {
+		"SUPER_ADMIN_TITLE": "Супер Администратор",
+		"ADMIN_TITLE": "Администратор",
+		"EMPLOYEE_TITLE": "Сотрудник",
+		"DEMO_CREDENTIALS_TITLE": "<span class=\"demo-text-span\">Демонстрационные учетные данные</span>",
+		"LABELS": {
+			"EMAIL": "Электронная почта: ",
+			"PASSWORD": "Пароль: "
+		}
 	},
 	"NO_IMAGE": {
 		"ADD_DROP": "Добавить или выложить изображение",
diff --git a/apps/gauzy/src/assets/i18n/zh.json b/apps/gauzy/src/assets/i18n/zh.json
index afe6330cb47..864c9980577 100644
--- a/apps/gauzy/src/assets/i18n/zh.json
+++ b/apps/gauzy/src/assets/i18n/zh.json
@@ -8,6 +8,7 @@
 		"REGISTER": "注册",
 		"CHANGE_PASSWORD": "更改密码",
 		"LOGIN": "登录",
+		"SIGNIN": "登录",
 		"SEND_CODE": "使用电子邮件登录",
 		"ADD_NOTE": "添加笔记",
 		"EDIT": "编辑",
@@ -4398,6 +4399,34 @@
 			"receipt": "收据"
 		}
 	},
+	"REGISTER_PAGE": {
+		"TITLE": "注册",
+		"HAVE_AN_ACCOUNT": "已经有账户？",
+		"LABELS": {
+			"FULL_NAME": "全名：",
+			"EMAIL": "电子邮件地址：",
+			"PASSWORD": "密码",
+			"CONFIRM_PASSWORD": "确认密码："
+		},
+		"PLACEHOLDERS": {
+			"FULL_NAME": "全名",
+			"EMAIL": "电子邮件地址",
+			"PASSWORD": "密码",
+			"CONFIRM_PASSWORD": "确认密码"
+		},
+		"VALIDATIONS": {
+			"FULL_NAME_REQUIRED": "需要全名！",
+			"FULL_NAME_SHOULD_CONTAIN": "全名应包含 {{ minLength }} 到 {{ maxLength }} 个字符",
+			"EMAIL_REQUIRED": "需要电子邮件地址！",
+			"EMAIL_SHOULD_BE_REAL": "电子邮件地址应为真实的！",
+			"PASSWORD_NO_SPACE_EDGES": "密码不能以空格开头或结尾！",
+			"PASSWORD_REQUIRED": "需要密码！",
+			"PASSWORD_SHOULD_CONTAIN": "密码应包含 {{ minLength }} 到 {{ maxLength }} 个字符",
+			"CONFIRM_PASSWORD_REQUIRED": "需要确认密码！",
+			"PASSWORDS_NOT_MATCH": "密码与确认密码不匹配！",
+			"AGREE_TERMS_PRIVACY": "<span class=\"normal-terms-text\">同意 </span><a routerLink=\"/legal/terms\" target=\"_blank\" class=\"terms-link\"><strong>条款和条件</strong></a><span class=\"normal-terms-text\"> 以及 </span><a routerLink=\"/legal/privacy\" target=\"_blank\" class=\"terms-link\"><strong>隐私政策</strong></a>"
+		}
+	},
 	"LOGIN_PAGE": {
 		"TITLE": "登录",
 		"SUB_TITLE": "你好！使用你的邮箱登录。",
@@ -4436,7 +4465,15 @@
 		},
 		"DEMO": {
 			"TITLE": "自动登录到演示账户。",
-			"SUB_TITLE": "请在下方选择帐户类型。"
+			"SUB_TITLE": "请在下方选择帐户类型。",
+			"SUPER_ADMIN_TITLE": "超级管理员",
+			"ADMIN_TITLE": "管理员",
+			"EMPLOYEE_TITLE": "员工",
+			"DEMO_CREDENTIALS_TITLE": "<span class=\"demo-text-span\">演示凭证</span>",
+			"LABELS": {
+				"EMAIL": "电子邮件：",
+				"PASSWORD": "密码："
+			}
 		}
 	},
 	"FORGOT_PASSWORD_PAGE": {
@@ -4504,11 +4541,33 @@
 			"CREATE_NEW_WORKSPACE": "创建一个新的工作空间",
 			"FIND_WORKSPACE": "寻找工作空间"
 		},
+		"LABELS": {
+			"EMAIL": "输入您的电子邮件地址：",
+			"PASSWORD": "输入您的密码："
+		},
+		"PLACEHOLDERS": {
+			"EMAIL": "name@workspace-email.com",
+			"PASSWORD": "密码"
+		},
+		"SIGN_IN_TITLE": "登录工作区",
+		"BACK_TO": "返回",
 		"SUCCESS_SIGNIN_TITLE": "恭喜！您已成功登录到您的工作区。",
 		"SUCCESS_SIGNIN_SUB_TITLE": "请耐心等待，我们正在准备工作区...",
 		"FAIL_SIGNIN_TITLE": "错误！您提供的魔法代码或链接已过期或无效。",
 		"FAIL_SIGNIN_SUB_TITLE": "请重新启动流程。",
-		"THANKING_TEXT": "感谢您选择我们。"
+		"THANKING_TEXT": "感谢您选择我们。",
+		"UNKNOWN_WORKSPACE": "不知道您的工作区？",
+		"FIND_WORKSPACE": "查找您的工作区"
+	},
+	"DEMO": {
+		"SUPER_ADMIN_TITLE": "超级管理员",
+		"ADMIN_TITLE": "管理员",
+		"EMPLOYEE_TITLE": "员工",
+		"DEMO_CREDENTIALS_TITLE": "<span class=\"demo-text-span\">演示凭证</span>",
+		"LABELS": {
+			"EMAIL": "电子邮件：",
+			"PASSWORD": "密码："
+		}
 	},
 	"NO_IMAGE": {
 		"ADD_DROP": "添加或删除图像",

From c3e88882bc22bc4125ce60f85e278e739a5ed145 Mon Sep 17 00:00:00 2001
From: RAHUL RATHORE <41804588+rahul-rocket@users.noreply.github.com>
Date: Wed, 6 Dec 2023 15:25:53 +0530
Subject: [PATCH 03/34] fix: added Open AI Key Secret option in Gauzy AI
 integration

---
 .../authorization.component.html              |  4 +-
 .../authorization/authorization.component.ts  | 56 ++++++++++++++++---
 apps/gauzy/src/assets/i18n/bg.json            | 12 +++-
 apps/gauzy/src/assets/i18n/en.json            |  3 +-
 apps/gauzy/src/assets/i18n/he.json            | 12 +++-
 apps/gauzy/src/assets/i18n/ru.json            | 12 +++-
 .../gauzy-ai/integration-ai.service.ts        |  8 ++-
 .../src/integration/integration.entity.ts     |  1 +
 8 files changed, 91 insertions(+), 17 deletions(-)

diff --git a/apps/gauzy/src/app/pages/integrations/gauzy-ai/components/authorization/authorization.component.html b/apps/gauzy/src/app/pages/integrations/gauzy-ai/components/authorization/authorization.component.html
index bb62b58a1c6..11cd592740c 100644
--- a/apps/gauzy/src/app/pages/integrations/gauzy-ai/components/authorization/authorization.component.html
+++ b/apps/gauzy/src/app/pages/integrations/gauzy-ai/components/authorization/authorization.component.html
@@ -13,7 +13,7 @@ <h5>
 	</nb-card-header>
 	<nb-card-body>
 		<div class="col-xl-6 col-12">
-			<form [formGroup]="form" (ngSubmit)="onSubmit()" #formDirective="ngForm">
+			<form [formGroup]="form" #formDirective="ngForm" (ngSubmit)="onSubmit()">
 				<div class="form-group">
 					<label for="client_id" class="label">
 						{{ 'INTEGRATIONS.GAUZY_AI_PAGE.API_KEY' | translate }}
@@ -41,7 +41,7 @@ <h5>
 					/>
 				</div>
 				<div class="form-group">
-					<label for="client_secret" class="label">
+					<label for="openai_api_secret_key" class="label">
 						{{ 'INTEGRATIONS.GAUZY_AI_PAGE.OPEN_AI_SECRET_KEY' | translate }}
 					</label>
 					<input
diff --git a/apps/gauzy/src/app/pages/integrations/gauzy-ai/components/authorization/authorization.component.ts b/apps/gauzy/src/app/pages/integrations/gauzy-ai/components/authorization/authorization.component.ts
index 5fc635a51c7..a88774736dd 100644
--- a/apps/gauzy/src/app/pages/integrations/gauzy-ai/components/authorization/authorization.component.ts
+++ b/apps/gauzy/src/app/pages/integrations/gauzy-ai/components/authorization/authorization.component.ts
@@ -4,19 +4,30 @@ import { FormGroup, FormBuilder, Validators, FormGroupDirective } from '@angular
 import { filter, tap } from 'rxjs/operators';
 import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
 import { IIntegrationTenant, IOrganization } from '@gauzy/contracts';
-import { GauzyAIService, Store } from './../../../../../@core/services';
+import { GauzyAIService, Store, ToastrService } from './../../../../../@core/services';
+import { ReplacePipe } from 'apps/gauzy/src/app/@shared/pipes';
 
 @UntilDestroy({ checkProperties: true })
 @Component({
 	selector: 'ngx-gauzy-ai-authorization',
 	templateUrl: './authorization.component.html',
 	styleUrls: ['./authorization.component.scss'],
+	providers: []
 })
 export class GauzyAIAuthorizationComponent implements AfterViewInit, OnInit, OnDestroy {
 
 	public organization: IOrganization;
 
+	/**
+	 * The form property is a readonly FormGroup that is built using the buildForm static method.
+	 */
 	readonly form: FormGroup = GauzyAIAuthorizationComponent.buildForm(this._formBuilder);
+
+	/**
+	 * Static method to build the Angular FormGroup using the FormBuilder.
+	 * @param fb The FormBuilder instance used to build the form.
+	 * @returns A FormGroup containing form controls for client_id, client_secret, and openai_api_secret_key.
+	 */
 	static buildForm(fb: FormBuilder): FormGroup {
 		return fb.group({
 			client_id: [null, Validators.required],
@@ -25,6 +36,7 @@ export class GauzyAIAuthorizationComponent implements AfterViewInit, OnInit, OnD
 		});
 	}
 
+	// Using @ViewChild to get a reference to the FormGroupDirective with the template reference variable 'formDirective'
 	@ViewChild('formDirective') formDirective: FormGroupDirective;
 
 	constructor(
@@ -32,7 +44,9 @@ export class GauzyAIAuthorizationComponent implements AfterViewInit, OnInit, OnD
 		private readonly _router: Router,
 		private readonly _activatedRoute: ActivatedRoute,
 		private readonly _store: Store,
-		private readonly _gauzyAIService: GauzyAIService
+		private readonly _gauzyAIService: GauzyAIService,
+		private readonly _toastrService: ToastrService,
+		private readonly _replacePipe: ReplacePipe
 	) { }
 
 	/**
@@ -74,17 +88,23 @@ export class GauzyAIAuthorizationComponent implements AfterViewInit, OnInit, OnD
 	}
 
 	/**
-	 *
-	 * @returns
+	 * Handles the form submission for creating a new integration.
+	 * @returns {Promise<void>} A promise indicating the success or failure of the submission.
 	 */
-	async onSubmit() {
-		if (!this.organization || this.form.invalid) {
-			return;
-		}
+	async onSubmit(): Promise<void> {
 		try {
+			// Check if the organization is available and the form is valid
+			if (!this.organization || this.form.invalid) {
+				return;
+			}
+
+			// Extract values from the form
 			const { client_id, client_secret, openai_api_secret_key } = this.form.value;
-			const { id: organizationId, tenantId } = this.organization;
 
+			// Extract values from the organization
+			const { id: organizationId, tenantId, name: organizationName } = this.organization;
+
+			// Create a new integration using the provided values
 			this._gauzyAIService.create({
 				client_id,
 				client_secret,
@@ -92,12 +112,30 @@ export class GauzyAIAuthorizationComponent implements AfterViewInit, OnInit, OnD
 				organizationId,
 				tenantId
 			}).pipe(
+				// Perform actions after the integration creation
+				tap((integration: IIntegrationTenant) => {
+					if (!!integration) {
+						// Transform integration name for display
+						const provider = this._replacePipe.transform(integration?.name, '_', ' ');
+
+						// Display success message
+						this._toastrService.success(`INTEGRATIONS.MESSAGE.INTEGRATION_ADDED`, {
+							provider,
+							organization: organizationName
+						});
+					}
+				}),
+				// Redirect to the Gauzy AI integration after creation
 				tap((integration: IIntegrationTenant) => {
+					//
+					this.formDirective.reset();
 					this._redirectToGauzyAIIntegration(integration.id);
 				}),
+				// Unsubscribe when the component is destroyed
 				untilDestroyed(this)
 			).subscribe();
 		} catch (error) {
+			// Log any errors that occur during the process
 			console.log('Error while creating new integration for Gauzy AI', error);
 		}
 	}
diff --git a/apps/gauzy/src/assets/i18n/bg.json b/apps/gauzy/src/assets/i18n/bg.json
index f3eea21944a..573f929dfd8 100644
--- a/apps/gauzy/src/assets/i18n/bg.json
+++ b/apps/gauzy/src/assets/i18n/bg.json
@@ -1205,7 +1205,17 @@
 		"FILTER_INTEGRATIONS": "Filter integrations",
 		"SEARCH_INTEGRATIONS": "Search integrations",
 		"PAID": "Paid",
-		"INTEGRATION": "Integration"
+		"INTEGRATION": "Integration",
+		"MESSAGE": {
+			"SETTINGS_UPDATED": "Updated settings for '{{provider}}' integration",
+			"INTEGRATION_DELETED": "Integration '{{provider}}' deleted successfully",
+			"NO_INTEGRATIONS": "You have not configured any integrations",
+			"INTEGRATION_ENABLED": "'{{provider}}' integration successfully enabled",
+			"INTEGRATION_DISABLED": "'{{provider}}' integration successfully disabled",
+			"INTEGRATION_ADDED": "Integration '{{provider}}' has been added to '{{organization}}'"
+		},
+		"ENABLED": "Enabled",
+		"DISABLED": "Disabled"
 	},
 	"DASHBOARD_PAGE": {
 		"ACCOUNTING": "Счетоводство",
diff --git a/apps/gauzy/src/assets/i18n/en.json b/apps/gauzy/src/assets/i18n/en.json
index b58b3114afe..260734b04dd 100644
--- a/apps/gauzy/src/assets/i18n/en.json
+++ b/apps/gauzy/src/assets/i18n/en.json
@@ -1277,7 +1277,8 @@
 			"INTEGRATION_DELETED": "Integration '{{provider}}' deleted successfully",
 			"NO_INTEGRATIONS": "You have not configured any integrations",
 			"INTEGRATION_ENABLED": "'{{provider}}' integration successfully enabled",
-			"INTEGRATION_DISABLED": "'{{provider}}' integration successfully disabled"
+			"INTEGRATION_DISABLED": "'{{provider}}' integration successfully disabled",
+			"INTEGRATION_ADDED": "Integration '{{provider}}' has been added to '{{organization}}'"
 		},
 		"ENABLED": "Enabled",
 		"DISABLED": "Disabled"
diff --git a/apps/gauzy/src/assets/i18n/he.json b/apps/gauzy/src/assets/i18n/he.json
index 46d042315cd..75259f6f65c 100644
--- a/apps/gauzy/src/assets/i18n/he.json
+++ b/apps/gauzy/src/assets/i18n/he.json
@@ -1205,7 +1205,17 @@
 		"FILTER_INTEGRATIONS": "Filter integrations",
 		"SEARCH_INTEGRATIONS": "Search integrations",
 		"PAID": "Paid",
-		"INTEGRATION": "Integration"
+		"INTEGRATION": "Integration",
+		"MESSAGE": {
+			"SETTINGS_UPDATED": "Updated settings for '{{provider}}' integration",
+			"INTEGRATION_DELETED": "Integration '{{provider}}' deleted successfully",
+			"NO_INTEGRATIONS": "You have not configured any integrations",
+			"INTEGRATION_ENABLED": "'{{provider}}' integration successfully enabled",
+			"INTEGRATION_DISABLED": "'{{provider}}' integration successfully disabled",
+			"INTEGRATION_ADDED": "Integration '{{provider}}' has been added to '{{organization}}'"
+		},
+		"ENABLED": "Enabled",
+		"DISABLED": "Disabled"
 	},
 	"DASHBOARD_PAGE": {
 		"ACCOUNTING": "Accounting",
diff --git a/apps/gauzy/src/assets/i18n/ru.json b/apps/gauzy/src/assets/i18n/ru.json
index 7ea01e7b035..f06173327d6 100644
--- a/apps/gauzy/src/assets/i18n/ru.json
+++ b/apps/gauzy/src/assets/i18n/ru.json
@@ -1205,7 +1205,17 @@
 		"FILTER_INTEGRATIONS": "Фильтровать интеграцию",
 		"SEARCH_INTEGRATIONS": "Интеграции поиска",
 		"PAID": "Оплачено",
-		"INTEGRATION": "Интеграция"
+		"INTEGRATION": "Интеграция",
+		"MESSAGE": {
+			"SETTINGS_UPDATED": "Обновлены настройки для '{{provider}}' интеграция",
+			"INTEGRATION_DELETED": "Интеграция '{{provider}}' успешно удалено",
+			"NO_INTEGRATIONS": "Вы не настроили ни одной интеграции",
+			"INTEGRATION_ENABLED": "Интеграция '{{provider}}' успешно включена",
+			"INTEGRATION_DISABLED": "Интеграция '{{provider}}' успешно отключена",
+			"INTEGRATION_ADDED": "Интеграция '{{provider}}' добавлена ​​в '{{organization}}'"
+		},
+		"ENABLED": "Enabled",
+		"DISABLED": "Disabled"
 	},
 	"DASHBOARD_PAGE": {
 		"ACCOUNTING": "Бухгалтер",
diff --git a/packages/core/src/integration/gauzy-ai/integration-ai.service.ts b/packages/core/src/integration/gauzy-ai/integration-ai.service.ts
index 9eeb62e99f3..8b6ff8b9481 100644
--- a/packages/core/src/integration/gauzy-ai/integration-ai.service.ts
+++ b/packages/core/src/integration/gauzy-ai/integration-ai.service.ts
@@ -23,14 +23,18 @@ export class IntegrationAIService {
 	async create(
 		input: IIntegrationAICreateInput
 	): Promise<IIntegrationTenant> {
-
 		try {
 			const tenantId = RequestContext.currentTenantId();
 			const { client_id, client_secret, openai_api_secret_key, organizationId } = input;
 
+			/**
+			 * Retrieves an integration from the database based on specified options.
+			 */
 			const integration = await this._integrationService.findOneByOptions({
 				where: {
-					provider: IntegrationEnum.GAUZY_AI
+					provider: IntegrationEnum.GAUZY_AI,
+					isActive: true,
+					isArchived: false
 				}
 			});
 
diff --git a/packages/core/src/integration/integration.entity.ts b/packages/core/src/integration/integration.entity.ts
index fa0a9197ae5..0d835ab67d2 100644
--- a/packages/core/src/integration/integration.entity.ts
+++ b/packages/core/src/integration/integration.entity.ts
@@ -75,6 +75,7 @@ export class Integration extends BaseEntity implements IIntegration {
 	@Column({ nullable: true })
 	order: number;
 
+	/** Additional fields */
 	fullImgUrl?: string;
 	/*
 	|--------------------------------------------------------------------------

From a160839803e20d0aee814bbb56df9a6b8db531e9 Mon Sep 17 00:00:00 2001
From: RAHUL RATHORE <41804588+rahul-rocket@users.noreply.github.com>
Date: Wed, 6 Dec 2023 17:52:45 +0530
Subject: [PATCH 04/34] wip: display AI integration settings

---
 .../@core/services/integrations.service.ts    | 15 +++---
 .../components/view/view.component.html       | 11 ++++-
 .../components/view/view.component.scss       | 11 +++++
 .../components/view/view.component.ts         | 38 ++++++++++++---
 .../gauzy-ai/gauzy-ai-routing.module.ts       |  4 ++
 .../integrations/gauzy-ai/gauzy-ai.module.ts  |  3 +-
 .../integration-setting.resolver.ts           | 47 +++++++++++++++++++
 .../integrations/integration.resolver.ts      |  2 +-
 apps/gauzy/src/assets/i18n/en.json            |  7 ++-
 .../integration-tenant.controller.ts          | 15 +++---
 10 files changed, 129 insertions(+), 24 deletions(-)
 create mode 100644 apps/gauzy/src/app/pages/integrations/integration-setting.resolver.ts

diff --git a/apps/gauzy/src/app/@core/services/integrations.service.ts b/apps/gauzy/src/app/@core/services/integrations.service.ts
index ed638c253e0..2fefedf3399 100644
--- a/apps/gauzy/src/app/@core/services/integrations.service.ts
+++ b/apps/gauzy/src/app/@core/services/integrations.service.ts
@@ -71,16 +71,17 @@ export class IntegrationsService {
 	}
 
 	/**
+	 * Get an IntegrationTenant by ID with optional relations.
 	 *
-	 * @param integrationId
-	 * @param relations
-	 * @returns
+	 * @param id - The ID of the IntegrationTenant.
+	 * @param relations - Optional relations for the request.
+	 * @returns {Observable<any>} An Observable of the HTTP response.
 	 */
-	fetchIntegrationTenant(
-		integrationId: IIntegrationTenant['id'],
+	getIntegrationTenant(
+		id: IIntegrationTenant['id'],
 		relations: IBaseRelationsEntityModel
-	) {
-		return this._http.get<any>(`${API_PREFIX}/integration-tenant/${integrationId}`, {
+	): Observable<IIntegrationTenant> {
+		return this._http.get<any>(`${API_PREFIX}/integration-tenant/${id}`, {
 			params: toParams({ ...relations })
 		});
 	}
diff --git a/apps/gauzy/src/app/pages/integrations/gauzy-ai/components/view/view.component.html b/apps/gauzy/src/app/pages/integrations/gauzy-ai/components/view/view.component.html
index 142a96f89b5..85bfb5d8559 100644
--- a/apps/gauzy/src/app/pages/integrations/gauzy-ai/components/view/view.component.html
+++ b/apps/gauzy/src/app/pages/integrations/gauzy-ai/components/view/view.component.html
@@ -28,6 +28,15 @@ <h5>
 		</div>
 	</nb-card-header>
 	<nb-card-body>
-		<ga-wip></ga-wip>
+		<nb-tabset class="mt-4">
+			<nb-tab [tabTitle]="'INTEGRATIONS.GAUZY_AI_PAGE.TAB.KEYS' | translate" [active]="true">
+				<!-- <header>
+					{{ 'INTEGRATIONS.GAUZY_AI_PAGE.CONSUMER_KEYS' | translate }}
+				</header> -->
+			</nb-tab>
+			<nb-tab [tabTitle]="'INTEGRATIONS.GAUZY_AI_PAGE.TAB.SETTINGS' | translate">
+				<ga-wip></ga-wip>
+			</nb-tab>
+		</nb-tabset>
 	</nb-card-body>
 </nb-card>
diff --git a/apps/gauzy/src/app/pages/integrations/gauzy-ai/components/view/view.component.scss b/apps/gauzy/src/app/pages/integrations/gauzy-ai/components/view/view.component.scss
index e69de29bb2d..15c43715364 100644
--- a/apps/gauzy/src/app/pages/integrations/gauzy-ai/components/view/view.component.scss
+++ b/apps/gauzy/src/app/pages/integrations/gauzy-ai/components/view/view.component.scss
@@ -0,0 +1,11 @@
+:host {
+    .tabset {
+        padding: 0;
+    }
+    header {
+        font-size: 18px;
+        font-weight: 600;
+        line-height: 30px;
+        letter-spacing: 0em;
+    }
+}
diff --git a/apps/gauzy/src/app/pages/integrations/gauzy-ai/components/view/view.component.ts b/apps/gauzy/src/app/pages/integrations/gauzy-ai/components/view/view.component.ts
index eb064cb7cfc..c070fc9fb46 100644
--- a/apps/gauzy/src/app/pages/integrations/gauzy-ai/components/view/view.component.ts
+++ b/apps/gauzy/src/app/pages/integrations/gauzy-ai/components/view/view.component.ts
@@ -1,9 +1,13 @@
 import { Component, OnInit } from '@angular/core';
 import { TitleCasePipe } from '@angular/common';
-import { Router } from '@angular/router';
+import { ActivatedRoute, Router } from '@angular/router';
+import { filter, tap } from 'rxjs/operators';
+import { Observable } from 'rxjs/internal/Observable';
 import { TranslateService } from '@ngx-translate/core';
-import { UntilDestroy } from '@ngneat/until-destroy';
+import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
+import { IIntegrationSetting, IOrganization } from '@gauzy/contracts';
 import { TranslationBaseComponent } from './../../../../../@shared/language-base';
+import { Store } from './../../../../../@core/services';
 
 @UntilDestroy({ checkProperties: true })
 @Component({
@@ -13,14 +17,36 @@ import { TranslationBaseComponent } from './../../../../../@shared/language-base
 })
 export class GauzyAIViewComponent extends TranslationBaseComponent implements OnInit {
 
+	public organization$: Observable<IOrganization>; // Observable to hold the selected organization
+	public settings$: Observable<IIntegrationSetting[]>;
+	public settings: IIntegrationSetting[] = [];
+
 	constructor(
-		public readonly _translateService: TranslateService,
-		private readonly _router: Router
+		private readonly _router: Router,
+		private readonly _activatedRoute: ActivatedRoute,
+		public readonly translateService: TranslateService,
+		private readonly _store: Store,
 	) {
-		super(_translateService);
+		super(translateService);
 	}
 
-	ngOnInit(): void { }
+	ngOnInit(): void {
+		// Setting up the organization$ observable pipeline
+		this.organization$ = this._store.selectedOrganization$.pipe(
+			// Exclude falsy values from the emitted values
+			filter((organization: IOrganization) => !!organization),
+			// Handle component lifecycle to avoid memory leaks
+			untilDestroyed(this)
+		);
+		this.settings$ = this._activatedRoute.data.pipe(
+			// Update component state with fetched issues
+			tap((settings: IIntegrationSetting[]) => {
+				this.settings = settings;
+			}),
+			// Handle component lifecycle to avoid memory leaks
+			untilDestroyed(this),
+		);
+	}
 
 	/**
 	 * Navigate to the "Integrations" page.
diff --git a/apps/gauzy/src/app/pages/integrations/gauzy-ai/gauzy-ai-routing.module.ts b/apps/gauzy/src/app/pages/integrations/gauzy-ai/gauzy-ai-routing.module.ts
index 08b89d7811c..e0c45190b51 100644
--- a/apps/gauzy/src/app/pages/integrations/gauzy-ai/gauzy-ai-routing.module.ts
+++ b/apps/gauzy/src/app/pages/integrations/gauzy-ai/gauzy-ai-routing.module.ts
@@ -5,6 +5,7 @@ import { IntegrationResolver } from '../integration.resolver';
 import { GauzyAIAuthorizationComponent } from './components/authorization/authorization.component';
 import { GauzyAILayoutComponent } from './gauzy-ai.layout.component';
 import { GauzyAIViewComponent } from './components/view/view.component';
+import { IntegrationSettingResolver } from '../integration-setting.resolver';
 
 const routes: Routes = [
 	{
@@ -31,6 +32,9 @@ const routes: Routes = [
 			{
 				path: ':id', // Child route with a parameter (id)
 				component: GauzyAIViewComponent, // Component for the route with an id parameter
+				resolve: {
+					settings: IntegrationSettingResolver, // Resolver to fetch data before activating the route
+				},
 			},
 		]
 	},
diff --git a/apps/gauzy/src/app/pages/integrations/gauzy-ai/gauzy-ai.module.ts b/apps/gauzy/src/app/pages/integrations/gauzy-ai/gauzy-ai.module.ts
index 0ca8fcbb2d2..a75a09a460b 100644
--- a/apps/gauzy/src/app/pages/integrations/gauzy-ai/gauzy-ai.module.ts
+++ b/apps/gauzy/src/app/pages/integrations/gauzy-ai/gauzy-ai.module.ts
@@ -1,7 +1,7 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { NbButtonModule, NbCardModule, NbIconModule, NbInputModule, NbTooltipModule } from '@nebular/theme';
+import { NbButtonModule, NbCardModule, NbIconModule, NbInputModule, NbTabsetModule, NbTooltipModule } from '@nebular/theme';
 import { TranslateModule } from './../../../@shared/translate/translate.module';
 import { BackNavigationModule } from './../../../@shared/back-navigation';
 import { GauzyAIRoutingModule } from './gauzy-ai-routing.module';
@@ -24,6 +24,7 @@ import { WorkInProgressModule } from '../../work-in-progress/work-in-progress.mo
 		NbCardModule,
 		NbIconModule,
 		NbInputModule,
+		NbTabsetModule,
 		NbTooltipModule,
 		GauzyAIRoutingModule,
 		TranslateModule,
diff --git a/apps/gauzy/src/app/pages/integrations/integration-setting.resolver.ts b/apps/gauzy/src/app/pages/integrations/integration-setting.resolver.ts
new file mode 100644
index 00000000000..b5db0ee9687
--- /dev/null
+++ b/apps/gauzy/src/app/pages/integrations/integration-setting.resolver.ts
@@ -0,0 +1,47 @@
+import { Injectable } from '@angular/core';
+import { Resolve, ActivatedRouteSnapshot, Router } from '@angular/router';
+import { Observable, EMPTY, map } from 'rxjs';
+import { catchError } from 'rxjs/operators';
+import { IIntegrationSetting, IIntegrationTenant } from '@gauzy/contracts';
+import { IntegrationsService } from '../../@core/services';
+
+@Injectable({
+    providedIn: 'root'
+})
+export class IntegrationSettingResolver implements Resolve<Observable<IIntegrationSetting[] | boolean>> {
+    constructor(
+        private readonly _router: Router,
+        private readonly _integrationsService: IntegrationsService
+    ) { }
+
+    /**
+     * Resolves integration settings before activating the route.
+     *
+     * @param route - The activated route snapshot.
+     * @returns An observable that emits integration settings or a boolean value.
+     */
+    resolve(route: ActivatedRouteSnapshot): Observable<IIntegrationSetting[] | boolean> {
+        try {
+            const integrationId = route.paramMap.get('id');
+
+            return this._integrationsService.getIntegrationTenant(integrationId, { relations: ['settings'] }).pipe(
+                map(({ settings }: IIntegrationTenant) => settings),
+                catchError((error: any) => {
+                    // Navigate to the new integration page in case of an error
+                    this._router.navigate(['/pages/integrations/new']);
+                    // Log the error for debugging purposes
+                    console.error('Error while fetching integration settings:', error);
+                    // Returning EMPTY as a placeholder; adjust this based on your needs
+                    return EMPTY;
+                })
+            );
+        } catch (error) {
+            // Handle synchronous errors (if any)
+            console.error('Error in IntegrationSettingsResolver:', error);
+            // Navigate to the new integration page in case of an error
+            this._router.navigate(['/pages/integrations/new']);
+            // Returning EMPTY as a placeholder; adjust this based on your needs
+            return EMPTY;
+        }
+    }
+}
diff --git a/apps/gauzy/src/app/pages/integrations/integration.resolver.ts b/apps/gauzy/src/app/pages/integrations/integration.resolver.ts
index d57b97a3233..9e426366577 100644
--- a/apps/gauzy/src/app/pages/integrations/integration.resolver.ts
+++ b/apps/gauzy/src/app/pages/integrations/integration.resolver.ts
@@ -19,7 +19,7 @@ export class IntegrationResolver implements Resolve<Observable<IIntegrationTenan
         private readonly _integrationsService: IntegrationsService,
     ) { }
 
-    /**s
+    /**
     * Resolves project details before activating a specific route.
     * @param route The activated route snapshot.
     * @returns An observable containing integration details or an empty observable.
diff --git a/apps/gauzy/src/assets/i18n/en.json b/apps/gauzy/src/assets/i18n/en.json
index 260734b04dd..a0a6e9fc549 100644
--- a/apps/gauzy/src/assets/i18n/en.json
+++ b/apps/gauzy/src/assets/i18n/en.json
@@ -1248,7 +1248,12 @@
 			"API_KEY": "Gauzy AI key",
 			"API_SECRET": "Gauzy AI Secret",
 			"OPEN_AI_SECRET_KEY": "Open AI Secret Key",
-			"DESCRIPTION": "Activate Gauzy AI integration for smarter job hunting."
+			"DESCRIPTION": "Activate Gauzy AI integration for smarter job hunting.",
+			"CONSUMER_KEYS": "Consumer Keys",
+			"TAB": {
+				"KEYS": "Keys",
+				"SETTINGS": "Settings"
+			}
 		},
 		"GITHUB_PAGE": {
 			"TITLE": "GitHub Integration",
diff --git a/packages/core/src/integration-tenant/integration-tenant.controller.ts b/packages/core/src/integration-tenant/integration-tenant.controller.ts
index 7e57156a21f..78b0ae1d9c5 100644
--- a/packages/core/src/integration-tenant/integration-tenant.controller.ts
+++ b/packages/core/src/integration-tenant/integration-tenant.controller.ts
@@ -80,11 +80,12 @@ export class IntegrationTenantController extends CrudController<IntegrationTenan
 	}
 
 	/**
-	 * Fetch an IntegrationTenant entity in the database
+	 * Fetches an IntegrationTenant entity by ID from the database.
 	 *
-	 * @param integrationId
-	 * @param query
-	 * @returns
+	 * @param integrationId - The ID of the IntegrationTenant entity (validated by UUIDValidationPipe).
+	 * @param query - Optional query parameters, such as relations.
+	 * @returns {Promise<IIntegrationTenant>} The fetched IntegrationTenant entity.
+	 * @throws {InternalServerErrorException} If an error occurs during the fetching process.
 	 */
 	@Get(':id')
 	async findById(
@@ -92,10 +93,10 @@ export class IntegrationTenantController extends CrudController<IntegrationTenan
 		@Query() query: RelationsQueryDTO
 	): Promise<IIntegrationTenant> {
 		try {
+			const { relations } = query;
+
 			// Attempt to find the IntegrationTenant entity in the database
-			return await this._integrationTenantService.findOneByIdString(integrationId, {
-				relations: query.relations,
-			});
+			return await this._integrationTenantService.findOneByIdString(integrationId, { relations });
 		} catch (error) {
 			// Handle and log any errors that occur
 			console.error(`Error while finding IntegrationTenant: ${error.message}`);

From 6eeb1b164be24d7a81ab71af78391c287c5adc52 Mon Sep 17 00:00:00 2001
From: RAHUL RATHORE <41804588+rahul-rocket@users.noreply.github.com>
Date: Wed, 6 Dec 2023 19:37:31 +0530
Subject: [PATCH 05/34] chore: console migration each file

---
 .../1638541848595-SwitchToMigration.ts        |  15 +-
 .../1638793919144-KnowledgeBasePlugin.ts      |   3 +
 .../1638797573521-ChangelogPlugin.ts          |  13 +-
 .../1639729354753-CreatePasswordResetTable.ts | 151 +++++++++---------
 .../1640007378352-AddColumnToRoleTable.ts     |  11 +-
 .../1640784835692-AlterActivityTable.ts       |   3 +
 ...42411409517-AlterCandidateEmployeeTable.ts |   3 +
 .../1642770124831-AlterEmailHistoryTable.ts   |   3 +
 .../1643201180573-AlterTaskTable.ts           |  13 +-
 .../1643807301083-AlterRolePermissionTable.ts |   3 +
 ...1643809486960-MigrateEmailTemplatesData.ts |   2 +-
 .../1644312012849-RolePermissionsReload.ts    |   5 +-
 .../1644491785525-AdjustTimeLogStopDate.ts    |  61 +++----
 .../1644568289509-AlterTimeLogTable.ts        |   3 +
 .../1644915598578-AlterEmployeeTable.ts       |   3 +
 .../1645012749640-AlterPaymentTable.ts        |   7 +-
 .../1645087150917-AlterEmailTable.ts          |   3 +
 .../1645179275947-AlterInvoiceTable.ts        |   3 +
 ...7-AddTimeTrackingFeatureToEmployeeTable.ts |   3 +
 .../1645726031706-AlterIntegrationTable.ts    |   3 +
 ...9050-AlterEmployeeRecurringExpenseTable.ts |   3 +
 .../1646117679347-AlterScreenshotTable.ts     |   3 +
 .../1646206946845-AlterExpenseTable.ts        |   3 +
 .../1647417832147-AlterActivityTable.ts       |   3 +
 .../1648899149818-AlterTenantTable.ts         |   3 +
 .../1650532321598-AlterOrganizationProject.ts |  15 +-
 .../1650704972412-AlterChangelogTable.ts      |   3 +
 .../1652270907163-AlterTimeOffRequestTable.ts |   3 +
 .../1652703299052-AlterTaskTableColumns.ts    |   3 +
 .../1652936174625-ReportTableIconSeed.ts      |  13 +-
 .../1653482244724-AlterExpenseTable.ts        |   7 +-
 ...742570167-AlterOrganizationContactTable.ts |   3 +
 .../1654675304373-SeedChangeLogFeature.ts     |   5 +-
 ...885355508-OrganizationProjectAlterTable.ts |   3 +
 .../1656833636109-AlterUserTable.ts           |   3 +
 ...59618978087-AlterInvoiceEstimateHistory.ts |   3 +
 .../1659684413063-AlterContactTable.ts        |   3 +
 .../1659696180759-AlterTenantTable.ts         |   7 +-
 ...660988196279-AlterWarehouseProductTable.ts |   4 +-
 .../1661599336316-AlterWarehouseMerchant.ts   |   4 +-
 .../1661853087396-AlterTimesheetTable.ts      |   4 +-
 .../1662994539197-AlterInvoiceTable.ts        |   4 +-
 ...64869127437-AlterCandidateFeedbackTable.ts |   8 +-
 ...5044607000-AlterCandidateInterviewTable.ts |   4 +-
 .../1665388204010-AlterWarehouseTable.ts      |   4 +-
 .../1665399395983-AlterOrganizationTable.ts   |   4 +-
 .../1665767813286-AltereInviteTable.ts        |   4 +-
 .../1666007548644-AlterEmployeeTable.ts       |   4 +-
 .../1666181221327-AlterOrganizationTable.ts   |   4 +-
 .../1666780716428-AlterEmployeeTable.ts       |   4 +-
 .../1668064327561-AlterOrganizationTable.ts   |   4 +-
 ...1668084518509-AlterEmployeeTableColumns.ts |   4 +-
 .../1668256889786-AlterCustomSmtpTable.ts     |   4 +-
 ...68446646237-AlterTableRelationCascading.ts |   6 +-
 .../1668502997873-AlterUserTable.ts           |   4 +-
 ...68504932478-AlterTableRelationCascading.ts |   4 +-
 ...-AlterUserTableEmailVerificationColumns.ts |   4 +-
 .../1669280426592-AlterInviteTable.ts         |   8 +-
 .../1669453028914-AlterUserInviteTable.ts     |   8 +-
 ...670313962263-AlterOrganizationTeamTable.ts |   4 +-
 ...058-AlterInviteAllowedOrganizationTable.ts |   4 +-
 ...671706727549-AlterOrganizationTeamTable.ts |   4 +-
 .../1672211594766-AlterCandidateTable.ts      |   4 +-
 .../1673005639130-AlterTimeLogTable.ts        |   4 +-
 .../1673423542165-AlterTaskTable.ts           |   4 +-
 .../1673589923548-CreateStatusTable.ts        |   3 +
 .../1673946248066-AlterTaskTable.ts           |   4 +-
 ...74044473393-SeedDefaultGlobalTaskStatus.ts |   6 +-
 .../1674109138954-AlterEmailSentTable.ts      |   4 +-
 .../1674535367176-CreateTaskPriorityTable.ts  |   4 +-
 .../1674538040466-CreateTaskSizeTable.ts      |   4 +-
 ...88-SeedDefaultGlobalTaskPriorityAndSize.ts |   6 +-
 .../1674749291896-RenamedTaskStatusTable.ts   |   4 +-
 .../1675186090641-AlterTaskStatusTable.ts     |   4 +-
 .../1675240711524-CreateEmployeePhoneTable.ts |   3 +
 .../1675241589518-AlterUserTable.ts           |   3 +
 .../1675410785835-AlterTaskTable.ts           |   4 +-
 ...5687502784-AddTimeZoneColumnToUserTable.ts |   4 +-
 ...676351186923-AlterOrganizationTeamTable.ts |   4 +-
 ...ngColumnToOrganizationTeamEmployeeTable.ts |   4 +-
 ...30369336-AddLogoToOrganizationTeamTable.ts |   4 +-
 .../1676827319035-AlterEmployeeTable.ts       |   4 +-
 ...41-SeedTaskPriorityAndSizeAndStatusIcon.ts |  28 ++--
 .../1676978573552-AlterOrganizationTable.ts   |   4 +-
 ...677063195155-AlterOrganizationTeamTable.ts |   4 +-
 .../migrations/1677142065591-AlterTagTable.ts |   4 +-
 .../1677156446733-AlterTaskTable.ts           |   4 +-
 .../1677313663312-AlterEmployeeTable.ts       |   4 +-
 .../1677508195152-AlterScreenshotTable.ts     |   4 +-
 ...-CreateOrganizationTeamJoinRequestTable.ts |   3 +
 .../1678190791247-CreateEmailResetTable.ts    |   4 +-
 ...678436030249-AlterOrganizationTeamTable.ts |   4 +-
 .../1678461100447-AlterEmailResetTable.ts     |   4 +-
 .../1678876700413-EmailTemplateReader.ts      |   4 +-
 ...atusTableTaskSizeTableTaskPriorityTable.ts |   4 +-
 ...4-AlterOrganizationTeamJoinRequestTable.ts |   4 +-
 .../1679308324164-AlterImageAssetTable.ts     |   4 +-
 ...79406665415-AddImageAssetColumnToTables.ts |   4 +-
 ...dImageAssetColumnToTheOrganizationTable.ts |   4 +-
 ...ageAssetColumnToTheProductCategoryTable.ts |   4 +-
 .../1679765443208-MigrateRolePermisisons.ts   |   7 +-
 .../1680071714132-CreateIssueTypeTable.ts     |   4 +-
 ...411434-AddIssueTypeColumnToTheTaskTable.ts |   4 +-
 ...586-AddIndexesColumnsToTheTimeSlotTable.ts |   4 +-
 ...9-AddIndexesColumnsToTheScreenshotTable.ts |   4 +-
 ...492-AddIndexesColumnsToTheActivityTable.ts |   4 +-
 ...93-AddIndexesColumnsToTheTimesheetTable.ts |   4 +-
 ...2764-AddIndexesColumnsToTheTimeLogTable.ts |   3 +
 ...30165590-AlterJobSearchRelationalTables.ts |   4 +-
 .../1680539459969-UpdateEmailTemplates.ts     |   4 +-
 ...680622389221-SeedDafaultGlobalIssueType.ts |   3 +
 ...orkOrganizationIdToTheOrganizationTable.ts |   4 +-
 .../1680692867660-AlterEmployeeTable.ts       |   4 +-
 ...setColumnToTheOrganizationDocumentTable.ts |   4 +-
 ...mentAssetColumnToTheTimeOffRequestTable.ts |   4 +-
 ...EmployeeStatusColumnsToTheEmployeeTable.ts |   3 +
 ...ganizationTeamIdColumnToTheTimeLogTable.ts |   4 +-
 ...686195290990-AlterOrganizationTeamTable.ts |   3 +
 ...MinimumBillingRateColumnToEmployeeTable.ts |   3 +
 ...inimumBillingRateColumnToCandidateTable.ts |   4 +-
 .../1687974863736-CreateTaskVersionTable.ts   |   3 +
 .../1688122296981-AlterTableEmployee.ts       |   4 +-
 ...88168798377-CreateRelatedIssueTypeTable.ts |   8 +-
 ...8886388219-AddParentIdColumnToTaskTable.ts |   4 +-
 ...2457-AddRelatedIssueRelationToTaskTable.ts |   3 +
 ...689150247379-CreateTaskLinkedIssueTable.ts |   4 +-
 ...1441-CreateOrganizationTaskSettingTable.ts |   4 +-
 ...689611487195-DropTaskRelatedIssuesTable.ts |  32 ++--
 ...1689670799675-CreateTaskEstimationTable.ts |   8 +-
 .../1690040638765-AlterReportTable.ts         |   4 +-
 ...iveTaskColumnToOrganizationTeamEmployee.ts |   6 +-
 ...kOrganizationNameToTheOrganizationTable.ts |   4 +-
 .../1691493358068-AlterIntegrationTable.ts    |   3 +-
 .../1691494801748-SeedIntegrationTable.ts     |   3 +-
 ...691756595248-AddUserIdColumnToUserTable.ts |   3 +-
 .../1692171665427-SeedIntegrationTable.ts     |   3 +-
 ...1607-AddOrganizationProjectTeamRelation.ts |   3 +-
 ...-AlterIntegrationTableRelationCascading.ts |   3 +-
 ...92433732267-AlterIntegrationTenantTable.ts |   3 +-
 ...547294428-AlterCodeToAlphaNumericFormat.ts |   3 +-
 ...1-AlterOrganizationTeamJoinRequestTable.ts |   4 +-
 ...3907817-AddColumnsToTheIntegrationTable.ts |   2 +-
 ...783-AddColumnsToTheIntegrationTypeTable.ts |   3 +-
 ...840-SeedIntegrationsAndIntegrationTypes.ts |   3 +-
 .../1695570009125-AlterTableTask.ts           |   3 +
 ...1695958130201-AddedArchivedColumnToUser.ts |   4 +-
 ...-AddedActiveArchivedColumnsToBaseEntity.ts |   4 +-
 .../migrations/1696704276300-AddLanguage.ts   |   2 +-
 ...ingColumnsToTheOrganizationProjectTable.ts |   3 +-
 ...cTagColumnToTheOrganizationProjectTable.ts |   3 +-
 ...546-AddedEmailStatusToEmailHistoryTable.ts |   4 +-
 ...691682-AlterTableInvoiceEstimateHistory.ts |   3 +-
 ...rationOrganizationGithubRepositoryTable.ts |   4 +-
 ...ncedAtColumnToTheIntegrationTenantTable.ts |   4 +-
 ...rationOrganizationGithubRepositoryTable.ts |   4 +-
 ...nOrganizationGithubRepositoryIssueTable.ts |   4 +-
 ...3745-AddSoftDeleteFeatureToTheAllTables.ts |   4 +-
 ...rationOrganizationGithubRepositoryTable.ts |   4 +-
 .../1699353179526-AlterPasswordResetTable.ts  |   4 +-
 .../1700123233258-AlterTableOrganization.ts   |   3 +-
 ...ddMultiTenantResetPasswordEmailTemplate.ts |   3 +-
 ...AtFeatureToTheTimesheetAndTimeLogTables.ts |   3 +-
 .../1701081154869-AlterScreenshotTable.ts     |   4 +-
 .../1701353754397-MigrateEmailTemplates.ts    |   3 +-
 164 files changed, 636 insertions(+), 315 deletions(-)

diff --git a/packages/core/src/database/migrations/1638541848595-SwitchToMigration.ts b/packages/core/src/database/migrations/1638541848595-SwitchToMigration.ts
index a4903e4cfa5..3bbeb287e3f 100644
--- a/packages/core/src/database/migrations/1638541848595-SwitchToMigration.ts
+++ b/packages/core/src/database/migrations/1638541848595-SwitchToMigration.ts
@@ -1,9 +1,12 @@
-import {MigrationInterface, QueryRunner} from "typeorm";
+import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class SwitchToMigration1638541848595 implements MigrationInterface {
     name = 'SwitchToMigration1638541848595'
 
     public async up(queryRunner: QueryRunner): Promise<void> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
@@ -5358,11 +5361,11 @@ export class SwitchToMigration1638541848595 implements MigrationInterface {
         await queryRunner.query(`CREATE INDEX "IDX_3557d514afd3794d40128e0542" ON "tag_warehouse" ("tagId") `);
     }
 
-     /**
-     * SqliteDB Down Migration
-     *
-     * @param queryRunner
-     */
+    /**
+    * SqliteDB Down Migration
+    *
+    * @param queryRunner
+    */
     private async sqliteDownQueryRunner(queryRunner: QueryRunner): Promise<void> {
         await queryRunner.query(`DROP INDEX "IDX_3557d514afd3794d40128e0542"`);
         await queryRunner.query(`DROP INDEX "IDX_08385e1e045b83d25978568743"`);
diff --git a/packages/core/src/database/migrations/1638793919144-KnowledgeBasePlugin.ts b/packages/core/src/database/migrations/1638793919144-KnowledgeBasePlugin.ts
index 832fd85fca5..ac934a1e00e 100644
--- a/packages/core/src/database/migrations/1638793919144-KnowledgeBasePlugin.ts
+++ b/packages/core/src/database/migrations/1638793919144-KnowledgeBasePlugin.ts
@@ -1,9 +1,12 @@
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class KnowledgeBasePlugin1638793919144 implements MigrationInterface {
     name = 'KnowledgeBasePlugin1638793919144';
 
     public async up(queryRunner: QueryRunner): Promise<void> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1638797573521-ChangelogPlugin.ts b/packages/core/src/database/migrations/1638797573521-ChangelogPlugin.ts
index c44ee25541a..5d7f07bc0a3 100644
--- a/packages/core/src/database/migrations/1638797573521-ChangelogPlugin.ts
+++ b/packages/core/src/database/migrations/1638797573521-ChangelogPlugin.ts
@@ -1,10 +1,13 @@
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class ChangelogPlugin1638797573521 implements MigrationInterface {
 
     name = 'ChangelogPlugin1638797573521';
 
     public async up(queryRunner: QueryRunner): Promise<void> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
@@ -77,11 +80,11 @@ export class ChangelogPlugin1638797573521 implements MigrationInterface {
         await queryRunner.query(`CREATE INDEX "IDX_c2037b621d2e8023898aee4ac7" ON "changelog" ("organizationId") `);
     }
 
-     /**
-     * SqliteDB Down Migration
-     *
-     * @param queryRunner
-     */
+    /**
+    * SqliteDB Down Migration
+    *
+    * @param queryRunner
+    */
     public async sqliteDownQueryRunner(queryRunner: QueryRunner): Promise<any> {
         await queryRunner.query(`DROP INDEX "IDX_c2037b621d2e8023898aee4ac7"`);
         await queryRunner.query(`DROP INDEX "IDX_744268ee0ec6073883267bc3b6"`);
diff --git a/packages/core/src/database/migrations/1639729354753-CreatePasswordResetTable.ts b/packages/core/src/database/migrations/1639729354753-CreatePasswordResetTable.ts
index 9683c6ac19c..8c7819f188d 100644
--- a/packages/core/src/database/migrations/1639729354753-CreatePasswordResetTable.ts
+++ b/packages/core/src/database/migrations/1639729354753-CreatePasswordResetTable.ts
@@ -1,86 +1,89 @@
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
-    export class CreatePasswordResetTable1639729354753 implements MigrationInterface {
+export class CreatePasswordResetTable1639729354753 implements MigrationInterface {
 
-        name = 'CreatePasswordResetTable1639729354753';
+    name = 'CreatePasswordResetTable1639729354753';
 
-        public async up(queryRunner: QueryRunner): Promise<void> {
-            if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
-                await this.sqliteUpQueryRunner(queryRunner);
-            } else {
-                await this.postgresUpQueryRunner(queryRunner);
-            }
-        }
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        console.log(chalk.yellow(this.name + ' start running!'));
 
-        public async down(queryRunner: QueryRunner): Promise<void> {
-            if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
-                await this.sqliteDownQueryRunner(queryRunner);
-            } else {
-                await this.postgresDownQueryRunner(queryRunner);
-            }
+        if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
+            await this.sqliteUpQueryRunner(queryRunner);
+        } else {
+            await this.postgresUpQueryRunner(queryRunner);
         }
+    }
 
-        /**
-         * PostgresDB Up Migration
-         *
-         * @param queryRunner
-         */
-        public async postgresUpQueryRunner(queryRunner: QueryRunner): Promise<any> {
-            await queryRunner.query(`CREATE TABLE "password_reset" ("id" uuid NOT NULL DEFAULT gen_random_uuid(), "createdAt" TIMESTAMP NOT NULL DEFAULT now(), "updatedAt" TIMESTAMP NOT NULL DEFAULT now(), "email" character varying NOT NULL, "token" character varying NOT NULL, CONSTRAINT "PK_8515e60a2cc41584fa4784f52ce" PRIMARY KEY ("id"))`);
-            await queryRunner.query(`CREATE INDEX "IDX_1c88db6e50f0704688d1f1978c" ON "password_reset" ("email") `);
-            await queryRunner.query(`CREATE INDEX "IDX_36e929b98372d961bb63bd4b4e" ON "password_reset" ("token") `);
-            await queryRunner.query(`ALTER TABLE "contact" ALTER COLUMN "latitude" TYPE double precision`);
-            await queryRunner.query(`ALTER TABLE "contact" ALTER COLUMN "longitude" TYPE double precision`);
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
+            await this.sqliteDownQueryRunner(queryRunner);
+        } else {
+            await this.postgresDownQueryRunner(queryRunner);
         }
+    }
 
-        /**
-         * PostgresDB Down Migration
-         *
-         * @param queryRunner
-         */
-        public async postgresDownQueryRunner(queryRunner: QueryRunner): Promise<any> {
-            await queryRunner.query(`ALTER TABLE "contact" ALTER COLUMN "longitude" TYPE double precision`);
-            await queryRunner.query(`ALTER TABLE "contact" ALTER COLUMN "latitude" TYPE double precision`);
-            await queryRunner.query(`DROP INDEX "public"."IDX_36e929b98372d961bb63bd4b4e"`);
-            await queryRunner.query(`DROP INDEX "public"."IDX_1c88db6e50f0704688d1f1978c"`);
-            await queryRunner.query(`DROP TABLE "password_reset"`);
-        }
+    /**
+     * PostgresDB Up Migration
+     *
+     * @param queryRunner
+     */
+    public async postgresUpQueryRunner(queryRunner: QueryRunner): Promise<any> {
+        await queryRunner.query(`CREATE TABLE "password_reset" ("id" uuid NOT NULL DEFAULT gen_random_uuid(), "createdAt" TIMESTAMP NOT NULL DEFAULT now(), "updatedAt" TIMESTAMP NOT NULL DEFAULT now(), "email" character varying NOT NULL, "token" character varying NOT NULL, CONSTRAINT "PK_8515e60a2cc41584fa4784f52ce" PRIMARY KEY ("id"))`);
+        await queryRunner.query(`CREATE INDEX "IDX_1c88db6e50f0704688d1f1978c" ON "password_reset" ("email") `);
+        await queryRunner.query(`CREATE INDEX "IDX_36e929b98372d961bb63bd4b4e" ON "password_reset" ("token") `);
+        await queryRunner.query(`ALTER TABLE "contact" ALTER COLUMN "latitude" TYPE double precision`);
+        await queryRunner.query(`ALTER TABLE "contact" ALTER COLUMN "longitude" TYPE double precision`);
+    }
 
-        /**
-         * SqliteDB Up Migration
-         *
-         * @param queryRunner
-         */
-        public async sqliteUpQueryRunner(queryRunner: QueryRunner): Promise<any> {
-            await queryRunner.query(`CREATE TABLE "password_reset" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "email" varchar NOT NULL, "token" varchar NOT NULL)`);
-            await queryRunner.query(`CREATE INDEX "IDX_1c88db6e50f0704688d1f1978c" ON "password_reset" ("email") `);
-            await queryRunner.query(`CREATE INDEX "IDX_36e929b98372d961bb63bd4b4e" ON "password_reset" ("token") `);
-            await queryRunner.query(`DROP INDEX "IDX_7719d73cd16a9f57ecc6ac24b3"`);
-            await queryRunner.query(`DROP INDEX "IDX_60468af1ce34043a900809c84f"`);
-            await queryRunner.query(`CREATE TABLE "temporary_contact" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "tenantId" varchar, "organizationId" varchar, "name" varchar, "firstName" varchar, "lastName" varchar, "country" varchar, "city" varchar, "address" varchar, "address2" varchar, "postcode" varchar, "latitude" float, "longitude" float, "regionCode" varchar, "fax" varchar, "fiscalInformation" varchar, "website" varchar, CONSTRAINT "FK_7719d73cd16a9f57ecc6ac24b3d" FOREIGN KEY ("organizationId") REFERENCES "organization" ("id") ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT "FK_60468af1ce34043a900809c84f2" FOREIGN KEY ("tenantId") REFERENCES "tenant" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`);
-            await queryRunner.query(`INSERT INTO "temporary_contact"("id", "createdAt", "updatedAt", "tenantId", "organizationId", "name", "firstName", "lastName", "country", "city", "address", "address2", "postcode", "latitude", "longitude", "regionCode", "fax", "fiscalInformation", "website") SELECT "id", "createdAt", "updatedAt", "tenantId", "organizationId", "name", "firstName", "lastName", "country", "city", "address", "address2", "postcode", "latitude", "longitude", "regionCode", "fax", "fiscalInformation", "website" FROM "contact"`);
-            await queryRunner.query(`DROP TABLE "contact"`);
-            await queryRunner.query(`ALTER TABLE "temporary_contact" RENAME TO "contact"`);
-            await queryRunner.query(`CREATE INDEX "IDX_7719d73cd16a9f57ecc6ac24b3" ON "contact" ("organizationId") `);
-            await queryRunner.query(`CREATE INDEX "IDX_60468af1ce34043a900809c84f" ON "contact" ("tenantId") `);
-        }
+    /**
+     * PostgresDB Down Migration
+     *
+     * @param queryRunner
+     */
+    public async postgresDownQueryRunner(queryRunner: QueryRunner): Promise<any> {
+        await queryRunner.query(`ALTER TABLE "contact" ALTER COLUMN "longitude" TYPE double precision`);
+        await queryRunner.query(`ALTER TABLE "contact" ALTER COLUMN "latitude" TYPE double precision`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_36e929b98372d961bb63bd4b4e"`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_1c88db6e50f0704688d1f1978c"`);
+        await queryRunner.query(`DROP TABLE "password_reset"`);
+    }
 
-        /**
-         * SqliteDB Down Migration
-         *
-         * @param queryRunner
-         */
-        public async sqliteDownQueryRunner(queryRunner: QueryRunner): Promise<any> {
-            await queryRunner.query(`DROP INDEX "IDX_60468af1ce34043a900809c84f"`);
-            await queryRunner.query(`DROP INDEX "IDX_7719d73cd16a9f57ecc6ac24b3"`);
-            await queryRunner.query(`ALTER TABLE "contact" RENAME TO "temporary_contact"`);
-            await queryRunner.query(`CREATE TABLE "contact" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "tenantId" varchar, "organizationId" varchar, "name" varchar, "firstName" varchar, "lastName" varchar, "country" varchar, "city" varchar, "address" varchar, "address2" varchar, "postcode" varchar, "latitude" float, "longitude" float, "regionCode" varchar, "fax" varchar, "fiscalInformation" varchar, "website" varchar, CONSTRAINT "FK_7719d73cd16a9f57ecc6ac24b3d" FOREIGN KEY ("organizationId") REFERENCES "organization" ("id") ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT "FK_60468af1ce34043a900809c84f2" FOREIGN KEY ("tenantId") REFERENCES "tenant" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`);
-            await queryRunner.query(`INSERT INTO "contact"("id", "createdAt", "updatedAt", "tenantId", "organizationId", "name", "firstName", "lastName", "country", "city", "address", "address2", "postcode", "latitude", "longitude", "regionCode", "fax", "fiscalInformation", "website") SELECT "id", "createdAt", "updatedAt", "tenantId", "organizationId", "name", "firstName", "lastName", "country", "city", "address", "address2", "postcode", "latitude", "longitude", "regionCode", "fax", "fiscalInformation", "website" FROM "temporary_contact"`);
-            await queryRunner.query(`DROP TABLE "temporary_contact"`);
-            await queryRunner.query(`CREATE INDEX "IDX_60468af1ce34043a900809c84f" ON "contact" ("tenantId") `);
-            await queryRunner.query(`CREATE INDEX "IDX_7719d73cd16a9f57ecc6ac24b3" ON "contact" ("organizationId") `);
-            await queryRunner.query(`DROP INDEX "IDX_36e929b98372d961bb63bd4b4e"`);
-            await queryRunner.query(`DROP INDEX "IDX_1c88db6e50f0704688d1f1978c"`);
-            await queryRunner.query(`DROP TABLE "password_reset"`);
-        }
+    /**
+     * SqliteDB Up Migration
+     *
+     * @param queryRunner
+     */
+    public async sqliteUpQueryRunner(queryRunner: QueryRunner): Promise<any> {
+        await queryRunner.query(`CREATE TABLE "password_reset" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "email" varchar NOT NULL, "token" varchar NOT NULL)`);
+        await queryRunner.query(`CREATE INDEX "IDX_1c88db6e50f0704688d1f1978c" ON "password_reset" ("email") `);
+        await queryRunner.query(`CREATE INDEX "IDX_36e929b98372d961bb63bd4b4e" ON "password_reset" ("token") `);
+        await queryRunner.query(`DROP INDEX "IDX_7719d73cd16a9f57ecc6ac24b3"`);
+        await queryRunner.query(`DROP INDEX "IDX_60468af1ce34043a900809c84f"`);
+        await queryRunner.query(`CREATE TABLE "temporary_contact" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "tenantId" varchar, "organizationId" varchar, "name" varchar, "firstName" varchar, "lastName" varchar, "country" varchar, "city" varchar, "address" varchar, "address2" varchar, "postcode" varchar, "latitude" float, "longitude" float, "regionCode" varchar, "fax" varchar, "fiscalInformation" varchar, "website" varchar, CONSTRAINT "FK_7719d73cd16a9f57ecc6ac24b3d" FOREIGN KEY ("organizationId") REFERENCES "organization" ("id") ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT "FK_60468af1ce34043a900809c84f2" FOREIGN KEY ("tenantId") REFERENCES "tenant" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`);
+        await queryRunner.query(`INSERT INTO "temporary_contact"("id", "createdAt", "updatedAt", "tenantId", "organizationId", "name", "firstName", "lastName", "country", "city", "address", "address2", "postcode", "latitude", "longitude", "regionCode", "fax", "fiscalInformation", "website") SELECT "id", "createdAt", "updatedAt", "tenantId", "organizationId", "name", "firstName", "lastName", "country", "city", "address", "address2", "postcode", "latitude", "longitude", "regionCode", "fax", "fiscalInformation", "website" FROM "contact"`);
+        await queryRunner.query(`DROP TABLE "contact"`);
+        await queryRunner.query(`ALTER TABLE "temporary_contact" RENAME TO "contact"`);
+        await queryRunner.query(`CREATE INDEX "IDX_7719d73cd16a9f57ecc6ac24b3" ON "contact" ("organizationId") `);
+        await queryRunner.query(`CREATE INDEX "IDX_60468af1ce34043a900809c84f" ON "contact" ("tenantId") `);
+    }
+
+    /**
+     * SqliteDB Down Migration
+     *
+     * @param queryRunner
+     */
+    public async sqliteDownQueryRunner(queryRunner: QueryRunner): Promise<any> {
+        await queryRunner.query(`DROP INDEX "IDX_60468af1ce34043a900809c84f"`);
+        await queryRunner.query(`DROP INDEX "IDX_7719d73cd16a9f57ecc6ac24b3"`);
+        await queryRunner.query(`ALTER TABLE "contact" RENAME TO "temporary_contact"`);
+        await queryRunner.query(`CREATE TABLE "contact" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "tenantId" varchar, "organizationId" varchar, "name" varchar, "firstName" varchar, "lastName" varchar, "country" varchar, "city" varchar, "address" varchar, "address2" varchar, "postcode" varchar, "latitude" float, "longitude" float, "regionCode" varchar, "fax" varchar, "fiscalInformation" varchar, "website" varchar, CONSTRAINT "FK_7719d73cd16a9f57ecc6ac24b3d" FOREIGN KEY ("organizationId") REFERENCES "organization" ("id") ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT "FK_60468af1ce34043a900809c84f2" FOREIGN KEY ("tenantId") REFERENCES "tenant" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`);
+        await queryRunner.query(`INSERT INTO "contact"("id", "createdAt", "updatedAt", "tenantId", "organizationId", "name", "firstName", "lastName", "country", "city", "address", "address2", "postcode", "latitude", "longitude", "regionCode", "fax", "fiscalInformation", "website") SELECT "id", "createdAt", "updatedAt", "tenantId", "organizationId", "name", "firstName", "lastName", "country", "city", "address", "address2", "postcode", "latitude", "longitude", "regionCode", "fax", "fiscalInformation", "website" FROM "temporary_contact"`);
+        await queryRunner.query(`DROP TABLE "temporary_contact"`);
+        await queryRunner.query(`CREATE INDEX "IDX_60468af1ce34043a900809c84f" ON "contact" ("tenantId") `);
+        await queryRunner.query(`CREATE INDEX "IDX_7719d73cd16a9f57ecc6ac24b3" ON "contact" ("organizationId") `);
+        await queryRunner.query(`DROP INDEX "IDX_36e929b98372d961bb63bd4b4e"`);
+        await queryRunner.query(`DROP INDEX "IDX_1c88db6e50f0704688d1f1978c"`);
+        await queryRunner.query(`DROP TABLE "password_reset"`);
     }
+}
diff --git a/packages/core/src/database/migrations/1640007378352-AddColumnToRoleTable.ts b/packages/core/src/database/migrations/1640007378352-AddColumnToRoleTable.ts
index 383efe7c637..246412fa408 100644
--- a/packages/core/src/database/migrations/1640007378352-AddColumnToRoleTable.ts
+++ b/packages/core/src/database/migrations/1640007378352-AddColumnToRoleTable.ts
@@ -1,14 +1,17 @@
 import { MigrationInterface, QueryRunner } from "typeorm";
-    
+import * as chalk from "chalk";
+
 export class AddColumnToRoleTable1640007378352 implements MigrationInterface {
 
     name = 'AddColumnToRoleTable1640007378352';
-    
+
     public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         await queryRunner.query(`ALTER TABLE "role" ADD "isSystem" boolean NOT NULL DEFAULT false`);
     }
-    
+
     public async down(queryRunner: QueryRunner): Promise<any> {
         await queryRunner.query(`ALTER TABLE "role" DROP COLUMN "isSystem"`);
     }
-}
\ No newline at end of file
+}
diff --git a/packages/core/src/database/migrations/1640784835692-AlterActivityTable.ts b/packages/core/src/database/migrations/1640784835692-AlterActivityTable.ts
index aeb88e62c40..c8efd7149eb 100644
--- a/packages/core/src/database/migrations/1640784835692-AlterActivityTable.ts
+++ b/packages/core/src/database/migrations/1640784835692-AlterActivityTable.ts
@@ -1,10 +1,13 @@
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AlterActivityTable1640784835692 implements MigrationInterface {
 
     name = 'AlterActivityTable1640784835692';
 
     public async up(queryRunner: QueryRunner): Promise<void> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1642411409517-AlterCandidateEmployeeTable.ts b/packages/core/src/database/migrations/1642411409517-AlterCandidateEmployeeTable.ts
index d5568f2ccfe..8df8885d493 100644
--- a/packages/core/src/database/migrations/1642411409517-AlterCandidateEmployeeTable.ts
+++ b/packages/core/src/database/migrations/1642411409517-AlterCandidateEmployeeTable.ts
@@ -1,10 +1,13 @@
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AlterCandidateEmployeeTable1642411409517 implements MigrationInterface {
 
     name = 'AlterCandidateEmployeeTable1642411409517';
 
     public async up(queryRunner: QueryRunner): Promise<void> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1642770124831-AlterEmailHistoryTable.ts b/packages/core/src/database/migrations/1642770124831-AlterEmailHistoryTable.ts
index 6a9d8f0848f..9cb1caff25d 100644
--- a/packages/core/src/database/migrations/1642770124831-AlterEmailHistoryTable.ts
+++ b/packages/core/src/database/migrations/1642770124831-AlterEmailHistoryTable.ts
@@ -1,10 +1,13 @@
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AlterEmailHistoryTable1642770124831 implements MigrationInterface {
 
     name = 'AlterEmailHistoryTable1642770124831';
 
     public async up(queryRunner: QueryRunner): Promise<void> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1643201180573-AlterTaskTable.ts b/packages/core/src/database/migrations/1643201180573-AlterTaskTable.ts
index 8219e8dc3be..4865fb0be0f 100644
--- a/packages/core/src/database/migrations/1643201180573-AlterTaskTable.ts
+++ b/packages/core/src/database/migrations/1643201180573-AlterTaskTable.ts
@@ -1,10 +1,13 @@
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AlterTaskTable1643201180573 implements MigrationInterface {
 
     name = 'AlterTaskTable1643201180573';
 
     public async up(queryRunner: QueryRunner): Promise<void> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
@@ -20,11 +23,11 @@ export class AlterTaskTable1643201180573 implements MigrationInterface {
         }
     }
 
-     /**
-     * PostgresDB Up Migration
-     *
-     * @param queryRunner
-     */
+    /**
+    * PostgresDB Up Migration
+    *
+    * @param queryRunner
+    */
     public async postgresUpQueryRunner(queryRunner: QueryRunner): Promise<any> {
         await queryRunner.query(`ALTER TABLE "task" ALTER COLUMN "status" SET DEFAULT 'Todo'`);
     }
diff --git a/packages/core/src/database/migrations/1643807301083-AlterRolePermissionTable.ts b/packages/core/src/database/migrations/1643807301083-AlterRolePermissionTable.ts
index 6df714fff5a..7955b54fbb3 100644
--- a/packages/core/src/database/migrations/1643807301083-AlterRolePermissionTable.ts
+++ b/packages/core/src/database/migrations/1643807301083-AlterRolePermissionTable.ts
@@ -1,10 +1,13 @@
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AlterRolePermissionTable1643807301083 implements MigrationInterface {
 
     name = 'AlterRolePermissionTable1643807301083';
 
     public async up(queryRunner: QueryRunner): Promise<void> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1643809486960-MigrateEmailTemplatesData.ts b/packages/core/src/database/migrations/1643809486960-MigrateEmailTemplatesData.ts
index f69c4ef6c08..274f55139cb 100644
--- a/packages/core/src/database/migrations/1643809486960-MigrateEmailTemplatesData.ts
+++ b/packages/core/src/database/migrations/1643809486960-MigrateEmailTemplatesData.ts
@@ -13,7 +13,7 @@ export class MigrateEmailTemplatesData1643809486960 implements MigrationInterfac
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
-        console.log(chalk.yellow(`${this.name} start running!`));
+        console.log(chalk.yellow(this.name + ' start running!'));
 
         const templates = Object.values(EmailTemplateEnum);
         await Promise.all(
diff --git a/packages/core/src/database/migrations/1644312012849-RolePermissionsReload.ts b/packages/core/src/database/migrations/1644312012849-RolePermissionsReload.ts
index eeec33609c5..ec19b6d4aff 100644
--- a/packages/core/src/database/migrations/1644312012849-RolePermissionsReload.ts
+++ b/packages/core/src/database/migrations/1644312012849-RolePermissionsReload.ts
@@ -1,10 +1,13 @@
 import { MigrationInterface, QueryRunner } from 'typeorm';
+import * as chalk from "chalk";
 import { RolePermissionUtils } from './../../role-permission/utils';
 
 export class RolePermissionsReload1644312012849 implements MigrationInterface {
 	name = 'RolePermissionsReload1644312012849';
 
 	public async up(queryRunner: QueryRunner): Promise<any> {
+		console.log(chalk.yellow(this.name + ' start running!'));
+
 		try {
 			await RolePermissionUtils.migrateRolePermissions(queryRunner);
 		} catch (error) {
@@ -12,5 +15,5 @@ export class RolePermissionsReload1644312012849 implements MigrationInterface {
 		}
 	}
 
-	public async down(queryRunner: QueryRunner): Promise<any> {}
+	public async down(queryRunner: QueryRunner): Promise<any> { }
 }
diff --git a/packages/core/src/database/migrations/1644491785525-AdjustTimeLogStopDate.ts b/packages/core/src/database/migrations/1644491785525-AdjustTimeLogStopDate.ts
index 3e84113ca8b..c6ca8767d7b 100644
--- a/packages/core/src/database/migrations/1644491785525-AdjustTimeLogStopDate.ts
+++ b/packages/core/src/database/migrations/1644491785525-AdjustTimeLogStopDate.ts
@@ -1,4 +1,5 @@
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 import { chain } from 'underscore';
 import * as moment from 'moment';
 import { isEmpty, isNotEmpty } from "@gauzy/common";
@@ -8,10 +9,12 @@ export class AdjustTimeLogStopDate1644491785525 implements MigrationInterface {
     name = 'AdjustTimeLogStopDate1644491785525';
 
     public async up(queryRunner: QueryRunner): Promise<any> {
-		const isSqlite = ['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type);
-		const timeSlots = await queryRunner.connection.manager.query(
-			isSqlite
-				? `
+        console.log(chalk.yellow(this.name + ' start running!'));
+
+        const isSqlite = ['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type);
+        const timeSlots = await queryRunner.connection.manager.query(
+            isSqlite
+                ? `
             SELECT * FROM
                 "time_slot"
             WHERE
@@ -20,7 +23,7 @@ export class AdjustTimeLogStopDate1644491785525 implements MigrationInterface {
                 "time_slot"."mouse" < ? OR
                 "time_slot"."duration" > ?;
         `
-				: `
+                : `
             SELECT * FROM
                 "time_slot"
             WHERE
@@ -29,16 +32,16 @@ export class AdjustTimeLogStopDate1644491785525 implements MigrationInterface {
                 "time_slot"."mouse" < $3 OR
                 "time_slot"."duration" > $4;
         `,
-			[0, 0, 0, 600]
-		);
+            [0, 0, 0, 600]
+        );
         for await (const timeSlot of timeSlots) {
             const duration = (timeSlot.duration < 0) ? 0 : (timeSlot.duration > 600) ? 600 : timeSlot.duration;
             const overall = (timeSlot.overall < 0) ? 0 : (timeSlot.overall > 600) ? 600 : timeSlot.overall;
             const keyboard = (timeSlot.keyboard < 0) ? 0 : (timeSlot.keyboard > 600) ? 600 : timeSlot.keyboard;
             const mouse = (timeSlot.mouse < 0) ? 0 : (timeSlot.mouse > 600) ? 600 : timeSlot.mouse;
             await queryRunner.connection.manager.query(
-				isSqlite
-					? `
+                isSqlite
+                    ? `
                 UPDATE "time_slot" SET
                     "duration" = ?,
                     "overall" = ?,
@@ -46,7 +49,7 @@ export class AdjustTimeLogStopDate1644491785525 implements MigrationInterface {
                     "mouse" = ?
                 WHERE
                     "id" IN(?)`
-					: `
+                    : `
                 UPDATE "time_slot" SET
                     "duration" = $1,
                     "overall" = $2,
@@ -54,8 +57,8 @@ export class AdjustTimeLogStopDate1644491785525 implements MigrationInterface {
                     "mouse" = $4
                 WHERE
                     "id" IN($5)`,
-				[duration, overall, keyboard, mouse, timeSlot.id]
-			);
+                [duration, overall, keyboard, mouse, timeSlot.id]
+            );
         }
 
         const timelogs = await queryRunner.connection.manager.query(`
@@ -78,11 +81,11 @@ export class AdjustTimeLogStopDate1644491785525 implements MigrationInterface {
                 )
                 .filter(Boolean);
             const [timeLog] = await queryRunner.connection.manager.query(
-				isSqlite
-					? `SELECT * FROM "time_log" WHERE "time_log"."id" = ? LIMIT 1`
-					: `SELECT * FROM "time_log" WHERE "time_log"."id" = $1 LIMIT 1`,
-				[timeLogId]
-			);
+                isSqlite
+                    ? `SELECT * FROM "time_log" WHERE "time_log"."id" = ? LIMIT 1`
+                    : `SELECT * FROM "time_log" WHERE "time_log"."id" = $1 LIMIT 1`,
+                [timeLogId]
+            );
 
             const logDifference = moment().diff(moment.utc(timeLog.startedAt), 'minutes');
             if (
@@ -90,19 +93,19 @@ export class AdjustTimeLogStopDate1644491785525 implements MigrationInterface {
                 logDifference > 10
             ) {
                 await queryRunner.connection.manager.query(
-					isSqlite
-						? `
+                    isSqlite
+                        ? `
                     UPDATE "time_log" SET
                         "stoppedAt" = ?
                     WHERE
                         "id" IN(?)`
-						: `
+                        : `
                     UPDATE "time_log" SET
                         "stoppedAt" = $1
                     WHERE
                         "id" IN($2)`,
-					[timeLog.startedAt, timeLog.id]
-				);
+                    [timeLog.startedAt, timeLog.id]
+                );
             } else if (isNotEmpty(timeSlotsIds)) {
                 const timeSlots = await queryRunner.connection.manager.query(`
                     SELECT * FROM
@@ -132,24 +135,24 @@ export class AdjustTimeLogStopDate1644491785525 implements MigrationInterface {
                     slotDifference = moment().diff(moment.utc(stoppedAt), 'minutes');
                 }
                 if (slotDifference > 10) {
-					await queryRunner.connection.manager.query(
-						isSqlite
-							? `
+                    await queryRunner.connection.manager.query(
+                        isSqlite
+                            ? `
                         UPDATE "time_log" SET
                             "stoppedAt" = ?
                         WHERE
                             "id" IN(?)`
-							: `
+                            : `
                         UPDATE "time_log" SET
                             "stoppedAt" = $1
                         WHERE
                             "id" IN($2)`,
-						[stoppedAt, timeLog.id]
-					);
+                        [stoppedAt, timeLog.id]
+                    );
                 }
             }
         }
     }
 
-    public async down(queryRunner: QueryRunner): Promise<any> {}
+    public async down(queryRunner: QueryRunner): Promise<any> { }
 }
diff --git a/packages/core/src/database/migrations/1644568289509-AlterTimeLogTable.ts b/packages/core/src/database/migrations/1644568289509-AlterTimeLogTable.ts
index 8cacf5fdb65..58310bc79e1 100644
--- a/packages/core/src/database/migrations/1644568289509-AlterTimeLogTable.ts
+++ b/packages/core/src/database/migrations/1644568289509-AlterTimeLogTable.ts
@@ -1,10 +1,13 @@
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AlterTimeLogTable1644568289509 implements MigrationInterface {
 
     name = 'AlterTimeLogTable1644568289509';
 
     public async up(queryRunner: QueryRunner): Promise<void> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1644915598578-AlterEmployeeTable.ts b/packages/core/src/database/migrations/1644915598578-AlterEmployeeTable.ts
index 6113dc48a10..3b78f3007c3 100644
--- a/packages/core/src/database/migrations/1644915598578-AlterEmployeeTable.ts
+++ b/packages/core/src/database/migrations/1644915598578-AlterEmployeeTable.ts
@@ -1,10 +1,13 @@
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AlterEmployeeTable1644915598578 implements MigrationInterface {
 
     name = 'AlterEmployeeTable1644915598578';
 
     public async up(queryRunner: QueryRunner): Promise<void> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1645012749640-AlterPaymentTable.ts b/packages/core/src/database/migrations/1645012749640-AlterPaymentTable.ts
index a9601f61f11..ba137bfb09b 100644
--- a/packages/core/src/database/migrations/1645012749640-AlterPaymentTable.ts
+++ b/packages/core/src/database/migrations/1645012749640-AlterPaymentTable.ts
@@ -1,10 +1,13 @@
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AlterPaymentTable1645012749640 implements MigrationInterface {
 
     name = 'AlterPaymentTable1645012749640';
 
     public async up(queryRunner: QueryRunner): Promise<void> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
@@ -47,12 +50,12 @@ export class AlterPaymentTable1645012749640 implements MigrationInterface {
     *
     * @param queryRunner
     */
-    public async sqliteUpQueryRunner(queryRunner: QueryRunner): Promise<any> {}
+    public async sqliteUpQueryRunner(queryRunner: QueryRunner): Promise<any> { }
 
     /**
      * SqliteDB Down Migration
      *
      * @param queryRunner
      */
-    public async sqliteDownQueryRunner(queryRunner: QueryRunner): Promise<any> {}
+    public async sqliteDownQueryRunner(queryRunner: QueryRunner): Promise<any> { }
 }
diff --git a/packages/core/src/database/migrations/1645087150917-AlterEmailTable.ts b/packages/core/src/database/migrations/1645087150917-AlterEmailTable.ts
index 3fe921e3b16..ceaa5464409 100644
--- a/packages/core/src/database/migrations/1645087150917-AlterEmailTable.ts
+++ b/packages/core/src/database/migrations/1645087150917-AlterEmailTable.ts
@@ -1,10 +1,13 @@
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AlterEmailTable1645087150917 implements MigrationInterface {
 
     name = 'AlterEmailTable1645087150917';
 
     public async up(queryRunner: QueryRunner): Promise<void> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1645179275947-AlterInvoiceTable.ts b/packages/core/src/database/migrations/1645179275947-AlterInvoiceTable.ts
index 27f36f11422..a0bcacf06b8 100644
--- a/packages/core/src/database/migrations/1645179275947-AlterInvoiceTable.ts
+++ b/packages/core/src/database/migrations/1645179275947-AlterInvoiceTable.ts
@@ -1,10 +1,13 @@
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AlterInvoiceTable1645179275947 implements MigrationInterface {
 
     name = 'AlterInvoiceTable1645179275947';
 
     public async up(queryRunner: QueryRunner): Promise<void> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1645441629137-AddTimeTrackingFeatureToEmployeeTable.ts b/packages/core/src/database/migrations/1645441629137-AddTimeTrackingFeatureToEmployeeTable.ts
index a46fe1af74f..0addaff0844 100644
--- a/packages/core/src/database/migrations/1645441629137-AddTimeTrackingFeatureToEmployeeTable.ts
+++ b/packages/core/src/database/migrations/1645441629137-AddTimeTrackingFeatureToEmployeeTable.ts
@@ -1,10 +1,13 @@
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AddTimeTrackingFeatureToEmployeeTable1645441629137 implements MigrationInterface {
 
     name = 'AddTimeTrackingFeatureToEmployeeTable1645441629137';
 
     public async up(queryRunner: QueryRunner): Promise<void> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1645726031706-AlterIntegrationTable.ts b/packages/core/src/database/migrations/1645726031706-AlterIntegrationTable.ts
index b45e568ab29..0119f870bf0 100644
--- a/packages/core/src/database/migrations/1645726031706-AlterIntegrationTable.ts
+++ b/packages/core/src/database/migrations/1645726031706-AlterIntegrationTable.ts
@@ -1,10 +1,13 @@
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AlterIntegrationTable1645726031706 implements MigrationInterface {
 
     name = 'AlterIntegrationTable1645726031706';
 
     public async up(queryRunner: QueryRunner): Promise<void> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1646056129050-AlterEmployeeRecurringExpenseTable.ts b/packages/core/src/database/migrations/1646056129050-AlterEmployeeRecurringExpenseTable.ts
index 9fe69a5956c..735e46ee25e 100644
--- a/packages/core/src/database/migrations/1646056129050-AlterEmployeeRecurringExpenseTable.ts
+++ b/packages/core/src/database/migrations/1646056129050-AlterEmployeeRecurringExpenseTable.ts
@@ -1,10 +1,13 @@
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AlterEmployeeRecurringExpenseTable1646056129050 implements MigrationInterface {
 
     name = 'AlterEmployeeRecurringExpenseTable1646056129050';
 
     public async up(queryRunner: QueryRunner): Promise<void> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1646117679347-AlterScreenshotTable.ts b/packages/core/src/database/migrations/1646117679347-AlterScreenshotTable.ts
index 8c8c96e4dc0..2eb5c816f6f 100644
--- a/packages/core/src/database/migrations/1646117679347-AlterScreenshotTable.ts
+++ b/packages/core/src/database/migrations/1646117679347-AlterScreenshotTable.ts
@@ -1,10 +1,13 @@
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AlterScreenshotTable1646117679347 implements MigrationInterface {
 
     name = 'AlterScreenshotTable1646117679347';
 
     public async up(queryRunner: QueryRunner): Promise<void> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1646206946845-AlterExpenseTable.ts b/packages/core/src/database/migrations/1646206946845-AlterExpenseTable.ts
index 1e41ae74ee7..3853c5f3571 100644
--- a/packages/core/src/database/migrations/1646206946845-AlterExpenseTable.ts
+++ b/packages/core/src/database/migrations/1646206946845-AlterExpenseTable.ts
@@ -1,10 +1,13 @@
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AlterExpenseTable1646206946845 implements MigrationInterface {
 
     name = 'AlterExpenseTable1646206946845';
 
     public async up(queryRunner: QueryRunner): Promise<void> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1647417832147-AlterActivityTable.ts b/packages/core/src/database/migrations/1647417832147-AlterActivityTable.ts
index e3d12eb5241..25c782f4eec 100644
--- a/packages/core/src/database/migrations/1647417832147-AlterActivityTable.ts
+++ b/packages/core/src/database/migrations/1647417832147-AlterActivityTable.ts
@@ -1,10 +1,13 @@
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AlterActivityTable1647417832147 implements MigrationInterface {
 
     name = 'AlterActivityTable1647417832147';
 
     public async up(queryRunner: QueryRunner): Promise<void> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1648899149818-AlterTenantTable.ts b/packages/core/src/database/migrations/1648899149818-AlterTenantTable.ts
index e4888a25f51..7c7098aca71 100644
--- a/packages/core/src/database/migrations/1648899149818-AlterTenantTable.ts
+++ b/packages/core/src/database/migrations/1648899149818-AlterTenantTable.ts
@@ -1,10 +1,13 @@
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AlterTenantTable1648899149818 implements MigrationInterface {
 
     name = 'AlterTenantTable1648899149818';
 
     public async up(queryRunner: QueryRunner): Promise<void> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1650532321598-AlterOrganizationProject.ts b/packages/core/src/database/migrations/1650532321598-AlterOrganizationProject.ts
index 61de3104c42..cc93384626c 100644
--- a/packages/core/src/database/migrations/1650532321598-AlterOrganizationProject.ts
+++ b/packages/core/src/database/migrations/1650532321598-AlterOrganizationProject.ts
@@ -1,4 +1,5 @@
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 import { seedProjectMembersCount } from "./../../organization-project/organization-project.seed";
 
 export class AlterOrganizationProject1650532321598 implements MigrationInterface {
@@ -6,6 +7,8 @@ export class AlterOrganizationProject1650532321598 implements MigrationInterface
     name = 'AlterOrganizationProject1650532321598';
 
     public async up(queryRunner: QueryRunner): Promise<void> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
@@ -90,21 +93,21 @@ export class AlterOrganizationProject1650532321598 implements MigrationInterface
     // And such Seed method basically update qty of members per project when we create initial data in DB
     private async _calculateProjectMembersCount(queryRunner: QueryRunner) {
 
-      console.log('_calculateProjectMembersCount called');
+        console.log('_calculateProjectMembersCount called');
 
         /**
          * GET all tenants in the system
          */
-	    const tenants = await queryRunner.connection.manager.query(`SELECT * FROM tenant`);
+        const tenants = await queryRunner.connection.manager.query(`SELECT * FROM tenant`);
 
-      console.log(`found ${tenants.length} tenants in DB`);
+        console.log(`found ${tenants.length} tenants in DB`);
 
-      await seedProjectMembersCount(
+        await seedProjectMembersCount(
             queryRunner.connection,
             tenants
-      );
+        );
 
-      console.log('_calculateProjectMembersCount called');
+        console.log('_calculateProjectMembersCount called');
 
     }
 }
diff --git a/packages/core/src/database/migrations/1650704972412-AlterChangelogTable.ts b/packages/core/src/database/migrations/1650704972412-AlterChangelogTable.ts
index b4086f932b8..6c22dbbec8d 100644
--- a/packages/core/src/database/migrations/1650704972412-AlterChangelogTable.ts
+++ b/packages/core/src/database/migrations/1650704972412-AlterChangelogTable.ts
@@ -1,10 +1,13 @@
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AlterChangelogTable1650704972412 implements MigrationInterface {
 
     name = 'AlterChangelogTable1650704972412';
 
     public async up(queryRunner: QueryRunner): Promise<void> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1652270907163-AlterTimeOffRequestTable.ts b/packages/core/src/database/migrations/1652270907163-AlterTimeOffRequestTable.ts
index 3343d0a2889..e5b76f2663d 100644
--- a/packages/core/src/database/migrations/1652270907163-AlterTimeOffRequestTable.ts
+++ b/packages/core/src/database/migrations/1652270907163-AlterTimeOffRequestTable.ts
@@ -1,9 +1,12 @@
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AlterTimeOffRequestTable1652270907163 implements MigrationInterface {
     name = 'AlterTimeOffRequestTable1652270907163';
 
     public async up(queryRunner: QueryRunner): Promise<void> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1652703299052-AlterTaskTableColumns.ts b/packages/core/src/database/migrations/1652703299052-AlterTaskTableColumns.ts
index 0aee8568ca1..a5269c4f308 100644
--- a/packages/core/src/database/migrations/1652703299052-AlterTaskTableColumns.ts
+++ b/packages/core/src/database/migrations/1652703299052-AlterTaskTableColumns.ts
@@ -1,10 +1,13 @@
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AlterTaskTableColumns1652703299052 implements MigrationInterface {
 
     name = 'AlterTaskTableColumns1652703299052';
 
     public async up(queryRunner: QueryRunner): Promise<void> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1652936174625-ReportTableIconSeed.ts b/packages/core/src/database/migrations/1652936174625-ReportTableIconSeed.ts
index 0b4b1240f48..7333041d64c 100644
--- a/packages/core/src/database/migrations/1652936174625-ReportTableIconSeed.ts
+++ b/packages/core/src/database/migrations/1652936174625-ReportTableIconSeed.ts
@@ -1,10 +1,13 @@
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class ReportTableIconSeed1652936174625 implements MigrationInterface {
 
-    name = 'ReportTableIconSeed1652936174625';
+	name = 'ReportTableIconSeed1652936174625';
+
+	public async up(queryRunner: QueryRunner): Promise<any> {
+		console.log(chalk.yellow(this.name + ' start running!'));
 
-    public async up(queryRunner: QueryRunner): Promise<any> {
 		const isSqlite = ['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type);
 		if (isSqlite) {
 			await queryRunner.connection.query(`UPDATE "report" SET "iconClass" = ? WHERE "slug" = ?`, ['far fa-clock', 'time-activity']);
@@ -31,9 +34,9 @@ export class ReportTableIconSeed1652936174625 implements MigrationInterface {
 			await queryRunner.connection.query(`UPDATE "report" SET "iconClass" = $1 WHERE "slug" = $2`, ['far fa-credit-card', 'project-budgets']);
 			await queryRunner.connection.query(`UPDATE "report" SET "iconClass" = $1 WHERE "slug" = $2`, ['far fa-credit-card', 'client-budgets']);
 		}
-    }
+	}
 
-    public async down(queryRunner: QueryRunner): Promise<any> {
+	public async down(queryRunner: QueryRunner): Promise<any> {
 		const isSqlite = ['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type);
 		if (isSqlite) {
 			await queryRunner.connection.query(`UPDATE "report" SET "iconClass" = ? WHERE "slug" = ?`, ['clock-outline', 'time-activity']);
@@ -60,5 +63,5 @@ export class ReportTableIconSeed1652936174625 implements MigrationInterface {
 			await queryRunner.connection.query(`UPDATE "report" SET "iconClass" = $1 WHERE "slug" = $2`, ['credit-card-outline', 'project-budgets']);
 			await queryRunner.connection.query(`UPDATE "report" SET "iconClass" = $1 WHERE "slug" = $2`, ['credit-card-outline', 'client-budgets']);
 		}
-    }
+	}
 }
diff --git a/packages/core/src/database/migrations/1653482244724-AlterExpenseTable.ts b/packages/core/src/database/migrations/1653482244724-AlterExpenseTable.ts
index 8b5c7977373..f81620e887b 100644
--- a/packages/core/src/database/migrations/1653482244724-AlterExpenseTable.ts
+++ b/packages/core/src/database/migrations/1653482244724-AlterExpenseTable.ts
@@ -1,10 +1,13 @@
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AlterExpenseTable1653482244724 implements MigrationInterface {
 
     name = 'AlterExpenseTable1653482244724';
 
     public async up(queryRunner: QueryRunner): Promise<void> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
@@ -61,12 +64,12 @@ export class AlterExpenseTable1653482244724 implements MigrationInterface {
      *
      * @param queryRunner
      */
-    public async sqliteUpQueryRunner(queryRunner: QueryRunner): Promise<any> {}
+    public async sqliteUpQueryRunner(queryRunner: QueryRunner): Promise<any> { }
 
     /**
      * SqliteDB Down Migration
      *
      * @param queryRunner
      */
-    public async sqliteDownQueryRunner(queryRunner: QueryRunner): Promise<any> {}
+    public async sqliteDownQueryRunner(queryRunner: QueryRunner): Promise<any> { }
 }
diff --git a/packages/core/src/database/migrations/1653742570167-AlterOrganizationContactTable.ts b/packages/core/src/database/migrations/1653742570167-AlterOrganizationContactTable.ts
index ed69fd2e046..771b2c83105 100644
--- a/packages/core/src/database/migrations/1653742570167-AlterOrganizationContactTable.ts
+++ b/packages/core/src/database/migrations/1653742570167-AlterOrganizationContactTable.ts
@@ -1,10 +1,13 @@
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AlterOrganizationContactTable1653742570167 implements MigrationInterface {
 
     name = 'AlterOrganizationContactTable1653742570167';
 
     public async up(queryRunner: QueryRunner): Promise<void> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1654675304373-SeedChangeLogFeature.ts b/packages/core/src/database/migrations/1654675304373-SeedChangeLogFeature.ts
index 2d1818b1e73..dd927c8032a 100644
--- a/packages/core/src/database/migrations/1654675304373-SeedChangeLogFeature.ts
+++ b/packages/core/src/database/migrations/1654675304373-SeedChangeLogFeature.ts
@@ -1,4 +1,5 @@
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 import { v4 as uuidV4 } from 'uuid';
 
 export class SeedChangeLogFeature1654675304373 implements MigrationInterface {
@@ -6,7 +7,9 @@ export class SeedChangeLogFeature1654675304373 implements MigrationInterface {
     name = 'SeedChangeLogFeature1654675304373';
 
     public async up(queryRunner: QueryRunner): Promise<any> {
-		const date = ['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type) ? Date.now() : new Date();
+        console.log(chalk.yellow(this.name + ' start running!'));
+
+        const date = ['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type) ? Date.now() : new Date();
         const features = [
             {
                 icon: 'cube-outline',
diff --git a/packages/core/src/database/migrations/1655885355508-OrganizationProjectAlterTable.ts b/packages/core/src/database/migrations/1655885355508-OrganizationProjectAlterTable.ts
index f4ebc0e0206..65e3e9802fa 100644
--- a/packages/core/src/database/migrations/1655885355508-OrganizationProjectAlterTable.ts
+++ b/packages/core/src/database/migrations/1655885355508-OrganizationProjectAlterTable.ts
@@ -1,10 +1,13 @@
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class OrganizationProjectAlterTable1655885355508 implements MigrationInterface {
 
     name = 'OrganizationProjectAlterTable1655885355508';
 
     public async up(queryRunner: QueryRunner): Promise<void> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1656833636109-AlterUserTable.ts b/packages/core/src/database/migrations/1656833636109-AlterUserTable.ts
index 78a81817570..0f384cd0465 100644
--- a/packages/core/src/database/migrations/1656833636109-AlterUserTable.ts
+++ b/packages/core/src/database/migrations/1656833636109-AlterUserTable.ts
@@ -1,10 +1,13 @@
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AlterUserTable1656833636109 implements MigrationInterface {
 
     name = 'AlterUserTable1656833636109';
 
     public async up(queryRunner: QueryRunner): Promise<void> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1659618978087-AlterInvoiceEstimateHistory.ts b/packages/core/src/database/migrations/1659618978087-AlterInvoiceEstimateHistory.ts
index cfb0698d4a0..0d8c21634e1 100644
--- a/packages/core/src/database/migrations/1659618978087-AlterInvoiceEstimateHistory.ts
+++ b/packages/core/src/database/migrations/1659618978087-AlterInvoiceEstimateHistory.ts
@@ -1,10 +1,13 @@
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AlterInvoiceEstimateHistory1659618978087 implements MigrationInterface {
 
     name = 'AlterInvoiceEstimateHistory1659618978087';
 
     public async up(queryRunner: QueryRunner): Promise<void> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1659684413063-AlterContactTable.ts b/packages/core/src/database/migrations/1659684413063-AlterContactTable.ts
index 42743a85f01..4d2e8261412 100644
--- a/packages/core/src/database/migrations/1659684413063-AlterContactTable.ts
+++ b/packages/core/src/database/migrations/1659684413063-AlterContactTable.ts
@@ -1,10 +1,13 @@
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AlterContactTable1659684413063 implements MigrationInterface {
 
     name = 'AlterContactTable1659684413063';
 
     public async up(queryRunner: QueryRunner): Promise<void> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1659696180759-AlterTenantTable.ts b/packages/core/src/database/migrations/1659696180759-AlterTenantTable.ts
index b9ba7321ae0..00e2b7a1913 100644
--- a/packages/core/src/database/migrations/1659696180759-AlterTenantTable.ts
+++ b/packages/core/src/database/migrations/1659696180759-AlterTenantTable.ts
@@ -1,10 +1,13 @@
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AlterTenantTable1659696180759 implements MigrationInterface {
 
     name = 'AlterTenantTable1659696180759';
 
     public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
@@ -25,14 +28,14 @@ export class AlterTenantTable1659696180759 implements MigrationInterface {
     *
     * @param queryRunner
     */
-    public async postgresUpQueryRunner(queryRunner: QueryRunner): Promise<any> {}
+    public async postgresUpQueryRunner(queryRunner: QueryRunner): Promise<any> { }
 
     /**
     * PostgresDB Down Migration
     *
     * @param queryRunner
     */
-    public async postgresDownQueryRunner(queryRunner: QueryRunner): Promise<any> {}
+    public async postgresDownQueryRunner(queryRunner: QueryRunner): Promise<any> { }
 
     /**
     * SqliteDB Up Migration
diff --git a/packages/core/src/database/migrations/1660988196279-AlterWarehouseProductTable.ts b/packages/core/src/database/migrations/1660988196279-AlterWarehouseProductTable.ts
index 79c69965364..9f287d562af 100644
--- a/packages/core/src/database/migrations/1660988196279-AlterWarehouseProductTable.ts
+++ b/packages/core/src/database/migrations/1660988196279-AlterWarehouseProductTable.ts
@@ -1,5 +1,5 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AlterWarehouseProductTable1660988196279 implements MigrationInterface {
 
@@ -11,6 +11,8 @@ export class AlterWarehouseProductTable1660988196279 implements MigrationInterfa
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1661599336316-AlterWarehouseMerchant.ts b/packages/core/src/database/migrations/1661599336316-AlterWarehouseMerchant.ts
index 06355e75439..32d3c6ee668 100644
--- a/packages/core/src/database/migrations/1661599336316-AlterWarehouseMerchant.ts
+++ b/packages/core/src/database/migrations/1661599336316-AlterWarehouseMerchant.ts
@@ -1,5 +1,5 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AlterWarehouseMerchant1661599336316 implements MigrationInterface {
 
@@ -11,6 +11,8 @@ export class AlterWarehouseMerchant1661599336316 implements MigrationInterface {
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1661853087396-AlterTimesheetTable.ts b/packages/core/src/database/migrations/1661853087396-AlterTimesheetTable.ts
index 9fc858979dd..d83e0d902ad 100644
--- a/packages/core/src/database/migrations/1661853087396-AlterTimesheetTable.ts
+++ b/packages/core/src/database/migrations/1661853087396-AlterTimesheetTable.ts
@@ -1,5 +1,5 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AlterTimesheetTable1661853087396 implements MigrationInterface {
 
@@ -11,6 +11,8 @@ export class AlterTimesheetTable1661853087396 implements MigrationInterface {
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1662994539197-AlterInvoiceTable.ts b/packages/core/src/database/migrations/1662994539197-AlterInvoiceTable.ts
index 79f96fc3f7b..c2fbdf5ff58 100644
--- a/packages/core/src/database/migrations/1662994539197-AlterInvoiceTable.ts
+++ b/packages/core/src/database/migrations/1662994539197-AlterInvoiceTable.ts
@@ -1,5 +1,5 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AlterInvoiceTable1662994539197 implements MigrationInterface {
 
@@ -11,6 +11,8 @@ export class AlterInvoiceTable1662994539197 implements MigrationInterface {
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1664869127437-AlterCandidateFeedbackTable.ts b/packages/core/src/database/migrations/1664869127437-AlterCandidateFeedbackTable.ts
index 8d89b6ad28d..e94f193d0b5 100644
--- a/packages/core/src/database/migrations/1664869127437-AlterCandidateFeedbackTable.ts
+++ b/packages/core/src/database/migrations/1664869127437-AlterCandidateFeedbackTable.ts
@@ -1,5 +1,5 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AlterCandidateFeedbackTable1664869127437 implements MigrationInterface {
 
@@ -11,6 +11,8 @@ export class AlterCandidateFeedbackTable1664869127437 implements MigrationInterf
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
@@ -58,12 +60,12 @@ export class AlterCandidateFeedbackTable1664869127437 implements MigrationInterf
     *
     * @param queryRunner
     */
-    public async sqliteUpQueryRunner(queryRunner: QueryRunner): Promise<any> {}
+    public async sqliteUpQueryRunner(queryRunner: QueryRunner): Promise<any> { }
 
     /**
     * SqliteDB Down Migration
     *
     * @param queryRunner
     */
-    public async sqliteDownQueryRunner(queryRunner: QueryRunner): Promise<any> {}
+    public async sqliteDownQueryRunner(queryRunner: QueryRunner): Promise<any> { }
 }
diff --git a/packages/core/src/database/migrations/1665044607000-AlterCandidateInterviewTable.ts b/packages/core/src/database/migrations/1665044607000-AlterCandidateInterviewTable.ts
index 9b30f411ec7..f82458fecdc 100644
--- a/packages/core/src/database/migrations/1665044607000-AlterCandidateInterviewTable.ts
+++ b/packages/core/src/database/migrations/1665044607000-AlterCandidateInterviewTable.ts
@@ -1,5 +1,5 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AlterCandidateInterviewTable1665044607000 implements MigrationInterface {
 
@@ -11,6 +11,8 @@ export class AlterCandidateInterviewTable1665044607000 implements MigrationInter
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1665388204010-AlterWarehouseTable.ts b/packages/core/src/database/migrations/1665388204010-AlterWarehouseTable.ts
index 458d1c7e1e0..fd6322cc0cc 100644
--- a/packages/core/src/database/migrations/1665388204010-AlterWarehouseTable.ts
+++ b/packages/core/src/database/migrations/1665388204010-AlterWarehouseTable.ts
@@ -1,5 +1,5 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AlterWarehouseTable1665388204010 implements MigrationInterface {
 
@@ -11,6 +11,8 @@ export class AlterWarehouseTable1665388204010 implements MigrationInterface {
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1665399395983-AlterOrganizationTable.ts b/packages/core/src/database/migrations/1665399395983-AlterOrganizationTable.ts
index 1596755ae7d..df5ec9e3c46 100644
--- a/packages/core/src/database/migrations/1665399395983-AlterOrganizationTable.ts
+++ b/packages/core/src/database/migrations/1665399395983-AlterOrganizationTable.ts
@@ -1,5 +1,5 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AlterOrganizationTable1665399395983 implements MigrationInterface {
 
@@ -11,6 +11,8 @@ export class AlterOrganizationTable1665399395983 implements MigrationInterface {
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1665767813286-AltereInviteTable.ts b/packages/core/src/database/migrations/1665767813286-AltereInviteTable.ts
index 5d973123799..55b983a0948 100644
--- a/packages/core/src/database/migrations/1665767813286-AltereInviteTable.ts
+++ b/packages/core/src/database/migrations/1665767813286-AltereInviteTable.ts
@@ -1,5 +1,5 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AltereInviteTable1665767813286 implements MigrationInterface {
 
@@ -11,6 +11,8 @@ export class AltereInviteTable1665767813286 implements MigrationInterface {
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1666007548644-AlterEmployeeTable.ts b/packages/core/src/database/migrations/1666007548644-AlterEmployeeTable.ts
index a5f46134a96..851a536c11d 100644
--- a/packages/core/src/database/migrations/1666007548644-AlterEmployeeTable.ts
+++ b/packages/core/src/database/migrations/1666007548644-AlterEmployeeTable.ts
@@ -1,5 +1,5 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AlterEmployeeTable1666007548644 implements MigrationInterface {
 
@@ -11,6 +11,8 @@ export class AlterEmployeeTable1666007548644 implements MigrationInterface {
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1666181221327-AlterOrganizationTable.ts b/packages/core/src/database/migrations/1666181221327-AlterOrganizationTable.ts
index 161df4c1e72..0a2abb102ae 100644
--- a/packages/core/src/database/migrations/1666181221327-AlterOrganizationTable.ts
+++ b/packages/core/src/database/migrations/1666181221327-AlterOrganizationTable.ts
@@ -1,5 +1,5 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AlterOrganizationTable1666181221327 implements MigrationInterface {
 
@@ -11,6 +11,8 @@ export class AlterOrganizationTable1666181221327 implements MigrationInterface {
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1666780716428-AlterEmployeeTable.ts b/packages/core/src/database/migrations/1666780716428-AlterEmployeeTable.ts
index 45a6e55c0ca..565e4453cfa 100644
--- a/packages/core/src/database/migrations/1666780716428-AlterEmployeeTable.ts
+++ b/packages/core/src/database/migrations/1666780716428-AlterEmployeeTable.ts
@@ -1,5 +1,5 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AlterEmployeeTable1666780716428 implements MigrationInterface {
 
@@ -11,6 +11,8 @@ export class AlterEmployeeTable1666780716428 implements MigrationInterface {
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1668064327561-AlterOrganizationTable.ts b/packages/core/src/database/migrations/1668064327561-AlterOrganizationTable.ts
index cc641c39406..20cfac01b94 100644
--- a/packages/core/src/database/migrations/1668064327561-AlterOrganizationTable.ts
+++ b/packages/core/src/database/migrations/1668064327561-AlterOrganizationTable.ts
@@ -1,5 +1,5 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AlterOrganizationTable1668064327561 implements MigrationInterface {
 
@@ -11,6 +11,8 @@ export class AlterOrganizationTable1668064327561 implements MigrationInterface {
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1668084518509-AlterEmployeeTableColumns.ts b/packages/core/src/database/migrations/1668084518509-AlterEmployeeTableColumns.ts
index 20cb17ab3f6..5bf61daae56 100644
--- a/packages/core/src/database/migrations/1668084518509-AlterEmployeeTableColumns.ts
+++ b/packages/core/src/database/migrations/1668084518509-AlterEmployeeTableColumns.ts
@@ -1,5 +1,5 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AlterEmployeeTableColumns1668084518509 implements MigrationInterface {
 
@@ -11,6 +11,8 @@ export class AlterEmployeeTableColumns1668084518509 implements MigrationInterfac
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1668256889786-AlterCustomSmtpTable.ts b/packages/core/src/database/migrations/1668256889786-AlterCustomSmtpTable.ts
index d46d0cb7fc5..44b743b28c9 100644
--- a/packages/core/src/database/migrations/1668256889786-AlterCustomSmtpTable.ts
+++ b/packages/core/src/database/migrations/1668256889786-AlterCustomSmtpTable.ts
@@ -1,5 +1,5 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AlterCustomSmtpTable1668256889786 implements MigrationInterface {
 
@@ -11,6 +11,8 @@ export class AlterCustomSmtpTable1668256889786 implements MigrationInterface {
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1668446646237-AlterTableRelationCascading.ts b/packages/core/src/database/migrations/1668446646237-AlterTableRelationCascading.ts
index 81dee5ec6ab..8344c225b05 100644
--- a/packages/core/src/database/migrations/1668446646237-AlterTableRelationCascading.ts
+++ b/packages/core/src/database/migrations/1668446646237-AlterTableRelationCascading.ts
@@ -1,5 +1,5 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AlterTableRelationCascading1668446646237 implements MigrationInterface {
 
@@ -11,6 +11,8 @@ export class AlterTableRelationCascading1668446646237 implements MigrationInterf
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
@@ -72,7 +74,7 @@ export class AlterTableRelationCascading1668446646237 implements MigrationInterf
     *
     * @param queryRunner
     */
-     public async sqliteUpQueryRunner(queryRunner: QueryRunner): Promise<any> {
+    public async sqliteUpQueryRunner(queryRunner: QueryRunner): Promise<any> {
         await queryRunner.query(`DROP INDEX "IDX_760034f54e598d519b5f0c4ece"`);
         await queryRunner.query(`DROP INDEX "IDX_e699b50ca468e75bbd36913dcc"`);
         await queryRunner.query(`CREATE TABLE "temporary_skill_employee" ("skillId" varchar NOT NULL, "employeeId" varchar NOT NULL, PRIMARY KEY ("skillId", "employeeId"))`);
diff --git a/packages/core/src/database/migrations/1668502997873-AlterUserTable.ts b/packages/core/src/database/migrations/1668502997873-AlterUserTable.ts
index 6a8c2f8e75d..305139b9683 100644
--- a/packages/core/src/database/migrations/1668502997873-AlterUserTable.ts
+++ b/packages/core/src/database/migrations/1668502997873-AlterUserTable.ts
@@ -1,5 +1,5 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AlterUserTable1668502997873 implements MigrationInterface {
 
@@ -11,6 +11,8 @@ export class AlterUserTable1668502997873 implements MigrationInterface {
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1668504932478-AlterTableRelationCascading.ts b/packages/core/src/database/migrations/1668504932478-AlterTableRelationCascading.ts
index fe8ae9de9f9..e4b4be975c5 100644
--- a/packages/core/src/database/migrations/1668504932478-AlterTableRelationCascading.ts
+++ b/packages/core/src/database/migrations/1668504932478-AlterTableRelationCascading.ts
@@ -1,5 +1,5 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AlterTableRelationCascading1668504932478 implements MigrationInterface {
 
@@ -11,6 +11,8 @@ export class AlterTableRelationCascading1668504932478 implements MigrationInterf
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1669033406667-AlterUserTableEmailVerificationColumns.ts b/packages/core/src/database/migrations/1669033406667-AlterUserTableEmailVerificationColumns.ts
index 1885755bee0..05ecda91105 100644
--- a/packages/core/src/database/migrations/1669033406667-AlterUserTableEmailVerificationColumns.ts
+++ b/packages/core/src/database/migrations/1669033406667-AlterUserTableEmailVerificationColumns.ts
@@ -1,5 +1,5 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AlterUserTableEmailVerificationColumns1669033406667 implements MigrationInterface {
 
@@ -11,6 +11,8 @@ export class AlterUserTableEmailVerificationColumns1669033406667 implements Migr
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1669280426592-AlterInviteTable.ts b/packages/core/src/database/migrations/1669280426592-AlterInviteTable.ts
index a33b70906c7..612da9310f1 100644
--- a/packages/core/src/database/migrations/1669280426592-AlterInviteTable.ts
+++ b/packages/core/src/database/migrations/1669280426592-AlterInviteTable.ts
@@ -1,5 +1,5 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AlterInviteTable1669280426592 implements MigrationInterface {
 
@@ -10,8 +10,10 @@ export class AlterInviteTable1669280426592 implements MigrationInterface {
     *
     * @param queryRunner
     */
-     public async up(queryRunner: QueryRunner): Promise<any> {
-         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
+    public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
+        if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
             await this.postgresUpQueryRunner(queryRunner);
diff --git a/packages/core/src/database/migrations/1669453028914-AlterUserInviteTable.ts b/packages/core/src/database/migrations/1669453028914-AlterUserInviteTable.ts
index 3747f255539..54c254d7eb7 100644
--- a/packages/core/src/database/migrations/1669453028914-AlterUserInviteTable.ts
+++ b/packages/core/src/database/migrations/1669453028914-AlterUserInviteTable.ts
@@ -1,5 +1,5 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AlterUserInviteTable1669453028914 implements MigrationInterface {
 
@@ -10,8 +10,10 @@ export class AlterUserInviteTable1669453028914 implements MigrationInterface {
     *
     * @param queryRunner
     */
-     public async up(queryRunner: QueryRunner): Promise<any> {
-         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
+    public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
+        if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
             await this.postgresUpQueryRunner(queryRunner);
diff --git a/packages/core/src/database/migrations/1670313962263-AlterOrganizationTeamTable.ts b/packages/core/src/database/migrations/1670313962263-AlterOrganizationTeamTable.ts
index a0a2a66f0c2..e4c53939fbe 100644
--- a/packages/core/src/database/migrations/1670313962263-AlterOrganizationTeamTable.ts
+++ b/packages/core/src/database/migrations/1670313962263-AlterOrganizationTeamTable.ts
@@ -1,5 +1,5 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AlterOrganizationTeamTable1670313962263 implements MigrationInterface {
 
@@ -11,6 +11,8 @@ export class AlterOrganizationTeamTable1670313962263 implements MigrationInterfa
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1671107860058-AlterInviteAllowedOrganizationTable.ts b/packages/core/src/database/migrations/1671107860058-AlterInviteAllowedOrganizationTable.ts
index c2a75400495..563ce0949a1 100644
--- a/packages/core/src/database/migrations/1671107860058-AlterInviteAllowedOrganizationTable.ts
+++ b/packages/core/src/database/migrations/1671107860058-AlterInviteAllowedOrganizationTable.ts
@@ -1,5 +1,5 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AlterInviteAllowedOrganizationTable1671107860058 implements MigrationInterface {
 
@@ -11,6 +11,8 @@ export class AlterInviteAllowedOrganizationTable1671107860058 implements Migrati
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1671706727549-AlterOrganizationTeamTable.ts b/packages/core/src/database/migrations/1671706727549-AlterOrganizationTeamTable.ts
index 6b6d051c36e..801aabaf8f7 100644
--- a/packages/core/src/database/migrations/1671706727549-AlterOrganizationTeamTable.ts
+++ b/packages/core/src/database/migrations/1671706727549-AlterOrganizationTeamTable.ts
@@ -1,5 +1,5 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AlterOrganizationTeamTable1671706727549 implements MigrationInterface {
 
@@ -11,6 +11,8 @@ export class AlterOrganizationTeamTable1671706727549 implements MigrationInterfa
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1672211594766-AlterCandidateTable.ts b/packages/core/src/database/migrations/1672211594766-AlterCandidateTable.ts
index 67ce8269da8..0f0269a8312 100644
--- a/packages/core/src/database/migrations/1672211594766-AlterCandidateTable.ts
+++ b/packages/core/src/database/migrations/1672211594766-AlterCandidateTable.ts
@@ -1,5 +1,5 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AlterCandidateTable1672211594766 implements MigrationInterface {
 
@@ -11,6 +11,8 @@ export class AlterCandidateTable1672211594766 implements MigrationInterface {
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1673005639130-AlterTimeLogTable.ts b/packages/core/src/database/migrations/1673005639130-AlterTimeLogTable.ts
index 43bbcf8741f..5cd1268d4af 100644
--- a/packages/core/src/database/migrations/1673005639130-AlterTimeLogTable.ts
+++ b/packages/core/src/database/migrations/1673005639130-AlterTimeLogTable.ts
@@ -1,5 +1,5 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AlterTimeLogTable1673005639130 implements MigrationInterface {
 
@@ -11,6 +11,8 @@ export class AlterTimeLogTable1673005639130 implements MigrationInterface {
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1673423542165-AlterTaskTable.ts b/packages/core/src/database/migrations/1673423542165-AlterTaskTable.ts
index 9f04d53f641..042d384061c 100644
--- a/packages/core/src/database/migrations/1673423542165-AlterTaskTable.ts
+++ b/packages/core/src/database/migrations/1673423542165-AlterTaskTable.ts
@@ -1,5 +1,5 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AlterTaskTable1673423542165 implements MigrationInterface {
 
@@ -11,6 +11,8 @@ export class AlterTaskTable1673423542165 implements MigrationInterface {
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1673589923548-CreateStatusTable.ts b/packages/core/src/database/migrations/1673589923548-CreateStatusTable.ts
index 67b58301692..5ad701a56f5 100644
--- a/packages/core/src/database/migrations/1673589923548-CreateStatusTable.ts
+++ b/packages/core/src/database/migrations/1673589923548-CreateStatusTable.ts
@@ -1,4 +1,5 @@
 import { MigrationInterface, QueryRunner } from 'typeorm';
+import * as chalk from "chalk";
 
 export class CreateStatusTable1673589923548 implements MigrationInterface {
 	name = 'CreateStatusTable1673589923548';
@@ -9,6 +10,8 @@ export class CreateStatusTable1673589923548 implements MigrationInterface {
 	 * @param queryRunner
 	 */
 	public async up(queryRunner: QueryRunner): Promise<any> {
+		console.log(chalk.yellow(this.name + ' start running!'));
+
 		if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
 			await this.sqliteUpQueryRunner(queryRunner);
 		} else {
diff --git a/packages/core/src/database/migrations/1673946248066-AlterTaskTable.ts b/packages/core/src/database/migrations/1673946248066-AlterTaskTable.ts
index f29d2c84a60..cf13188cbb0 100644
--- a/packages/core/src/database/migrations/1673946248066-AlterTaskTable.ts
+++ b/packages/core/src/database/migrations/1673946248066-AlterTaskTable.ts
@@ -1,5 +1,5 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AlterTaskTable1673946248066 implements MigrationInterface {
 
@@ -11,6 +11,8 @@ export class AlterTaskTable1673946248066 implements MigrationInterface {
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1674044473393-SeedDefaultGlobalTaskStatus.ts b/packages/core/src/database/migrations/1674044473393-SeedDefaultGlobalTaskStatus.ts
index 8e901d0d3e3..4c1306ce52d 100644
--- a/packages/core/src/database/migrations/1674044473393-SeedDefaultGlobalTaskStatus.ts
+++ b/packages/core/src/database/migrations/1674044473393-SeedDefaultGlobalTaskStatus.ts
@@ -1,5 +1,5 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 import { v4 as uuidV4 } from 'uuid';
 import { DEFAULT_GLOBAL_STATUSES } from "./../../tasks/statuses/default-global-statuses";
 
@@ -13,6 +13,8 @@ export class SeedDefaultGlobalTaskStatus1674044473393 implements MigrationInterf
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         try {
             for await (const status of DEFAULT_GLOBAL_STATUSES) {
                 const payload = Object.values(status);
@@ -36,5 +38,5 @@ export class SeedDefaultGlobalTaskStatus1674044473393 implements MigrationInterf
     *
     * @param queryRunner
     */
-    public async down(queryRunner: QueryRunner): Promise<any> {}
+    public async down(queryRunner: QueryRunner): Promise<any> { }
 }
diff --git a/packages/core/src/database/migrations/1674109138954-AlterEmailSentTable.ts b/packages/core/src/database/migrations/1674109138954-AlterEmailSentTable.ts
index 1cd078988be..5a5a4eecabf 100644
--- a/packages/core/src/database/migrations/1674109138954-AlterEmailSentTable.ts
+++ b/packages/core/src/database/migrations/1674109138954-AlterEmailSentTable.ts
@@ -1,5 +1,5 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AlterEmailSentTable1674109138954 implements MigrationInterface {
 
@@ -11,6 +11,8 @@ export class AlterEmailSentTable1674109138954 implements MigrationInterface {
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1674535367176-CreateTaskPriorityTable.ts b/packages/core/src/database/migrations/1674535367176-CreateTaskPriorityTable.ts
index 7f459e0664c..88baee671ca 100644
--- a/packages/core/src/database/migrations/1674535367176-CreateTaskPriorityTable.ts
+++ b/packages/core/src/database/migrations/1674535367176-CreateTaskPriorityTable.ts
@@ -1,5 +1,5 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class CreateTaskPriorityTable1674535367176 implements MigrationInterface {
 
@@ -11,6 +11,8 @@ export class CreateTaskPriorityTable1674535367176 implements MigrationInterface
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1674538040466-CreateTaskSizeTable.ts b/packages/core/src/database/migrations/1674538040466-CreateTaskSizeTable.ts
index 44842f206c4..ea5e80a7e26 100644
--- a/packages/core/src/database/migrations/1674538040466-CreateTaskSizeTable.ts
+++ b/packages/core/src/database/migrations/1674538040466-CreateTaskSizeTable.ts
@@ -1,5 +1,5 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class CreateTaskSizeTable1674538040466 implements MigrationInterface {
 
@@ -11,6 +11,8 @@ export class CreateTaskSizeTable1674538040466 implements MigrationInterface {
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1674638501088-SeedDefaultGlobalTaskPriorityAndSize.ts b/packages/core/src/database/migrations/1674638501088-SeedDefaultGlobalTaskPriorityAndSize.ts
index 1cfb0475e90..efaf084326e 100644
--- a/packages/core/src/database/migrations/1674638501088-SeedDefaultGlobalTaskPriorityAndSize.ts
+++ b/packages/core/src/database/migrations/1674638501088-SeedDefaultGlobalTaskPriorityAndSize.ts
@@ -1,5 +1,5 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 import { v4 as uuidV4 } from 'uuid';
 import { DEFAULT_GLOBAL_PRIORITIES } from "./../../tasks/priorities/default-global-priorities";
 import { DEFAULT_GLOBAL_SIZES } from "./../../tasks/sizes/default-global-sizes";
@@ -14,6 +14,8 @@ export class SeedDefaultGlobalTaskPriorityAndSize1674638501088 implements Migrat
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         await this.seedDefaultTaskPriorities(queryRunner);
         await this.seedDefaultTaskSizes(queryRunner);
     }
@@ -23,7 +25,7 @@ export class SeedDefaultGlobalTaskPriorityAndSize1674638501088 implements Migrat
     *
     * @param queryRunner
     */
-    public async down(queryRunner: QueryRunner): Promise<any> {}
+    public async down(queryRunner: QueryRunner): Promise<any> { }
 
     /**
      * Default global task priorities
diff --git a/packages/core/src/database/migrations/1674749291896-RenamedTaskStatusTable.ts b/packages/core/src/database/migrations/1674749291896-RenamedTaskStatusTable.ts
index 2bfab6739cb..e6101bd7d14 100644
--- a/packages/core/src/database/migrations/1674749291896-RenamedTaskStatusTable.ts
+++ b/packages/core/src/database/migrations/1674749291896-RenamedTaskStatusTable.ts
@@ -1,5 +1,5 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class RenamedTaskStatusTable1674749291896 implements MigrationInterface {
 
@@ -11,6 +11,8 @@ export class RenamedTaskStatusTable1674749291896 implements MigrationInterface {
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         await queryRunner.query(`ALTER TABLE "status" RENAME TO "task_status"`);
     }
 
diff --git a/packages/core/src/database/migrations/1675186090641-AlterTaskStatusTable.ts b/packages/core/src/database/migrations/1675186090641-AlterTaskStatusTable.ts
index 03b5fe29254..49632903748 100644
--- a/packages/core/src/database/migrations/1675186090641-AlterTaskStatusTable.ts
+++ b/packages/core/src/database/migrations/1675186090641-AlterTaskStatusTable.ts
@@ -1,5 +1,5 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AlterTaskStatusTable1675186090641 implements MigrationInterface {
 
@@ -11,6 +11,8 @@ export class AlterTaskStatusTable1675186090641 implements MigrationInterface {
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1675240711524-CreateEmployeePhoneTable.ts b/packages/core/src/database/migrations/1675240711524-CreateEmployeePhoneTable.ts
index da29021d053..3d90836814f 100644
--- a/packages/core/src/database/migrations/1675240711524-CreateEmployeePhoneTable.ts
+++ b/packages/core/src/database/migrations/1675240711524-CreateEmployeePhoneTable.ts
@@ -1,4 +1,5 @@
 import { MigrationInterface, QueryRunner } from 'typeorm';
+import * as chalk from "chalk";
 
 export class CreateEmployeePhoneTable1675240711524 implements MigrationInterface {
 	name = 'CreateEmployeePhoneTable1675240711524';
@@ -9,6 +10,8 @@ export class CreateEmployeePhoneTable1675240711524 implements MigrationInterface
 	 * @param queryRunner
 	 */
 	public async up(queryRunner: QueryRunner): Promise<any> {
+		console.log(chalk.yellow(this.name + ' start running!'));
+
 		if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
 			await this.sqliteUpQueryRunner(queryRunner);
 		} else {
diff --git a/packages/core/src/database/migrations/1675241589518-AlterUserTable.ts b/packages/core/src/database/migrations/1675241589518-AlterUserTable.ts
index ab701043850..f3e04c1d39f 100644
--- a/packages/core/src/database/migrations/1675241589518-AlterUserTable.ts
+++ b/packages/core/src/database/migrations/1675241589518-AlterUserTable.ts
@@ -1,4 +1,5 @@
 import { MigrationInterface, QueryRunner } from 'typeorm';
+import * as chalk from "chalk";
 
 export class AlterUserTable1675241589518 implements MigrationInterface {
 	name = 'AlterUserTable1675241589518';
@@ -9,6 +10,8 @@ export class AlterUserTable1675241589518 implements MigrationInterface {
 	 * @param queryRunner
 	 */
 	public async up(queryRunner: QueryRunner): Promise<any> {
+		console.log(chalk.yellow(this.name + ' start running!'));
+
 		if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
 			await this.sqliteUpQueryRunner(queryRunner);
 		} else {
diff --git a/packages/core/src/database/migrations/1675410785835-AlterTaskTable.ts b/packages/core/src/database/migrations/1675410785835-AlterTaskTable.ts
index 684217e8cc8..6d2189a822e 100644
--- a/packages/core/src/database/migrations/1675410785835-AlterTaskTable.ts
+++ b/packages/core/src/database/migrations/1675410785835-AlterTaskTable.ts
@@ -1,5 +1,5 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AlterTaskTable1675410785835 implements MigrationInterface {
 
@@ -11,6 +11,8 @@ export class AlterTaskTable1675410785835 implements MigrationInterface {
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1675687502784-AddTimeZoneColumnToUserTable.ts b/packages/core/src/database/migrations/1675687502784-AddTimeZoneColumnToUserTable.ts
index a47d9a50f4f..5bed53fbbe4 100644
--- a/packages/core/src/database/migrations/1675687502784-AddTimeZoneColumnToUserTable.ts
+++ b/packages/core/src/database/migrations/1675687502784-AddTimeZoneColumnToUserTable.ts
@@ -1,5 +1,5 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AddTimeZoneColumnToUserTable1675687502784 implements MigrationInterface {
 
@@ -11,6 +11,8 @@ export class AddTimeZoneColumnToUserTable1675687502784 implements MigrationInter
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1676351186923-AlterOrganizationTeamTable.ts b/packages/core/src/database/migrations/1676351186923-AlterOrganizationTeamTable.ts
index 65e9f518e0f..3c723b27574 100644
--- a/packages/core/src/database/migrations/1676351186923-AlterOrganizationTeamTable.ts
+++ b/packages/core/src/database/migrations/1676351186923-AlterOrganizationTeamTable.ts
@@ -1,5 +1,5 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AlterOrganizationTeamTable1676351186923 implements MigrationInterface {
 
@@ -11,6 +11,8 @@ export class AlterOrganizationTeamTable1676351186923 implements MigrationInterfa
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1676477607906-AddTimeTrackingColumnToOrganizationTeamEmployeeTable.ts b/packages/core/src/database/migrations/1676477607906-AddTimeTrackingColumnToOrganizationTeamEmployeeTable.ts
index 90ccca59881..2d3eff79bcc 100644
--- a/packages/core/src/database/migrations/1676477607906-AddTimeTrackingColumnToOrganizationTeamEmployeeTable.ts
+++ b/packages/core/src/database/migrations/1676477607906-AddTimeTrackingColumnToOrganizationTeamEmployeeTable.ts
@@ -1,5 +1,5 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AddTimeTrackingColumnToOrganizationTeamEmployeeTable1676477607906 implements MigrationInterface {
 
@@ -11,6 +11,8 @@ export class AddTimeTrackingColumnToOrganizationTeamEmployeeTable1676477607906 i
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1676630369336-AddLogoToOrganizationTeamTable.ts b/packages/core/src/database/migrations/1676630369336-AddLogoToOrganizationTeamTable.ts
index ccb6c80db2f..c2974bdbd68 100644
--- a/packages/core/src/database/migrations/1676630369336-AddLogoToOrganizationTeamTable.ts
+++ b/packages/core/src/database/migrations/1676630369336-AddLogoToOrganizationTeamTable.ts
@@ -1,5 +1,5 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AddLogoToOrganizationTeamTable1676630369336 implements MigrationInterface {
 
@@ -11,6 +11,8 @@ export class AddLogoToOrganizationTeamTable1676630369336 implements MigrationInt
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1676827319035-AlterEmployeeTable.ts b/packages/core/src/database/migrations/1676827319035-AlterEmployeeTable.ts
index 1e0df6cbd52..30026c41e1e 100644
--- a/packages/core/src/database/migrations/1676827319035-AlterEmployeeTable.ts
+++ b/packages/core/src/database/migrations/1676827319035-AlterEmployeeTable.ts
@@ -1,5 +1,5 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AlterEmployeeTable1676827319035 implements MigrationInterface {
 
@@ -11,6 +11,8 @@ export class AlterEmployeeTable1676827319035 implements MigrationInterface {
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1676870424741-SeedTaskPriorityAndSizeAndStatusIcon.ts b/packages/core/src/database/migrations/1676870424741-SeedTaskPriorityAndSizeAndStatusIcon.ts
index 34883581ceb..a3ddff31e55 100644
--- a/packages/core/src/database/migrations/1676870424741-SeedTaskPriorityAndSizeAndStatusIcon.ts
+++ b/packages/core/src/database/migrations/1676870424741-SeedTaskPriorityAndSizeAndStatusIcon.ts
@@ -1,5 +1,5 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 import { getConfig } from "@gauzy/config";
 import { copyAssets } from "./../../core/seeds/utils";
 import { DEFAULT_GLOBAL_PRIORITIES } from "./../../tasks/priorities/default-global-priorities";
@@ -17,6 +17,8 @@ export class SeedTaskPriorityAndSizeAndStatusIcon1676870424741 implements Migrat
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         await this.seedTaskStatusIcon(queryRunner);
         await this.seedTaskPriorityIcon(queryRunner);
         await this.seedTaskSizeIcon(queryRunner);
@@ -38,10 +40,10 @@ export class SeedTaskPriorityAndSizeAndStatusIcon1676870424741 implements Migrat
             for await (const status of DEFAULT_GLOBAL_STATUSES) {
                 const { name, value, icon, color } = status;
                 const filepath = `ever-icons/${icon}`;
-				let  query = `UPDATE "task_status" SET "icon" = '${filepath}', "color" = '${color}' WHERE ("name" = $1 AND "value" = $2) AND ("tenantId" IS NULL AND "organizationId" IS NULL)`;
-				if(['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
-					 query = `UPDATE "task_status" SET "icon" = '${filepath}', "color" = '${color}' WHERE ("name" = ? AND "value" = ?) AND ("tenantId" IS NULL AND "organizationId" IS NULL)`;
-				}
+                let query = `UPDATE "task_status" SET "icon" = '${filepath}', "color" = '${color}' WHERE ("name" = $1 AND "value" = $2) AND ("tenantId" IS NULL AND "organizationId" IS NULL)`;
+                if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
+                    query = `UPDATE "task_status" SET "icon" = '${filepath}', "color" = '${color}' WHERE ("name" = ? AND "value" = ?) AND ("tenantId" IS NULL AND "organizationId" IS NULL)`;
+                }
                 await queryRunner.connection.manager.query(query, [name, value]);
                 copyAssets(status.icon, this.config);
             }
@@ -60,10 +62,10 @@ export class SeedTaskPriorityAndSizeAndStatusIcon1676870424741 implements Migrat
             for await (const priority of DEFAULT_GLOBAL_PRIORITIES) {
                 const { name, value, icon, color } = priority;
                 const filepath = `ever-icons/${icon}`;
-				let query = `UPDATE "task_priority" SET "icon" = '${filepath}', "color" = '${color}' WHERE ("name" = $1 AND "value" = $2) AND ("tenantId" IS NULL AND "organizationId" IS NULL)`;
-				if(['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
-					query = `UPDATE "task_priority" SET "icon" = '${filepath}', "color" = '${color}' WHERE ("name" = ? AND "value" = ?) AND ("tenantId" IS NULL AND "organizationId" IS NULL)`;
-				}
+                let query = `UPDATE "task_priority" SET "icon" = '${filepath}', "color" = '${color}' WHERE ("name" = $1 AND "value" = $2) AND ("tenantId" IS NULL AND "organizationId" IS NULL)`;
+                if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
+                    query = `UPDATE "task_priority" SET "icon" = '${filepath}', "color" = '${color}' WHERE ("name" = ? AND "value" = ?) AND ("tenantId" IS NULL AND "organizationId" IS NULL)`;
+                }
                 await queryRunner.connection.manager.query(query, [name, value]);
                 copyAssets(priority.icon, this.config);
             }
@@ -82,10 +84,10 @@ export class SeedTaskPriorityAndSizeAndStatusIcon1676870424741 implements Migrat
             for await (const size of DEFAULT_GLOBAL_SIZES) {
                 const { name, value, icon, color } = size;
                 const filepath = `ever-icons/${icon}`;
-				let query = `UPDATE "task_size" SET "icon" = '${filepath}', "color" = '${color}' WHERE ("name" = $1 AND "value" = $2) AND ("tenantId" IS NULL AND "organizationId" IS NULL)`;
-				if(['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
-					 query = `UPDATE "task_size" SET "icon" = '${filepath}', "color" = '${color}' WHERE ("name" = ? AND "value" = ?) AND ("tenantId" IS NULL AND "organizationId" IS NULL)`;
-				}
+                let query = `UPDATE "task_size" SET "icon" = '${filepath}', "color" = '${color}' WHERE ("name" = $1 AND "value" = $2) AND ("tenantId" IS NULL AND "organizationId" IS NULL)`;
+                if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
+                    query = `UPDATE "task_size" SET "icon" = '${filepath}', "color" = '${color}' WHERE ("name" = ? AND "value" = ?) AND ("tenantId" IS NULL AND "organizationId" IS NULL)`;
+                }
                 await queryRunner.connection.manager.query(query, [name, value]);
                 copyAssets(size.icon, this.config);
             }
diff --git a/packages/core/src/database/migrations/1676978573552-AlterOrganizationTable.ts b/packages/core/src/database/migrations/1676978573552-AlterOrganizationTable.ts
index 3924b61f0d3..68f77ee1d0d 100644
--- a/packages/core/src/database/migrations/1676978573552-AlterOrganizationTable.ts
+++ b/packages/core/src/database/migrations/1676978573552-AlterOrganizationTable.ts
@@ -1,5 +1,5 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AlterOrganizationTable1676828580883 implements MigrationInterface {
 
@@ -11,6 +11,8 @@ export class AlterOrganizationTable1676828580883 implements MigrationInterface {
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1677063195155-AlterOrganizationTeamTable.ts b/packages/core/src/database/migrations/1677063195155-AlterOrganizationTeamTable.ts
index 23e78aca41a..e45b8a12894 100644
--- a/packages/core/src/database/migrations/1677063195155-AlterOrganizationTeamTable.ts
+++ b/packages/core/src/database/migrations/1677063195155-AlterOrganizationTeamTable.ts
@@ -1,5 +1,5 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AlterOrganizationTeamTable1677063195155 implements MigrationInterface {
 
@@ -11,6 +11,8 @@ export class AlterOrganizationTeamTable1677063195155 implements MigrationInterfa
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1677142065591-AlterTagTable.ts b/packages/core/src/database/migrations/1677142065591-AlterTagTable.ts
index 1f385dd25f3..69e72a91e00 100644
--- a/packages/core/src/database/migrations/1677142065591-AlterTagTable.ts
+++ b/packages/core/src/database/migrations/1677142065591-AlterTagTable.ts
@@ -1,5 +1,5 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AlterTagTable1677142065591 implements MigrationInterface {
 
@@ -11,6 +11,8 @@ export class AlterTagTable1677142065591 implements MigrationInterface {
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1677156446733-AlterTaskTable.ts b/packages/core/src/database/migrations/1677156446733-AlterTaskTable.ts
index 4e276a35a81..ae63ddc59fa 100644
--- a/packages/core/src/database/migrations/1677156446733-AlterTaskTable.ts
+++ b/packages/core/src/database/migrations/1677156446733-AlterTaskTable.ts
@@ -1,5 +1,5 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AlterTaskTable1677156446733 implements MigrationInterface {
 
@@ -11,6 +11,8 @@ export class AlterTaskTable1677156446733 implements MigrationInterface {
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1677313663312-AlterEmployeeTable.ts b/packages/core/src/database/migrations/1677313663312-AlterEmployeeTable.ts
index 1efa8e45eb9..698d2a1ac5a 100644
--- a/packages/core/src/database/migrations/1677313663312-AlterEmployeeTable.ts
+++ b/packages/core/src/database/migrations/1677313663312-AlterEmployeeTable.ts
@@ -1,5 +1,5 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AlterEmployeeTable1677313663312 implements MigrationInterface {
 
@@ -11,6 +11,8 @@ export class AlterEmployeeTable1677313663312 implements MigrationInterface {
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1677508195152-AlterScreenshotTable.ts b/packages/core/src/database/migrations/1677508195152-AlterScreenshotTable.ts
index 87784ff768f..dcc97762dcb 100644
--- a/packages/core/src/database/migrations/1677508195152-AlterScreenshotTable.ts
+++ b/packages/core/src/database/migrations/1677508195152-AlterScreenshotTable.ts
@@ -1,5 +1,5 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AlterScreenshotTable1677508195152 implements MigrationInterface {
 
@@ -11,6 +11,8 @@ export class AlterScreenshotTable1677508195152 implements MigrationInterface {
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1678187685289-CreateOrganizationTeamJoinRequestTable.ts b/packages/core/src/database/migrations/1678187685289-CreateOrganizationTeamJoinRequestTable.ts
index 6b3a99dfcc2..5612936d642 100644
--- a/packages/core/src/database/migrations/1678187685289-CreateOrganizationTeamJoinRequestTable.ts
+++ b/packages/core/src/database/migrations/1678187685289-CreateOrganizationTeamJoinRequestTable.ts
@@ -1,4 +1,5 @@
 import { MigrationInterface, QueryRunner } from 'typeorm';
+import * as chalk from "chalk";
 
 export class CreateOrganizationTeamJoinRequestTable1678187685289 implements MigrationInterface {
 	name = 'CreateOrganizationTeamJoinRequestTable1678187685289';
@@ -9,6 +10,8 @@ export class CreateOrganizationTeamJoinRequestTable1678187685289 implements Migr
 	 * @param queryRunner
 	 */
 	public async up(queryRunner: QueryRunner): Promise<any> {
+		console.log(chalk.yellow(this.name + ' start running!'));
+
 		if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
 			await this.sqliteUpQueryRunner(queryRunner);
 		} else {
diff --git a/packages/core/src/database/migrations/1678190791247-CreateEmailResetTable.ts b/packages/core/src/database/migrations/1678190791247-CreateEmailResetTable.ts
index cb536e26438..98f157bcb2c 100644
--- a/packages/core/src/database/migrations/1678190791247-CreateEmailResetTable.ts
+++ b/packages/core/src/database/migrations/1678190791247-CreateEmailResetTable.ts
@@ -1,5 +1,5 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class CreateEmailResetTable1678190791247 implements MigrationInterface {
 
@@ -11,6 +11,8 @@ export class CreateEmailResetTable1678190791247 implements MigrationInterface {
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1678436030249-AlterOrganizationTeamTable.ts b/packages/core/src/database/migrations/1678436030249-AlterOrganizationTeamTable.ts
index cfba65adc22..34fda4efa29 100644
--- a/packages/core/src/database/migrations/1678436030249-AlterOrganizationTeamTable.ts
+++ b/packages/core/src/database/migrations/1678436030249-AlterOrganizationTeamTable.ts
@@ -1,5 +1,5 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AlterOrganizationTeamTable1678436030249 implements MigrationInterface {
 
@@ -11,6 +11,8 @@ export class AlterOrganizationTeamTable1678436030249 implements MigrationInterfa
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1678461100447-AlterEmailResetTable.ts b/packages/core/src/database/migrations/1678461100447-AlterEmailResetTable.ts
index 19b0238aa18..3a7ff2e51d0 100644
--- a/packages/core/src/database/migrations/1678461100447-AlterEmailResetTable.ts
+++ b/packages/core/src/database/migrations/1678461100447-AlterEmailResetTable.ts
@@ -1,5 +1,5 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AlterEmailResetTable1678461100447 implements MigrationInterface {
 
@@ -11,6 +11,8 @@ export class AlterEmailResetTable1678461100447 implements MigrationInterface {
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1678876700413-EmailTemplateReader.ts b/packages/core/src/database/migrations/1678876700413-EmailTemplateReader.ts
index a73b587ac81..6012adfc828 100644
--- a/packages/core/src/database/migrations/1678876700413-EmailTemplateReader.ts
+++ b/packages/core/src/database/migrations/1678876700413-EmailTemplateReader.ts
@@ -1,5 +1,5 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 import { EmailTemplateEnum } from '@gauzy/contracts';
 import { EmailTemplateUtils } from './../../email-template/utils';
 
@@ -13,6 +13,8 @@ export class EmailTemplateReader1678876700413 implements MigrationInterface {
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         try {
             await EmailTemplateUtils.migrateEmailTemplates(
                 queryRunner,
diff --git a/packages/core/src/database/migrations/1679055440296-AlterTaskStatusTableTaskSizeTableTaskPriorityTable.ts b/packages/core/src/database/migrations/1679055440296-AlterTaskStatusTableTaskSizeTableTaskPriorityTable.ts
index 9e113c4bae1..b0a064e1e34 100644
--- a/packages/core/src/database/migrations/1679055440296-AlterTaskStatusTableTaskSizeTableTaskPriorityTable.ts
+++ b/packages/core/src/database/migrations/1679055440296-AlterTaskStatusTableTaskSizeTableTaskPriorityTable.ts
@@ -1,5 +1,5 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AlterTaskStatusTableTaskSizeTableTaskPriorityTable1679055440296 implements MigrationInterface {
 
@@ -11,6 +11,8 @@ export class AlterTaskStatusTableTaskSizeTableTaskPriorityTable1679055440296 imp
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1679119603264-AlterOrganizationTeamJoinRequestTable.ts b/packages/core/src/database/migrations/1679119603264-AlterOrganizationTeamJoinRequestTable.ts
index 0d129fba1f0..4e1acaa3d6e 100644
--- a/packages/core/src/database/migrations/1679119603264-AlterOrganizationTeamJoinRequestTable.ts
+++ b/packages/core/src/database/migrations/1679119603264-AlterOrganizationTeamJoinRequestTable.ts
@@ -1,5 +1,5 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AlterOrganizationTeamJoinRequestTable1679119603264 implements MigrationInterface {
 
@@ -11,6 +11,8 @@ export class AlterOrganizationTeamJoinRequestTable1679119603264 implements Migra
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1679308324164-AlterImageAssetTable.ts b/packages/core/src/database/migrations/1679308324164-AlterImageAssetTable.ts
index 316c4c6070c..a94f84bbb10 100644
--- a/packages/core/src/database/migrations/1679308324164-AlterImageAssetTable.ts
+++ b/packages/core/src/database/migrations/1679308324164-AlterImageAssetTable.ts
@@ -1,5 +1,5 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AlterImageAssetTable1679308324164 implements MigrationInterface {
 
@@ -11,6 +11,8 @@ export class AlterImageAssetTable1679308324164 implements MigrationInterface {
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1679406665415-AddImageAssetColumnToTables.ts b/packages/core/src/database/migrations/1679406665415-AddImageAssetColumnToTables.ts
index fe53b2e80b8..e2a8acfc655 100644
--- a/packages/core/src/database/migrations/1679406665415-AddImageAssetColumnToTables.ts
+++ b/packages/core/src/database/migrations/1679406665415-AddImageAssetColumnToTables.ts
@@ -1,5 +1,5 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AddImageAssetColumnToTables1679406665415 implements MigrationInterface {
 
@@ -11,6 +11,8 @@ export class AddImageAssetColumnToTables1679406665415 implements MigrationInterf
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1679676292810-AddImageAssetColumnToTheOrganizationTable.ts b/packages/core/src/database/migrations/1679676292810-AddImageAssetColumnToTheOrganizationTable.ts
index 5de65ba3377..1017eadb428 100644
--- a/packages/core/src/database/migrations/1679676292810-AddImageAssetColumnToTheOrganizationTable.ts
+++ b/packages/core/src/database/migrations/1679676292810-AddImageAssetColumnToTheOrganizationTable.ts
@@ -1,5 +1,5 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AddImageAssetColumnToTheOrganizationTable1679676292810 implements MigrationInterface {
 
@@ -11,6 +11,8 @@ export class AddImageAssetColumnToTheOrganizationTable1679676292810 implements M
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1679724221071-AddImageAssetColumnToTheProductCategoryTable.ts b/packages/core/src/database/migrations/1679724221071-AddImageAssetColumnToTheProductCategoryTable.ts
index a081d93539a..c294923daf4 100644
--- a/packages/core/src/database/migrations/1679724221071-AddImageAssetColumnToTheProductCategoryTable.ts
+++ b/packages/core/src/database/migrations/1679724221071-AddImageAssetColumnToTheProductCategoryTable.ts
@@ -1,5 +1,5 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AddImageAssetColumnToTheProductCategoryTable1679724221071 implements MigrationInterface {
 
@@ -11,6 +11,8 @@ export class AddImageAssetColumnToTheProductCategoryTable1679724221071 implement
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1679765443208-MigrateRolePermisisons.ts b/packages/core/src/database/migrations/1679765443208-MigrateRolePermisisons.ts
index c925b6fafa2..e3b3c5fbaed 100644
--- a/packages/core/src/database/migrations/1679765443208-MigrateRolePermisisons.ts
+++ b/packages/core/src/database/migrations/1679765443208-MigrateRolePermisisons.ts
@@ -1,5 +1,6 @@
-import { RolePermissionUtils } from './../../role-permission/utils';
 import { MigrationInterface, QueryRunner } from 'typeorm';
+import * as chalk from "chalk";
+import { RolePermissionUtils } from './../../role-permission/utils';
 
 export class MigrateRolePermisisons1679765443208 implements MigrationInterface {
 	name = 'MigrateRolePermisisons1679765443208';
@@ -10,6 +11,8 @@ export class MigrateRolePermisisons1679765443208 implements MigrationInterface {
 	 * @param queryRunner
 	 */
 	public async up(queryRunner: QueryRunner): Promise<any> {
+		console.log(chalk.yellow(this.name + ' start running!'));
+
 		try {
 			await RolePermissionUtils.migrateRolePermissions(queryRunner);
 		} catch (error) {
@@ -22,5 +25,5 @@ export class MigrateRolePermisisons1679765443208 implements MigrationInterface {
 	 *
 	 * @param queryRunner
 	 */
-	public async down(queryRunner: QueryRunner): Promise<any> {}
+	public async down(queryRunner: QueryRunner): Promise<any> { }
 }
diff --git a/packages/core/src/database/migrations/1680071714132-CreateIssueTypeTable.ts b/packages/core/src/database/migrations/1680071714132-CreateIssueTypeTable.ts
index eac3e717d95..3a3163cd4d7 100644
--- a/packages/core/src/database/migrations/1680071714132-CreateIssueTypeTable.ts
+++ b/packages/core/src/database/migrations/1680071714132-CreateIssueTypeTable.ts
@@ -1,5 +1,5 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class CreateIssueTypeTable1680071714132 implements MigrationInterface {
 
@@ -11,6 +11,8 @@ export class CreateIssueTypeTable1680071714132 implements MigrationInterface {
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1680082411434-AddIssueTypeColumnToTheTaskTable.ts b/packages/core/src/database/migrations/1680082411434-AddIssueTypeColumnToTheTaskTable.ts
index 23ed7ac16fa..e427ba5152d 100644
--- a/packages/core/src/database/migrations/1680082411434-AddIssueTypeColumnToTheTaskTable.ts
+++ b/packages/core/src/database/migrations/1680082411434-AddIssueTypeColumnToTheTaskTable.ts
@@ -1,5 +1,5 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AddIssueTypeColumnToTheTaskTable1680082411434 implements MigrationInterface {
 
@@ -11,6 +11,8 @@ export class AddIssueTypeColumnToTheTaskTable1680082411434 implements MigrationI
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1680108987586-AddIndexesColumnsToTheTimeSlotTable.ts b/packages/core/src/database/migrations/1680108987586-AddIndexesColumnsToTheTimeSlotTable.ts
index 21e0e3073ba..ceef395d819 100644
--- a/packages/core/src/database/migrations/1680108987586-AddIndexesColumnsToTheTimeSlotTable.ts
+++ b/packages/core/src/database/migrations/1680108987586-AddIndexesColumnsToTheTimeSlotTable.ts
@@ -1,5 +1,5 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AddIndexesColumnsToTheTimeSlotTable1680108987586 implements MigrationInterface {
 
@@ -11,6 +11,8 @@ export class AddIndexesColumnsToTheTimeSlotTable1680108987586 implements Migrati
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1680110810109-AddIndexesColumnsToTheScreenshotTable.ts b/packages/core/src/database/migrations/1680110810109-AddIndexesColumnsToTheScreenshotTable.ts
index 42b1978824f..920c5904cf2 100644
--- a/packages/core/src/database/migrations/1680110810109-AddIndexesColumnsToTheScreenshotTable.ts
+++ b/packages/core/src/database/migrations/1680110810109-AddIndexesColumnsToTheScreenshotTable.ts
@@ -1,5 +1,5 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AddIndexesColumnsToTheScreenshotTable1680110810109 implements MigrationInterface {
 
@@ -11,6 +11,8 @@ export class AddIndexesColumnsToTheScreenshotTable1680110810109 implements Migra
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1680154573492-AddIndexesColumnsToTheActivityTable.ts b/packages/core/src/database/migrations/1680154573492-AddIndexesColumnsToTheActivityTable.ts
index 234fe73a2fc..72478887b34 100644
--- a/packages/core/src/database/migrations/1680154573492-AddIndexesColumnsToTheActivityTable.ts
+++ b/packages/core/src/database/migrations/1680154573492-AddIndexesColumnsToTheActivityTable.ts
@@ -1,5 +1,5 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AddIndexesColumnsToTheActivityTable1680154573492 implements MigrationInterface {
 
@@ -11,6 +11,8 @@ export class AddIndexesColumnsToTheActivityTable1680154573492 implements Migrati
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1680164421193-AddIndexesColumnsToTheTimesheetTable.ts b/packages/core/src/database/migrations/1680164421193-AddIndexesColumnsToTheTimesheetTable.ts
index 49f58e5300d..df7aae18a7f 100644
--- a/packages/core/src/database/migrations/1680164421193-AddIndexesColumnsToTheTimesheetTable.ts
+++ b/packages/core/src/database/migrations/1680164421193-AddIndexesColumnsToTheTimesheetTable.ts
@@ -1,5 +1,5 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AddIndexesColumnsToTheTimesheetTable1680164421193 implements MigrationInterface {
 
@@ -11,6 +11,8 @@ export class AddIndexesColumnsToTheTimesheetTable1680164421193 implements Migrat
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1680172332764-AddIndexesColumnsToTheTimeLogTable.ts b/packages/core/src/database/migrations/1680172332764-AddIndexesColumnsToTheTimeLogTable.ts
index 2ecb630367c..b285d7c942a 100644
--- a/packages/core/src/database/migrations/1680172332764-AddIndexesColumnsToTheTimeLogTable.ts
+++ b/packages/core/src/database/migrations/1680172332764-AddIndexesColumnsToTheTimeLogTable.ts
@@ -1,4 +1,5 @@
 import { MigrationInterface, QueryRunner } from 'typeorm';
+import * as chalk from "chalk";
 
 export class AddIndexesColumnsToTheTimeLogTable1680172332764 implements MigrationInterface {
 	name = 'AddIndexesColumnsToTheTimeLogTable1680172332764';
@@ -9,6 +10,8 @@ export class AddIndexesColumnsToTheTimeLogTable1680172332764 implements Migratio
 	 * @param queryRunner
 	 */
 	public async up(queryRunner: QueryRunner): Promise<any> {
+		console.log(chalk.yellow(this.name + ' start running!'));
+
 		if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
 			await this.sqliteUpQueryRunner(queryRunner);
 		} else {
diff --git a/packages/core/src/database/migrations/1680530165590-AlterJobSearchRelationalTables.ts b/packages/core/src/database/migrations/1680530165590-AlterJobSearchRelationalTables.ts
index 26f8c1ec58d..b09618f1832 100644
--- a/packages/core/src/database/migrations/1680530165590-AlterJobSearchRelationalTables.ts
+++ b/packages/core/src/database/migrations/1680530165590-AlterJobSearchRelationalTables.ts
@@ -1,5 +1,5 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AlterJobSearchRelationalTables1680530165590 implements MigrationInterface {
 
@@ -11,6 +11,8 @@ export class AlterJobSearchRelationalTables1680530165590 implements MigrationInt
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1680539459969-UpdateEmailTemplates.ts b/packages/core/src/database/migrations/1680539459969-UpdateEmailTemplates.ts
index 75173cea8f0..1f070619871 100644
--- a/packages/core/src/database/migrations/1680539459969-UpdateEmailTemplates.ts
+++ b/packages/core/src/database/migrations/1680539459969-UpdateEmailTemplates.ts
@@ -1,5 +1,5 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 import { EmailTemplateEnum } from '@gauzy/contracts';
 import { EmailTemplateUtils } from './../../email-template/utils';
 
@@ -13,6 +13,8 @@ export class UpdateEmailTemplates1680539459969 implements MigrationInterface {
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         const templates = Object.values(EmailTemplateEnum);
         await Promise.all(
             templates.map(
diff --git a/packages/core/src/database/migrations/1680622389221-SeedDafaultGlobalIssueType.ts b/packages/core/src/database/migrations/1680622389221-SeedDafaultGlobalIssueType.ts
index 74f82019ad7..e0ce0a073ea 100644
--- a/packages/core/src/database/migrations/1680622389221-SeedDafaultGlobalIssueType.ts
+++ b/packages/core/src/database/migrations/1680622389221-SeedDafaultGlobalIssueType.ts
@@ -1,4 +1,5 @@
 import { MigrationInterface, QueryRunner } from 'typeorm';
+import * as chalk from "chalk";
 import { v4 as uuidv4 } from 'uuid';
 import * as path from 'path';
 import * as fs from 'fs';
@@ -19,6 +20,8 @@ export class SeedDafaultGlobalIssueType1680622389221 implements MigrationInterfa
 	 * @param queryRunner
 	 */
 	public async up(queryRunner: QueryRunner): Promise<any> {
+		console.log(chalk.yellow(this.name + ' start running!'));
+
 		await this.seedDefaultIssueTypes(queryRunner);
 	}
 
diff --git a/packages/core/src/database/migrations/1680688280325-AddUpworkOrganizationIdToTheOrganizationTable.ts b/packages/core/src/database/migrations/1680688280325-AddUpworkOrganizationIdToTheOrganizationTable.ts
index 15644143c3a..ae6575fa4df 100644
--- a/packages/core/src/database/migrations/1680688280325-AddUpworkOrganizationIdToTheOrganizationTable.ts
+++ b/packages/core/src/database/migrations/1680688280325-AddUpworkOrganizationIdToTheOrganizationTable.ts
@@ -1,5 +1,5 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AddUpworkOrganizationIdToTheOrganizationTable1680688280325 implements MigrationInterface {
 
@@ -11,6 +11,8 @@ export class AddUpworkOrganizationIdToTheOrganizationTable1680688280325 implemen
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1680692867660-AlterEmployeeTable.ts b/packages/core/src/database/migrations/1680692867660-AlterEmployeeTable.ts
index ab374b9d996..000f4075e78 100644
--- a/packages/core/src/database/migrations/1680692867660-AlterEmployeeTable.ts
+++ b/packages/core/src/database/migrations/1680692867660-AlterEmployeeTable.ts
@@ -1,5 +1,5 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AlterEmployeeTable1680692867660 implements MigrationInterface {
 
@@ -11,6 +11,8 @@ export class AlterEmployeeTable1680692867660 implements MigrationInterface {
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1680866279166-AddDocumentAssetColumnToTheOrganizationDocumentTable.ts b/packages/core/src/database/migrations/1680866279166-AddDocumentAssetColumnToTheOrganizationDocumentTable.ts
index 46764826600..883433f19fa 100644
--- a/packages/core/src/database/migrations/1680866279166-AddDocumentAssetColumnToTheOrganizationDocumentTable.ts
+++ b/packages/core/src/database/migrations/1680866279166-AddDocumentAssetColumnToTheOrganizationDocumentTable.ts
@@ -1,5 +1,5 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AddDocumentAssetColumnToTheOrganizationDocumentTable1680866279166 implements MigrationInterface {
 
@@ -11,6 +11,8 @@ export class AddDocumentAssetColumnToTheOrganizationDocumentTable1680866279166 i
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1680871419966-AddDocumentAssetColumnToTheTimeOffRequestTable.ts b/packages/core/src/database/migrations/1680871419966-AddDocumentAssetColumnToTheTimeOffRequestTable.ts
index ed6ea27b611..ef598fd2eb1 100644
--- a/packages/core/src/database/migrations/1680871419966-AddDocumentAssetColumnToTheTimeOffRequestTable.ts
+++ b/packages/core/src/database/migrations/1680871419966-AddDocumentAssetColumnToTheTimeOffRequestTable.ts
@@ -1,5 +1,5 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AddDocumentAssetColumnToTheTimeOffRequestTable1680871419966 implements MigrationInterface {
 
@@ -11,6 +11,8 @@ export class AddDocumentAssetColumnToTheTimeOffRequestTable1680871419966 impleme
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1681132031905-AddEmployeeStatusColumnsToTheEmployeeTable.ts b/packages/core/src/database/migrations/1681132031905-AddEmployeeStatusColumnsToTheEmployeeTable.ts
index 36f50d3ff46..6255083614e 100644
--- a/packages/core/src/database/migrations/1681132031905-AddEmployeeStatusColumnsToTheEmployeeTable.ts
+++ b/packages/core/src/database/migrations/1681132031905-AddEmployeeStatusColumnsToTheEmployeeTable.ts
@@ -1,4 +1,5 @@
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AddEmployeeStatusColumnsToTheEmployeeTable1681132031905 implements MigrationInterface {
 
@@ -10,6 +11,8 @@ export class AddEmployeeStatusColumnsToTheEmployeeTable1681132031905 implements
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1681455351186-AddOrganizationTeamIdColumnToTheTimeLogTable.ts b/packages/core/src/database/migrations/1681455351186-AddOrganizationTeamIdColumnToTheTimeLogTable.ts
index 552cff5af94..2614b8eef18 100644
--- a/packages/core/src/database/migrations/1681455351186-AddOrganizationTeamIdColumnToTheTimeLogTable.ts
+++ b/packages/core/src/database/migrations/1681455351186-AddOrganizationTeamIdColumnToTheTimeLogTable.ts
@@ -1,5 +1,5 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AddOrganizationTeamIdColumnToTheTimeLogTable1681455351186 implements MigrationInterface {
 
@@ -11,6 +11,8 @@ export class AddOrganizationTeamIdColumnToTheTimeLogTable1681455351186 implement
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1686195290990-AlterOrganizationTeamTable.ts b/packages/core/src/database/migrations/1686195290990-AlterOrganizationTeamTable.ts
index 00024302f2b..94adf4bbd8f 100644
--- a/packages/core/src/database/migrations/1686195290990-AlterOrganizationTeamTable.ts
+++ b/packages/core/src/database/migrations/1686195290990-AlterOrganizationTeamTable.ts
@@ -1,4 +1,5 @@
 import { MigrationInterface, QueryRunner } from 'typeorm';
+import * as chalk from "chalk";
 
 export class AlterOrganizationTeamTable1686195290990 implements MigrationInterface {
 	name = 'AlterOrganizationTeamTable1686195290990';
@@ -9,6 +10,8 @@ export class AlterOrganizationTeamTable1686195290990 implements MigrationInterfa
 	 * @param queryRunner
 	 */
 	public async up(queryRunner: QueryRunner): Promise<any> {
+		console.log(chalk.yellow(this.name + ' start running!'));
+
 		if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
 			await this.sqliteUpQueryRunner(queryRunner);
 		} else {
diff --git a/packages/core/src/database/migrations/1687967010243-AddMinimumBillingRateColumnToEmployeeTable.ts b/packages/core/src/database/migrations/1687967010243-AddMinimumBillingRateColumnToEmployeeTable.ts
index 8bbcd1eb663..f87b1e7dc0d 100644
--- a/packages/core/src/database/migrations/1687967010243-AddMinimumBillingRateColumnToEmployeeTable.ts
+++ b/packages/core/src/database/migrations/1687967010243-AddMinimumBillingRateColumnToEmployeeTable.ts
@@ -1,4 +1,5 @@
 import { MigrationInterface, QueryRunner } from 'typeorm';
+import * as chalk from "chalk";
 
 export class AddMinimumBillingRateColumnToEmployeeTable1687967010243 implements MigrationInterface {
 	name = 'AddMinimumBillingRateColumnToEmployeeTable1687967010243';
@@ -9,6 +10,8 @@ export class AddMinimumBillingRateColumnToEmployeeTable1687967010243 implements
 	 * @param queryRunner
 	 */
 	public async up(queryRunner: QueryRunner): Promise<any> {
+		console.log(chalk.yellow(this.name + ' start running!'));
+
 		if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
 			await this.sqliteUpQueryRunner(queryRunner);
 		} else {
diff --git a/packages/core/src/database/migrations/1687967919076-AddMinimumBillingRateColumnToCandidateTable.ts b/packages/core/src/database/migrations/1687967919076-AddMinimumBillingRateColumnToCandidateTable.ts
index 401b71d46f6..5cb7bc4aaba 100644
--- a/packages/core/src/database/migrations/1687967919076-AddMinimumBillingRateColumnToCandidateTable.ts
+++ b/packages/core/src/database/migrations/1687967919076-AddMinimumBillingRateColumnToCandidateTable.ts
@@ -1,5 +1,5 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AddMinimumBillingRateColumnToCandidateTable1687967919076 implements MigrationInterface {
 
@@ -11,6 +11,8 @@ export class AddMinimumBillingRateColumnToCandidateTable1687967919076 implements
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1687974863736-CreateTaskVersionTable.ts b/packages/core/src/database/migrations/1687974863736-CreateTaskVersionTable.ts
index 3b40219b27a..31a5a1d738d 100644
--- a/packages/core/src/database/migrations/1687974863736-CreateTaskVersionTable.ts
+++ b/packages/core/src/database/migrations/1687974863736-CreateTaskVersionTable.ts
@@ -1,4 +1,5 @@
 import { MigrationInterface, QueryRunner } from 'typeorm';
+import * as chalk from "chalk";
 
 export class CreateTaskVersionTable1687974863736 implements MigrationInterface {
 	name = 'CreateTaskVersionTable1687974863736';
@@ -9,6 +10,8 @@ export class CreateTaskVersionTable1687974863736 implements MigrationInterface {
 	 * @param queryRunner
 	 */
 	public async up(queryRunner: QueryRunner): Promise<any> {
+		console.log(chalk.yellow(this.name + ' start running!'));
+
 		if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
 			await this.sqliteUpQueryRunner(queryRunner);
 		} else {
diff --git a/packages/core/src/database/migrations/1688122296981-AlterTableEmployee.ts b/packages/core/src/database/migrations/1688122296981-AlterTableEmployee.ts
index 7111d4f8205..97b39f486b5 100644
--- a/packages/core/src/database/migrations/1688122296981-AlterTableEmployee.ts
+++ b/packages/core/src/database/migrations/1688122296981-AlterTableEmployee.ts
@@ -1,5 +1,5 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AlterTableEmployee1688122296981 implements MigrationInterface {
 
@@ -11,6 +11,8 @@ export class AlterTableEmployee1688122296981 implements MigrationInterface {
 	* @param queryRunner
 	*/
 	public async up(queryRunner: QueryRunner): Promise<any> {
+		console.log(chalk.yellow(this.name + ' start running!'));
+
 		if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
 			await this.sqliteUpQueryRunner(queryRunner);
 		} else {
diff --git a/packages/core/src/database/migrations/1688168798377-CreateRelatedIssueTypeTable.ts b/packages/core/src/database/migrations/1688168798377-CreateRelatedIssueTypeTable.ts
index 3f2fba0efa6..84d203b2079 100644
--- a/packages/core/src/database/migrations/1688168798377-CreateRelatedIssueTypeTable.ts
+++ b/packages/core/src/database/migrations/1688168798377-CreateRelatedIssueTypeTable.ts
@@ -1,8 +1,8 @@
 import { MigrationInterface, QueryRunner } from 'typeorm';
+import * as chalk from "chalk";
+
+export class CreateRelatedIssueTypeTable1688168798377 implements MigrationInterface {
 
-export class CreateRelatedIssueTypeTable1688168798377
-	implements MigrationInterface
-{
 	name = 'CreateRelatedIssueTypeTable1688168798377';
 
 	/**
@@ -11,6 +11,8 @@ export class CreateRelatedIssueTypeTable1688168798377
 	 * @param queryRunner
 	 */
 	public async up(queryRunner: QueryRunner): Promise<any> {
+		console.log(chalk.yellow(this.name + ' start running!'));
+
 		if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
 			await this.sqliteUpQueryRunner(queryRunner);
 		} else {
diff --git a/packages/core/src/database/migrations/1688886388219-AddParentIdColumnToTaskTable.ts b/packages/core/src/database/migrations/1688886388219-AddParentIdColumnToTaskTable.ts
index bd3da2a89c4..3e60bc308c1 100644
--- a/packages/core/src/database/migrations/1688886388219-AddParentIdColumnToTaskTable.ts
+++ b/packages/core/src/database/migrations/1688886388219-AddParentIdColumnToTaskTable.ts
@@ -1,5 +1,5 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AddParentIdColumnToTaskTable1688886388219 implements MigrationInterface {
 
@@ -11,6 +11,8 @@ export class AddParentIdColumnToTaskTable1688886388219 implements MigrationInter
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1688966032457-AddRelatedIssueRelationToTaskTable.ts b/packages/core/src/database/migrations/1688966032457-AddRelatedIssueRelationToTaskTable.ts
index 1c9c4ff1372..e6af026329a 100644
--- a/packages/core/src/database/migrations/1688966032457-AddRelatedIssueRelationToTaskTable.ts
+++ b/packages/core/src/database/migrations/1688966032457-AddRelatedIssueRelationToTaskTable.ts
@@ -1,4 +1,5 @@
 import { MigrationInterface, QueryRunner } from 'typeorm';
+import * as chalk from "chalk";
 
 export class AddRelatedIssueRelationToTaskTable1688966032457 implements MigrationInterface {
 	name = 'AddRelatedIssueRelationToTaskTable1688966032457';
@@ -9,6 +10,8 @@ export class AddRelatedIssueRelationToTaskTable1688966032457 implements Migratio
 	 * @param queryRunner
 	 */
 	public async up(queryRunner: QueryRunner): Promise<any> {
+		console.log(chalk.yellow(this.name + ' start running!'));
+
 		if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
 			await this.sqliteUpQueryRunner(queryRunner);
 		} else {
diff --git a/packages/core/src/database/migrations/1689150247379-CreateTaskLinkedIssueTable.ts b/packages/core/src/database/migrations/1689150247379-CreateTaskLinkedIssueTable.ts
index b39e0150e92..bd7c19a6487 100644
--- a/packages/core/src/database/migrations/1689150247379-CreateTaskLinkedIssueTable.ts
+++ b/packages/core/src/database/migrations/1689150247379-CreateTaskLinkedIssueTable.ts
@@ -1,5 +1,5 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class CreateTaskLinkedIssueTable1689150247379 implements MigrationInterface {
 
@@ -11,6 +11,8 @@ export class CreateTaskLinkedIssueTable1689150247379 implements MigrationInterfa
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1689181881441-CreateOrganizationTaskSettingTable.ts b/packages/core/src/database/migrations/1689181881441-CreateOrganizationTaskSettingTable.ts
index b600e5e81f3..0d02fcbcf6b 100644
--- a/packages/core/src/database/migrations/1689181881441-CreateOrganizationTaskSettingTable.ts
+++ b/packages/core/src/database/migrations/1689181881441-CreateOrganizationTaskSettingTable.ts
@@ -1,5 +1,5 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class CreateOrganizationTaskSettingTable1689181881441 implements MigrationInterface {
 
@@ -11,6 +11,8 @@ export class CreateOrganizationTaskSettingTable1689181881441 implements Migratio
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1689611487195-DropTaskRelatedIssuesTable.ts b/packages/core/src/database/migrations/1689611487195-DropTaskRelatedIssuesTable.ts
index d616a34c67d..5bb1e67cb6b 100644
--- a/packages/core/src/database/migrations/1689611487195-DropTaskRelatedIssuesTable.ts
+++ b/packages/core/src/database/migrations/1689611487195-DropTaskRelatedIssuesTable.ts
@@ -1,5 +1,5 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class DropTaskRelatedIssuesTable1689611487195 implements MigrationInterface {
 
@@ -11,6 +11,8 @@ export class DropTaskRelatedIssuesTable1689611487195 implements MigrationInterfa
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
@@ -38,10 +40,10 @@ export class DropTaskRelatedIssuesTable1689611487195 implements MigrationInterfa
     */
     public async postgresUpQueryRunner(queryRunner: QueryRunner): Promise<any> {
         await queryRunner.query(`ALTER TABLE "task_related_issues" DROP CONSTRAINT "FK_425ec34e019f63336fe8d2940ce"`);
-		await queryRunner.query(`ALTER TABLE "task_related_issues" DROP CONSTRAINT "FK_c93e2e6d5d0e3a1d7af2725f9fc"`);
-		await queryRunner.query(`DROP INDEX "public"."IDX_425ec34e019f63336fe8d2940c"`);
-		await queryRunner.query(`DROP INDEX "public"."IDX_c93e2e6d5d0e3a1d7af2725f9f"`);
-		await queryRunner.query(`DROP TABLE "task_related_issues"`);
+        await queryRunner.query(`ALTER TABLE "task_related_issues" DROP CONSTRAINT "FK_c93e2e6d5d0e3a1d7af2725f9fc"`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_425ec34e019f63336fe8d2940c"`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_c93e2e6d5d0e3a1d7af2725f9f"`);
+        await queryRunner.query(`DROP TABLE "task_related_issues"`);
     }
 
     /**
@@ -60,16 +62,16 @@ export class DropTaskRelatedIssuesTable1689611487195 implements MigrationInterfa
     */
     public async sqliteUpQueryRunner(queryRunner: QueryRunner): Promise<any> {
         await queryRunner.query(`DROP INDEX "IDX_425ec34e019f63336fe8d2940c"`);
-		await queryRunner.query(`DROP INDEX "IDX_c93e2e6d5d0e3a1d7af2725f9f"`);
-		await queryRunner.query(`ALTER TABLE "task_related_issues" RENAME TO "temporary_task_related_issues"`);
-		await queryRunner.query(`CREATE TABLE "task_related_issues" ("taskId_1" varchar NOT NULL, "taskId_2" varchar NOT NULL, PRIMARY KEY ("taskId_1", "taskId_2"))`);
-		await queryRunner.query(`INSERT INTO "task_related_issues"("taskId_1", "taskId_2") SELECT "taskId_1", "taskId_2" FROM "temporary_task_related_issues"`);
-		await queryRunner.query(`DROP TABLE "temporary_task_related_issues"`);
-		await queryRunner.query(`CREATE INDEX "IDX_425ec34e019f63336fe8d2940c" ON "task_related_issues" ("taskId_2")`);
-		await queryRunner.query(`CREATE INDEX "IDX_c93e2e6d5d0e3a1d7af2725f9f" ON "task_related_issues" ("taskId_1")`);
-		await queryRunner.query(`DROP INDEX "IDX_425ec34e019f63336fe8d2940c"`);
-		await queryRunner.query(`DROP INDEX "IDX_c93e2e6d5d0e3a1d7af2725f9f"`);
-		await queryRunner.query(`DROP TABLE "task_related_issues"`);
+        await queryRunner.query(`DROP INDEX "IDX_c93e2e6d5d0e3a1d7af2725f9f"`);
+        await queryRunner.query(`ALTER TABLE "task_related_issues" RENAME TO "temporary_task_related_issues"`);
+        await queryRunner.query(`CREATE TABLE "task_related_issues" ("taskId_1" varchar NOT NULL, "taskId_2" varchar NOT NULL, PRIMARY KEY ("taskId_1", "taskId_2"))`);
+        await queryRunner.query(`INSERT INTO "task_related_issues"("taskId_1", "taskId_2") SELECT "taskId_1", "taskId_2" FROM "temporary_task_related_issues"`);
+        await queryRunner.query(`DROP TABLE "temporary_task_related_issues"`);
+        await queryRunner.query(`CREATE INDEX "IDX_425ec34e019f63336fe8d2940c" ON "task_related_issues" ("taskId_2")`);
+        await queryRunner.query(`CREATE INDEX "IDX_c93e2e6d5d0e3a1d7af2725f9f" ON "task_related_issues" ("taskId_1")`);
+        await queryRunner.query(`DROP INDEX "IDX_425ec34e019f63336fe8d2940c"`);
+        await queryRunner.query(`DROP INDEX "IDX_c93e2e6d5d0e3a1d7af2725f9f"`);
+        await queryRunner.query(`DROP TABLE "task_related_issues"`);
     }
 
     /**
diff --git a/packages/core/src/database/migrations/1689670799675-CreateTaskEstimationTable.ts b/packages/core/src/database/migrations/1689670799675-CreateTaskEstimationTable.ts
index 8becb60f917..13fdc14e836 100644
--- a/packages/core/src/database/migrations/1689670799675-CreateTaskEstimationTable.ts
+++ b/packages/core/src/database/migrations/1689670799675-CreateTaskEstimationTable.ts
@@ -1,8 +1,8 @@
 import { MigrationInterface, QueryRunner } from 'typeorm';
+import * as chalk from "chalk";
+
+export class CreateTaskEstimationTable1689670799675 implements MigrationInterface {
 
-export class CreateTaskEstimationTable1689670799675
-	implements MigrationInterface
-{
 	name = 'CreateTaskEstimationTable1689670799675';
 
 	/**
@@ -11,6 +11,8 @@ export class CreateTaskEstimationTable1689670799675
 	 * @param queryRunner
 	 */
 	public async up(queryRunner: QueryRunner): Promise<any> {
+		console.log(chalk.yellow(this.name + ' start running!'));
+
 		if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
 			await this.sqliteUpQueryRunner(queryRunner);
 		} else {
diff --git a/packages/core/src/database/migrations/1690040638765-AlterReportTable.ts b/packages/core/src/database/migrations/1690040638765-AlterReportTable.ts
index 84ec429ba70..db7a895d4e3 100644
--- a/packages/core/src/database/migrations/1690040638765-AlterReportTable.ts
+++ b/packages/core/src/database/migrations/1690040638765-AlterReportTable.ts
@@ -1,5 +1,5 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AlterReportTable1690040638765 implements MigrationInterface {
 
@@ -11,6 +11,8 @@ export class AlterReportTable1690040638765 implements MigrationInterface {
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1690167501143-AddActiveTaskColumnToOrganizationTeamEmployee.ts b/packages/core/src/database/migrations/1690167501143-AddActiveTaskColumnToOrganizationTeamEmployee.ts
index f704f302695..921bcf2e0d3 100644
--- a/packages/core/src/database/migrations/1690167501143-AddActiveTaskColumnToOrganizationTeamEmployee.ts
+++ b/packages/core/src/database/migrations/1690167501143-AddActiveTaskColumnToOrganizationTeamEmployee.ts
@@ -1,8 +1,8 @@
 import { MigrationInterface, QueryRunner } from 'typeorm';
+import * as chalk from "chalk";
 
 export class AddActiveTaskColumnToOrganizationTeamEmployee1690167501143
-	implements MigrationInterface
-{
+	implements MigrationInterface {
 	name = 'AddActiveTaskColumnToOrganizationTeamEmployee1690167501143';
 
 	/**
@@ -11,6 +11,8 @@ export class AddActiveTaskColumnToOrganizationTeamEmployee1690167501143
 	 * @param queryRunner
 	 */
 	public async up(queryRunner: QueryRunner): Promise<any> {
+		console.log(chalk.yellow(this.name + ' start running!'));
+
 		if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
 			await this.sqliteUpQueryRunner(queryRunner);
 		} else {
diff --git a/packages/core/src/database/migrations/1690527506095-AddUpworkOrganizationNameToTheOrganizationTable.ts b/packages/core/src/database/migrations/1690527506095-AddUpworkOrganizationNameToTheOrganizationTable.ts
index 5776077e30a..6dcae7607fe 100644
--- a/packages/core/src/database/migrations/1690527506095-AddUpworkOrganizationNameToTheOrganizationTable.ts
+++ b/packages/core/src/database/migrations/1690527506095-AddUpworkOrganizationNameToTheOrganizationTable.ts
@@ -1,5 +1,5 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AddUpworkOrganizationNameToTheOrganizationTable1690527506095 implements MigrationInterface {
 
@@ -11,6 +11,8 @@ export class AddUpworkOrganizationNameToTheOrganizationTable1690527506095 implem
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1691493358068-AlterIntegrationTable.ts b/packages/core/src/database/migrations/1691493358068-AlterIntegrationTable.ts
index 144806767a9..19647ed125d 100644
--- a/packages/core/src/database/migrations/1691493358068-AlterIntegrationTable.ts
+++ b/packages/core/src/database/migrations/1691493358068-AlterIntegrationTable.ts
@@ -1,4 +1,3 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
 import * as chalk from 'chalk';
 
@@ -12,7 +11,7 @@ export class AlterIntegrationTable1691493358068 implements MigrationInterface {
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
-        console.log(chalk.yellow(`${this.name} start running!`));
+        console.log(chalk.yellow(this.name + ' start running!'));
 
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
diff --git a/packages/core/src/database/migrations/1691494801748-SeedIntegrationTable.ts b/packages/core/src/database/migrations/1691494801748-SeedIntegrationTable.ts
index 3c40fdf8ff3..c59267e03c7 100644
--- a/packages/core/src/database/migrations/1691494801748-SeedIntegrationTable.ts
+++ b/packages/core/src/database/migrations/1691494801748-SeedIntegrationTable.ts
@@ -1,4 +1,3 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
 import { v4 as uuidv4 } from 'uuid';
 import * as chalk from 'chalk';
@@ -17,7 +16,7 @@ export class SeedIntegrationTable1691494801748 implements MigrationInterface {
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
-        console.log(chalk.yellow(`${this.name} start running!`));
+        console.log(chalk.yellow(this.name + ' start running!'));
 
         await this.upsertIntegrationsAndIntegrationTypes(queryRunner);
     }
diff --git a/packages/core/src/database/migrations/1691756595248-AddUserIdColumnToUserTable.ts b/packages/core/src/database/migrations/1691756595248-AddUserIdColumnToUserTable.ts
index c06dd68ac58..424b892bab2 100644
--- a/packages/core/src/database/migrations/1691756595248-AddUserIdColumnToUserTable.ts
+++ b/packages/core/src/database/migrations/1691756595248-AddUserIdColumnToUserTable.ts
@@ -1,4 +1,3 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
 import * as chalk from 'chalk';
 
@@ -12,7 +11,7 @@ export class AddUserIdColumnToUserTable1691756595248 implements MigrationInterfa
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
-        console.log(chalk.yellow(`${this.name} start running!`));
+        console.log(chalk.yellow(this.name + ' start running!'));
 
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
diff --git a/packages/core/src/database/migrations/1692171665427-SeedIntegrationTable.ts b/packages/core/src/database/migrations/1692171665427-SeedIntegrationTable.ts
index 65b5db6c5f9..acaa9d12760 100644
--- a/packages/core/src/database/migrations/1692171665427-SeedIntegrationTable.ts
+++ b/packages/core/src/database/migrations/1692171665427-SeedIntegrationTable.ts
@@ -1,4 +1,3 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
 import { v4 as uuidv4 } from 'uuid';
 import { getConfig } from "@gauzy/config";
@@ -17,7 +16,7 @@ export class SeedIntegrationTable1692171665427 implements MigrationInterface {
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
-        console.log(chalk.yellow(`SeedIntegrationTable1692171665427 start running!`));
+        console.log(chalk.yellow(this.name + ' start running!'));
 
         await this.upsertIntegrationsAndIntegrationTypes(queryRunner);
     }
diff --git a/packages/core/src/database/migrations/1692256031607-AddOrganizationProjectTeamRelation.ts b/packages/core/src/database/migrations/1692256031607-AddOrganizationProjectTeamRelation.ts
index 3e3f1ff80bc..34b12bd5a7d 100644
--- a/packages/core/src/database/migrations/1692256031607-AddOrganizationProjectTeamRelation.ts
+++ b/packages/core/src/database/migrations/1692256031607-AddOrganizationProjectTeamRelation.ts
@@ -1,4 +1,3 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
 import * as chalk from 'chalk';
 
@@ -12,7 +11,7 @@ export class AddOrganizationProjectTeamRelation1692256031607 implements Migratio
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
-        console.log(chalk.yellow(`${this.name} start running!`));
+        console.log(chalk.yellow(this.name + ' start running!'));
 
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
diff --git a/packages/core/src/database/migrations/1692275997367-AlterIntegrationTableRelationCascading.ts b/packages/core/src/database/migrations/1692275997367-AlterIntegrationTableRelationCascading.ts
index ca042bea7cd..8540fb9e2c3 100644
--- a/packages/core/src/database/migrations/1692275997367-AlterIntegrationTableRelationCascading.ts
+++ b/packages/core/src/database/migrations/1692275997367-AlterIntegrationTableRelationCascading.ts
@@ -1,4 +1,3 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
 import * as chalk from 'chalk';
 
@@ -12,7 +11,7 @@ export class AlterIntegrationTableRelationCascading1692275997367 implements Migr
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
-        console.log(chalk.yellow(`AlterIntegrationTableRelationCascading1692275997367 start running!`));
+        console.log(chalk.yellow(this.name + ' start running!'));
 
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
diff --git a/packages/core/src/database/migrations/1692433732267-AlterIntegrationTenantTable.ts b/packages/core/src/database/migrations/1692433732267-AlterIntegrationTenantTable.ts
index e789ba78452..0a71a82e66a 100644
--- a/packages/core/src/database/migrations/1692433732267-AlterIntegrationTenantTable.ts
+++ b/packages/core/src/database/migrations/1692433732267-AlterIntegrationTenantTable.ts
@@ -1,4 +1,3 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
 import * as chalk from 'chalk';
 
@@ -12,7 +11,7 @@ export class AlterIntegrationTenantTable1692433732267 implements MigrationInterf
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
-        console.log(chalk.yellow(`${this.name} start running!`));
+        console.log(chalk.yellow(this.name + ' start running!'));
 
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
diff --git a/packages/core/src/database/migrations/1693547294428-AlterCodeToAlphaNumericFormat.ts b/packages/core/src/database/migrations/1693547294428-AlterCodeToAlphaNumericFormat.ts
index c02991a1a0a..3019528eae1 100644
--- a/packages/core/src/database/migrations/1693547294428-AlterCodeToAlphaNumericFormat.ts
+++ b/packages/core/src/database/migrations/1693547294428-AlterCodeToAlphaNumericFormat.ts
@@ -1,4 +1,3 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
 import * as chalk from 'chalk';
 
@@ -12,7 +11,7 @@ export class AlterCodeToAlphaNumericFormat1693547294428 implements MigrationInte
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
-        console.log(chalk.yellow(`${this.name} start running!`));
+        console.log(chalk.yellow(this.name + ' start running!'));
 
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
diff --git a/packages/core/src/database/migrations/1694427247661-AlterOrganizationTeamJoinRequestTable.ts b/packages/core/src/database/migrations/1694427247661-AlterOrganizationTeamJoinRequestTable.ts
index 4fa010dfc27..c87051e7124 100644
--- a/packages/core/src/database/migrations/1694427247661-AlterOrganizationTeamJoinRequestTable.ts
+++ b/packages/core/src/database/migrations/1694427247661-AlterOrganizationTeamJoinRequestTable.ts
@@ -1,5 +1,5 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AlterOrganizationTeamJoinRequestTable1694427247661 implements MigrationInterface {
 
@@ -11,6 +11,8 @@ export class AlterOrganizationTeamJoinRequestTable1694427247661 implements Migra
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1695023907817-AddColumnsToTheIntegrationTable.ts b/packages/core/src/database/migrations/1695023907817-AddColumnsToTheIntegrationTable.ts
index 0898c14dad7..0edcb06c4db 100644
--- a/packages/core/src/database/migrations/1695023907817-AddColumnsToTheIntegrationTable.ts
+++ b/packages/core/src/database/migrations/1695023907817-AddColumnsToTheIntegrationTable.ts
@@ -11,7 +11,7 @@ export class AddColumnsToTheIntegrationTable1695023907817 implements MigrationIn
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
-        console.log(chalk.yellow(`${this.name} start running!`));
+        console.log(chalk.yellow(this.name + ' start running!'));
 
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
diff --git a/packages/core/src/database/migrations/1695111838783-AddColumnsToTheIntegrationTypeTable.ts b/packages/core/src/database/migrations/1695111838783-AddColumnsToTheIntegrationTypeTable.ts
index e933ed0d9d6..7d083ad93e7 100644
--- a/packages/core/src/database/migrations/1695111838783-AddColumnsToTheIntegrationTypeTable.ts
+++ b/packages/core/src/database/migrations/1695111838783-AddColumnsToTheIntegrationTypeTable.ts
@@ -1,4 +1,3 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
 import * as chalk from 'chalk';
 
@@ -12,7 +11,7 @@ export class AddColumnsToTheIntegrationTypeTable1695111838783 implements Migrati
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
-        console.log(chalk.yellow(`${this.name} start running!`));
+        console.log(chalk.yellow(this.name + ' start running!'));
 
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
diff --git a/packages/core/src/database/migrations/1695112275840-SeedIntegrationsAndIntegrationTypes.ts b/packages/core/src/database/migrations/1695112275840-SeedIntegrationsAndIntegrationTypes.ts
index 62bc8034b80..8efb07d0043 100644
--- a/packages/core/src/database/migrations/1695112275840-SeedIntegrationsAndIntegrationTypes.ts
+++ b/packages/core/src/database/migrations/1695112275840-SeedIntegrationsAndIntegrationTypes.ts
@@ -1,4 +1,3 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
 import * as chalk from 'chalk';
 import { IntegrationTypeEnum } from "@gauzy/contracts";
@@ -15,7 +14,7 @@ export class SeedIntegrationsAndIntegrationTypes1695112275840 implements Migrati
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
-        console.log(chalk.yellow(`${this.name} start running!`));
+        console.log(chalk.yellow(this.name + ' start running!'));
 
         await IntegrationsUtils.upsertIntegrationTypes(queryRunner, [IntegrationTypeEnum.PROJECT_MANAGEMENT]);
         await IntegrationsUtils.upsertIntegrationsAndIntegrationTypes(queryRunner, PROJECT_MANAGE_DEFAULT_INTEGRATIONS);
diff --git a/packages/core/src/database/migrations/1695570009125-AlterTableTask.ts b/packages/core/src/database/migrations/1695570009125-AlterTableTask.ts
index bfcdfcd09ec..0ec172a8f55 100644
--- a/packages/core/src/database/migrations/1695570009125-AlterTableTask.ts
+++ b/packages/core/src/database/migrations/1695570009125-AlterTableTask.ts
@@ -1,4 +1,5 @@
 import { MigrationInterface, QueryRunner } from 'typeorm';
+import * as chalk from "chalk";
 
 export class AlterTableTask1695570009125 implements MigrationInterface {
 	name = 'AlterTableTask1695570009125';
@@ -9,6 +10,8 @@ export class AlterTableTask1695570009125 implements MigrationInterface {
 	 * @param queryRunner
 	 */
 	public async up(queryRunner: QueryRunner): Promise<any> {
+		console.log(chalk.yellow(this.name + ' start running!'));
+
 		if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
 			await this.sqliteUpQueryRunner(queryRunner);
 		} else {
diff --git a/packages/core/src/database/migrations/1695958130201-AddedArchivedColumnToUser.ts b/packages/core/src/database/migrations/1695958130201-AddedArchivedColumnToUser.ts
index d0fe4155b9b..4773be5f57e 100644
--- a/packages/core/src/database/migrations/1695958130201-AddedArchivedColumnToUser.ts
+++ b/packages/core/src/database/migrations/1695958130201-AddedArchivedColumnToUser.ts
@@ -1,5 +1,5 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AddedArchivedColumnToUser1695958130201 implements MigrationInterface {
 
@@ -11,6 +11,8 @@ export class AddedArchivedColumnToUser1695958130201 implements MigrationInterfac
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1696413384868-AddedActiveArchivedColumnsToBaseEntity.ts b/packages/core/src/database/migrations/1696413384868-AddedActiveArchivedColumnsToBaseEntity.ts
index 3b17efa43f5..3bce1f69c46 100644
--- a/packages/core/src/database/migrations/1696413384868-AddedActiveArchivedColumnsToBaseEntity.ts
+++ b/packages/core/src/database/migrations/1696413384868-AddedActiveArchivedColumnsToBaseEntity.ts
@@ -1,5 +1,5 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AddedActiveArchivedColumnsToBaseEntity1696413384868 implements MigrationInterface {
 
@@ -11,6 +11,8 @@ export class AddedActiveArchivedColumnsToBaseEntity1696413384868 implements Migr
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1696704276300-AddLanguage.ts b/packages/core/src/database/migrations/1696704276300-AddLanguage.ts
index faa74a7ce5f..e65b67888f2 100644
--- a/packages/core/src/database/migrations/1696704276300-AddLanguage.ts
+++ b/packages/core/src/database/migrations/1696704276300-AddLanguage.ts
@@ -11,7 +11,7 @@ export class AddLanguage1696704276300 implements MigrationInterface {
 	 * @param queryRunner
 	 */
 	public async up(queryRunner: QueryRunner): Promise<any> {
-		console.log(chalk.yellow(`${this.name} start running!`));
+		console.log(chalk.yellow(this.name + ' start running!'));
 
 		await LanguageUtils.migrateLanguages(queryRunner);
 	}
diff --git a/packages/core/src/database/migrations/1697263211513-AddedIntegrationSettingColumnsToTheOrganizationProjectTable.ts b/packages/core/src/database/migrations/1697263211513-AddedIntegrationSettingColumnsToTheOrganizationProjectTable.ts
index 98605c1bd23..0fa11a6d2c9 100644
--- a/packages/core/src/database/migrations/1697263211513-AddedIntegrationSettingColumnsToTheOrganizationProjectTable.ts
+++ b/packages/core/src/database/migrations/1697263211513-AddedIntegrationSettingColumnsToTheOrganizationProjectTable.ts
@@ -1,4 +1,3 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
 import * as chalk from "chalk";
 
@@ -12,7 +11,7 @@ export class AddedIntegrationSettingColumnsToTheOrganizationProjectTable16972632
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
-        console.log(chalk.yellow(`${this.name} start running!`));
+        console.log(chalk.yellow(this.name + ' start running!'));
 
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
diff --git a/packages/core/src/database/migrations/1697434249910-AddSyncTagColumnToTheOrganizationProjectTable.ts b/packages/core/src/database/migrations/1697434249910-AddSyncTagColumnToTheOrganizationProjectTable.ts
index 846b514c3d9..52489c0ee53 100644
--- a/packages/core/src/database/migrations/1697434249910-AddSyncTagColumnToTheOrganizationProjectTable.ts
+++ b/packages/core/src/database/migrations/1697434249910-AddSyncTagColumnToTheOrganizationProjectTable.ts
@@ -1,4 +1,3 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
 import * as chalk from "chalk";
 
@@ -12,7 +11,7 @@ export class AddSyncTagColumnToTheOrganizationProjectTable1697434249910 implemen
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
-        console.log(chalk.yellow(`${this.name} start running!`));
+        console.log(chalk.yellow(this.name + ' start running!'));
 
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
diff --git a/packages/core/src/database/migrations/1697635735546-AddedEmailStatusToEmailHistoryTable.ts b/packages/core/src/database/migrations/1697635735546-AddedEmailStatusToEmailHistoryTable.ts
index 166ffbce8cf..58ce4bf632d 100644
--- a/packages/core/src/database/migrations/1697635735546-AddedEmailStatusToEmailHistoryTable.ts
+++ b/packages/core/src/database/migrations/1697635735546-AddedEmailStatusToEmailHistoryTable.ts
@@ -1,5 +1,5 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AddedEmailStatusToEmailHistoryTable1697635735546 implements MigrationInterface {
 
@@ -11,6 +11,8 @@ export class AddedEmailStatusToEmailHistoryTable1697635735546 implements Migrati
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1697692691682-AlterTableInvoiceEstimateHistory.ts b/packages/core/src/database/migrations/1697692691682-AlterTableInvoiceEstimateHistory.ts
index 74b73722357..4530dc07b7d 100644
--- a/packages/core/src/database/migrations/1697692691682-AlterTableInvoiceEstimateHistory.ts
+++ b/packages/core/src/database/migrations/1697692691682-AlterTableInvoiceEstimateHistory.ts
@@ -1,4 +1,3 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
 import * as chalk from "chalk";
 
@@ -12,7 +11,7 @@ export class AlterTableInvoiceEstimateHistory1697692691682 implements MigrationI
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
-        console.log(chalk.yellow(`${this.name} start running!`));
+        console.log(chalk.yellow(this.name + ' start running!'));
 
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
diff --git a/packages/core/src/database/migrations/1697716380119-CreateIntegrationOrganizationGithubRepositoryTable.ts b/packages/core/src/database/migrations/1697716380119-CreateIntegrationOrganizationGithubRepositoryTable.ts
index aed7341f364..232177d22a4 100644
--- a/packages/core/src/database/migrations/1697716380119-CreateIntegrationOrganizationGithubRepositoryTable.ts
+++ b/packages/core/src/database/migrations/1697716380119-CreateIntegrationOrganizationGithubRepositoryTable.ts
@@ -1,5 +1,5 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class CreateIntegrationOrganizationGithubRepositoryTable1697716380119 implements MigrationInterface {
 
@@ -11,6 +11,8 @@ export class CreateIntegrationOrganizationGithubRepositoryTable1697716380119 imp
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1697978582510-AddedLastSyncedAtColumnToTheIntegrationTenantTable.ts b/packages/core/src/database/migrations/1697978582510-AddedLastSyncedAtColumnToTheIntegrationTenantTable.ts
index ffd4cc9fbc5..11c41d8eff4 100644
--- a/packages/core/src/database/migrations/1697978582510-AddedLastSyncedAtColumnToTheIntegrationTenantTable.ts
+++ b/packages/core/src/database/migrations/1697978582510-AddedLastSyncedAtColumnToTheIntegrationTenantTable.ts
@@ -1,5 +1,5 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AddedLastSyncedAtColumnToTheIntegrationTenantTable1697978582510 implements MigrationInterface {
 
@@ -11,6 +11,8 @@ export class AddedLastSyncedAtColumnToTheIntegrationTenantTable1697978582510 imp
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1698214673445-AlterIntegrationOrganizationGithubRepositoryTable.ts b/packages/core/src/database/migrations/1698214673445-AlterIntegrationOrganizationGithubRepositoryTable.ts
index 0a3b8fe62eb..8f33dc5a97f 100644
--- a/packages/core/src/database/migrations/1698214673445-AlterIntegrationOrganizationGithubRepositoryTable.ts
+++ b/packages/core/src/database/migrations/1698214673445-AlterIntegrationOrganizationGithubRepositoryTable.ts
@@ -1,5 +1,5 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AlterIntegrationOrganizationGithubRepositoryTable1698214673445 implements MigrationInterface {
 
@@ -11,6 +11,8 @@ export class AlterIntegrationOrganizationGithubRepositoryTable1698214673445 impl
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1698383136452-CreateIntegrationOrganizationGithubRepositoryIssueTable.ts b/packages/core/src/database/migrations/1698383136452-CreateIntegrationOrganizationGithubRepositoryIssueTable.ts
index 6cef445e838..ddbad13212e 100644
--- a/packages/core/src/database/migrations/1698383136452-CreateIntegrationOrganizationGithubRepositoryIssueTable.ts
+++ b/packages/core/src/database/migrations/1698383136452-CreateIntegrationOrganizationGithubRepositoryIssueTable.ts
@@ -1,5 +1,5 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class CreateIntegrationOrganizationGithubRepositoryIssueTable1698383136452 implements MigrationInterface {
 
@@ -11,6 +11,8 @@ export class CreateIntegrationOrganizationGithubRepositoryIssueTable169838313645
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1698659313745-AddSoftDeleteFeatureToTheAllTables.ts b/packages/core/src/database/migrations/1698659313745-AddSoftDeleteFeatureToTheAllTables.ts
index 143ba298162..449e4de0121 100644
--- a/packages/core/src/database/migrations/1698659313745-AddSoftDeleteFeatureToTheAllTables.ts
+++ b/packages/core/src/database/migrations/1698659313745-AddSoftDeleteFeatureToTheAllTables.ts
@@ -1,5 +1,5 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AddSoftDeleteFeatureToTheAllTables1698659313745 implements MigrationInterface {
 
@@ -11,6 +11,8 @@ export class AddSoftDeleteFeatureToTheAllTables1698659313745 implements Migratio
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1698991349981-AlterIntegrationOrganizationGithubRepositoryTable.ts b/packages/core/src/database/migrations/1698991349981-AlterIntegrationOrganizationGithubRepositoryTable.ts
index 28ae4f4ff5f..de978411f9f 100644
--- a/packages/core/src/database/migrations/1698991349981-AlterIntegrationOrganizationGithubRepositoryTable.ts
+++ b/packages/core/src/database/migrations/1698991349981-AlterIntegrationOrganizationGithubRepositoryTable.ts
@@ -1,5 +1,5 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AlterIntegrationOrganizationGithubRepositoryTable1698991349981 implements MigrationInterface {
 
@@ -11,6 +11,8 @@ export class AlterIntegrationOrganizationGithubRepositoryTable1698991349981 impl
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1699353179526-AlterPasswordResetTable.ts b/packages/core/src/database/migrations/1699353179526-AlterPasswordResetTable.ts
index e4705de2647..eae19b507c6 100644
--- a/packages/core/src/database/migrations/1699353179526-AlterPasswordResetTable.ts
+++ b/packages/core/src/database/migrations/1699353179526-AlterPasswordResetTable.ts
@@ -1,5 +1,5 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AlterPasswordResetTable1699353179526 implements MigrationInterface {
 
@@ -11,6 +11,8 @@ export class AlterPasswordResetTable1699353179526 implements MigrationInterface
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1700123233258-AlterTableOrganization.ts b/packages/core/src/database/migrations/1700123233258-AlterTableOrganization.ts
index 8d3b7c2ea3a..a9a918e6f29 100644
--- a/packages/core/src/database/migrations/1700123233258-AlterTableOrganization.ts
+++ b/packages/core/src/database/migrations/1700123233258-AlterTableOrganization.ts
@@ -1,4 +1,3 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
 import * as chalk from "chalk";
 
@@ -12,7 +11,7 @@ export class AlterTableOrganization1700123233258 implements MigrationInterface {
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
-        console.log(chalk.yellow(`${this.name} start running!`));
+        console.log(chalk.yellow(this.name + ' start running!'));
 
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
diff --git a/packages/core/src/database/migrations/1700462617037-AddMultiTenantResetPasswordEmailTemplate.ts b/packages/core/src/database/migrations/1700462617037-AddMultiTenantResetPasswordEmailTemplate.ts
index c517e38f03c..99a23d9e0dd 100644
--- a/packages/core/src/database/migrations/1700462617037-AddMultiTenantResetPasswordEmailTemplate.ts
+++ b/packages/core/src/database/migrations/1700462617037-AddMultiTenantResetPasswordEmailTemplate.ts
@@ -1,4 +1,3 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
 import * as chalk from "chalk";
 import { EmailTemplateEnum } from "@gauzy/contracts";
@@ -14,7 +13,7 @@ export class AddMultiTenantResetPasswordEmailTemplate1700462617037 implements Mi
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
-        console.log(chalk.yellow(`${this.name} start running!`));
+        console.log(chalk.yellow(this.name + ' start running!'));
 
         // Migrate email templates for multi-tenant password reset
         try {
diff --git a/packages/core/src/database/migrations/1701067699290-AddedEditedAtFeatureToTheTimesheetAndTimeLogTables.ts b/packages/core/src/database/migrations/1701067699290-AddedEditedAtFeatureToTheTimesheetAndTimeLogTables.ts
index 5ac7884fad9..2a7b6517b75 100644
--- a/packages/core/src/database/migrations/1701067699290-AddedEditedAtFeatureToTheTimesheetAndTimeLogTables.ts
+++ b/packages/core/src/database/migrations/1701067699290-AddedEditedAtFeatureToTheTimesheetAndTimeLogTables.ts
@@ -1,4 +1,3 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
 import * as chalk from "chalk";
 
@@ -12,7 +11,7 @@ export class AddedEditedAtFeatureToTheTimesheetAndTimeLogTables1701067699290 imp
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
-        console.log(chalk.yellow(`${this.name} start running!`));
+        console.log(chalk.yellow(this.name + ' start running!'));
 
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
diff --git a/packages/core/src/database/migrations/1701081154869-AlterScreenshotTable.ts b/packages/core/src/database/migrations/1701081154869-AlterScreenshotTable.ts
index 8acce21d768..ebb9e4957cc 100644
--- a/packages/core/src/database/migrations/1701081154869-AlterScreenshotTable.ts
+++ b/packages/core/src/database/migrations/1701081154869-AlterScreenshotTable.ts
@@ -1,5 +1,5 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from "chalk";
 
 export class AlterScreenshotTable1701081154869 implements MigrationInterface {
 
@@ -11,6 +11,8 @@ export class AlterScreenshotTable1701081154869 implements MigrationInterface {
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
+        console.log(chalk.yellow(this.name + ' start running!'));
+
         if (['sqlite', 'better-sqlite3'].includes(queryRunner.connection.options.type)) {
             await this.sqliteUpQueryRunner(queryRunner);
         } else {
diff --git a/packages/core/src/database/migrations/1701353754397-MigrateEmailTemplates.ts b/packages/core/src/database/migrations/1701353754397-MigrateEmailTemplates.ts
index 4be45075638..e19dc26a608 100644
--- a/packages/core/src/database/migrations/1701353754397-MigrateEmailTemplates.ts
+++ b/packages/core/src/database/migrations/1701353754397-MigrateEmailTemplates.ts
@@ -1,4 +1,3 @@
-
 import { MigrationInterface, QueryRunner } from "typeorm";
 import * as chalk from 'chalk';
 import { EmailTemplateEnum } from "@gauzy/contracts";
@@ -14,7 +13,7 @@ export class MigrateEmailTemplates1701353754397 implements MigrationInterface {
     * @param queryRunner
     */
     public async up(queryRunner: QueryRunner): Promise<any> {
-        console.log(chalk.yellow(`${this.name} start running!`));
+        console.log(chalk.yellow(this.name + ' start running!'));
 
         const templates = Object.values(EmailTemplateEnum);
         await Promise.all(

From 4b2ef738eaab72e7920b9dce715ff16ed0ee1e89 Mon Sep 17 00:00:00 2001
From: Kifungo A <45813955+adkif@users.noreply.github.com>
Date: Wed, 6 Dec 2023 18:17:21 +0200
Subject: [PATCH 06/34] feat: create text mask directive

---
 .../gauzy/src/app/@shared/directives/index.ts |  2 +
 .../@shared/directives/text-mask.directive.ts | 53 +++++++++++++++++++
 .../integrations/gauzy-ai/gauzy-ai.module.ts  |  4 +-
 3 files changed, 58 insertions(+), 1 deletion(-)
 create mode 100644 apps/gauzy/src/app/@shared/directives/text-mask.directive.ts

diff --git a/apps/gauzy/src/app/@shared/directives/index.ts b/apps/gauzy/src/app/@shared/directives/index.ts
index bddabe95279..162dd9daa19 100755
--- a/apps/gauzy/src/app/@shared/directives/index.ts
+++ b/apps/gauzy/src/app/@shared/directives/index.ts
@@ -6,6 +6,7 @@ import { UnderConstructionDirective } from './under-construction.directive';
 import { ReadMoreDirective } from './read-more';
 import { TimeTrackingAuthorizedDirective } from './time-tracking-authorized-directive';
 import { NoSpaceEdgesDirective } from './no-space-edges.directive';
+import { TextMaskDirective } from './text-mask.directive';
 
 export const DIRECTIVES = [
 	AutocompleteOffDirective,
@@ -16,4 +17,5 @@ export const DIRECTIVES = [
 	OutsideDirective,
 	UnderConstructionDirective,
 	NoSpaceEdgesDirective,
+	TextMaskDirective
 ];
diff --git a/apps/gauzy/src/app/@shared/directives/text-mask.directive.ts b/apps/gauzy/src/app/@shared/directives/text-mask.directive.ts
new file mode 100644
index 00000000000..a81ec116559
--- /dev/null
+++ b/apps/gauzy/src/app/@shared/directives/text-mask.directive.ts
@@ -0,0 +1,53 @@
+import { Directive, ElementRef, Renderer2, Input } from '@angular/core';
+
+interface IMaskConfig {
+	text: string;
+	showOriginal: boolean;
+	replacement: number;
+}
+
+@Directive({
+	selector: '[gaTextMask]'
+})
+export class TextMaskDirective {
+	private readonly _config: IMaskConfig;
+
+	constructor(private el: ElementRef, private renderer: Renderer2) {
+		this._config = {
+			text: '',
+			showOriginal: false,
+			replacement: 0.5
+		};
+	}
+
+	private applyTextMask() {
+		const text = this.config.showOriginal ? this.config.text : this.maskText(this.config.text);
+		this.renderer.setProperty(this.el.nativeElement, 'innerText', text);
+	}
+
+	private maskText(text: string): string {
+		if (!text) {
+			return '';
+		}
+
+		const textArray = text.split('');
+
+		for (let i = 0; i < textArray.length; i++) {
+			if (i < Math.floor(this.config.replacement * textArray.length)) {
+				textArray[i] = '*';
+			}
+		}
+
+		return textArray.join('');
+	}
+
+	public get config(): IMaskConfig {
+		return this._config;
+	}
+
+	@Input()
+	public set config(partialConfig: Partial<IMaskConfig>) {
+		Object.assign(this._config, partialConfig);
+		this.applyTextMask();
+	}
+}
diff --git a/apps/gauzy/src/app/pages/integrations/gauzy-ai/gauzy-ai.module.ts b/apps/gauzy/src/app/pages/integrations/gauzy-ai/gauzy-ai.module.ts
index a75a09a460b..d602305d22a 100644
--- a/apps/gauzy/src/app/pages/integrations/gauzy-ai/gauzy-ai.module.ts
+++ b/apps/gauzy/src/app/pages/integrations/gauzy-ai/gauzy-ai.module.ts
@@ -9,6 +9,7 @@ import { GauzyAILayoutComponent } from './gauzy-ai.layout.component';
 import { GauzyAIAuthorizationComponent } from './components/authorization/authorization.component';
 import { GauzyAIViewComponent } from './components/view/view.component';
 import { WorkInProgressModule } from '../../work-in-progress/work-in-progress.module';
+import { DirectivesModule } from '../../../@shared/directives/directives.module';
 
 @NgModule({
 	declarations: [
@@ -29,7 +30,8 @@ import { WorkInProgressModule } from '../../work-in-progress/work-in-progress.mo
 		GauzyAIRoutingModule,
 		TranslateModule,
 		BackNavigationModule,
-		WorkInProgressModule
+		WorkInProgressModule,
+		DirectivesModule
 	]
 })
 export class GauzyAIModule { }

From 8ab7fc2f3aae623a543e93b2a44404d079ee2e40 Mon Sep 17 00:00:00 2001
From: Kifungo A <45813955+adkif@users.noreply.github.com>
Date: Wed, 6 Dec 2023 18:30:00 +0200
Subject: [PATCH 07/34] feat: improve UI

---
 .../components/view/view.component.html       | 31 ++++++++---
 .../components/view/view.component.scss       | 52 ++++++++++++++++---
 .../components/view/view.component.ts         | 18 +++++--
 3 files changed, 82 insertions(+), 19 deletions(-)

diff --git a/apps/gauzy/src/app/pages/integrations/gauzy-ai/components/view/view.component.html b/apps/gauzy/src/app/pages/integrations/gauzy-ai/components/view/view.component.html
index 85bfb5d8559..4c5f64e83e9 100644
--- a/apps/gauzy/src/app/pages/integrations/gauzy-ai/components/view/view.component.html
+++ b/apps/gauzy/src/app/pages/integrations/gauzy-ai/components/view/view.component.html
@@ -12,13 +12,7 @@ <h5>
 		</div>
 		<div>
 			<div>
-				<button
-					nbButton
-					status="primary"
-					class="mr-2"
-					size="small"
-					(click)="navigateToResetIntegration()"
-				>
+				<button nbButton status="primary" class="mr-2" size="small" (click)="navigateToResetIntegration()">
 					<div class="sync-container">
 						<nb-icon class="sync" icon="sync-outline"></nb-icon>
 						{{ 'BUTTONS.RESET_INTEGRATION' | translate }}
@@ -33,6 +27,29 @@ <h5>
 				<!-- <header>
 					{{ 'INTEGRATIONS.GAUZY_AI_PAGE.CONSUMER_KEYS' | translate }}
 				</header> -->
+				<div class="integration-container">
+					<div class="integration-row" *ngFor="let setting of dummySettings">
+						<div class="integration-label">
+							{{ setting.settingsName }}
+							<nb-icon icon="info-outline" size="small"></nb-icon>
+						</div>
+						<div class="integration-value">
+							<nb-icon
+								(click)="setting.show = !setting.show"
+								[icon]="!!setting.show ? 'eye-outline' : 'eye-off-outline'"
+							></nb-icon>
+							<div
+								gaTextMask
+								[config]="{
+									text: setting.settingsValue,
+									showOriginal: !!setting.show,
+									replacement: 0.75
+								}"
+								class="integration-mask"
+							></div>
+						</div>
+					</div>
+				</div>
 			</nb-tab>
 			<nb-tab [tabTitle]="'INTEGRATIONS.GAUZY_AI_PAGE.TAB.SETTINGS' | translate">
 				<ga-wip></ga-wip>
diff --git a/apps/gauzy/src/app/pages/integrations/gauzy-ai/components/view/view.component.scss b/apps/gauzy/src/app/pages/integrations/gauzy-ai/components/view/view.component.scss
index 15c43715364..385c24fff31 100644
--- a/apps/gauzy/src/app/pages/integrations/gauzy-ai/components/view/view.component.scss
+++ b/apps/gauzy/src/app/pages/integrations/gauzy-ai/components/view/view.component.scss
@@ -1,11 +1,47 @@
 :host {
-    .tabset {
-        padding: 0;
-    }
-    header {
-        font-size: 18px;
-        font-weight: 600;
-        line-height: 30px;
-        letter-spacing: 0em;
+  .tabset {
+    padding: 0;
+  }
+
+  header {
+    font-size: 18px;
+    font-weight: 600;
+    line-height: 30px;
+    letter-spacing: 0em;
+  }
+
+  nb-tab.content-active {
+    background: var(--gauzy-card-2);
+    height: calc(100vh - 20.5rem);
+    border-radius: 0 var(--border-radius) var(--border-radius) var(--border-radius);
+  }
+
+  .integration-container {
+    display: flex;
+    flex-direction: column;
+    gap: 0.5rem;
+
+    .integration-row {
+      background: var(--gauzy-card-2);
+      padding: 1rem;
+      border-radius: var(--border-radius);
+      display: flex;
+      justify-content: space-between;
+
+      .integration-label {
+        nb-icon {
+          font-size: 1rem;
+        }
+      }
+
+      .integration-value {
+        display: flex;
+        gap: 0.25rem;
+
+        nb-icon {
+          cursor: pointer;
+        }
+      }
     }
+  }
 }
diff --git a/apps/gauzy/src/app/pages/integrations/gauzy-ai/components/view/view.component.ts b/apps/gauzy/src/app/pages/integrations/gauzy-ai/components/view/view.component.ts
index c070fc9fb46..e1a9dab7409 100644
--- a/apps/gauzy/src/app/pages/integrations/gauzy-ai/components/view/view.component.ts
+++ b/apps/gauzy/src/app/pages/integrations/gauzy-ai/components/view/view.component.ts
@@ -16,16 +16,26 @@ import { Store } from './../../../../../@core/services';
 	providers: [TitleCasePipe]
 })
 export class GauzyAIViewComponent extends TranslationBaseComponent implements OnInit {
-
 	public organization$: Observable<IOrganization>; // Observable to hold the selected organization
 	public settings$: Observable<IIntegrationSetting[]>;
 	public settings: IIntegrationSetting[] = [];
+	public dummySettings: IIntegrationSetting[] = [
+		{
+			settingsValue: '382808338280882808xS8Y8XsL',
+			settingsName: 'API Keys'
+		},
+		{ settingsValue: '382808xS8Y3828088K382808sG', settingsName: 'API Secret' },
+		{
+			settingsValue: '382382808808xS3828088Y8Jsm',
+			settingsName: 'Open AI API Secret'
+		}
+	];
 
 	constructor(
 		private readonly _router: Router,
 		private readonly _activatedRoute: ActivatedRoute,
 		public readonly translateService: TranslateService,
-		private readonly _store: Store,
+		private readonly _store: Store
 	) {
 		super(translateService);
 	}
@@ -44,13 +54,13 @@ export class GauzyAIViewComponent extends TranslationBaseComponent implements On
 				this.settings = settings;
 			}),
 			// Handle component lifecycle to avoid memory leaks
-			untilDestroyed(this),
+			untilDestroyed(this)
 		);
 	}
 
 	/**
 	 * Navigate to the "Integrations" page.
-	*/
+	 */
 	navigateToIntegrations(): void {
 		this._router.navigate(['/pages/integrations']);
 	}

From 88dcf3442f8258eba618bd308bd6ff7c26f7a3bb Mon Sep 17 00:00:00 2001
From: Kifungo A <45813955+adkif@users.noreply.github.com>
Date: Wed, 6 Dec 2023 18:51:43 +0200
Subject: [PATCH 08/34] feat: add generated date

---
 .../gauzy-ai/components/view/view.component.html      | 11 ++++++++---
 .../gauzy-ai/components/view/view.component.scss      |  5 +++++
 .../gauzy-ai/components/view/view.component.ts        |  8 +++++---
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/apps/gauzy/src/app/pages/integrations/gauzy-ai/components/view/view.component.html b/apps/gauzy/src/app/pages/integrations/gauzy-ai/components/view/view.component.html
index 4c5f64e83e9..7bf3d7e699f 100644
--- a/apps/gauzy/src/app/pages/integrations/gauzy-ai/components/view/view.component.html
+++ b/apps/gauzy/src/app/pages/integrations/gauzy-ai/components/view/view.component.html
@@ -29,9 +29,14 @@ <h5>
 				</header> -->
 				<div class="integration-container">
 					<div class="integration-row" *ngFor="let setting of dummySettings">
-						<div class="integration-label">
-							{{ setting.settingsName }}
-							<nb-icon icon="info-outline" size="small"></nb-icon>
+						<div class="integration-label-container">
+							<div class="integration-label">
+								{{ setting.settingsName }}
+								<nb-icon icon="info-outline" size="small"></nb-icon>
+							</div>
+							<div class="date">
+								Generated {{ setting.createdAt | date: 'longDate' }}
+							</div>
 						</div>
 						<div class="integration-value">
 							<nb-icon
diff --git a/apps/gauzy/src/app/pages/integrations/gauzy-ai/components/view/view.component.scss b/apps/gauzy/src/app/pages/integrations/gauzy-ai/components/view/view.component.scss
index 385c24fff31..c0fced3fb35 100644
--- a/apps/gauzy/src/app/pages/integrations/gauzy-ai/components/view/view.component.scss
+++ b/apps/gauzy/src/app/pages/integrations/gauzy-ai/components/view/view.component.scss
@@ -21,6 +21,11 @@
     flex-direction: column;
     gap: 0.5rem;
 
+    .date {
+      color: var(--gauzy-text-color-2);
+      font-size: 12px;
+    }
+
     .integration-row {
       background: var(--gauzy-card-2);
       padding: 1rem;
diff --git a/apps/gauzy/src/app/pages/integrations/gauzy-ai/components/view/view.component.ts b/apps/gauzy/src/app/pages/integrations/gauzy-ai/components/view/view.component.ts
index e1a9dab7409..41e66965afc 100644
--- a/apps/gauzy/src/app/pages/integrations/gauzy-ai/components/view/view.component.ts
+++ b/apps/gauzy/src/app/pages/integrations/gauzy-ai/components/view/view.component.ts
@@ -22,12 +22,14 @@ export class GauzyAIViewComponent extends TranslationBaseComponent implements On
 	public dummySettings: IIntegrationSetting[] = [
 		{
 			settingsValue: '382808338280882808xS8Y8XsL',
-			settingsName: 'API Keys'
+			settingsName: 'API Keys',
+			createdAt: new Date()
 		},
-		{ settingsValue: '382808xS8Y3828088K382808sG', settingsName: 'API Secret' },
+		{ settingsValue: '382808xS8Y3828088K382808sG', settingsName: 'API Secret', createdAt: new Date() },
 		{
 			settingsValue: '382382808808xS3828088Y8Jsm',
-			settingsName: 'Open AI API Secret'
+			settingsName: 'Open AI API Secret',
+			createdAt: new Date()
 		}
 	];
 

From a86d3135ae3f7ce4f38da883c3c1f02b1c404ac9 Mon Sep 17 00:00:00 2001
From: CoderNadir <coder.nadir@gmail.com>
Date: Wed, 6 Dec 2023 18:56:12 +0100
Subject: [PATCH 09/34] fix: #7174 | remove html code from translation json
 file

---
 .../src/app/auth/login/login.component.html   |  6 ++++--
 .../app/auth/register/register.component.html | 17 +++++++++++++++-
 apps/gauzy/src/assets/i18n/ar.json            | 20 ++++++++-----------
 apps/gauzy/src/assets/i18n/bg.json            | 20 ++++++++-----------
 apps/gauzy/src/assets/i18n/de.json            | 20 ++++++++-----------
 apps/gauzy/src/assets/i18n/en.json            | 20 ++++++++-----------
 apps/gauzy/src/assets/i18n/es.json            | 20 ++++++++-----------
 apps/gauzy/src/assets/i18n/fr.json            | 20 ++++++++-----------
 apps/gauzy/src/assets/i18n/he.json            | 20 ++++++++-----------
 apps/gauzy/src/assets/i18n/it.json            | 20 ++++++++-----------
 apps/gauzy/src/assets/i18n/nl.json            | 20 ++++++++-----------
 apps/gauzy/src/assets/i18n/pl.json            | 20 ++++++++-----------
 apps/gauzy/src/assets/i18n/pt.json            | 20 ++++++++-----------
 apps/gauzy/src/assets/i18n/ru.json            | 20 ++++++++-----------
 apps/gauzy/src/assets/i18n/zh.json            | 20 ++++++++-----------
 15 files changed, 124 insertions(+), 159 deletions(-)

diff --git a/apps/gauzy/src/app/auth/login/login.component.html b/apps/gauzy/src/app/auth/login/login.component.html
index 3deb963e400..f3444bc59c6 100644
--- a/apps/gauzy/src/app/auth/login/login.component.html
+++ b/apps/gauzy/src/app/auth/login/login.component.html
@@ -12,8 +12,10 @@ <h2 id="title" class="title">{{ 'LOGIN_PAGE.TITLE' | translate }}</h2>
           <nb-accordion-item class="demo-credentials-select-item">
             <nb-accordion-item-header class="demo-credentials-header">
               <div class="demo-credentials-head-text">
-                <div [innerHTML]="'LOGIN_PAGE.DEMO.DEMO_CREDENTIALS_TITLE' | translate">
-                </div>
+                <span class="demo-text-span">
+                  {{ "LOGIN_PAGE.DEMO.DEMO_TITLE" | translate }}
+                </span>
+                {{ "LOGIN_PAGE.DEMO.CREDENTIALS_TITLE" | translate }}
               </div>
             </nb-accordion-item-header>
             <nb-accordion-item-body class="demo-credentials-body">
diff --git a/apps/gauzy/src/app/auth/register/register.component.html b/apps/gauzy/src/app/auth/register/register.component.html
index 508917afe63..0c8088b0403 100644
--- a/apps/gauzy/src/app/auth/register/register.component.html
+++ b/apps/gauzy/src/app/auth/register/register.component.html
@@ -183,7 +183,22 @@ <h1 id="title" class="title">{{ "REGISTER_PAGE.TITLE" | translate }}</h1>
 						[(ngModel)]="user.terms"
 						[required]="getConfigValue('forms.register.terms')"
 					>
-						<div [innerHTML]="'REGISTER_PAGE.VALIDATIONS.AGREE_TERMS_PRIVACY' | translate"></div>
+						<span class="normal-terms-text">
+							{{ "REGISTER_PAGE.VALIDATIONS.CHECK_BOX_TEXTS.AGREE_TO" | translate }}
+						</span>
+						<a routerLink="/legal/terms" target="_blank" class="terms-link">
+							<strong>
+								{{ "REGISTER_PAGE.VALIDATIONS.CHECK_BOX_TEXTS.TERMS_AND_CONDITIONS" | translate }}
+							</strong>
+						</a>
+						<span class="normal-terms-text">
+							{{ "REGISTER_PAGE.VALIDATIONS.CHECK_BOX_TEXTS.AND" | translate }}
+						</span>
+						<a routerLink="/legal/privacy" target="_blank" class="terms-link">
+							<strong>
+								{{ "REGISTER_PAGE.VALIDATIONS.CHECK_BOX_TEXTS.PRIVACY_POLICY" | translate }}
+							</strong>
+						</a>
 					</nb-checkbox>
 				</div>
 			</ng-container>
diff --git a/apps/gauzy/src/assets/i18n/ar.json b/apps/gauzy/src/assets/i18n/ar.json
index 4e2dd520b42..0609733e772 100644
--- a/apps/gauzy/src/assets/i18n/ar.json
+++ b/apps/gauzy/src/assets/i18n/ar.json
@@ -4423,7 +4423,12 @@
 			"PASSWORD_SHOULD_CONTAIN": "يجب أن تحتوي كلمة المرور على عدد من {{ minLength }} إلى {{ maxLength }} حرفًا",
 			"CONFIRM_PASSWORD_REQUIRED": "!تأكيد كلمة المرور مطلوب",
 			"PASSWORDS_NOT_MATCH": "!كلمة المرور لا تتطابق مع تأكيد كلمة المرور",
-			"AGREE_TERMS_PRIVACY": "<span class=\"normal-terms-text\"> موافق على </span><a routerLink=\"/legal/terms\" target=\"_blank\" class=\"terms-link\"><strong> الشروط و الأحكام </strong></a><span class=\"normal-terms-text\"> و </span><a routerLink=\"/legal/privacy\" target=\"_blank\" class=\"terms-link\"><strong> سياسة الخصوصية </strong></a>"
+			"CHECK_BOX_TEXTS": {
+				"AGREE_TO": "أوافق على",
+				"TERMS_AND_CONDITIONS": "البنود والشروط",
+				"AND": " و ",
+				"PRIVACY_POLICY": "سياسة الخصوصية"
+			}
 		}
 	},
 	"LOGIN_PAGE": {
@@ -4468,7 +4473,8 @@
 			"SUPER_ADMIN_TITLE": "مشرف عام",
 			"ADMIN_TITLE": "مسؤول",
 			"EMPLOYEE_TITLE": "موظف",
-			"DEMO_CREDENTIALS_TITLE": "<span class=\"demo-text-span\">بيانات</span> العرض",
+			"DEMO_TITLE": "عرض تجريبي",
+			"CREDENTIALS_TITLE": "بيانات الاعتماد",
 			"LABELS": {
 				"EMAIL": " :البريد الإلكتروني",
 				"PASSWORD": " :كلمة المرور"
@@ -4558,16 +4564,6 @@
 		"UNKNOWN_WORKSPACE": "لا تعرف مساحة العمل الخاصة بك؟",
 		"FIND_WORKSPACE": "ابحث عن مساحتك الخاصة"
 	},
-	"DEMO": {
-		"SUPER_ADMIN_TITLE": "مشرف عام",
-		"ADMIN_TITLE": "مسؤول",
-		"EMPLOYEE_TITLE": "موظف",
-		"DEMO_CREDENTIALS_TITLE": "<span class=\"demo-text-span\">بيانات</span> العرض",
-		"LABELS": {
-			"EMAIL": ":البريد الإلكتروني",
-			"PASSWORD": ":كلمة المرور"
-		}
-	},
 	"NO_IMAGE": {
 		"ADD_DROP": "أضف أو أزل الصورة",
 		"AVAILABLE": "الصورة غير متاحة"
diff --git a/apps/gauzy/src/assets/i18n/bg.json b/apps/gauzy/src/assets/i18n/bg.json
index 56a20738b90..d635b5911b2 100644
--- a/apps/gauzy/src/assets/i18n/bg.json
+++ b/apps/gauzy/src/assets/i18n/bg.json
@@ -4350,7 +4350,12 @@
 			"PASSWORD_SHOULD_CONTAIN": "Паролата трябва да съдържа от {{ minLength }} до {{ maxLength }} знака",
 			"CONFIRM_PASSWORD_REQUIRED": "Изисква се потвърждение на паролата!",
 			"PASSWORDS_NOT_MATCH": "Паролата не съвпада с потвърждението на паролата!",
-			"AGREE_TERMS_PRIVACY": "<span class=\"normal-terms-text\">Съгласен съм с </span><a routerLink=\"/legal/terms\" target=\"_blank\" class=\"terms-link\"><strong>Общи условия и правила</strong></a><span class=\"normal-terms-text\"> и </span><a routerLink=\"/legal/privacy\" target=\"_blank\" class=\"terms-link\"><strong>Политика за поверителност</strong></a>"
+			"CHECK_BOX_TEXTS": {
+				"AGREE_TO": "Съгласен съм с",
+				"TERMS_AND_CONDITIONS": "Общи условия",
+				"AND": " и ",
+				"PRIVACY_POLICY": "Политика за поверителност"
+			}
 		}
 	},
 	"LOGIN_PAGE": {
@@ -4395,7 +4400,8 @@
 			"SUPER_ADMIN_TITLE": "Супер администратор",
 			"ADMIN_TITLE": "Администратор",
 			"EMPLOYEE_TITLE": "Служител",
-			"DEMO_CREDENTIALS_TITLE": "<span class=\"demo-text-span\">Демо</span> данни",
+			"DEMO_TITLE": "Демо",
+			"CREDENTIALS_TITLE": "Удостоверения",
 			"LABELS": {
 				"EMAIL": "Имейл: ",
 				"PASSWORD": "Парола: "
@@ -4484,16 +4490,6 @@
 		"UNKNOWN_WORKSPACE": "Не знаете работното си пространство?",
 		"FIND_WORKSPACE": "Намерете вашето работно пространство"
 	},
-	"DEMO": {
-		"SUPER_ADMIN_TITLE": "Супер администратор",
-		"ADMIN_TITLE": "Администратор",
-		"EMPLOYEE_TITLE": "Служител",
-		"DEMO_CREDENTIALS_TITLE": "<span class=\"demo-text-span\">Демо</span> данни",
-		"LABELS": {
-			"EMAIL": "Имейл: ",
-			"PASSWORD": "Парола: "
-		}
-	},
 	"NO_IMAGE": {
 		"ADD_DROP": "Add or Drop Image",
 		"AVAILABLE": "Image not available"
diff --git a/apps/gauzy/src/assets/i18n/de.json b/apps/gauzy/src/assets/i18n/de.json
index f28cd24404a..5db70a6fbe3 100644
--- a/apps/gauzy/src/assets/i18n/de.json
+++ b/apps/gauzy/src/assets/i18n/de.json
@@ -4420,7 +4420,12 @@
 			"PASSWORD_SHOULD_CONTAIN": "Das Passwort sollte zwischen {{ minLength }} und {{ maxLength }} Zeichen enthalten",
 			"CONFIRM_PASSWORD_REQUIRED": "Die Bestätigung des Passworts ist erforderlich!",
 			"PASSWORDS_NOT_MATCH": "Das Passwort stimmt nicht mit der Passwortbestätigung überein!",
-			"AGREE_TERMS_PRIVACY": "<span class=\"normal-terms-text\">Ich stimme den </span><a routerLink=\"/legal/terms\" target=\"_blank\" class=\"terms-link\"><strong>Allgemeinen Geschäftsbedingungen</strong></a><span class=\"normal-terms-text\"> und der </span><a routerLink=\"/legal/privacy\" target=\"_blank\" class=\"terms-link\"><strong>Datenschutzrichtlinie</strong></a> zu"
+			"CHECK_BOX_TEXTS": {
+				"AGREE_TO": "Zustimmen",
+				"TERMS_AND_CONDITIONS": "Allgemeine Geschäftsbedingungen",
+				"AND": " und ",
+				"PRIVACY_POLICY": "Datenschutzbestimmungen"
+			}
 		}
 	},
 	"LOGIN_PAGE": {
@@ -4465,7 +4470,8 @@
 			"SUPER_ADMIN_TITLE": "Super-Administrator",
 			"ADMIN_TITLE": "Administrator",
 			"EMPLOYEE_TITLE": "Mitarbeiter",
-			"DEMO_CREDENTIALS_TITLE": "<span class=\"demo-text-span\">Demo</span> Anmeldedaten",
+			"DEMO_TITLE": "Demo",
+			"CREDENTIALS_TITLE": "Anmeldedaten",
 			"LABELS": {
 				"EMAIL": "E-Mail: ",
 				"PASSWORD": "Passwort: "
@@ -4555,16 +4561,6 @@
 		"UNKNOWN_WORKSPACE": "Kennen Sie Ihren Arbeitsbereich nicht?",
 		"FIND_WORKSPACE": "Finden Sie Ihren Arbeitsbereich"
 	},
-	"DEMO": {
-		"SUPER_ADMIN_TITLE": "Super-Administrator",
-		"ADMIN_TITLE": "Administrator",
-		"EMPLOYEE_TITLE": "Mitarbeiter",
-		"DEMO_CREDENTIALS_TITLE": "<span class=\"demo-text-span\">Demo</span> Anmeldedaten",
-		"LABELS": {
-			"EMAIL": "E-Mail: ",
-			"PASSWORD": "Passwort: "
-		}
-	},
 	"NO_IMAGE": {
 		"ADD_DROP": "Bild hinzufügen oder entfernen",
 		"AVAILABLE": "Bild nicht verfügbar"
diff --git a/apps/gauzy/src/assets/i18n/en.json b/apps/gauzy/src/assets/i18n/en.json
index 6aa7c242b23..adc24fd0032 100644
--- a/apps/gauzy/src/assets/i18n/en.json
+++ b/apps/gauzy/src/assets/i18n/en.json
@@ -4505,7 +4505,12 @@
 			"PASSWORD_SHOULD_CONTAIN": "Password should contain from {{ minLength }} to {{ maxLength }} characters!",
 			"CONFIRM_PASSWORD_REQUIRED": "Password confirmation is required!",
 			"PASSWORDS_NOT_MATCH": "Password does not match the confirm password!",
-			"AGREE_TERMS_PRIVACY": "<span class=\"normal-terms-text\">Agree to </span><a routerLink=\"/legal/terms\" target=\"_blank\" class=\"terms-link\"><strong>Terms & Conditions</strong></a><span class=\"normal-terms-text\"> and </span><a routerLink=\"/legal/privacy\" target=\"_blank\" class=\"terms-link\"><strong>Privacy Policy</strong></a>"
+			"CHECK_BOX_TEXTS": {
+				"AGREE_TO":"Agree to",
+				"TERMS_AND_CONDITIONS":"Terms & Conditions",
+				"AND": " and ",
+				"PRIVACY_POLICY": "Privacy Policy"
+			}
 		}
 	},
 	"LOGIN_PAGE": {
@@ -4550,7 +4555,8 @@
 			"SUPER_ADMIN_TITLE": "Super Admin",
 			"ADMIN_TITLE": "Admin",
 			"EMPLOYEE_TITLE": "Employee",
-			"DEMO_CREDENTIALS_TITLE": "<span class=\"demo-text-span\">Demo</span> Credentials",
+			"DEMO_TITLE": "Demo",
+			"CREDENTIALS_TITLE": "Credentials",
 			"LABELS": {
 				"EMAIL":"Email: ",
 				"PASSWORD": "Password: "
@@ -4640,16 +4646,6 @@
 		"UNKNOWN_WORKSPACE": "Don't know your workspace?",
 		"FIND_WORKSPACE": "Find your workspaces"
 	},
-	"DEMO": {
-		"SUPER_ADMIN_TITLE": "Super Admin",
-		"ADMIN_TITLE": "Admin",
-		"EMPLOYEE_TITLE": "Employee",
-		"DEMO_CREDENTIALS_TITLE": "<span class=\"demo-text-span\">Demo</span> Credentials",
-		"LABELS": {
-			"EMAIL":"Email: ",
-			"PASSWORD": "Password: "
-		}
-	},
 	"NO_IMAGE": {
 		"ADD_DROP": "Add or Drop Image",
 		"AVAILABLE": "Image not available"
diff --git a/apps/gauzy/src/assets/i18n/es.json b/apps/gauzy/src/assets/i18n/es.json
index 9d1b2e0f54e..101d4179d4a 100644
--- a/apps/gauzy/src/assets/i18n/es.json
+++ b/apps/gauzy/src/assets/i18n/es.json
@@ -4426,7 +4426,12 @@
 			"PASSWORD_SHOULD_CONTAIN": "La contraseña debe contener entre {{ minLength }} y {{ maxLength }} caracteres",
 			"CONFIRM_PASSWORD_REQUIRED": "¡Se requiere la confirmación de la contraseña!",
 			"PASSWORDS_NOT_MATCH": "La contraseña no coincide con la confirmación de la contraseña!",
-			"AGREE_TERMS_PRIVACY": "<span class=\"normal-terms-text\">Acepto los </span><a routerLink=\"/legal/terms\" target=\"_blank\" class=\"terms-link\"><strong>Términos y condiciones</strong></a><span class=\"normal-terms-text\"> y la </span><a routerLink=\"/legal/privacy\" target=\"_blank\" class=\"terms-link\"><strong>Política de privacidad</strong></a>"
+			"CHECK_BOX_TEXTS": {
+				"AGREE_TO": "Aceptar",
+				"TERMS_AND_CONDITIONS": "Términos y condiciones",
+				"AND": " y ",
+				"PRIVACY_POLICY": "Política de privacidad"
+			}
 		}
 	},
 	"LOGIN_PAGE": {
@@ -4471,7 +4476,8 @@
 			"SUPER_ADMIN_TITLE": "Superadministrador",
 			"ADMIN_TITLE": "Administrador",
 			"EMPLOYEE_TITLE": "Empleado",
-			"DEMO_CREDENTIALS_TITLE": "<span class=\"demo-text-span\">Credenciales de demostración</span>",
+			"DEMO_TITLE": "Demo",
+			"CREDENTIALS_TITLE": "Credenciales",
 			"LABELS": {
 				"EMAIL": "Correo electrónico: ",
 				"PASSWORD": "Contraseña: "
@@ -4561,16 +4567,6 @@
 		"UNKNOWN_WORKSPACE": "¿No conoces tu espacio de trabajo?",
 		"FIND_WORKSPACE": "Encuentra tu espacio de trabajo"
 	},
-	"DEMO": {
-		"SUPER_ADMIN_TITLE": "Superadministrador",
-		"ADMIN_TITLE": "Administrador",
-		"EMPLOYEE_TITLE": "Empleado",
-		"DEMO_CREDENTIALS_TITLE": "<span class=\"demo-text-span\">Credenciales de demostración</span>",
-		"LABELS": {
-			"EMAIL": "Correo electrónico: ",
-			"PASSWORD": "Contraseña: "
-		}
-	},
 	"NO_IMAGE": {
 		"ADD_DROP": "Agregar o Eliminar Imagen",
 		"AVAILABLE": "Imagen no disponible"
diff --git a/apps/gauzy/src/assets/i18n/fr.json b/apps/gauzy/src/assets/i18n/fr.json
index bb97161ff02..5f7899048d5 100644
--- a/apps/gauzy/src/assets/i18n/fr.json
+++ b/apps/gauzy/src/assets/i18n/fr.json
@@ -4425,7 +4425,12 @@
 			"PASSWORD_SHOULD_CONTAIN": "Le mot de passe doit contenir entre {{ minLength }} et {{ maxLength }} caractères",
 			"CONFIRM_PASSWORD_REQUIRED": "La confirmation du mot de passe est requise !",
 			"PASSWORDS_NOT_MATCH": "Le mot de passe ne correspond pas à la confirmation du mot de passe !",
-			"AGREE_TERMS_PRIVACY": "<span class=\"normal-terms-text\">J'accepte les </span><a routerLink=\"/legal/terms\" target=\"_blank\" class=\"terms-link\"><strong>Conditions générales</strong></a><span class=\"normal-terms-text\"> et la </span><a routerLink=\"/legal/privacy\" target=\"_blank\" class=\"terms-link\"><strong>Politique de confidentialité</strong></a>"
+			"CHECK_BOX_TEXTS": {
+				"AGREE_TO": "Accepter",
+				"TERMS_AND_CONDITIONS": "Conditions générales",
+				"AND": " et ",
+				"PRIVACY_POLICY": "Politique de confidentialité"
+			}
 		}
 	},
 	"LOGIN_PAGE": {
@@ -4470,7 +4475,8 @@
 			"SUPER_ADMIN_TITLE": "Super administrateur",
 			"ADMIN_TITLE": "Administrateur",
 			"EMPLOYEE_TITLE": "Employé",
-			"DEMO_CREDENTIALS_TITLE": "<span class=\"demo-text-span\">Identifiants de démonstration</span>",
+			"DEMO_TITLE": "Démo",
+			"CREDENTIALS_TITLE": "Identifiants",
 			"LABELS": {
 				"EMAIL": "E-mail : ",
 				"PASSWORD": "Mot de passe : "
@@ -4560,16 +4566,6 @@
 		"UNKNOWN_WORKSPACE": "Vous ne connaissez pas votre espace de travail ?",
 		"FIND_WORKSPACE": "Trouver votre espace de travail"
 	},
-	"DEMO": {
-		"SUPER_ADMIN_TITLE": "Super administrateur",
-		"ADMIN_TITLE": "Administrateur",
-		"EMPLOYEE_TITLE": "Employé",
-		"DEMO_CREDENTIALS_TITLE": "<span class=\"demo-text-span\">Identifiants de démonstration</span>",
-		"LABELS": {
-			"EMAIL": "E-mail: ",
-			"PASSWORD": "Mot de passe: "
-		}
-	},
 	"NO_IMAGE": {
 		"ADD_DROP": "Ajouter ou supprimer une image",
 		"AVAILABLE": "Image non disponible"
diff --git a/apps/gauzy/src/assets/i18n/he.json b/apps/gauzy/src/assets/i18n/he.json
index e70f5d58921..e7e9bdff1b8 100644
--- a/apps/gauzy/src/assets/i18n/he.json
+++ b/apps/gauzy/src/assets/i18n/he.json
@@ -4348,7 +4348,12 @@
 			"PASSWORD_SHOULD_CONTAIN": "סיסמה צריכה להכיל בין {{ minLength }} ל-{{ maxLength }} תווים",
 			"CONFIRM_PASSWORD_REQUIRED": "אישור סיסמה נדרש!",
 			"PASSWORDS_NOT_MATCH": "הסיסמה לא תואמת לאישור הסיסמה!",
-			"AGREE_TERMS_PRIVACY": "<span class=\"normal-terms-text\">מסכים ל </span><a routerLink=\"/legal/terms\" target=\"_blank\" class=\"terms-link\"><strong>תנאי השימוש</strong></a><span class=\"normal-terms-text\"> ול </span><a routerLink=\"/legal/privacy\" target=\"_blank\" class=\"terms-link\"><strong>מדיניות הפרטיות</strong></a>"
+			"CHECK_BOX_TEXTS": {
+				"AGREE_TO": "הסכמה",
+				"TERMS_AND_CONDITIONS": "תנאים והגבלות",
+				"AND": " וגם ",
+				"PRIVACY_POLICY": "מדיניות פרטיות"
+			}
 		}
 	},
 	"LOGIN_PAGE": {
@@ -4393,7 +4398,8 @@
 			"SUPER_ADMIN_TITLE": "מנהל ראשי",
 			"ADMIN_TITLE": "מנהל",
 			"EMPLOYEE_TITLE": "עובד",
-			"DEMO_CREDENTIALS_TITLE": "<span class=\"demo-text-span\">פרטי דמו</span>",
+			"DEMO_TITLE": "הדגמה",
+			"CREDENTIALS_TITLE": "פרטי כניסה",
 			"LABELS": {
 				"EMAIL": "אימייל: ",
 				"PASSWORD": "סיסמה: "
@@ -4482,16 +4488,6 @@
 		"UNKNOWN_WORKSPACE": "אין לך מושג מה המרחב שלך?",
 		"FIND_WORKSPACE": "מצא את המרחב שלך"
 	},
-	"DEMO": {
-		"SUPER_ADMIN_TITLE": "מנהל ראשי",
-		"ADMIN_TITLE": "מנהל",
-		"EMPLOYEE_TITLE": "עובד",
-		"DEMO_CREDENTIALS_TITLE": "<span class=\"demo-text-span\">פרטי דמו</span>",
-		"LABELS": {
-			"EMAIL": "אימייל: ",
-			"PASSWORD": "סיסמה: "
-		}
-	},
 	"NO_IMAGE": {
 		"ADD_DROP": "Add or Drop Image",
 		"AVAILABLE": "Image not available"
diff --git a/apps/gauzy/src/assets/i18n/it.json b/apps/gauzy/src/assets/i18n/it.json
index f2902cb22a5..576695fbd6e 100644
--- a/apps/gauzy/src/assets/i18n/it.json
+++ b/apps/gauzy/src/assets/i18n/it.json
@@ -4424,7 +4424,12 @@
 			"PASSWORD_SHOULD_CONTAIN": "La password deve contenere tra {{ minLength }} e {{ maxLength }} caratteri",
 			"CONFIRM_PASSWORD_REQUIRED": "La conferma della password è obbligatoria!",
 			"PASSWORDS_NOT_MATCH": "La password non corrisponde alla conferma della password!",
-			"AGREE_TERMS_PRIVACY": "<span class=\"normal-terms-text\">Accetto </span><a routerLink=\"/legal/terms\" target=\"_blank\" class=\"terms-link\"><strong>Termini e Condizioni</strong></a><span class=\"normal-terms-text\"> e </span><a routerLink=\"/legal/privacy\" target=\"_blank\" class=\"terms-link\"><strong>Informativa sulla privacy</strong></a>"
+			"CHECK_BOX_TEXTS": {
+				"AGREE_TO": "Accetto",
+				"TERMS_AND_CONDITIONS": "Termini e condizioni",
+				"AND": " e ",
+				"PRIVACY_POLICY": "Informativa sulla privacy"
+			}
 		}
 	},
 	"LOGIN_PAGE": {
@@ -4469,7 +4474,8 @@
 			"SUPER_ADMIN_TITLE": "Super Admin",
 			"ADMIN_TITLE": "Admin",
 			"EMPLOYEE_TITLE": "Impiegato",
-			"DEMO_CREDENTIALS_TITLE": "<span class=\"demo-text-span\">Credenziali Demo</span>",
+			"DEMO_TITLE": "Demo",
+			"CREDENTIALS_TITLE": "Credenziali",
 			"LABELS": {
 				"EMAIL": "Email: ",
 				"PASSWORD": "Password: "
@@ -4559,16 +4565,6 @@
 		"UNKNOWN_WORKSPACE": "Non conosci il tuo spazio di lavoro?",
 		"FIND_WORKSPACE": "Trova i tuoi spazi di lavoro"
 	},
-	"DEMO": {
-		"SUPER_ADMIN_TITLE": "Super Admin",
-		"ADMIN_TITLE": "Admin",
-		"EMPLOYEE_TITLE": "Impiegato",
-		"DEMO_CREDENTIALS_TITLE": "<span class=\"demo-text-span\">Credenziali Demo</span>",
-		"LABELS": {
-			"EMAIL": "Email: ",
-			"PASSWORD": "Password: "
-		}
-	},
 	"NO_IMAGE": {
 		"ADD_DROP": "Aggiungi o Rimuovi Immagine",
 		"AVAILABLE": "Immagine non disponibile"
diff --git a/apps/gauzy/src/assets/i18n/nl.json b/apps/gauzy/src/assets/i18n/nl.json
index 6884c568882..0279c248d10 100644
--- a/apps/gauzy/src/assets/i18n/nl.json
+++ b/apps/gauzy/src/assets/i18n/nl.json
@@ -4424,7 +4424,12 @@
 			"PASSWORD_SHOULD_CONTAIN": "Wachtwoord moet tussen {{ minLength }} en {{ maxLength }} tekens bevatten",
 			"CONFIRM_PASSWORD_REQUIRED": "Bevestiging van wachtwoord is verplicht!",
 			"PASSWORDS_NOT_MATCH": "Wachtwoord komt niet overeen met de bevestiging van het wachtwoord!",
-			"AGREE_TERMS_PRIVACY": "<span class=\"normal-terms-text\">Akkoord met </span><a routerLink=\"/legal/terms\" target=\"_blank\" class=\"terms-link\"><strong>Algemene voorwaarden</strong></a><span class=\"normal-terms-text\"> en </span><a routerLink=\"/legal/privacy\" target=\"_blank\" class=\"terms-link\"><strong>Privacybeleid</strong></a>"
+			"CHECK_BOX_TEXTS": {
+				"AGREE_TO": "Akkoord met",
+				"TERMS_AND_CONDITIONS": "Algemene voorwaarden",
+				"AND": " en ",
+				"PRIVACY_POLICY": "Privacybeleid"
+			}
 		}
 	},
 	"LOGIN_PAGE": {
@@ -4469,7 +4474,8 @@
 			"SUPER_ADMIN_TITLE": "Superbeheerder",
 			"ADMIN_TITLE": "Beheerder",
 			"EMPLOYEE_TITLE": "Werknemer",
-			"DEMO_CREDENTIALS_TITLE": "<span class=\"demo-text-span\">Demo-inloggegevens</span>",
+			"DEMO_TITLE": "Demo",
+			"CREDENTIALS_TITLE": "Inloggegevens",
 			"LABELS": {
 				"EMAIL": "E-mail: ",
 				"PASSWORD": "Wachtwoord: "
@@ -4559,16 +4565,6 @@
 		"UNKNOWN_WORKSPACE": "Weet je niet waar je werkruimte is?",
 		"FIND_WORKSPACE": "Vind je werkruimtes"
 	},
-	"DEMO": {
-		"SUPER_ADMIN_TITLE": "Superbeheerder",
-		"ADMIN_TITLE": "Beheerder",
-		"EMPLOYEE_TITLE": "Werknemer",
-		"DEMO_CREDENTIALS_TITLE": "<span class=\"demo-text-span\">Demo-inloggegevens</span>",
-		"LABELS": {
-			"EMAIL": "E-mail: ",
-			"PASSWORD": "Wachtwoord: "
-		}
-	},
 	"NO_IMAGE": {
 		"ADD_DROP": "Afbeelding toevoegen of verwijderen",
 		"AVAILABLE": "Afbeelding niet beschikbaar"
diff --git a/apps/gauzy/src/assets/i18n/pl.json b/apps/gauzy/src/assets/i18n/pl.json
index 164a222b8a0..0669f68648b 100644
--- a/apps/gauzy/src/assets/i18n/pl.json
+++ b/apps/gauzy/src/assets/i18n/pl.json
@@ -4424,7 +4424,12 @@
 			"PASSWORD_SHOULD_CONTAIN": "Hasło powinno zawierać od {{ minLength }} do {{ maxLength }} znaków",
 			"CONFIRM_PASSWORD_REQUIRED": "Potwierdzenie hasła jest wymagane!",
 			"PASSWORDS_NOT_MATCH": "Hasło nie pasuje do potwierdzenia hasła!",
-			"AGREE_TERMS_PRIVACY": "<span class=\"normal-terms-text\">Zgadzam się z </span><a routerLink=\"/legal/terms\" target=\"_blank\" class=\"terms-link\"><strong>Warunki korzystania</strong></a><span class=\"normal-terms-text\"> oraz </span><a routerLink=\"/legal/privacy\" target=\"_blank\" class=\"terms-link\"><strong>Polityką prywatności</strong></a>"
+			"CHECK_BOX_TEXTS": {
+				"AGREE_TO": "Zgadzam się na",
+				"TERMS_AND_CONDITIONS": "Regulamin",
+				"AND": " oraz ",
+				"PRIVACY_POLICY": "Polityka prywatności"
+			}
 		}
 	},
 	"LOGIN_PAGE": {
@@ -4469,7 +4474,8 @@
 			"SUPER_ADMIN_TITLE": "Superadministrator",
 			"ADMIN_TITLE": "Administrator",
 			"EMPLOYEE_TITLE": "Pracownik",
-			"DEMO_CREDENTIALS_TITLE": "<span class=\"demo-text-span\">Dane do logowania w wersji demonstracyjnej</span>",
+			"DEMO_TITLE": "Dema",
+			"CREDENTIALS_TITLE": "Dane uwierzytelniające",
 			"LABELS": {
 				"EMAIL": "E-mail: ",
 				"PASSWORD": "Hasło: "
@@ -4559,16 +4565,6 @@
 		"UNKNOWN_WORKSPACE": "Nie wiesz, gdzie jest twoja przestrzeń robocza?",
 		"FIND_WORKSPACE": "Znajdź swoje przestrzenie robocze"
 	},
-	"DEMO": {
-		"SUPER_ADMIN_TITLE": "Superadministrator",
-		"ADMIN_TITLE": "Administrator",
-		"EMPLOYEE_TITLE": "Pracownik",
-		"DEMO_CREDENTIALS_TITLE": "<span class=\"demo-text-span\">Dane do logowania w wersji demonstracyjnej</span>",
-		"LABELS": {
-			"EMAIL": "E-mail: ",
-			"PASSWORD": "Hasło: "
-		}
-	},
 	"NO_IMAGE": {
 		"ADD_DROP": "Dodaj lub usuń obraz",
 		"AVAILABLE": "Zdjęcie niedostępne"
diff --git a/apps/gauzy/src/assets/i18n/pt.json b/apps/gauzy/src/assets/i18n/pt.json
index c554ca0bba0..c14e061b74c 100644
--- a/apps/gauzy/src/assets/i18n/pt.json
+++ b/apps/gauzy/src/assets/i18n/pt.json
@@ -4424,7 +4424,12 @@
 			"PASSWORD_SHOULD_CONTAIN": "A senha deve conter de {{ minLength }} a {{ maxLength }} caracteres",
 			"CONFIRM_PASSWORD_REQUIRED": "Confirmação de senha é obrigatória!",
 			"PASSWORDS_NOT_MATCH": "A senha não coincide com a confirmação de senha!",
-			"AGREE_TERMS_PRIVACY": "<span class=\"normal-terms-text\">Concordo com </span><a routerLink=\"/legal/terms\" target=\"_blank\" class=\"terms-link\"><strong>Termos de Uso</strong></a><span class=\"normal-terms-text\"> e </span><a routerLink=\"/legal/privacy\" target=\"_blank\" class=\"terms-link\"><strong>Política de Privacidade</strong></a>"
+			"CHECK_BOX_TEXTS": {
+				"AGREE_TO": "Concordo com",
+				"TERMS_AND_CONDITIONS": "Termos e Condições",
+				"AND": " e ",
+				"PRIVACY_POLICY": "Política de Privacidade"
+			}
 		}
 	},
 	"LOGIN_PAGE": {
@@ -4469,7 +4474,8 @@
 			"SUPER_ADMIN_TITLE": "Super Administrador",
 			"ADMIN_TITLE": "Administrador",
 			"EMPLOYEE_TITLE": "Funcionário",
-			"DEMO_CREDENTIALS_TITLE": "<span class=\"demo-text-span\">Credenciais de Demonstração</span>",
+			"DEMO_TITLE": "Demonstração",
+			"CREDENTIALS_TITLE": "Credenciais",
 			"LABELS": {
 				"EMAIL": "E-mail: ",
 				"PASSWORD": "Senha: "
@@ -4559,16 +4565,6 @@
 		"UNKNOWN_WORKSPACE": "Não conhece a sua área de trabalho?",
 		"FIND_WORKSPACE": "Encontre suas áreas de trabalho"
 	},
-	"DEMO": {
-		"SUPER_ADMIN_TITLE": "Super Administrador",
-		"ADMIN_TITLE": "Administrador",
-		"EMPLOYEE_TITLE": "Funcionário",
-		"DEMO_CREDENTIALS_TITLE": "<span class=\"demo-text-span\">Credenciais de Demonstração</span>",
-		"LABELS": {
-			"EMAIL": "E-mail: ",
-			"PASSWORD": "Senha: "
-		}
-	},
 	"NO_IMAGE": {
 		"ADD_DROP": "Adicionar ou Remover Imagem",
 		"AVAILABLE": "Imagem não disponível."
diff --git a/apps/gauzy/src/assets/i18n/ru.json b/apps/gauzy/src/assets/i18n/ru.json
index 1b43ccff12e..3fad25cb172 100644
--- a/apps/gauzy/src/assets/i18n/ru.json
+++ b/apps/gauzy/src/assets/i18n/ru.json
@@ -4349,7 +4349,12 @@
 			"PASSWORD_SHOULD_CONTAIN": "Пароль должен содержать от {{ minLength }} до {{ maxLength }} символов",
 			"CONFIRM_PASSWORD_REQUIRED": "Требуется подтверждение пароля!",
 			"PASSWORDS_NOT_MATCH": "Пароли не совпадают!",
-			"AGREE_TERMS_PRIVACY": "<span class=\"normal-terms-text\">Соглашаюсь с </span><a routerLink=\"/legal/terms\" target=\"_blank\" class=\"terms-link\"><strong>Условиями использования</strong></a><span class=\"normal-terms-text\"> и </span><a routerLink=\"/legal/privacy\" target=\"_blank\" class=\"terms-link\"><strong>Политикой конфиденциальности</strong></a>"
+			"CHECK_BOX_TEXTS": {
+				"AGREE_TO": "Согласен с",
+				"TERMS_AND_CONDITIONS": "Условиями использования",
+				"AND": " и ",
+				"PRIVACY_POLICY": "Политикой конфиденциальности"
+			}
 		}
 	},
 	"LOGIN_PAGE": {
@@ -4394,7 +4399,8 @@
 			"SUPER_ADMIN_TITLE": "Супер Администратор",
 			"ADMIN_TITLE": "Администратор",
 			"EMPLOYEE_TITLE": "Сотрудник",
-			"DEMO_CREDENTIALS_TITLE": "<span class=\"demo-text-span\">Демонстрационные учетные данные</span>",
+			"DEMO_TITLE": "Демо",
+			"CREDENTIALS_TITLE": "Учетные данные",
 			"LABELS": {
 				"EMAIL": "Электронная почта: ",
 				"PASSWORD": "Пароль: "
@@ -4483,16 +4489,6 @@
 		"UNKNOWN_WORKSPACE": "Не знаете своего рабочего пространства?",
 		"FIND_WORKSPACE": "Найти ваши рабочие пространства"
 	},
-	"DEMO": {
-		"SUPER_ADMIN_TITLE": "Супер Администратор",
-		"ADMIN_TITLE": "Администратор",
-		"EMPLOYEE_TITLE": "Сотрудник",
-		"DEMO_CREDENTIALS_TITLE": "<span class=\"demo-text-span\">Демонстрационные учетные данные</span>",
-		"LABELS": {
-			"EMAIL": "Электронная почта: ",
-			"PASSWORD": "Пароль: "
-		}
-	},
 	"NO_IMAGE": {
 		"ADD_DROP": "Добавить или выложить изображение",
 		"AVAILABLE": "Изображение недоступно"
diff --git a/apps/gauzy/src/assets/i18n/zh.json b/apps/gauzy/src/assets/i18n/zh.json
index 864c9980577..5979c92c09c 100644
--- a/apps/gauzy/src/assets/i18n/zh.json
+++ b/apps/gauzy/src/assets/i18n/zh.json
@@ -4424,7 +4424,12 @@
 			"PASSWORD_SHOULD_CONTAIN": "密码应包含 {{ minLength }} 到 {{ maxLength }} 个字符",
 			"CONFIRM_PASSWORD_REQUIRED": "需要确认密码！",
 			"PASSWORDS_NOT_MATCH": "密码与确认密码不匹配！",
-			"AGREE_TERMS_PRIVACY": "<span class=\"normal-terms-text\">同意 </span><a routerLink=\"/legal/terms\" target=\"_blank\" class=\"terms-link\"><strong>条款和条件</strong></a><span class=\"normal-terms-text\"> 以及 </span><a routerLink=\"/legal/privacy\" target=\"_blank\" class=\"terms-link\"><strong>隐私政策</strong></a>"
+			"CHECK_BOX_TEXTS": {
+				"AGREE_TO": "同意",
+				"TERMS_AND_CONDITIONS": "条款和条件",
+				"AND": " 和 ",
+				"PRIVACY_POLICY": "隐私政策"
+			}
 		}
 	},
 	"LOGIN_PAGE": {
@@ -4469,7 +4474,8 @@
 			"SUPER_ADMIN_TITLE": "超级管理员",
 			"ADMIN_TITLE": "管理员",
 			"EMPLOYEE_TITLE": "员工",
-			"DEMO_CREDENTIALS_TITLE": "<span class=\"demo-text-span\">演示凭证</span>",
+			"DEMO_TITLE": "演示",
+			"CREDENTIALS_TITLE": "凭证",
 			"LABELS": {
 				"EMAIL": "电子邮件：",
 				"PASSWORD": "密码："
@@ -4559,16 +4565,6 @@
 		"UNKNOWN_WORKSPACE": "不知道您的工作区？",
 		"FIND_WORKSPACE": "查找您的工作区"
 	},
-	"DEMO": {
-		"SUPER_ADMIN_TITLE": "超级管理员",
-		"ADMIN_TITLE": "管理员",
-		"EMPLOYEE_TITLE": "员工",
-		"DEMO_CREDENTIALS_TITLE": "<span class=\"demo-text-span\">演示凭证</span>",
-		"LABELS": {
-			"EMAIL": "电子邮件：",
-			"PASSWORD": "密码："
-		}
-	},
 	"NO_IMAGE": {
 		"ADD_DROP": "添加或删除图像",
 		"AVAILABLE": "图像不可用"

From a1c92e978220103607487ed4ae819833f76c54ae Mon Sep 17 00:00:00 2001
From: RAHUL RATHORE <41804588+rahul-rocket@users.noreply.github.com>
Date: Thu, 7 Dec 2023 11:50:05 +0530
Subject: [PATCH 10/34] fix: integration settings sensitive keys are wrapped in
 mask

---
 .../common-angular/src/utils/shared-utils.ts  | 21 +++++++--
 .../core/src/core/decorators/is-secret.ts     | 47 ++++++++++---------
 .../integration-setting.controller.ts         | 12 ++---
 .../integration-setting.entity.ts             | 46 ++++++++++++++++--
 .../integration-setting.utils.ts              | 45 ++++++++++++++++++
 .../gauzy-ai/integration-ai.middleware.ts     |  1 +
 6 files changed, 133 insertions(+), 39 deletions(-)
 create mode 100644 packages/core/src/integration-setting/integration-setting.utils.ts

diff --git a/packages/common-angular/src/utils/shared-utils.ts b/packages/common-angular/src/utils/shared-utils.ts
index dbdfa69e3f5..328a68cf833 100644
--- a/packages/common-angular/src/utils/shared-utils.ts
+++ b/packages/common-angular/src/utils/shared-utils.ts
@@ -358,9 +358,22 @@ export function sleep(ms: number) {
 }
 
 /**
- * Parses a string into an integer.
+ * Convert an array of objects to an object with specified key-value pairs.
  *
- * @param {string} value - The string to parse into an integer.
- * @returns {number} - The parsed integer value.
+ * @param array - The array of objects.
+ * @param key - The property to use as the key in the resulting object.
+ * @param value - The property to use as the value in the resulting object.
+ * @returns An object with key-value pairs based on the specified properties.
  */
-export const parsedInt = (value: string) => parseInt(value, 10);
+export function arrayToObject<T extends Record<string, any>>(
+	array: T[],
+	key: keyof T,
+	value: keyof T
+): Record<string, any> {
+	return array.reduce((prev, current) => {
+		return {
+			...prev,
+			[String(current[key])]: current[value],
+		};
+	}, {});
+}
diff --git a/packages/core/src/core/decorators/is-secret.ts b/packages/core/src/core/decorators/is-secret.ts
index a1d4dd648f1..016b6ea0f5b 100644
--- a/packages/core/src/core/decorators/is-secret.ts
+++ b/packages/core/src/core/decorators/is-secret.ts
@@ -17,15 +17,20 @@ export function IsSecret(boolean: boolean = true): PropertyDecorator {
 }
 
 /**
- * Wrapper for secrets keys
+ * Wrap specified keys in an object with a specific character based on metadata.
  *
- * @param secrets
- * @param targets
- * @param percentage
- * @param character
- * @returns
+ * @param secrets - The object containing the sensitive data.
+ * @param targets - The target class or classes with metadata.
+ * @param percentage - The percentage of the string to be replaced with the character.
+ * @param character - The character used for replacement.
+ * @returns The object with specified keys wrapped.
  */
-export function WrapSecrets(secrets: any, targets: any, percentage = 35, character = '*') {
+export function WrapSecrets(
+	secrets: Record<string, any>,
+	targets: any | any[],
+	percentage = 35,
+	character = '*'
+) {
 	// Check if found class target, convert it into array to use for loop
 	if (isClassInstance(targets)) {
 		targets = [targets];
@@ -33,26 +38,24 @@ export function WrapSecrets(secrets: any, targets: any, percentage = 35, charact
 	for (const target of targets) {
 		if (isObject(secrets)) {
 			for (const [key, value] of Object.entries(secrets)) {
-				if (Reflect.hasMetadata(key, target)) {
-					if (Reflect.getMetadata(key, target)) {
-						if (isNotEmpty(value)) {
-							const string = value.toString();
+				if (Reflect.hasMetadata(key, target) && Reflect.getMetadata(key, target)) {
+					if (isNotEmpty(value)) {
+						const string = value.toString();
 
-							// Calculate offset in percentage based on secret length
-							const offset = Math.ceil((percentage / 100) * string.length);
+						// Calculate offset in percentage based on secret length
+						const offset = Math.ceil((percentage / 100) * string.length);
 
-							// Get first offset character
-							const first = string.substring(0, offset);
+						// Get first offset character
+						const first = string.substring(0, offset);
 
-							// Get last offset character
-							const last = string.slice(string.length - offset);
+						// Get last offset character
+						const last = string.slice(string.length - offset);
 
-							// Create character repeater
-							const repeater = character.repeat(offset);
+						// Create character repeater
+						const repeater = character.repeat(offset);
 
-							// ReplaceAll secrets with character
-							secrets[key] = string.replace(first, repeater).replace(last, repeater);
-						}
+						// ReplaceAll secrets with character
+						secrets[key] = string.replace(first, repeater).replace(last, repeater);
 					}
 				}
 			}
diff --git a/packages/core/src/integration-setting/integration-setting.controller.ts b/packages/core/src/integration-setting/integration-setting.controller.ts
index a3671d58b48..031e3d4d8d4 100644
--- a/packages/core/src/integration-setting/integration-setting.controller.ts
+++ b/packages/core/src/integration-setting/integration-setting.controller.ts
@@ -1,20 +1,14 @@
 import { Controller, UseGuards } from '@nestjs/common';
 import { ApiTags } from '@nestjs/swagger';
 import { PermissionsEnum } from '@gauzy/contracts';
-import { CrudController } from './../core/crud';
 import { Permissions } from './../shared/decorators';
 import { PermissionGuard, TenantPermissionGuard } from './../shared/guards';
-import { IntegrationSettingService } from './integration-setting.service';
-import { IntegrationSetting } from './integration-setting.entity';
 
 @ApiTags('IntegrationSetting')
 @UseGuards(TenantPermissionGuard, PermissionGuard)
 @Permissions(PermissionsEnum.INTEGRATION_VIEW)
 @Controller('integration-setting')
-export class IntegrationSettingController extends CrudController<IntegrationSetting> {
-	constructor(
-		private readonly integrationSettingService: IntegrationSettingService
-	) {
-		super(integrationSettingService);
-	}
+export class IntegrationSettingController {
+
+	constructor() { }
 }
diff --git a/packages/core/src/integration-setting/integration-setting.entity.ts b/packages/core/src/integration-setting/integration-setting.entity.ts
index 9c0632463f0..12ea4448215 100644
--- a/packages/core/src/integration-setting/integration-setting.entity.ts
+++ b/packages/core/src/integration-setting/integration-setting.entity.ts
@@ -1,20 +1,27 @@
 import { ApiProperty } from '@nestjs/swagger';
-import { Column, Entity, JoinColumn, RelationId, ManyToOne, Index } from 'typeorm';
-import { IsUUID } from 'class-validator';
+import { Column, Entity, JoinColumn, RelationId, ManyToOne, Index, AfterLoad } from 'typeorm';
+import { IsNotEmpty, IsUUID } from 'class-validator';
+import { Exclude, Expose } from 'class-transformer';
 import { IIntegrationSetting } from '@gauzy/contracts';
 import {
 	IntegrationTenant,
 	TenantOrganizationBaseEntity
-} from '../core/entities/internal';
+} from './../core/entities/internal';
+import { IsSecret } from './../core/decorators';
+import { KeysToWrapSecrets, sensitiveSecretKeys } from './integration-setting.utils';
 
 @Entity('integration_setting')
 export class IntegrationSetting extends TenantOrganizationBaseEntity implements IIntegrationSetting {
 
+	@Exclude({ toPlainOnly: true })
 	@ApiProperty({ type: () => String })
+	@IsNotEmpty()
 	@Column()
 	settingsName: string;
 
+	@Exclude({ toPlainOnly: true })
 	@ApiProperty({ type: () => String })
+	@IsNotEmpty()
 	@Column()
 	settingsValue: string;
 
@@ -27,7 +34,6 @@ export class IntegrationSetting extends TenantOrganizationBaseEntity implements
 	/**
 	 * IntegrationTenant
 	 */
-	@ApiProperty({ type: () => IntegrationTenant })
 	@ManyToOne(() => IntegrationTenant, (it) => it.settings, {
 		/** Database cascade action on delete. */
 		onDelete: 'CASCADE',
@@ -41,4 +47,36 @@ export class IntegrationSetting extends TenantOrganizationBaseEntity implements
 	@Index()
 	@Column()
 	integrationId?: IntegrationTenant['id'];
+
+	/**
+	 * Additional fields to expose secret fields
+	 */
+	@Expose({ toPlainOnly: true, name: 'settingsName' })
+	@IsSecret()
+	wrapSecretKey?: string;
+
+	@Expose({ toPlainOnly: true, name: 'settingsValue' })
+	@IsSecret()
+	wrapSecretvalue?: string;
+
+	/*
+	|--------------------------------------------------------------------------
+	| @EventSubscriber
+	|--------------------------------------------------------------------------
+	*/
+	/**
+	 * Called after entity is loaded.
+	 */
+	@AfterLoad()
+	afterLoadEntity?() {
+		const { settingsName, settingsValue } = this;
+
+		// Apply the wrapping function only to the sensitive keys
+		const wrapped = KeysToWrapSecrets(sensitiveSecretKeys, {
+			[settingsName]: settingsValue,
+		});
+
+		this.wrapSecretKey = settingsName;
+		this.wrapSecretvalue = wrapped[settingsName];
+	}
 }
diff --git a/packages/core/src/integration-setting/integration-setting.utils.ts b/packages/core/src/integration-setting/integration-setting.utils.ts
new file mode 100644
index 00000000000..93d4e6c7c9b
--- /dev/null
+++ b/packages/core/src/integration-setting/integration-setting.utils.ts
@@ -0,0 +1,45 @@
+import { isNotEmpty, isObject } from "@gauzy/common";
+
+// Assuming you have fetched sensitive keys specific entity
+export const sensitiveSecretKeys = ['apiKey', 'apiSecret', 'openaiApiSecretKey'];
+
+/**
+ * Wrap specified keys in an object with a specific character.
+ *
+ * @param keysToWrap - An array of keys to be wrapped.
+ * @param secrets - The object containing the sensitive data.
+ * @param percentage - The percentage of the string to be replaced with the character.
+ * @param character - The character used for replacement.
+ * @returns The object with specified keys wrapped.
+ */
+export function KeysToWrapSecrets(
+    keysToWrap: string[],
+    secrets: Record<string, any>,
+    percentage = 35,
+    character = '*'
+) {
+    // Checks if a value is an object
+    if (isObject(secrets) && Array.isArray(keysToWrap)) {
+        // Checks if a value is not empty
+        for (const key of keysToWrap) {
+            if (isNotEmpty(secrets[key])) {
+                const string = secrets[key].toString();
+                // Calculate offset in percentage based on secret length
+                const offset = Math.ceil((percentage / 100) * string.length);
+
+                // Get first offset character
+                const first = string.substring(0, offset);
+
+                // Get last offset character
+                const last = string.slice(string.length - offset);
+
+                // Create character repeater
+                const repeater = character.repeat(offset);
+
+                // ReplaceAll secrets with character
+                secrets[key] = string.replace(first, repeater).replace(last, repeater);
+            }
+        }
+    }
+    return secrets;
+}
diff --git a/packages/core/src/integration/gauzy-ai/integration-ai.middleware.ts b/packages/core/src/integration/gauzy-ai/integration-ai.middleware.ts
index 6fad02b928d..9adbf807cd8 100644
--- a/packages/core/src/integration/gauzy-ai/integration-ai.middleware.ts
+++ b/packages/core/src/integration/gauzy-ai/integration-ai.middleware.ts
@@ -42,6 +42,7 @@ export class IntegrationAIMiddleware implements NestMiddleware {
                 });
                 // Convert settings array to an object
                 const { apiKey: ApiKey, apiSecret: ApiSecret } = arrayToObject(settings, 'settingsName', 'settingsValue');
+                console.log({ ApiKey, ApiSecret });
 
                 if (ApiKey && ApiSecret) {
                     // Update custom headers and request configuration with API key and secret

From ab03047b50cb62d18f50a7959ef6408319e3f9c8 Mon Sep 17 00:00:00 2001
From: RAHUL RATHORE <41804588+rahul-rocket@users.noreply.github.com>
Date: Thu, 7 Dec 2023 14:38:48 +0530
Subject: [PATCH 11/34] feat: #7246 displayed consumer keys with mask format

---
 .../@shared/directives/text-mask.directive.ts | 52 +++++++++-----
 .../components/view/view.component.html       | 23 +++----
 .../components/view/view.component.ts         | 69 +++++++++++++++----
 .../integrations/gauzy-ai/gauzy-ai.module.ts  | 17 +++--
 apps/gauzy/src/assets/i18n/bg.json            | 32 +++++++++
 apps/gauzy/src/assets/i18n/en.json            |  6 ++
 apps/gauzy/src/assets/i18n/he.json            | 32 +++++++++
 apps/gauzy/src/assets/i18n/ru.json            | 32 +++++++++
 packages/core/src/core/entities/internal.ts   |  1 +
 .../core/src/core/entities/subscribers.ts     |  2 +
 .../integration-setting.entity.ts             | 21 ------
 .../integration-setting.subscriber.ts         | 42 +++++++++++
 12 files changed, 259 insertions(+), 70 deletions(-)
 create mode 100644 packages/core/src/integration-setting/integration-setting.subscriber.ts

diff --git a/apps/gauzy/src/app/@shared/directives/text-mask.directive.ts b/apps/gauzy/src/app/@shared/directives/text-mask.directive.ts
index a81ec116559..73788bbed9b 100644
--- a/apps/gauzy/src/app/@shared/directives/text-mask.directive.ts
+++ b/apps/gauzy/src/app/@shared/directives/text-mask.directive.ts
@@ -1,5 +1,6 @@
 import { Directive, ElementRef, Renderer2, Input } from '@angular/core';
 
+// Interface representing the configuration for text masking
 interface IMaskConfig {
 	text: string;
 	showOriginal: boolean;
@@ -10,44 +11,59 @@ interface IMaskConfig {
 	selector: '[gaTextMask]'
 })
 export class TextMaskDirective {
-	private readonly _config: IMaskConfig;
-
-	constructor(private el: ElementRef, private renderer: Renderer2) {
-		this._config = {
-			text: '',
-			showOriginal: false,
-			replacement: 0.5
-		};
-	}
+	// Default configuration for text masking
+	private readonly _config: IMaskConfig = {
+		text: '',
+		showOriginal: false,
+		replacement: 0.5
+	};
+
+	// Constructor to inject dependencies
+	constructor(
+		private readonly el: ElementRef,
+		private readonly renderer: Renderer2
+	) { }
 
-	private applyTextMask() {
+	// Apply the configured text mask to the element
+	private applyTextMask(): void {
+		// Get the text based on the showOriginal configuration
 		const text = this.config.showOriginal ? this.config.text : this.maskText(this.config.text);
+
+		// Set the masked or original text to the element's inner text
 		this.renderer.setProperty(this.el.nativeElement, 'innerText', text);
 	}
 
-	private maskText(text: string): string {
-		if (!text) {
+	// Mask the given text based on the configured replacement percentage
+	private maskText(value: string): string {
+		// If text is not provided, return an empty string
+		if (!value) {
 			return '';
 		}
 
-		const textArray = text.split('');
+		// Convert the text into an array of characters
+		const text = value.split('');
 
-		for (let i = 0; i < textArray.length; i++) {
-			if (i < Math.floor(this.config.replacement * textArray.length)) {
-				textArray[i] = '*';
-			}
+		// Replace the specified percentage of characters with asterisks ('*')
+		for (let i = 0; i < Math.floor(this.config.replacement * text.length); i++) {
+			text[i] = '*';
 		}
 
-		return textArray.join('');
+		// Join the array back into a string and return the masked text
+		return text.join('');
 	}
 
+	// Getter for the current configuration
 	public get config(): IMaskConfig {
 		return this._config;
 	}
 
+	// Setter for updating the configuration and applying the text mask
 	@Input()
 	public set config(partialConfig: Partial<IMaskConfig>) {
+		// Merge the provided partial configuration with the default configuration
 		Object.assign(this._config, partialConfig);
+
+		// Apply the text mask with the updated configuration
 		this.applyTextMask();
 	}
 }
diff --git a/apps/gauzy/src/app/pages/integrations/gauzy-ai/components/view/view.component.html b/apps/gauzy/src/app/pages/integrations/gauzy-ai/components/view/view.component.html
index 7bf3d7e699f..ae884de43d5 100644
--- a/apps/gauzy/src/app/pages/integrations/gauzy-ai/components/view/view.component.html
+++ b/apps/gauzy/src/app/pages/integrations/gauzy-ai/components/view/view.component.html
@@ -24,32 +24,25 @@ <h5>
 	<nb-card-body>
 		<nb-tabset class="mt-4">
 			<nb-tab [tabTitle]="'INTEGRATIONS.GAUZY_AI_PAGE.TAB.KEYS' | translate" [active]="true">
-				<!-- <header>
+				<header class="mb-3">
 					{{ 'INTEGRATIONS.GAUZY_AI_PAGE.CONSUMER_KEYS' | translate }}
-				</header> -->
+				</header>
 				<div class="integration-container">
-					<div class="integration-row" *ngFor="let setting of dummySettings">
+					<div class="integration-row" *ngFor="let setting of settings$ | async">
 						<div class="integration-label-container">
 							<div class="integration-label">
-								{{ setting.settingsName }}
-								<nb-icon icon="info-outline" size="small"></nb-icon>
+								{{ getTitleForSetting(setting) }}
+								<nb-icon icon="info-outline" size="small" [nbTooltip]="getTooltipForSetting(setting)"></nb-icon>
 							</div>
 							<div class="date">
-								Generated {{ setting.createdAt | date: 'longDate' }}
+								{{ 'INTEGRATIONS.GAUZY_AI_PAGE.GENERATED' | translate }} {{ setting.createdAt | dateFormat }}
 							</div>
 						</div>
 						<div class="integration-value">
-							<nb-icon
-								(click)="setting.show = !setting.show"
-								[icon]="!!setting.show ? 'eye-outline' : 'eye-off-outline'"
-							></nb-icon>
+							<nb-icon (click)="setting.show = !setting.show" [icon]="!!setting.show ? 'eye-outline' : 'eye-off-outline'"></nb-icon>
 							<div
 								gaTextMask
-								[config]="{
-									text: setting.settingsValue,
-									showOriginal: !!setting.show,
-									replacement: 0.75
-								}"
+								[config]="{ text: setting.settingsValue, showOriginal: !!setting.show }"
 								class="integration-mask"
 							></div>
 						</div>
diff --git a/apps/gauzy/src/app/pages/integrations/gauzy-ai/components/view/view.component.ts b/apps/gauzy/src/app/pages/integrations/gauzy-ai/components/view/view.component.ts
index 41e66965afc..081549ff89c 100644
--- a/apps/gauzy/src/app/pages/integrations/gauzy-ai/components/view/view.component.ts
+++ b/apps/gauzy/src/app/pages/integrations/gauzy-ai/components/view/view.component.ts
@@ -1,35 +1,49 @@
 import { Component, OnInit } from '@angular/core';
 import { TitleCasePipe } from '@angular/common';
-import { ActivatedRoute, Router } from '@angular/router';
-import { filter, tap } from 'rxjs/operators';
+import { ActivatedRoute, Data, Router } from '@angular/router';
+import { filter, map, tap } from 'rxjs/operators';
 import { Observable } from 'rxjs/internal/Observable';
 import { TranslateService } from '@ngx-translate/core';
 import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
 import { IIntegrationSetting, IOrganization } from '@gauzy/contracts';
 import { TranslationBaseComponent } from './../../../../../@shared/language-base';
+import { DateFormatPipe } from './../../../../../@shared/pipes';
 import { Store } from './../../../../../@core/services';
 
+enum SettingTitlesEnum {
+	API_KEY = 'apiKey',
+	API_SECRET = 'apiSecret',
+	OPEN_AI_SECRET_KEY = 'openaiApiSecretKey'
+}
+
 @UntilDestroy({ checkProperties: true })
 @Component({
 	styleUrls: ['./view.component.scss'],
 	templateUrl: './view.component.html',
-	providers: [TitleCasePipe]
+	providers: [TitleCasePipe, DateFormatPipe]
 })
 export class GauzyAIViewComponent extends TranslationBaseComponent implements OnInit {
+
 	public organization$: Observable<IOrganization>; // Observable to hold the selected organization
 	public settings$: Observable<IIntegrationSetting[]>;
 	public settings: IIntegrationSetting[] = [];
-	public dummySettings: IIntegrationSetting[] = [
+
+	// Define a mapping object for setting names to titles and information
+	public settingTitles: Record<string, string>[] = [
 		{
-			settingsValue: '382808338280882808xS8Y8XsL',
-			settingsName: 'API Keys',
-			createdAt: new Date()
+			title: this.getTranslation('INTEGRATIONS.GAUZY_AI_PAGE.API_KEY'),
+			information: this.getTranslation('INTEGRATIONS.GAUZY_AI_PAGE.TOOLTIP.API_KEY'),
+			matching: SettingTitlesEnum.API_KEY
 		},
-		{ settingsValue: '382808xS8Y3828088K382808sG', settingsName: 'API Secret', createdAt: new Date() },
 		{
-			settingsValue: '382382808808xS3828088Y8Jsm',
-			settingsName: 'Open AI API Secret',
-			createdAt: new Date()
+			title: this.getTranslation('INTEGRATIONS.GAUZY_AI_PAGE.API_SECRET'),
+			information: this.getTranslation('INTEGRATIONS.GAUZY_AI_PAGE.TOOLTIP.API_SECRET'),
+			matching: SettingTitlesEnum.API_SECRET
+		},
+		{
+			title: this.getTranslation('INTEGRATIONS.GAUZY_AI_PAGE.OPEN_AI_SECRET_KEY'),
+			information: this.getTranslation('INTEGRATIONS.GAUZY_AI_PAGE.TOOLTIP.OPEN_AI_SECRET_KEY'),
+			matching: SettingTitlesEnum.OPEN_AI_SECRET_KEY
 		}
 	];
 
@@ -50,8 +64,11 @@ export class GauzyAIViewComponent extends TranslationBaseComponent implements On
 			// Handle component lifecycle to avoid memory leaks
 			untilDestroyed(this)
 		);
+
+		// Setting up the settings$ observable pipeline
 		this.settings$ = this._activatedRoute.data.pipe(
-			// Update component state with fetched issues
+			map(({ settings }: Data) => settings),
+			// Update component state with fetched settings
 			tap((settings: IIntegrationSetting[]) => {
 				this.settings = settings;
 			}),
@@ -60,6 +77,34 @@ export class GauzyAIViewComponent extends TranslationBaseComponent implements On
 		);
 	}
 
+	/**
+	 * Gets the title for a given integration setting.
+	 *
+	 * @param setting - The integration setting for which to retrieve the title.
+	 * @returns The title for the integration setting, or the original setting name if not found.
+	 */
+	getTitleForSetting(setting: IIntegrationSetting): string {
+		// Find the key configuration that matches the setting name
+		const keyConfig = this.settingTitles.find((key) => key.matching === setting.settingsName);
+
+		// If a key configuration is found, return its title; otherwise, return the original setting name
+		return keyConfig?.title || setting.settingsName;
+	}
+
+	/**
+	 * Gets the tooltip content for a given integration setting.
+	 *
+	 * @param setting - The integration setting for which to retrieve the tooltip content.
+	 * @returns The tooltip content for the integration setting, or an empty string if not found.
+	 */
+	getTooltipForSetting(setting: IIntegrationSetting): string {
+		// Find the key configuration that matches the setting name
+		const keyConfig = this.settingTitles.find((key) => key.matching === setting.settingsName);
+
+		// If a key configuration is found, return its information; otherwise, return an empty string
+		return keyConfig?.information || '';
+	}
+
 	/**
 	 * Navigate to the "Integrations" page.
 	 */
diff --git a/apps/gauzy/src/app/pages/integrations/gauzy-ai/gauzy-ai.module.ts b/apps/gauzy/src/app/pages/integrations/gauzy-ai/gauzy-ai.module.ts
index d602305d22a..1869d3b45dc 100644
--- a/apps/gauzy/src/app/pages/integrations/gauzy-ai/gauzy-ai.module.ts
+++ b/apps/gauzy/src/app/pages/integrations/gauzy-ai/gauzy-ai.module.ts
@@ -1,15 +1,23 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { NbButtonModule, NbCardModule, NbIconModule, NbInputModule, NbTabsetModule, NbTooltipModule } from '@nebular/theme';
+import {
+	NbButtonModule,
+	NbCardModule,
+	NbIconModule,
+	NbInputModule,
+	NbTabsetModule,
+	NbTooltipModule
+} from '@nebular/theme';
 import { TranslateModule } from './../../../@shared/translate/translate.module';
 import { BackNavigationModule } from './../../../@shared/back-navigation';
+import { DirectivesModule } from '../../../@shared/directives/directives.module';
+import { SharedModule } from '../../../@shared/shared.module';
+import { WorkInProgressModule } from '../../work-in-progress/work-in-progress.module';
 import { GauzyAIRoutingModule } from './gauzy-ai-routing.module';
 import { GauzyAILayoutComponent } from './gauzy-ai.layout.component';
 import { GauzyAIAuthorizationComponent } from './components/authorization/authorization.component';
 import { GauzyAIViewComponent } from './components/view/view.component';
-import { WorkInProgressModule } from '../../work-in-progress/work-in-progress.module';
-import { DirectivesModule } from '../../../@shared/directives/directives.module';
 
 @NgModule({
 	declarations: [
@@ -31,7 +39,8 @@ import { DirectivesModule } from '../../../@shared/directives/directives.module'
 		TranslateModule,
 		BackNavigationModule,
 		WorkInProgressModule,
-		DirectivesModule
+		DirectivesModule,
+		SharedModule.forRoot()
 	]
 })
 export class GauzyAIModule { }
diff --git a/apps/gauzy/src/assets/i18n/bg.json b/apps/gauzy/src/assets/i18n/bg.json
index 573f929dfd8..9a0c142ff27 100644
--- a/apps/gauzy/src/assets/i18n/bg.json
+++ b/apps/gauzy/src/assets/i18n/bg.json
@@ -1198,6 +1198,38 @@
 			"DATE_RANGE_PLACEHOLDER": "Choose date between",
 			"HOURLY": "Hourly"
 		},
+		"GAUZY_AI_PAGE": {
+			"TITLE": "Gauzy AI Integration",
+			"API_KEY": "Gauzy AI key",
+			"API_SECRET": "Gauzy AI Secret",
+			"OPEN_AI_SECRET_KEY": "Open AI Secret Key",
+			"DESCRIPTION": "Activate Gauzy AI integration for smarter job hunting.",
+			"CONSUMER_KEYS": "Consumer Keys",
+			"GENERATED": "Generated",
+			"TAB": {
+				"KEYS": "Keys",
+				"SETTINGS": "Settings"
+			},
+			"TOOLTIP": {
+				"API_KEY": "The API Key serves as your App identifier for API requests, remaining permanently hidden, with some characters visible.",
+				"API_SECRET": "The API Secret serves as your App identifier for API requests, remaining permanently hidden, with some characters visible.",
+				"OPEN_AI_SECRET_KEY": "The OpenAI API Secret serves as your App identifier for API requests, remaining permanently hidden, with some characters visible."
+			}
+		},
+		"GITHUB_PAGE": {
+			"TITLE": "GitHub Integration",
+			"AUTO_SYNC_TABLE_LABEL": "Syncing GitHub Repositories and Projects",
+			"SELECT_REPOSITORY": "Select repository",
+			"SEARCH_REPOSITORY": "Type to search repository",
+			"SYNCED_ISSUES": "'{{repository}}' issues & labels synced successfully",
+			"HAS_SYNCED_ENABLED": "'{{repository}}' sync successfully enabled",
+			"HAS_SYNCED_DISABLED": "'{{repository}}' sync successfully disabled",
+			"DESCRIPTION": "Activate GitHub integration for project & repository sync.",
+			"TAB": {
+				"AUTO_SYNC": "Auto sync",
+				"MANUAL_SYNC": "Manual sync"
+			}
+		},
 		"COMING_SOON": "Coming soon",
 		"RE_INTEGRATE": "Re-integrate",
 		"SETTINGS": "Настройки",
diff --git a/apps/gauzy/src/assets/i18n/en.json b/apps/gauzy/src/assets/i18n/en.json
index a0a6e9fc549..64d0bf1b59d 100644
--- a/apps/gauzy/src/assets/i18n/en.json
+++ b/apps/gauzy/src/assets/i18n/en.json
@@ -1250,9 +1250,15 @@
 			"OPEN_AI_SECRET_KEY": "Open AI Secret Key",
 			"DESCRIPTION": "Activate Gauzy AI integration for smarter job hunting.",
 			"CONSUMER_KEYS": "Consumer Keys",
+			"GENERATED": "Generated",
 			"TAB": {
 				"KEYS": "Keys",
 				"SETTINGS": "Settings"
+			},
+			"TOOLTIP": {
+				"API_KEY": "The API Key serves as your App identifier for API requests, remaining permanently hidden, with some characters visible.",
+				"API_SECRET": "The API Secret serves as your App identifier for API requests, remaining permanently hidden, with some characters visible.",
+				"OPEN_AI_SECRET_KEY": "The OpenAI API Secret serves as your App identifier for API requests, remaining permanently hidden, with some characters visible."
 			}
 		},
 		"GITHUB_PAGE": {
diff --git a/apps/gauzy/src/assets/i18n/he.json b/apps/gauzy/src/assets/i18n/he.json
index 75259f6f65c..b193ac4d7dc 100644
--- a/apps/gauzy/src/assets/i18n/he.json
+++ b/apps/gauzy/src/assets/i18n/he.json
@@ -1198,6 +1198,38 @@
 			"DATE_RANGE_PLACEHOLDER": "Choose date between",
 			"HOURLY": "Hourly"
 		},
+		"GAUZY_AI_PAGE": {
+			"TITLE": "Gauzy AI Integration",
+			"API_KEY": "Gauzy AI key",
+			"API_SECRET": "Gauzy AI Secret",
+			"OPEN_AI_SECRET_KEY": "Open AI Secret Key",
+			"DESCRIPTION": "Activate Gauzy AI integration for smarter job hunting.",
+			"CONSUMER_KEYS": "Consumer Keys",
+			"GENERATED": "Generated",
+			"TAB": {
+				"KEYS": "Keys",
+				"SETTINGS": "Settings"
+			},
+			"TOOLTIP": {
+				"API_KEY": "The API Key serves as your App identifier for API requests, remaining permanently hidden, with some characters visible.",
+				"API_SECRET": "The API Secret serves as your App identifier for API requests, remaining permanently hidden, with some characters visible.",
+				"OPEN_AI_SECRET_KEY": "The OpenAI API Secret serves as your App identifier for API requests, remaining permanently hidden, with some characters visible."
+			}
+		},
+		"GITHUB_PAGE": {
+			"TITLE": "GitHub Integration",
+			"AUTO_SYNC_TABLE_LABEL": "Syncing GitHub Repositories and Projects",
+			"SELECT_REPOSITORY": "Select repository",
+			"SEARCH_REPOSITORY": "Type to search repository",
+			"SYNCED_ISSUES": "'{{repository}}' issues & labels synced successfully",
+			"HAS_SYNCED_ENABLED": "'{{repository}}' sync successfully enabled",
+			"HAS_SYNCED_DISABLED": "'{{repository}}' sync successfully disabled",
+			"DESCRIPTION": "Activate GitHub integration for project & repository sync.",
+			"TAB": {
+				"AUTO_SYNC": "Auto sync",
+				"MANUAL_SYNC": "Manual sync"
+			}
+		},
 		"COMING_SOON": "Coming soon",
 		"RE_INTEGRATE": "Re-integrate",
 		"SETTINGS": "הגדרות",
diff --git a/apps/gauzy/src/assets/i18n/ru.json b/apps/gauzy/src/assets/i18n/ru.json
index f06173327d6..88a96dc3644 100644
--- a/apps/gauzy/src/assets/i18n/ru.json
+++ b/apps/gauzy/src/assets/i18n/ru.json
@@ -1198,6 +1198,38 @@
 			"DATE_RANGE_PLACEHOLDER": "Выберите дату между",
 			"HOURLY": "Почасовой"
 		},
+		"GAUZY_AI_PAGE": {
+			"TITLE": "Gauzy AI Integration",
+			"API_KEY": "Gauzy AI key",
+			"API_SECRET": "Gauzy AI Secret",
+			"OPEN_AI_SECRET_KEY": "Open AI Secret Key",
+			"DESCRIPTION": "Activate Gauzy AI integration for smarter job hunting.",
+			"CONSUMER_KEYS": "Consumer Keys",
+			"GENERATED": "Generated",
+			"TAB": {
+				"KEYS": "Keys",
+				"SETTINGS": "Settings"
+			},
+			"TOOLTIP": {
+				"API_KEY": "The API Key serves as your App identifier for API requests, remaining permanently hidden, with some characters visible.",
+				"API_SECRET": "The API Secret serves as your App identifier for API requests, remaining permanently hidden, with some characters visible.",
+				"OPEN_AI_SECRET_KEY": "The OpenAI API Secret serves as your App identifier for API requests, remaining permanently hidden, with some characters visible."
+			}
+		},
+		"GITHUB_PAGE": {
+			"TITLE": "GitHub Integration",
+			"AUTO_SYNC_TABLE_LABEL": "Syncing GitHub Repositories and Projects",
+			"SELECT_REPOSITORY": "Select repository",
+			"SEARCH_REPOSITORY": "Type to search repository",
+			"SYNCED_ISSUES": "'{{repository}}' issues & labels synced successfully",
+			"HAS_SYNCED_ENABLED": "'{{repository}}' sync successfully enabled",
+			"HAS_SYNCED_DISABLED": "'{{repository}}' sync successfully disabled",
+			"DESCRIPTION": "Activate GitHub integration for project & repository sync.",
+			"TAB": {
+				"AUTO_SYNC": "Auto sync",
+				"MANUAL_SYNC": "Manual sync"
+			}
+		},
 		"COMING_SOON": "Скоро появится",
 		"RE_INTEGRATE": "Переинтегрировать",
 		"SETTINGS": "Настройки",
diff --git a/packages/core/src/core/entities/internal.ts b/packages/core/src/core/entities/internal.ts
index 15f9d5e4d45..4ebe86f9c01 100644
--- a/packages/core/src/core/entities/internal.ts
+++ b/packages/core/src/core/entities/internal.ts
@@ -186,4 +186,5 @@ export * from './../../time-tracking/screenshot/screenshot.subscriber';
 export * from './../../time-tracking/time-slot/time-slot.subscriber';
 export * from './../../user/user.subscriber';
 export * from './../../integration/integration.subscriber';
+export * from './../../integration-setting/integration-setting.subscriber';
 export * from '././../../jitsu-analytics/jitsu-events-subscriber';
diff --git a/packages/core/src/core/entities/subscribers.ts b/packages/core/src/core/entities/subscribers.ts
index f98a2e90377..bce62729f27 100644
--- a/packages/core/src/core/entities/subscribers.ts
+++ b/packages/core/src/core/entities/subscribers.ts
@@ -8,6 +8,7 @@ import {
 	FeatureSubscriber,
 	ImageAssetSubscriber,
 	ImportHistorySubscriber,
+	IntegrationSettingSubscriber,
 	IntegrationSubscriber,
 	InviteSubscriber,
 	InvoiceSubscriber,
@@ -50,6 +51,7 @@ export const coreSubscribers = [
 	FeatureSubscriber,
 	ImageAssetSubscriber,
 	ImportHistorySubscriber,
+	IntegrationSettingSubscriber,
 	IntegrationSubscriber,
 	InviteSubscriber,
 	InvoiceSubscriber,
diff --git a/packages/core/src/integration-setting/integration-setting.entity.ts b/packages/core/src/integration-setting/integration-setting.entity.ts
index 12ea4448215..d7f98f9437d 100644
--- a/packages/core/src/integration-setting/integration-setting.entity.ts
+++ b/packages/core/src/integration-setting/integration-setting.entity.ts
@@ -58,25 +58,4 @@ export class IntegrationSetting extends TenantOrganizationBaseEntity implements
 	@Expose({ toPlainOnly: true, name: 'settingsValue' })
 	@IsSecret()
 	wrapSecretvalue?: string;
-
-	/*
-	|--------------------------------------------------------------------------
-	| @EventSubscriber
-	|--------------------------------------------------------------------------
-	*/
-	/**
-	 * Called after entity is loaded.
-	 */
-	@AfterLoad()
-	afterLoadEntity?() {
-		const { settingsName, settingsValue } = this;
-
-		// Apply the wrapping function only to the sensitive keys
-		const wrapped = KeysToWrapSecrets(sensitiveSecretKeys, {
-			[settingsName]: settingsValue,
-		});
-
-		this.wrapSecretKey = settingsName;
-		this.wrapSecretvalue = wrapped[settingsName];
-	}
 }
diff --git a/packages/core/src/integration-setting/integration-setting.subscriber.ts b/packages/core/src/integration-setting/integration-setting.subscriber.ts
new file mode 100644
index 00000000000..6077c91b763
--- /dev/null
+++ b/packages/core/src/integration-setting/integration-setting.subscriber.ts
@@ -0,0 +1,42 @@
+import { EntitySubscriberInterface, EventSubscriber, LoadEvent } from 'typeorm';
+import { IntegrationSetting } from './integration-setting.entity';
+import { KeysToWrapSecrets, sensitiveSecretKeys } from './integration-setting.utils';
+
+@EventSubscriber()
+export class IntegrationSettingSubscriber implements EntitySubscriberInterface<IntegrationSetting> {
+    /**
+     * Indicates that this subscriber only listen to IntegrationSetting events.
+     */
+    listenTo() {
+        return IntegrationSetting;
+    }
+
+    /**
+     * Called after entity is loaded from the database.
+     *
+     * @param entity
+     * @param event
+     */
+    async afterLoad(
+        entity: IntegrationSetting | Partial<IntegrationSetting>,
+        event?: LoadEvent<IntegrationSetting>
+    ): Promise<any | void> {
+
+        // Extract sensitive information from the entity
+        const { settingsName, settingsValue } = entity;
+
+        // Specify the percentage of the string to be replaced with the character
+        const percentage = 25;
+
+        // Create an object containing the sensitive data
+        const secrets: Record<string, string> = {
+            [settingsName]: settingsValue,
+        };
+
+        // Apply the wrapping function only to the sensitive keys
+        const wrapped = KeysToWrapSecrets(sensitiveSecretKeys, secrets, percentage);
+
+        entity.wrapSecretKey = settingsName;
+        entity.wrapSecretvalue = wrapped[settingsName];
+    }
+}

From a6de0c142e0940e3b852088026002b6b7070622f Mon Sep 17 00:00:00 2001
From: Ruslan K <evereq@gmail.com>
Date: Thu, 7 Dec 2023 10:12:27 +0100
Subject: [PATCH 12/34] Update deploy-render-demo.yml

---
 .github/workflows/deploy-render-demo.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/deploy-render-demo.yml b/.github/workflows/deploy-render-demo.yml
index 8b52e977d0a..a17117e8102 100644
--- a/.github/workflows/deploy-render-demo.yml
+++ b/.github/workflows/deploy-render-demo.yml
@@ -3,7 +3,7 @@ name: Deploy to Render Demo
 on:
     workflow_run:
         workflows: ['Build and Publish Docker Images Demo']
-        branches: [develop, temp]
+        branches: [render]
         types:
             - completed
 

From d42469d8d573732470ea6143b7b6a173fff9ce54 Mon Sep 17 00:00:00 2001
From: RAHUL RATHORE <41804588+rahul-rocket@users.noreply.github.com>
Date: Thu, 7 Dec 2023 14:43:39 +0530
Subject: [PATCH 13/34] fix: #7246 removed unnecessary import

---
 .../integrations/gauzy-ai/components/view/view.component.ts    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/apps/gauzy/src/app/pages/integrations/gauzy-ai/components/view/view.component.ts b/apps/gauzy/src/app/pages/integrations/gauzy-ai/components/view/view.component.ts
index 081549ff89c..56b5d589f25 100644
--- a/apps/gauzy/src/app/pages/integrations/gauzy-ai/components/view/view.component.ts
+++ b/apps/gauzy/src/app/pages/integrations/gauzy-ai/components/view/view.component.ts
@@ -7,7 +7,6 @@ import { TranslateService } from '@ngx-translate/core';
 import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
 import { IIntegrationSetting, IOrganization } from '@gauzy/contracts';
 import { TranslationBaseComponent } from './../../../../../@shared/language-base';
-import { DateFormatPipe } from './../../../../../@shared/pipes';
 import { Store } from './../../../../../@core/services';
 
 enum SettingTitlesEnum {
@@ -20,7 +19,7 @@ enum SettingTitlesEnum {
 @Component({
 	styleUrls: ['./view.component.scss'],
 	templateUrl: './view.component.html',
-	providers: [TitleCasePipe, DateFormatPipe]
+	providers: [TitleCasePipe]
 })
 export class GauzyAIViewComponent extends TranslationBaseComponent implements OnInit {
 

From 1f21deee865d1f3aaa7bf543412e659a7d48c3a2 Mon Sep 17 00:00:00 2001
From: RAHUL RATHORE <41804588+rahul-rocket@users.noreply.github.com>
Date: Thu, 7 Dec 2023 14:52:20 +0530
Subject: [PATCH 14/34] fix: removed console.log for github middleware

---
 packages/core/src/integration/github/github.middleware.ts | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/core/src/integration/github/github.middleware.ts b/packages/core/src/integration/github/github.middleware.ts
index 8a0f1470dab..47d0a869a08 100644
--- a/packages/core/src/integration/github/github.middleware.ts
+++ b/packages/core/src/integration/github/github.middleware.ts
@@ -51,9 +51,7 @@ export class GithubMiddleware implements NestMiddleware {
                         // Convert the 'settings' array to an object using the 'settingsName' and 'settingsValue' properties
                         settings: arrayToObject(settings, 'settingsName', 'settingsValue')
                     });
-                } catch (error) {
-                    console.log(`Error while getting integration settings inside middleware: %s`, error?.message);
-                }
+                } catch (error) { }
             }
         } catch (error) {
             console.log(`Error while getting integration (${IntegrationEnum.GITHUB}) tenant inside middleware: %s`, error?.message);

From afffd1c377da2e8c1a8ccbe0b28bc6315bd473d6 Mon Sep 17 00:00:00 2001
From: RAHUL RATHORE <41804588+rahul-rocket@users.noreply.github.com>
Date: Thu, 7 Dec 2023 16:25:07 +0530
Subject: [PATCH 15/34] feat: #7246 send openai secret key dynamically

---
 .../authorization.component.html              |  4 +--
 .../components/view/view.component.ts         | 16 ++++-----
 apps/gauzy/src/assets/i18n/bg.json            |  4 +--
 apps/gauzy/src/assets/i18n/en.json            |  6 ++--
 apps/gauzy/src/assets/i18n/he.json            |  4 +--
 apps/gauzy/src/assets/i18n/ru.json            |  4 +--
 .../integration-setting.entity.ts             |  3 +-
 .../integration-setting.subscriber.ts         |  4 +--
 .../integration-setting.utils.ts              |  4 +--
 .../gauzy-ai/integration-ai.middleware.ts     | 19 ++++++----
 .../gauzy-ai/integration-ai.service.ts        |  2 +-
 .../src/configuration.interface.ts            |  9 ++---
 .../integration-ai/src/gauzy-ai.module.ts     |  4 +--
 .../integration-ai/src/gauzy-ai.service.ts    | 35 +++++++++++--------
 14 files changed, 65 insertions(+), 53 deletions(-)

diff --git a/apps/gauzy/src/app/pages/integrations/gauzy-ai/components/authorization/authorization.component.html b/apps/gauzy/src/app/pages/integrations/gauzy-ai/components/authorization/authorization.component.html
index 11cd592740c..d80134abd52 100644
--- a/apps/gauzy/src/app/pages/integrations/gauzy-ai/components/authorization/authorization.component.html
+++ b/apps/gauzy/src/app/pages/integrations/gauzy-ai/components/authorization/authorization.component.html
@@ -42,13 +42,13 @@ <h5>
 				</div>
 				<div class="form-group">
 					<label for="openai_api_secret_key" class="label">
-						{{ 'INTEGRATIONS.GAUZY_AI_PAGE.OPEN_AI_SECRET_KEY' | translate }}
+						{{ 'INTEGRATIONS.GAUZY_AI_PAGE.OPEN_AI_API_SECRET_KEY' | translate }}
 					</label>
 					<input
 						id="openai_api_secret_key"
 						formControlName="openai_api_secret_key"
 						nbInput
-						[placeholder]="'FORM.PLACEHOLDERS.OPEN_AI_SECRET_KEY' | translate"
+						[placeholder]="'FORM.PLACEHOLDERS.OPEN_AI_API_SECRET_KEY' | translate"
 						required
 						fullWidth
 					/>
diff --git a/apps/gauzy/src/app/pages/integrations/gauzy-ai/components/view/view.component.ts b/apps/gauzy/src/app/pages/integrations/gauzy-ai/components/view/view.component.ts
index 56b5d589f25..9b7da3cf82b 100644
--- a/apps/gauzy/src/app/pages/integrations/gauzy-ai/components/view/view.component.ts
+++ b/apps/gauzy/src/app/pages/integrations/gauzy-ai/components/view/view.component.ts
@@ -12,7 +12,7 @@ import { Store } from './../../../../../@core/services';
 enum SettingTitlesEnum {
 	API_KEY = 'apiKey',
 	API_SECRET = 'apiSecret',
-	OPEN_AI_SECRET_KEY = 'openaiApiSecretKey'
+	OPEN_AI_API_SECRET_KEY = 'openAiApiSecretKey'
 }
 
 @UntilDestroy({ checkProperties: true })
@@ -31,18 +31,18 @@ export class GauzyAIViewComponent extends TranslationBaseComponent implements On
 	public settingTitles: Record<string, string>[] = [
 		{
 			title: this.getTranslation('INTEGRATIONS.GAUZY_AI_PAGE.API_KEY'),
-			information: this.getTranslation('INTEGRATIONS.GAUZY_AI_PAGE.TOOLTIP.API_KEY'),
-			matching: SettingTitlesEnum.API_KEY
+			matching: SettingTitlesEnum.API_KEY,
+			information: this.getTranslation('INTEGRATIONS.GAUZY_AI_PAGE.TOOLTIP.API_KEY')
 		},
 		{
 			title: this.getTranslation('INTEGRATIONS.GAUZY_AI_PAGE.API_SECRET'),
-			information: this.getTranslation('INTEGRATIONS.GAUZY_AI_PAGE.TOOLTIP.API_SECRET'),
-			matching: SettingTitlesEnum.API_SECRET
+			matching: SettingTitlesEnum.API_SECRET,
+			information: this.getTranslation('INTEGRATIONS.GAUZY_AI_PAGE.TOOLTIP.API_SECRET')
 		},
 		{
-			title: this.getTranslation('INTEGRATIONS.GAUZY_AI_PAGE.OPEN_AI_SECRET_KEY'),
-			information: this.getTranslation('INTEGRATIONS.GAUZY_AI_PAGE.TOOLTIP.OPEN_AI_SECRET_KEY'),
-			matching: SettingTitlesEnum.OPEN_AI_SECRET_KEY
+			title: this.getTranslation('INTEGRATIONS.GAUZY_AI_PAGE.OPEN_AI_API_SECRET_KEY'),
+			matching: SettingTitlesEnum.OPEN_AI_API_SECRET_KEY,
+			information: this.getTranslation('INTEGRATIONS.GAUZY_AI_PAGE.TOOLTIP.OPEN_AI_API_SECRET_KEY')
 		}
 	];
 
diff --git a/apps/gauzy/src/assets/i18n/bg.json b/apps/gauzy/src/assets/i18n/bg.json
index 9a0c142ff27..58b5328dcef 100644
--- a/apps/gauzy/src/assets/i18n/bg.json
+++ b/apps/gauzy/src/assets/i18n/bg.json
@@ -1202,7 +1202,7 @@
 			"TITLE": "Gauzy AI Integration",
 			"API_KEY": "Gauzy AI key",
 			"API_SECRET": "Gauzy AI Secret",
-			"OPEN_AI_SECRET_KEY": "Open AI Secret Key",
+			"OPEN_AI_API_SECRET_KEY": "Open AI Secret Key",
 			"DESCRIPTION": "Activate Gauzy AI integration for smarter job hunting.",
 			"CONSUMER_KEYS": "Consumer Keys",
 			"GENERATED": "Generated",
@@ -1213,7 +1213,7 @@
 			"TOOLTIP": {
 				"API_KEY": "The API Key serves as your App identifier for API requests, remaining permanently hidden, with some characters visible.",
 				"API_SECRET": "The API Secret serves as your App identifier for API requests, remaining permanently hidden, with some characters visible.",
-				"OPEN_AI_SECRET_KEY": "The OpenAI API Secret serves as your App identifier for API requests, remaining permanently hidden, with some characters visible."
+				"OPEN_AI_API_SECRET_KEY": "The OpenAI API Secret serves as your App identifier for API requests, remaining permanently hidden, with some characters visible."
 			}
 		},
 		"GITHUB_PAGE": {
diff --git a/apps/gauzy/src/assets/i18n/en.json b/apps/gauzy/src/assets/i18n/en.json
index 64d0bf1b59d..9728d9519b2 100644
--- a/apps/gauzy/src/assets/i18n/en.json
+++ b/apps/gauzy/src/assets/i18n/en.json
@@ -645,7 +645,7 @@
 			"UPWORK_SECRET": "Upwork Secret",
 			"GAUZY_API_KEY": "Gauzy AI Key",
 			"GAUZY_API_SECRET": "Gauzy AI Secret",
-			"OPEN_AI_SECRET_KEY": "Open AI Secret Key",
+			"OPEN_AI_API_SECRET_KEY": "Open AI Secret Key",
 			"SELECT_COMPANY": "Select Company",
 			"TYPE_SEARCH_REQUEST": "Type your search request here...",
 			"SELECT_ICON": "Select Icon",
@@ -1247,7 +1247,7 @@
 			"TITLE": "Gauzy AI Integration",
 			"API_KEY": "Gauzy AI key",
 			"API_SECRET": "Gauzy AI Secret",
-			"OPEN_AI_SECRET_KEY": "Open AI Secret Key",
+			"OPEN_AI_API_SECRET_KEY": "Open AI Secret Key",
 			"DESCRIPTION": "Activate Gauzy AI integration for smarter job hunting.",
 			"CONSUMER_KEYS": "Consumer Keys",
 			"GENERATED": "Generated",
@@ -1258,7 +1258,7 @@
 			"TOOLTIP": {
 				"API_KEY": "The API Key serves as your App identifier for API requests, remaining permanently hidden, with some characters visible.",
 				"API_SECRET": "The API Secret serves as your App identifier for API requests, remaining permanently hidden, with some characters visible.",
-				"OPEN_AI_SECRET_KEY": "The OpenAI API Secret serves as your App identifier for API requests, remaining permanently hidden, with some characters visible."
+				"OPEN_AI_API_SECRET_KEY": "The OpenAI API Secret serves as your App identifier for API requests, remaining permanently hidden, with some characters visible."
 			}
 		},
 		"GITHUB_PAGE": {
diff --git a/apps/gauzy/src/assets/i18n/he.json b/apps/gauzy/src/assets/i18n/he.json
index b193ac4d7dc..83f11047337 100644
--- a/apps/gauzy/src/assets/i18n/he.json
+++ b/apps/gauzy/src/assets/i18n/he.json
@@ -1202,7 +1202,7 @@
 			"TITLE": "Gauzy AI Integration",
 			"API_KEY": "Gauzy AI key",
 			"API_SECRET": "Gauzy AI Secret",
-			"OPEN_AI_SECRET_KEY": "Open AI Secret Key",
+			"OPEN_AI_API_SECRET_KEY": "Open AI Secret Key",
 			"DESCRIPTION": "Activate Gauzy AI integration for smarter job hunting.",
 			"CONSUMER_KEYS": "Consumer Keys",
 			"GENERATED": "Generated",
@@ -1213,7 +1213,7 @@
 			"TOOLTIP": {
 				"API_KEY": "The API Key serves as your App identifier for API requests, remaining permanently hidden, with some characters visible.",
 				"API_SECRET": "The API Secret serves as your App identifier for API requests, remaining permanently hidden, with some characters visible.",
-				"OPEN_AI_SECRET_KEY": "The OpenAI API Secret serves as your App identifier for API requests, remaining permanently hidden, with some characters visible."
+				"OPEN_AI_API_SECRET_KEY": "The OpenAI API Secret serves as your App identifier for API requests, remaining permanently hidden, with some characters visible."
 			}
 		},
 		"GITHUB_PAGE": {
diff --git a/apps/gauzy/src/assets/i18n/ru.json b/apps/gauzy/src/assets/i18n/ru.json
index 88a96dc3644..3a0edeb43bb 100644
--- a/apps/gauzy/src/assets/i18n/ru.json
+++ b/apps/gauzy/src/assets/i18n/ru.json
@@ -1202,7 +1202,7 @@
 			"TITLE": "Gauzy AI Integration",
 			"API_KEY": "Gauzy AI key",
 			"API_SECRET": "Gauzy AI Secret",
-			"OPEN_AI_SECRET_KEY": "Open AI Secret Key",
+			"OPEN_AI_API_SECRET_KEY": "Open AI Secret Key",
 			"DESCRIPTION": "Activate Gauzy AI integration for smarter job hunting.",
 			"CONSUMER_KEYS": "Consumer Keys",
 			"GENERATED": "Generated",
@@ -1213,7 +1213,7 @@
 			"TOOLTIP": {
 				"API_KEY": "The API Key serves as your App identifier for API requests, remaining permanently hidden, with some characters visible.",
 				"API_SECRET": "The API Secret serves as your App identifier for API requests, remaining permanently hidden, with some characters visible.",
-				"OPEN_AI_SECRET_KEY": "The OpenAI API Secret serves as your App identifier for API requests, remaining permanently hidden, with some characters visible."
+				"OPEN_AI_API_SECRET_KEY": "The OpenAI API Secret serves as your App identifier for API requests, remaining permanently hidden, with some characters visible."
 			}
 		},
 		"GITHUB_PAGE": {
diff --git a/packages/core/src/integration-setting/integration-setting.entity.ts b/packages/core/src/integration-setting/integration-setting.entity.ts
index d7f98f9437d..335d4721bf4 100644
--- a/packages/core/src/integration-setting/integration-setting.entity.ts
+++ b/packages/core/src/integration-setting/integration-setting.entity.ts
@@ -1,5 +1,5 @@
 import { ApiProperty } from '@nestjs/swagger';
-import { Column, Entity, JoinColumn, RelationId, ManyToOne, Index, AfterLoad } from 'typeorm';
+import { Column, Entity, JoinColumn, RelationId, ManyToOne, Index } from 'typeorm';
 import { IsNotEmpty, IsUUID } from 'class-validator';
 import { Exclude, Expose } from 'class-transformer';
 import { IIntegrationSetting } from '@gauzy/contracts';
@@ -8,7 +8,6 @@ import {
 	TenantOrganizationBaseEntity
 } from './../core/entities/internal';
 import { IsSecret } from './../core/decorators';
-import { KeysToWrapSecrets, sensitiveSecretKeys } from './integration-setting.utils';
 
 @Entity('integration_setting')
 export class IntegrationSetting extends TenantOrganizationBaseEntity implements IIntegrationSetting {
diff --git a/packages/core/src/integration-setting/integration-setting.subscriber.ts b/packages/core/src/integration-setting/integration-setting.subscriber.ts
index 6077c91b763..39b7087744a 100644
--- a/packages/core/src/integration-setting/integration-setting.subscriber.ts
+++ b/packages/core/src/integration-setting/integration-setting.subscriber.ts
@@ -1,6 +1,6 @@
 import { EntitySubscriberInterface, EventSubscriber, LoadEvent } from 'typeorm';
 import { IntegrationSetting } from './integration-setting.entity';
-import { KeysToWrapSecrets, sensitiveSecretKeys } from './integration-setting.utils';
+import { keysToWrapSecrets, sensitiveSecretKeys } from './integration-setting.utils';
 
 @EventSubscriber()
 export class IntegrationSettingSubscriber implements EntitySubscriberInterface<IntegrationSetting> {
@@ -34,7 +34,7 @@ export class IntegrationSettingSubscriber implements EntitySubscriberInterface<I
         };
 
         // Apply the wrapping function only to the sensitive keys
-        const wrapped = KeysToWrapSecrets(sensitiveSecretKeys, secrets, percentage);
+        const wrapped = keysToWrapSecrets(sensitiveSecretKeys, secrets, percentage);
 
         entity.wrapSecretKey = settingsName;
         entity.wrapSecretvalue = wrapped[settingsName];
diff --git a/packages/core/src/integration-setting/integration-setting.utils.ts b/packages/core/src/integration-setting/integration-setting.utils.ts
index 93d4e6c7c9b..81774791bdf 100644
--- a/packages/core/src/integration-setting/integration-setting.utils.ts
+++ b/packages/core/src/integration-setting/integration-setting.utils.ts
@@ -1,7 +1,7 @@
 import { isNotEmpty, isObject } from "@gauzy/common";
 
 // Assuming you have fetched sensitive keys specific entity
-export const sensitiveSecretKeys = ['apiKey', 'apiSecret', 'openaiApiSecretKey'];
+export const sensitiveSecretKeys = ['apiKey', 'apiSecret', 'openAiApiSecretKey'];
 
 /**
  * Wrap specified keys in an object with a specific character.
@@ -12,7 +12,7 @@ export const sensitiveSecretKeys = ['apiKey', 'apiSecret', 'openaiApiSecretKey']
  * @param character - The character used for replacement.
  * @returns The object with specified keys wrapped.
  */
-export function KeysToWrapSecrets(
+export function keysToWrapSecrets(
     keysToWrap: string[],
     secrets: Record<string, any>,
     percentage = 35,
diff --git a/packages/core/src/integration/gauzy-ai/integration-ai.middleware.ts b/packages/core/src/integration/gauzy-ai/integration-ai.middleware.ts
index 9adbf807cd8..427b61492aa 100644
--- a/packages/core/src/integration/gauzy-ai/integration-ai.middleware.ts
+++ b/packages/core/src/integration/gauzy-ai/integration-ai.middleware.ts
@@ -41,15 +41,22 @@ export class IntegrationAIMiddleware implements NestMiddleware {
                     name: IntegrationEnum.GAUZY_AI
                 });
                 // Convert settings array to an object
-                const { apiKey: ApiKey, apiSecret: ApiSecret } = arrayToObject(settings, 'settingsName', 'settingsValue');
-                console.log({ ApiKey, ApiSecret });
+                const { apiKey, apiSecret, openAiApiSecretKey } = arrayToObject(settings, 'settingsName', 'settingsValue');
 
-                if (ApiKey && ApiSecret) {
+                if (apiKey && apiSecret) {
                     // Update custom headers and request configuration with API key and secret
-                    request.headers['X-APP-ID'] = ApiKey;
-                    request.headers['X-API-KEY'] = ApiSecret;
+                    request.headers['X-APP-ID'] = apiKey;
+                    request.headers['X-API-KEY'] = apiSecret;
 
-                    this.requestConfigProvider.setConfig({ ApiKey, ApiSecret });
+                    if (isNotEmpty(openAiApiSecretKey)) {
+                        request.headers['X-OPENAI-SECRET-KEY'] = openAiApiSecretKey;
+                    }
+
+                    this.requestConfigProvider.setConfig({
+                        apiKey,
+                        apiSecret,
+                        ...(isNotEmpty(openAiApiSecretKey) && { openAiApiSecretKey }),
+                    });
                 }
             }
         } catch (error) {
diff --git a/packages/core/src/integration/gauzy-ai/integration-ai.service.ts b/packages/core/src/integration/gauzy-ai/integration-ai.service.ts
index 8b6ff8b9481..ea07f33831b 100644
--- a/packages/core/src/integration/gauzy-ai/integration-ai.service.ts
+++ b/packages/core/src/integration/gauzy-ai/integration-ai.service.ts
@@ -65,7 +65,7 @@ export class IntegrationAIService {
 								settingsValue: client_secret
 							},
 							{
-								settingsName: 'openaiApiSecretKey',
+								settingsName: 'openAiApiSecretKey',
 								settingsValue: openai_api_secret_key
 							}
 						].map((setting) => ({
diff --git a/packages/plugins/integration-ai/src/configuration.interface.ts b/packages/plugins/integration-ai/src/configuration.interface.ts
index 402b1421ac6..c5316634ac3 100644
--- a/packages/plugins/integration-ai/src/configuration.interface.ts
+++ b/packages/plugins/integration-ai/src/configuration.interface.ts
@@ -1,13 +1,14 @@
 
 // IApiKeyMethod represents an interface for ApiKey authentication method, with optional ApiKey and ApiSecret properties.
 export interface IApiKeyMethod {
-    ApiKey?: string;
-    ApiSecret?: string;
+    apiKey?: string;
+    apiSecret?: string;
+    openAiApiSecretKey?: string;
 }
 
 export interface IBearerTokenMethod {
-    ApiTenantId?: string;
-    ApiBearerToken?: string;
+    tenantIdApi?: string;
+    bearerTokenApi?: string;
 }
 
 export type IConfigurationOptions = IApiKeyMethod & IBearerTokenMethod;
diff --git a/packages/plugins/integration-ai/src/gauzy-ai.module.ts b/packages/plugins/integration-ai/src/gauzy-ai.module.ts
index 1fe19fb2f8e..cbadc5509c5 100644
--- a/packages/plugins/integration-ai/src/gauzy-ai.module.ts
+++ b/packages/plugins/integration-ai/src/gauzy-ai.module.ts
@@ -51,8 +51,8 @@ export class GauzyAIModule {
 				{
 					provide: GAUZY_AI_CONFIG_OPTIONS,
 					useFactory: (config: ConfigService): IConfigurationOptions => ({
-						ApiKey: config.get<string>('guazyAI.gauzyAiApiKey'),
-						ApiSecret: config.get<string>('guazyAI.gauzyAiApiSecret'),
+						apiKey: config.get<string>('guazyAI.gauzyAiApiKey'),
+						apiSecret: config.get<string>('guazyAI.gauzyAiApiSecret'),
 						...options,
 					}),
 					inject: [ConfigService],
diff --git a/packages/plugins/integration-ai/src/gauzy-ai.service.ts b/packages/plugins/integration-ai/src/gauzy-ai.service.ts
index 91ec3c29af2..e5f3ef0a2eb 100644
--- a/packages/plugins/integration-ai/src/gauzy-ai.service.ts
+++ b/packages/plugins/integration-ai/src/gauzy-ai.service.ts
@@ -71,6 +71,7 @@ export interface ImageAnalysisResult {
 export class GauzyAIService {
     private readonly _logger = new Logger(GauzyAIService.name);
     private _client: ApolloClient<NormalizedCacheObject>;
+    public logging: boolean = false;
 
     // For now, we disable Apollo client caching for all GraphQL queries and mutations
     private readonly defaultOptions: DefaultOptions = {
@@ -115,7 +116,7 @@ export class GauzyAIService {
         }
     ): Observable<AxiosResponse<T>> {
         /** */
-        const { ApiKey, ApiSecret, ApiBearerToken, ApiTenantId } = this._requestConfigProvider.getConfig();
+        const { apiKey, apiSecret, openAiApiSecretKey, bearerTokenApi, tenantIdApi } = this._requestConfigProvider.getConfig();
 
         // Add your custom headers
         const customHeaders = (): AxiosRequestHeaders => ({
@@ -126,17 +127,21 @@ export class GauzyAIService {
             'X-API-KEY': this._configService.get<string>('guazyAI.gauzyAiApiSecret'),
 
             /** */
-            ...(ApiKey ? { 'X-APP-ID': ApiKey } : {}),
-            ...(ApiSecret ? { 'X-API-KEY': ApiSecret } : {}),
+            ...(apiKey ? { 'X-APP-ID': apiKey } : {}),
+            ...(apiSecret ? { 'X-API-KEY': apiSecret } : {}),
+            ...(openAiApiSecretKey ? { 'X-OPENAI-SECRET-KEY': openAiApiSecretKey } : {}),
 
             /** */
-            ...(ApiTenantId ? { 'Tenant-Id': ApiTenantId } : {}),
-            ...(ApiBearerToken ? { 'Authorization': ApiBearerToken } : {}),
+            ...(bearerTokenApi ? { 'Authorization': bearerTokenApi } : {}),
+            ...(tenantIdApi ? { 'Tenant-Id': tenantIdApi } : {}),
         });
 
         /** */
         const headers: AxiosRequestHeaders = customHeaders();
-        // console.log('Default AxiosRequestConfig Headers: %s', `${JSON.stringify(headers)}`);
+
+        if (this.logging) {
+            console.log('Default AxiosRequestConfig Headers: %s', `${JSON.stringify(headers)}`);
+        }
 
         // Merge the provided options with the default options
         const mergedOptions: AxiosRequestConfig<T> = {
@@ -414,7 +419,6 @@ export class GauzyAIService {
                     method: HttpMethodEnum.POST, // Set the HTTP method to GET
                     data: createOneEmployeeJobApplication
                 }).pipe(
-                    tap((resp: AxiosResponse<any, any>) => console.log(resp)),
                     map((resp: AxiosResponse<any, any>) => resp.data)
                 )
             );
@@ -1317,8 +1321,7 @@ export class GauzyAIService {
     private initClient() {
         // Create a custom ApolloLink to modify headers
         const authLink = new ApolloLink((operation, forward) => {
-            const { ApiKey, ApiSecret, ApiBearerToken, ApiTenantId } = this._requestConfigProvider.getConfig();
-            console.log(this._requestConfigProvider.getConfig(), 'Runtime Gauzy AI Integration Config');
+            const { apiKey, apiSecret, openAiApiSecretKey, bearerTokenApi, tenantIdApi } = this._requestConfigProvider.getConfig();
 
             // Add your custom headers here
             const customHeaders = {
@@ -1327,14 +1330,16 @@ export class GauzyAIService {
                 'X-APP-ID': this._configService.get<string>('guazyAI.gauzyAiApiKey'),
                 'X-API-KEY': this._configService.get<string>('guazyAI.gauzyAiApiSecret'),
 
-                ...(ApiKey ? { 'X-APP-ID': ApiKey } : {}),
-                ...(ApiSecret ? { 'X-API-KEY': ApiSecret } : {}),
+                ...(apiKey ? { 'X-APP-ID': apiKey } : {}),
+                ...(apiSecret ? { 'X-API-KEY': apiSecret } : {}),
+                ...(openAiApiSecretKey ? { 'X-OPENAI-SECRET-KEY': openAiApiSecretKey } : {}),
 
-                ...(ApiTenantId ? { 'Tenant-Id': ApiTenantId } : {}),
-                ...(ApiBearerToken ? { 'Authorization': ApiBearerToken } : {}),
+                ...(bearerTokenApi ? { 'Authorization': bearerTokenApi } : {}),
+                ...(tenantIdApi ? { 'Tenant-Id': tenantIdApi } : {}),
             };
-            console.log('Custom Run Time Headers: %s', customHeaders);
-
+            if (this.logging) {
+                console.log('Custom Run Time Headers: %s', customHeaders);
+            }
             // Modify the operation context to include the headers
             operation.setContext(({ headers }) => ({
                 headers: {

From 1944abe520238ae9a3013b7580cdf2f0cb31d8d0 Mon Sep 17 00:00:00 2001
From: CoderNadir <coder.nadir@gmail.com>
Date: Thu, 7 Dec 2023 12:04:51 +0100
Subject: [PATCH 16/34] fix: #7229 | fix preventing shortcuts from being
 triggered when typing on searchable inputs (NbOptions)

---
 apps/gauzy/src/app/@theme/components/header/header.component.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/gauzy/src/app/@theme/components/header/header.component.ts b/apps/gauzy/src/app/@theme/components/header/header.component.ts
index 0788e367884..47f34e97541 100644
--- a/apps/gauzy/src/app/@theme/components/header/header.component.ts
+++ b/apps/gauzy/src/app/@theme/components/header/header.component.ts
@@ -242,6 +242,8 @@ export class HeaderComponent extends TranslationBaseComponent implements OnInit,
 			},
 			(event: KeyboardEvent, handler: HotkeysEvent) => {
 				const pressedKeys: string = this.pressedKeysToString(handler);
+				// -- prevent triggering shortcuts when typing in NbOptions (searchable inputs)
+				if ((event.target as Element).localName === "nb-option") return;
 				if (this.shortcutsMap.has(pressedKeys)) {
 					// -- close dialog if open when using shortcuts and prevent closing dialog by pressing unregistered keys
 					this.quickActionsRef &&

From 520a9aade6154d0d425261bab246f10e39347cab Mon Sep 17 00:00:00 2001
From: RAHUL RATHORE <41804588+rahul-rocket@users.noreply.github.com>
Date: Thu, 7 Dec 2023 16:49:06 +0530
Subject: [PATCH 17/34] fix: #7246 show some error toasters nofication

---
 .../authorization.component.html              |  1 -
 .../authorization/authorization.component.ts  | 22 +++++++++++++++----
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/apps/gauzy/src/app/pages/integrations/gauzy-ai/components/authorization/authorization.component.html b/apps/gauzy/src/app/pages/integrations/gauzy-ai/components/authorization/authorization.component.html
index d80134abd52..8a11ec43544 100644
--- a/apps/gauzy/src/app/pages/integrations/gauzy-ai/components/authorization/authorization.component.html
+++ b/apps/gauzy/src/app/pages/integrations/gauzy-ai/components/authorization/authorization.component.html
@@ -49,7 +49,6 @@ <h5>
 						formControlName="openai_api_secret_key"
 						nbInput
 						[placeholder]="'FORM.PLACEHOLDERS.OPEN_AI_API_SECRET_KEY' | translate"
-						required
 						fullWidth
 					/>
 				</div>
diff --git a/apps/gauzy/src/app/pages/integrations/gauzy-ai/components/authorization/authorization.component.ts b/apps/gauzy/src/app/pages/integrations/gauzy-ai/components/authorization/authorization.component.ts
index a88774736dd..42931cf1866 100644
--- a/apps/gauzy/src/app/pages/integrations/gauzy-ai/components/authorization/authorization.component.ts
+++ b/apps/gauzy/src/app/pages/integrations/gauzy-ai/components/authorization/authorization.component.ts
@@ -1,11 +1,12 @@
 import { Component, OnInit, OnDestroy, ViewChild, AfterViewInit } from '@angular/core';
 import { ActivatedRoute, Data, Router } from '@angular/router';
 import { FormGroup, FormBuilder, Validators, FormGroupDirective } from '@angular/forms';
-import { filter, tap } from 'rxjs/operators';
+import { EMPTY } from 'rxjs';
+import { catchError, filter, tap } from 'rxjs/operators';
 import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
-import { IIntegrationTenant, IOrganization } from '@gauzy/contracts';
-import { GauzyAIService, Store, ToastrService } from './../../../../../@core/services';
-import { ReplacePipe } from 'apps/gauzy/src/app/@shared/pipes';
+import { HttpStatus, IIntegrationTenant, IOrganization } from '@gauzy/contracts';
+import { ErrorHandlingService, GauzyAIService, Store, ToastrService } from './../../../../../@core/services';
+import { ReplacePipe } from './../../../../../@shared/pipes';
 
 @UntilDestroy({ checkProperties: true })
 @Component({
@@ -46,6 +47,7 @@ export class GauzyAIAuthorizationComponent implements AfterViewInit, OnInit, OnD
 		private readonly _store: Store,
 		private readonly _gauzyAIService: GauzyAIService,
 		private readonly _toastrService: ToastrService,
+		private readonly _errorHandlingService: ErrorHandlingService,
 		private readonly _replacePipe: ReplacePipe
 	) { }
 
@@ -112,6 +114,11 @@ export class GauzyAIAuthorizationComponent implements AfterViewInit, OnInit, OnD
 				organizationId,
 				tenantId
 			}).pipe(
+				tap((response: any) => {
+					if (response['status'] == HttpStatus.BAD_REQUEST) {
+						throw new Error(`${response['message']}`);
+					}
+				}),
 				// Perform actions after the integration creation
 				tap((integration: IIntegrationTenant) => {
 					if (!!integration) {
@@ -131,6 +138,13 @@ export class GauzyAIAuthorizationComponent implements AfterViewInit, OnInit, OnD
 					this.formDirective.reset();
 					this._redirectToGauzyAIIntegration(integration.id);
 				}),
+				// Catch and handle errors
+				catchError((error) => {
+					// Handle and log errors using the _errorHandlingService
+					this._errorHandlingService.handleError(error);
+					// Return an empty observable to continue the stream
+					return EMPTY;
+				}),
 				// Unsubscribe when the component is destroyed
 				untilDestroyed(this)
 			).subscribe();

From 159f354c1f10796e0195dc364b31e82c254dcad1 Mon Sep 17 00:00:00 2001
From: RAHUL RATHORE <41804588+rahul-rocket@users.noreply.github.com>
Date: Thu, 7 Dec 2023 16:50:37 +0530
Subject: [PATCH 18/34] fix: #7246 open ai api key secret is optional

---
 .../gauzy-ai/integration-ai.service.ts          | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/packages/core/src/integration/gauzy-ai/integration-ai.service.ts b/packages/core/src/integration/gauzy-ai/integration-ai.service.ts
index ea07f33831b..1acef8d3097 100644
--- a/packages/core/src/integration/gauzy-ai/integration-ai.service.ts
+++ b/packages/core/src/integration/gauzy-ai/integration-ai.service.ts
@@ -1,13 +1,13 @@
-import { Injectable, Logger } from '@nestjs/common';
+import { HttpException, HttpStatus, Injectable } from '@nestjs/common';
 import { CommandBus } from '@nestjs/cqrs';
 import { IIntegrationAICreateInput, IIntegrationTenant, IntegrationEnum } from '@gauzy/contracts';
+import { isNotEmpty } from '@gauzy/common';
 import { RequestContext } from '../../core/context';
 import { IntegrationTenantUpdateOrCreateCommand } from '../../integration-tenant/commands';
 import { IntegrationService } from './../../integration/integration.service';
 
 @Injectable()
 export class IntegrationAIService {
-	private readonly logger = new Logger('IntegrationAIService');
 
 	constructor(
 		private readonly _commandBus: CommandBus,
@@ -64,10 +64,12 @@ export class IntegrationAIService {
 								settingsName: 'apiSecret',
 								settingsValue: client_secret
 							},
-							{
-								settingsName: 'openAiApiSecretKey',
-								settingsValue: openai_api_secret_key
-							}
+							...(isNotEmpty(openai_api_secret_key) ? [
+								{
+									settingsName: 'openAiApiSecretKey',
+									settingsValue: openai_api_secret_key
+								}
+							] : [])
 						].map((setting) => ({
 							...setting,
 							tenantId,
@@ -77,8 +79,7 @@ export class IntegrationAIService {
 				)
 			);
 		} catch (error) {
-			this.logger.error(`Error while creating ${IntegrationEnum.GAUZY_AI} integration settings`, error?.message);
-			throw new Error(`Failed to add ${IntegrationEnum.GAUZY_AI} integration`);
+			throw new HttpException(`Failed to add Gauzy AI integration`, HttpStatus.BAD_REQUEST);
 		}
 	}
 }

From d8acd3f1c3c3043261f1a2229415bae1f942d233 Mon Sep 17 00:00:00 2001
From: RAHUL RATHORE <41804588+rahul-rocket@users.noreply.github.com>
Date: Thu, 7 Dec 2023 16:55:07 +0530
Subject: [PATCH 19/34] fix: added back console.log configuration

---
 packages/plugins/integration-ai/src/gauzy-ai.service.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/plugins/integration-ai/src/gauzy-ai.service.ts b/packages/plugins/integration-ai/src/gauzy-ai.service.ts
index e5f3ef0a2eb..45e55d25012 100644
--- a/packages/plugins/integration-ai/src/gauzy-ai.service.ts
+++ b/packages/plugins/integration-ai/src/gauzy-ai.service.ts
@@ -1337,7 +1337,9 @@ export class GauzyAIService {
                 ...(bearerTokenApi ? { 'Authorization': bearerTokenApi } : {}),
                 ...(tenantIdApi ? { 'Tenant-Id': tenantIdApi } : {}),
             };
+
             if (this.logging) {
+                console.log(this._requestConfigProvider.getConfig(), 'Runtime Gauzy AI Integration Config');
                 console.log('Custom Run Time Headers: %s', customHeaders);
             }
             // Modify the operation context to include the headers

From 8ddb63c8cd06e02a1e9a01913a1fe79a341cc11a Mon Sep 17 00:00:00 2001
From: RAHUL RATHORE <41804588+rahul-rocket@users.noreply.github.com>
Date: Thu, 7 Dec 2023 16:58:15 +0530
Subject: [PATCH 20/34] fix: typo for apiKey and apiSecret

---
 packages/plugins/integration-ai/src/gauzy-ai.module.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/plugins/integration-ai/src/gauzy-ai.module.ts b/packages/plugins/integration-ai/src/gauzy-ai.module.ts
index cbadc5509c5..23646b52aa4 100644
--- a/packages/plugins/integration-ai/src/gauzy-ai.module.ts
+++ b/packages/plugins/integration-ai/src/gauzy-ai.module.ts
@@ -17,8 +17,8 @@ import { GAUZY_AI_CONFIG_OPTIONS } from './constants';
 				maxRedirects: 5,
 				headers: {
 					'Content-Type': 'application/json',
-					ApiKey: config.get<string>('guazyAI.gauzyAiApiKey'),
-					ApiSecret: config.get<string>('guazyAI.gauzyAiApiSecret'),
+					apiKey: config.get<string>('guazyAI.gauzyAiApiKey'),
+					apiSecret: config.get<string>('guazyAI.gauzyAiApiSecret'),
 				},
 			}),
 			inject: [ConfigService],

From d99c4bb8a219d6ba840caacc3f522bf52c4069af Mon Sep 17 00:00:00 2001
From: RAHUL RATHORE <41804588+rahul-rocket@users.noreply.github.com>
Date: Thu, 7 Dec 2023 17:08:20 +0530
Subject: [PATCH 21/34] fix: #7246 disabled selectors visibility for AI
 integration

---
 .../gauzy-ai/gauzy-ai-routing.module.ts       | 24 ++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/apps/gauzy/src/app/pages/integrations/gauzy-ai/gauzy-ai-routing.module.ts b/apps/gauzy/src/app/pages/integrations/gauzy-ai/gauzy-ai-routing.module.ts
index e0c45190b51..3d8a16fa334 100644
--- a/apps/gauzy/src/app/pages/integrations/gauzy-ai/gauzy-ai-routing.module.ts
+++ b/apps/gauzy/src/app/pages/integrations/gauzy-ai/gauzy-ai-routing.module.ts
@@ -11,6 +11,14 @@ const routes: Routes = [
 	{
 		path: '', // Empty path for the main route
 		component: GauzyAILayoutComponent, // Component for the main layout
+		data: {
+			selectors: {
+				project: false,
+				team: false,
+				employee: false,
+				date: false
+			}
+		},
 		children: [
 			{
 				path: '', // Child route for the default page
@@ -26,7 +34,13 @@ const routes: Routes = [
 				path: 'reset', // Separate route for the reset page
 				component: GauzyAIAuthorizationComponent, // Create a new component for the reset page
 				data: {
-					state: false
+					state: false,
+					selectors: {
+						project: false,
+						team: false,
+						employee: false,
+						date: false
+					}
 				}
 			},
 			{
@@ -35,6 +49,14 @@ const routes: Routes = [
 				resolve: {
 					settings: IntegrationSettingResolver, // Resolver to fetch data before activating the route
 				},
+				data: {
+					selectors: {
+						project: false,
+						team: false,
+						employee: false,
+						date: false
+					}
+				},
 			},
 		]
 	},

From 316c4d67e0ef63ce9aeea80cab45f3ae4cd392a7 Mon Sep 17 00:00:00 2001
From: RAHUL RATHORE <41804588+rahul-rocket@users.noreply.github.com>
Date: Thu, 7 Dec 2023 17:11:42 +0530
Subject: [PATCH 22/34] fix: cspell spelling

---
 .cspell.json                                                  | 4 +++-
 .../src/integration-setting/integration-setting.entity.ts     | 2 +-
 .../src/integration-setting/integration-setting.subscriber.ts | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.cspell.json b/.cspell.json
index 64d65a6dd21..3d981b37a7f 100644
--- a/.cspell.json
+++ b/.cspell.json
@@ -408,7 +408,9 @@
 		"SCALEWAY",
 		"VULTR",
 		"Codegen",
-		"icns"
+		"icns",
+		"openai",
+		"OPENAI"
 	],
 	"useGitignore": true,
 	"ignorePaths": [
diff --git a/packages/core/src/integration-setting/integration-setting.entity.ts b/packages/core/src/integration-setting/integration-setting.entity.ts
index 335d4721bf4..ab89af6f4cd 100644
--- a/packages/core/src/integration-setting/integration-setting.entity.ts
+++ b/packages/core/src/integration-setting/integration-setting.entity.ts
@@ -56,5 +56,5 @@ export class IntegrationSetting extends TenantOrganizationBaseEntity implements
 
 	@Expose({ toPlainOnly: true, name: 'settingsValue' })
 	@IsSecret()
-	wrapSecretvalue?: string;
+	wrapSecretValue?: string;
 }
diff --git a/packages/core/src/integration-setting/integration-setting.subscriber.ts b/packages/core/src/integration-setting/integration-setting.subscriber.ts
index 39b7087744a..a858c4c983d 100644
--- a/packages/core/src/integration-setting/integration-setting.subscriber.ts
+++ b/packages/core/src/integration-setting/integration-setting.subscriber.ts
@@ -37,6 +37,6 @@ export class IntegrationSettingSubscriber implements EntitySubscriberInterface<I
         const wrapped = keysToWrapSecrets(sensitiveSecretKeys, secrets, percentage);
 
         entity.wrapSecretKey = settingsName;
-        entity.wrapSecretvalue = wrapped[settingsName];
+        entity.wrapSecretValue = wrapped[settingsName];
     }
 }

From 7516858a21c6d3ed422067e1bc42c6a109d85368 Mon Sep 17 00:00:00 2001
From: RAHUL RATHORE <41804588+rahul-rocket@users.noreply.github.com>
Date: Thu, 7 Dec 2023 17:14:30 +0530
Subject: [PATCH 23/34] fix: for now disabled form reset after add integration

---
 .../components/authorization/authorization.component.ts        | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/apps/gauzy/src/app/pages/integrations/gauzy-ai/components/authorization/authorization.component.ts b/apps/gauzy/src/app/pages/integrations/gauzy-ai/components/authorization/authorization.component.ts
index 42931cf1866..039bb4cc142 100644
--- a/apps/gauzy/src/app/pages/integrations/gauzy-ai/components/authorization/authorization.component.ts
+++ b/apps/gauzy/src/app/pages/integrations/gauzy-ai/components/authorization/authorization.component.ts
@@ -134,9 +134,8 @@ export class GauzyAIAuthorizationComponent implements AfterViewInit, OnInit, OnD
 				}),
 				// Redirect to the Gauzy AI integration after creation
 				tap((integration: IIntegrationTenant) => {
-					//
-					this.formDirective.reset();
 					this._redirectToGauzyAIIntegration(integration.id);
+					// this.formDirective.reset();
 				}),
 				// Catch and handle errors
 				catchError((error) => {

From ab72024ec12fc9bed841329dc32a9387ad88a3c2 Mon Sep 17 00:00:00 2001
From: Kifungo A <45813955+adkif@users.noreply.github.com>
Date: Thu, 7 Dec 2023 19:52:58 +0200
Subject: [PATCH 24/34] fix: surround splashScreen with try/catch

---
 apps/desktop-timer/src/index.ts | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/apps/desktop-timer/src/index.ts b/apps/desktop-timer/src/index.ts
index 0538b7750a2..8bd8a17bbef 100644
--- a/apps/desktop-timer/src/index.ts
+++ b/apps/desktop-timer/src/index.ts
@@ -391,9 +391,13 @@ app.on('ready', async () => {
 		API_BASE_URL: getApiBaseUrl(configs || {}),
 		IS_INTEGRATED_DESKTOP: configs?.isLocalServer,
 	};
-	splashScreen = new SplashScreen(pathWindow.timeTrackerUi);
-	await splashScreen.loadURL();
-	splashScreen.show();
+	try {
+		splashScreen = new SplashScreen(pathWindow.timeTrackerUi);
+		await splashScreen.loadURL();
+		splashScreen.show();
+	} catch (error) {
+		throw new UIError('SPLASH', error, '400');
+	}
 	if (!settings) {
 		launchAtStartup(true, false);
 	}

From 705400a95ef2af0f033a34509bfd91874ad7e1cf Mon Sep 17 00:00:00 2001
From: Kifungo A <45813955+adkif@users.noreply.github.com>
Date: Thu, 7 Dec 2023 20:21:24 +0200
Subject: [PATCH 25/34] fix: replace UIerror with a simple console.error

---
 apps/desktop-timer/src/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/desktop-timer/src/index.ts b/apps/desktop-timer/src/index.ts
index 8bd8a17bbef..be90885441b 100644
--- a/apps/desktop-timer/src/index.ts
+++ b/apps/desktop-timer/src/index.ts
@@ -396,7 +396,7 @@ app.on('ready', async () => {
 		await splashScreen.loadURL();
 		splashScreen.show();
 	} catch (error) {
-		throw new UIError('SPLASH', error, '400');
+		console.error(error);
 	}
 	if (!settings) {
 		launchAtStartup(true, false);

From 479f382eeba318edb886943c067a496da15beda6 Mon Sep 17 00:00:00 2001
From: CoderNadir <coder.nadir@gmail.com>
Date: Thu, 7 Dec 2023 20:06:55 +0100
Subject: [PATCH 26/34] fix: #7229 | add (pantone) word to .cspell.json file to
 avoid check spelling errors

---
 .cspell.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.cspell.json b/.cspell.json
index 64d65a6dd21..0d2c8f4d1f2 100644
--- a/.cspell.json
+++ b/.cspell.json
@@ -408,7 +408,8 @@
 		"SCALEWAY",
 		"VULTR",
 		"Codegen",
-		"icns"
+		"icns",
+		"pantone"
 	],
 	"useGitignore": true,
 	"ignorePaths": [

From 8e93dfc04235355f67f22765173fd02af2465fea Mon Sep 17 00:00:00 2001
From: CoderNadir <coder.nadir@gmail.com>
Date: Thu, 7 Dec 2023 22:40:36 +0100
Subject: [PATCH 27/34] fix: #7242 | fix date string overflow the bar on
 timesheets weekly tab

---
 .../timesheet/weekly/weekly/weekly.component.scss          | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/apps/gauzy/src/app/pages/employees/timesheet/weekly/weekly/weekly.component.scss b/apps/gauzy/src/app/pages/employees/timesheet/weekly/weekly/weekly.component.scss
index 6685be66fe4..1bf854610d3 100644
--- a/apps/gauzy/src/app/pages/employees/timesheet/weekly/weekly/weekly.component.scss
+++ b/apps/gauzy/src/app/pages/employees/timesheet/weekly/weekly/weekly.component.scss
@@ -42,8 +42,13 @@
     background: var(--gauzy-card-4);
     border-radius: nb-theme(border-radius);
     padding: 3px;
-    height: 42px;
     padding-left: 12px;
+    flex-wrap: nowrap;
+
+    .project-name {
+      flex: 0 0 20%;
+      max-width: 20%;
+    }
   }
 
   nb-card-body {

From cebeb0d3ff6b541b264cef8d9ec711ab660ce80f Mon Sep 17 00:00:00 2001
From: RAHUL RATHORE <41804588+rahul-rocket@users.noreply.github.com>
Date: Fri, 8 Dec 2023 11:43:42 +0530
Subject: [PATCH 28/34] fix: increase padding for custom header

---
 .../employees/timesheet/weekly/weekly/weekly.component.scss     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/gauzy/src/app/pages/employees/timesheet/weekly/weekly/weekly.component.scss b/apps/gauzy/src/app/pages/employees/timesheet/weekly/weekly/weekly.component.scss
index 1bf854610d3..531387f9928 100644
--- a/apps/gauzy/src/app/pages/employees/timesheet/weekly/weekly/weekly.component.scss
+++ b/apps/gauzy/src/app/pages/employees/timesheet/weekly/weekly/weekly.component.scss
@@ -41,7 +41,7 @@
     color: nb-theme(gauzy-text-color-2);
     background: var(--gauzy-card-4);
     border-radius: nb-theme(border-radius);
-    padding: 3px;
+    padding: 10px;
     padding-left: 12px;
     flex-wrap: nowrap;
 

From a50a8cfaa183484e3ccd81c6e7aaa29345a06d2c Mon Sep 17 00:00:00 2001
From: RAHUL RATHORE <41804588+rahul-rocket@users.noreply.github.com>
Date: Fri, 8 Dec 2023 12:03:32 +0530
Subject: [PATCH 29/34] fix: #7242 deepscan issue

---
 .../components/header/header.component.ts     | 808 +++++++++---------
 1 file changed, 404 insertions(+), 404 deletions(-)

diff --git a/apps/gauzy/src/app/@theme/components/header/header.component.ts b/apps/gauzy/src/app/@theme/components/header/header.component.ts
index 0788e367884..840dfd40f7e 100644
--- a/apps/gauzy/src/app/@theme/components/header/header.component.ts
+++ b/apps/gauzy/src/app/@theme/components/header/header.component.ts
@@ -18,6 +18,7 @@ import { debounceTime, filter, tap } from 'rxjs/operators';
 import { TranslateService } from '@ngx-translate/core';
 import * as moment from 'moment';
 import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
+import hotkeys, { HotkeysEvent } from 'hotkeys-js';
 import { distinctUntilChange, isNotEmpty } from '@gauzy/common-angular';
 import {
 	CrudActionEnum,
@@ -51,7 +52,6 @@ import { TranslationBaseComponent } from '../../../@shared/language-base';
 import { ChangeDetectorRef } from '@angular/core';
 import { OrganizationTeamStore } from '../../../@core/services/organization-team-store.service';
 import { QuickActionsComponent } from '../../../@shared/dialogs/quick-actions/quick-actions.component';
-import hotkeys, { HotkeysEvent } from 'hotkeys-js';
 
 @UntilDestroy({ checkProperties: true })
 @Component({
@@ -245,8 +245,8 @@ export class HeaderComponent extends TranslationBaseComponent implements OnInit,
 				if (this.shortcutsMap.has(pressedKeys)) {
 					// -- close dialog if open when using shortcuts and prevent closing dialog by pressing unregistered keys
 					this.quickActionsRef &&
-					pressedKeys !== this.defaultShortcuts.quickActions.toLowerCase() &&
-					this.shortcutsMap.has(pressedKeys)
+						pressedKeys !== this.defaultShortcuts.quickActions.toLowerCase() &&
+						this.shortcutsMap.has(pressedKeys)
 						? this.quickActionsRef.close()
 						: null;
 					if (handler.scope === 'defaultShortcuts' && this.shortcutsMap.has(pressedKeys)) {
@@ -269,7 +269,7 @@ export class HeaderComponent extends TranslationBaseComponent implements OnInit,
 
 	private registerShortcut(keys: string, action: () => void) {
 		this.shortcutsMap.set(keys.toLowerCase(), action);
-		hotkeys(keys, 'defaultShortcuts', () => {});
+		hotkeys(keys, 'defaultShortcuts', () => { });
 		hotkeys.setScope('defaultShortcuts');
 	}
 
@@ -321,14 +321,14 @@ export class HeaderComponent extends TranslationBaseComponent implements OnInit,
 		});
 	}
 
-	private toggleQuickActionsDialog() {
+	/**
+	 * Toggles the quick actions dialog, opening it if it's not open, and closing it if it's already open.
+	 */
+	private toggleQuickActionsDialog(): void {
 		if (!this.quickActionsRef) {
 			this.openQuickActions();
-			return;
-		}
-		if (this.quickActionsRef) {
+		} else {
 			this.quickActionsRef.close();
-			return;
 		}
 	}
 
@@ -618,521 +618,521 @@ export class HeaderComponent extends TranslationBaseComponent implements OnInit,
 			// Divider (Accounting)
 			...(this.store.hasAnyPermission(PermissionsEnum.INVOICES_EDIT, PermissionsEnum.ALL_ORG_EDIT)
 				? [
-						{
-							title: this.getTranslation('QUICK_ACTIONS_MENU.CREATE_INVOICE'),
-							icon: 'file-text-outline',
-							link: 'pages/accounting/invoices/add',
-							data: {
-								action: 'createInvoice'
-							},
-							badge: {
-								text: this.formatShortcut(this.defaultShortcuts.createInvoice),
-								status: 'control'
-							}
+					{
+						title: this.getTranslation('QUICK_ACTIONS_MENU.CREATE_INVOICE'),
+						icon: 'file-text-outline',
+						link: 'pages/accounting/invoices/add',
+						data: {
+							action: 'createInvoice'
+						},
+						badge: {
+							text: this.formatShortcut(this.defaultShortcuts.createInvoice),
+							status: 'control'
 						}
-				  ]
+					}
+				]
 				: []),
 			...(!!this.user.employee
 				? [
-						{
-							title: this.getTranslation('QUICK_ACTIONS_MENU.RECEIVED_INVOICES'),
-							icon: {
-								icon: 'file-invoice-dollar',
-								pack: 'font-awesome'
-							},
-							link: 'pages/accounting/invoices/received-invoices',
-							data: {
-								action: 'receivedInvoices'
-							},
-							badge: {
-								text: this.formatShortcut(this.defaultShortcuts.receivedInvoices),
-								status: 'control'
-							}
+					{
+						title: this.getTranslation('QUICK_ACTIONS_MENU.RECEIVED_INVOICES'),
+						icon: {
+							icon: 'file-invoice-dollar',
+							pack: 'font-awesome'
+						},
+						link: 'pages/accounting/invoices/received-invoices',
+						data: {
+							action: 'receivedInvoices'
+						},
+						badge: {
+							text: this.formatShortcut(this.defaultShortcuts.receivedInvoices),
+							status: 'control'
 						}
-				  ]
+					}
+				]
 				: []),
 			...(this.store.hasAnyPermission(PermissionsEnum.ORG_INCOMES_EDIT, PermissionsEnum.ALL_ORG_EDIT)
 				? [
-						{
-							title: this.getTranslation('QUICK_ACTIONS_MENU.CREATE_INCOME'),
-							icon: 'plus-circle-outline',
-							link: 'pages/accounting/income',
-							data: {
-								action: 'createIncome'
-							},
-							queryParams: {
-								openAddDialog: true
-							},
-							badge: {
-								text: this.formatShortcut(this.defaultShortcuts.createIncome),
-								status: 'control'
-							}
+					{
+						title: this.getTranslation('QUICK_ACTIONS_MENU.CREATE_INCOME'),
+						icon: 'plus-circle-outline',
+						link: 'pages/accounting/income',
+						data: {
+							action: 'createIncome'
+						},
+						queryParams: {
+							openAddDialog: true
+						},
+						badge: {
+							text: this.formatShortcut(this.defaultShortcuts.createIncome),
+							status: 'control'
 						}
-				  ]
+					}
+				]
 				: []),
 			...(this.store.hasAnyPermission(PermissionsEnum.ORG_EXPENSES_EDIT, PermissionsEnum.ALL_ORG_EDIT)
 				? [
-						{
-							title: this.getTranslation('QUICK_ACTIONS_MENU.CREATE_EXPENSE'),
-							icon: 'minus-circle-outline',
-							link: 'pages/accounting/expenses',
-							data: {
-								action: 'createExpense'
-							},
-							queryParams: {
-								openAddDialog: true
-							},
-							badge: {
-								text: this.formatShortcut(this.defaultShortcuts.createExpense),
-								status: 'control'
-							}
+					{
+						title: this.getTranslation('QUICK_ACTIONS_MENU.CREATE_EXPENSE'),
+						icon: 'minus-circle-outline',
+						link: 'pages/accounting/expenses',
+						data: {
+							action: 'createExpense'
+						},
+						queryParams: {
+							openAddDialog: true
+						},
+						badge: {
+							text: this.formatShortcut(this.defaultShortcuts.createExpense),
+							status: 'control'
 						}
-				  ]
+					}
+				]
 				: []),
 
 			...(this.store.hasAnyPermission(PermissionsEnum.ESTIMATES_EDIT, PermissionsEnum.ALL_ORG_EDIT)
 				? [
-						{
-							title: this.getTranslation('QUICK_ACTIONS_MENU.CREATE_ESTIMATE'),
-							icon: 'file-outline',
-							link: 'pages/accounting/invoices/estimates/add',
-							data: {
-								action: 'createEstimate'
-							},
-							badge: {
-								text: this.formatShortcut(this.defaultShortcuts.createEstimate),
-								status: 'control'
-							}
+					{
+						title: this.getTranslation('QUICK_ACTIONS_MENU.CREATE_ESTIMATE'),
+						icon: 'file-outline',
+						link: 'pages/accounting/invoices/estimates/add',
+						data: {
+							action: 'createEstimate'
+						},
+						badge: {
+							text: this.formatShortcut(this.defaultShortcuts.createEstimate),
+							status: 'control'
 						}
-				  ]
+					}
+				]
 				: []),
 			...(!!this.user.employee
 				? [
-						{
-							title: this.getTranslation('QUICK_ACTIONS_MENU.RECEIVED_ESTIMATES'),
-							icon: {
-								icon: 'file-invoice',
-								pack: 'font-awesome'
-							},
-							link: 'pages/accounting/invoices/received-estimates',
-							data: {
-								action: 'receivedEstimates'
-							},
-							badge: {
-								text: this.formatShortcut(this.defaultShortcuts.receivedEstimates),
-								status: 'control'
-							}
+					{
+						title: this.getTranslation('QUICK_ACTIONS_MENU.RECEIVED_ESTIMATES'),
+						icon: {
+							icon: 'file-invoice',
+							pack: 'font-awesome'
+						},
+						link: 'pages/accounting/invoices/received-estimates',
+						data: {
+							action: 'receivedEstimates'
+						},
+						badge: {
+							text: this.formatShortcut(this.defaultShortcuts.receivedEstimates),
+							status: 'control'
 						}
-				  ]
+					}
+				]
 				: []),
 			...(this.store.hasAnyPermission(PermissionsEnum.ORG_PAYMENT_ADD_EDIT, PermissionsEnum.ALL_ORG_EDIT)
 				? [
-						{
-							title: this.getTranslation('QUICK_ACTIONS_MENU.CREATE_PAYMENT'),
-							icon: 'credit-card-outline',
-							link: 'pages/accounting/payments',
-							data: {
-								action: 'createPayment'
-							},
-							queryParams: {
-								openAddDialog: true
-							},
-							badge: {
-								text: this.formatShortcut(this.defaultShortcuts.createPayment),
-								status: 'control'
-							}
+					{
+						title: this.getTranslation('QUICK_ACTIONS_MENU.CREATE_PAYMENT'),
+						icon: 'credit-card-outline',
+						link: 'pages/accounting/payments',
+						data: {
+							action: 'createPayment'
+						},
+						queryParams: {
+							openAddDialog: true
+						},
+						badge: {
+							text: this.formatShortcut(this.defaultShortcuts.createPayment),
+							status: 'control'
 						}
-				  ]
+					}
+				]
 				: []),
 			// Divider (Organization)
 			...(this.store.hasAnyPermission(PermissionsEnum.ORG_EMPLOYEES_EDIT, PermissionsEnum.ALL_ORG_EDIT)
 				? [
-						{
-							title: this.getTranslation('QUICK_ACTIONS_MENU.ADD_EMPLOYEE'),
-							icon: 'people-outline',
-							link: 'pages/employees',
-							data: {
-								action: 'addEmployee'
-							},
-							queryParams: {
-								openAddDialog: true
-							},
-							badge: {
-								text: this.formatShortcut(this.defaultShortcuts.addEmployee),
-								status: 'control'
-							}
+					{
+						title: this.getTranslation('QUICK_ACTIONS_MENU.ADD_EMPLOYEE'),
+						icon: 'people-outline',
+						link: 'pages/employees',
+						data: {
+							action: 'addEmployee'
+						},
+						queryParams: {
+							openAddDialog: true
+						},
+						badge: {
+							text: this.formatShortcut(this.defaultShortcuts.addEmployee),
+							status: 'control'
 						}
-				  ]
+					}
+				]
 				: []),
 			...(this.store.hasAnyPermission(PermissionsEnum.ORG_INVENTORY_PRODUCT_EDIT, PermissionsEnum.ALL_ORG_EDIT)
 				? [
-						{
-							title: this.getTranslation('QUICK_ACTIONS_MENU.ADD_INVENTORY'),
-							icon: 'inbox-outline',
-							link: 'pages/organization/inventory/create',
-							data: {
-								action: 'addInventory'
-							},
-							badge: {
-								text: this.formatShortcut(this.defaultShortcuts.addInventory),
-								status: 'control'
-							}
+					{
+						title: this.getTranslation('QUICK_ACTIONS_MENU.ADD_INVENTORY'),
+						icon: 'inbox-outline',
+						link: 'pages/organization/inventory/create',
+						data: {
+							action: 'addInventory'
+						},
+						badge: {
+							text: this.formatShortcut(this.defaultShortcuts.addInventory),
+							status: 'control'
 						}
-				  ]
+					}
+				]
 				: []),
 			...(this.store.hasAnyPermission(PermissionsEnum.ORG_EQUIPMENT_EDIT, PermissionsEnum.ALL_ORG_EDIT) ||
-			!!this.user.employee
+				!!this.user.employee
 				? [
-						{
-							title: this.getTranslation('QUICK_ACTIONS_MENU.ADD_EQUIPMENT'),
-							icon: 'pantone-outline',
-							link: 'pages/organization/equipment',
-							data: {
-								action: 'addEquipment'
-							},
-							queryParams: {
-								openAddDialog: true
-							},
-							badge: {
-								text: this.formatShortcut(this.defaultShortcuts.addEquipment),
-								status: 'control'
-							}
+					{
+						title: this.getTranslation('QUICK_ACTIONS_MENU.ADD_EQUIPMENT'),
+						icon: 'pantone-outline',
+						link: 'pages/organization/equipment',
+						data: {
+							action: 'addEquipment'
+						},
+						queryParams: {
+							openAddDialog: true
+						},
+						badge: {
+							text: this.formatShortcut(this.defaultShortcuts.addEquipment),
+							status: 'control'
 						}
-				  ]
+					}
+				]
 				: []),
 			...(this.store.hasAnyPermission(PermissionsEnum.ALL_ORG_EDIT)
 				? [
-						{
-							title: this.getTranslation('QUICK_ACTIONS_MENU.ADD_VENDOR'),
-							icon: 'car-outline',
-							link: 'pages/organization/vendors',
-							data: {
-								action: 'addVendor'
-							},
-							queryParams: {
-								openAddDialog: true
-							},
-							badge: {
-								text: this.formatShortcut(this.defaultShortcuts.addVendor),
-								status: 'control'
-							}
+					{
+						title: this.getTranslation('QUICK_ACTIONS_MENU.ADD_VENDOR'),
+						icon: 'car-outline',
+						link: 'pages/organization/vendors',
+						data: {
+							action: 'addVendor'
+						},
+						queryParams: {
+							openAddDialog: true
+						},
+						badge: {
+							text: this.formatShortcut(this.defaultShortcuts.addVendor),
+							status: 'control'
 						}
-				  ]
+					}
+				]
 				: []),
 			...(this.store.hasAnyPermission(PermissionsEnum.ALL_ORG_EDIT)
 				? [
-						{
-							title: this.getTranslation('QUICK_ACTIONS_MENU.ADD_DEPARTMENT'),
-							icon: 'briefcase-outline',
-							link: 'pages/organization/departments',
-							data: {
-								action: 'addDepartment'
-							},
-							queryParams: {
-								openAddDialog: true
-							},
-							badge: {
-								text: this.formatShortcut(this.defaultShortcuts.addDepartment),
-								status: 'control'
-							}
+					{
+						title: this.getTranslation('QUICK_ACTIONS_MENU.ADD_DEPARTMENT'),
+						icon: 'briefcase-outline',
+						link: 'pages/organization/departments',
+						data: {
+							action: 'addDepartment'
+						},
+						queryParams: {
+							openAddDialog: true
+						},
+						badge: {
+							text: this.formatShortcut(this.defaultShortcuts.addDepartment),
+							status: 'control'
 						}
-				  ]
+					}
+				]
 				: []),
 
 			// Divider (Project Management)
 			...(this.store.hasAnyPermission(PermissionsEnum.ALL_ORG_EDIT)
 				? [
-						{
-							title: this.getTranslation('QUICK_ACTIONS_MENU.CREATE_TEAM'),
-							icon: 'people-outline',
-							link: 'pages/organization/teams',
-							data: {
-								action: 'createTeam'
-							},
-							queryParams: {
-								openAddDialog: true
-							},
-							badge: {
-								text: this.formatShortcut(this.defaultShortcuts.createTeam),
-								status: 'control'
-							}
+					{
+						title: this.getTranslation('QUICK_ACTIONS_MENU.CREATE_TEAM'),
+						icon: 'people-outline',
+						link: 'pages/organization/teams',
+						data: {
+							action: 'createTeam'
+						},
+						queryParams: {
+							openAddDialog: true
+						},
+						badge: {
+							text: this.formatShortcut(this.defaultShortcuts.createTeam),
+							status: 'control'
 						}
-				  ]
+					}
+				]
 				: []),
 			...(this.store.hasPermission(PermissionsEnum.ORG_TASK_ADD)
 				? [
-						{
-							title: this.getTranslation('QUICK_ACTIONS_MENU.CREATE_TASK'),
-							icon: 'archive-outline',
-							link: 'pages/tasks/dashboard',
-							data: {
-								action: 'createTask'
-							},
-							queryParams: {
-								openAddDialog: true
-							},
-							badge: {
-								text: this.formatShortcut(this.defaultShortcuts.createTask),
-								status: 'control'
-							}
+					{
+						title: this.getTranslation('QUICK_ACTIONS_MENU.CREATE_TASK'),
+						icon: 'archive-outline',
+						link: 'pages/tasks/dashboard',
+						data: {
+							action: 'createTask'
+						},
+						queryParams: {
+							openAddDialog: true
+						},
+						badge: {
+							text: this.formatShortcut(this.defaultShortcuts.createTask),
+							status: 'control'
 						}
-				  ]
+					}
+				]
 				: []),
 			...(this.store.hasAnyPermission(PermissionsEnum.ORG_PROJECT_ADD, PermissionsEnum.ALL_ORG_EDIT)
 				? [
-						{
-							title: this.getTranslation('QUICK_ACTIONS_MENU.CREATE_PROJECT'),
-							icon: 'color-palette-outline',
-							link: 'pages/organization/projects/create',
-							data: {
-								action: 'createProject'
-							},
-							badge: {
-								text: this.formatShortcut(this.defaultShortcuts.createProject),
-								status: 'control'
-							}
+					{
+						title: this.getTranslation('QUICK_ACTIONS_MENU.CREATE_PROJECT'),
+						icon: 'color-palette-outline',
+						link: 'pages/organization/projects/create',
+						data: {
+							action: 'createProject'
+						},
+						badge: {
+							text: this.formatShortcut(this.defaultShortcuts.createProject),
+							status: 'control'
 						}
-				  ]
+					}
+				]
 				: []),
 			...(this.store.hasAnyPermission(PermissionsEnum.ORG_TASK_VIEW, PermissionsEnum.ALL_ORG_EDIT)
 				? [
-						{
-							title: this.getTranslation('QUICK_ACTIONS_MENU.VIEW_TASKS'),
-							icon: 'calendar-outline',
-							link: 'pages/tasks/dashboard',
-							data: {
-								action: 'viewTasks'
-							},
-							badge: {
-								text: this.formatShortcut(this.defaultShortcuts.viewTasks),
-								status: 'control'
-							}
+					{
+						title: this.getTranslation('QUICK_ACTIONS_MENU.VIEW_TASKS'),
+						icon: 'calendar-outline',
+						link: 'pages/tasks/dashboard',
+						data: {
+							action: 'viewTasks'
+						},
+						badge: {
+							text: this.formatShortcut(this.defaultShortcuts.viewTasks),
+							status: 'control'
 						}
-				  ]
+					}
+				]
 				: []),
 			...(this.store.hasAnyPermission(PermissionsEnum.ORG_TASK_VIEW, PermissionsEnum.ALL_ORG_EDIT)
 				? [
-						{
-							title: this.getTranslation('QUICK_ACTIONS_MENU.VIEW_TEAM_TASKS'),
-							icon: 'layers-outline',
-							link: 'pages/tasks/team',
-							data: {
-								action: 'viewTeamTasks'
-							},
-							badge: {
-								text: this.formatShortcut(this.defaultShortcuts.viewTeamTasks),
-								status: 'control'
-							}
+					{
+						title: this.getTranslation('QUICK_ACTIONS_MENU.VIEW_TEAM_TASKS'),
+						icon: 'layers-outline',
+						link: 'pages/tasks/team',
+						data: {
+							action: 'viewTeamTasks'
+						},
+						badge: {
+							text: this.formatShortcut(this.defaultShortcuts.viewTeamTasks),
+							status: 'control'
 						}
-				  ]
+					}
+				]
 				: []),
 
 			// Divider (Jobs)
 			...(this.store.hasAnyPermission(PermissionsEnum.ORG_CANDIDATES_EDIT, PermissionsEnum.ALL_ORG_EDIT)
 				? [
-						{
-							title: this.getTranslation('QUICK_ACTIONS_MENU.CREATE_CANDIDATE'),
-							icon: 'person-add-outline',
-							link: 'pages/employees/candidates',
-							data: {
-								action: 'createCandidate'
-							},
-							queryParams: {
-								openAddDialog: true
-							},
-							badge: {
-								text: this.formatShortcut(this.defaultShortcuts.createCandidate),
-								status: 'control'
-							}
+					{
+						title: this.getTranslation('QUICK_ACTIONS_MENU.CREATE_CANDIDATE'),
+						icon: 'person-add-outline',
+						link: 'pages/employees/candidates',
+						data: {
+							action: 'createCandidate'
+						},
+						queryParams: {
+							openAddDialog: true
+						},
+						badge: {
+							text: this.formatShortcut(this.defaultShortcuts.createCandidate),
+							status: 'control'
 						}
-				  ]
+					}
+				]
 				: []),
 			...(this.store.hasAnyPermission(PermissionsEnum.ORG_PROPOSALS_EDIT, PermissionsEnum.ALL_ORG_EDIT)
 				? [
-						{
-							title: this.getTranslation('QUICK_ACTIONS_MENU.CREATE_PROPOSAL'),
-							icon: 'paper-plane-outline',
-							link: 'pages/sales/proposals/register',
-							data: {
-								action: 'createProposal'
-							},
-							badge: {
-								text: this.formatShortcut(this.defaultShortcuts.createProposal),
-								status: 'control'
-							}
+					{
+						title: this.getTranslation('QUICK_ACTIONS_MENU.CREATE_PROPOSAL'),
+						icon: 'paper-plane-outline',
+						link: 'pages/sales/proposals/register',
+						data: {
+							action: 'createProposal'
+						},
+						badge: {
+							text: this.formatShortcut(this.defaultShortcuts.createProposal),
+							status: 'control'
 						}
-				  ]
+					}
+				]
 				: []),
 			...(this.store.hasAnyPermission(PermissionsEnum.ORG_CONTRACT_EDIT, PermissionsEnum.ALL_ORG_EDIT)
 				? [
-						{
-							title: this.getTranslation('QUICK_ACTIONS_MENU.CREATE_CONTRACT'),
-							icon: 'file-text-outline',
-							link: 'pages/integrations/upwork',
-							data: {
-								action: 'createContract'
-							},
-							badge: {
-								text: this.formatShortcut(this.defaultShortcuts.createContract),
-								status: 'control'
-							}
+					{
+						title: this.getTranslation('QUICK_ACTIONS_MENU.CREATE_CONTRACT'),
+						icon: 'file-text-outline',
+						link: 'pages/integrations/upwork',
+						data: {
+							action: 'createContract'
+						},
+						badge: {
+							text: this.formatShortcut(this.defaultShortcuts.createContract),
+							status: 'control'
 						}
-				  ]
+					}
+				]
 				: []),
 			// Divider (Contacts)
 			...(this.store.hasAnyPermission(PermissionsEnum.ORG_CONTACT_EDIT, PermissionsEnum.ALL_ORG_EDIT)
 				? [
-						{
-							title: this.getTranslation('QUICK_ACTIONS_MENU.CREATE_LEAD'),
-							icon: 'shield-outline',
-							link: 'pages/contacts/leads',
-							data: {
-								action: 'createLead'
-							},
-							queryParams: {
-								openAddDialog: true
-							},
-							badge: {
-								text: this.formatShortcut(this.defaultShortcuts.createLead),
-								status: 'control'
-							}
+					{
+						title: this.getTranslation('QUICK_ACTIONS_MENU.CREATE_LEAD'),
+						icon: 'shield-outline',
+						link: 'pages/contacts/leads',
+						data: {
+							action: 'createLead'
+						},
+						queryParams: {
+							openAddDialog: true
+						},
+						badge: {
+							text: this.formatShortcut(this.defaultShortcuts.createLead),
+							status: 'control'
 						}
-				  ]
+					}
+				]
 				: []),
 			...(this.store.hasAnyPermission(PermissionsEnum.ORG_CONTACT_EDIT, PermissionsEnum.ALL_ORG_EDIT)
 				? [
-						{
-							title: this.getTranslation('QUICK_ACTIONS_MENU.CREATE_CUSTOMER'),
-							icon: 'person-done-outline',
-							link: 'pages/contacts/customers',
-							data: {
-								action: 'createCustomer'
-							},
-							queryParams: {
-								openAddDialog: true
-							},
-							badge: {
-								text: this.formatShortcut(this.defaultShortcuts.createCustomer),
-								status: 'control'
-							}
+					{
+						title: this.getTranslation('QUICK_ACTIONS_MENU.CREATE_CUSTOMER'),
+						icon: 'person-done-outline',
+						link: 'pages/contacts/customers',
+						data: {
+							action: 'createCustomer'
+						},
+						queryParams: {
+							openAddDialog: true
+						},
+						badge: {
+							text: this.formatShortcut(this.defaultShortcuts.createCustomer),
+							status: 'control'
 						}
-				  ]
+					}
+				]
 				: []),
 			...(this.store.hasAnyPermission(PermissionsEnum.ORG_CONTACT_EDIT, PermissionsEnum.ALL_ORG_EDIT)
 				? [
-						{
-							title: this.getTranslation('QUICK_ACTIONS_MENU.CREATE_CLIENT'),
-							icon: 'person-outline',
-							link: 'pages/contacts/clients',
-							data: {
-								action: 'createClient'
-							},
-							queryParams: {
-								openAddDialog: true
-							},
-							badge: {
-								text: this.formatShortcut(this.defaultShortcuts.createClient),
-								status: 'control'
-							}
+					{
+						title: this.getTranslation('QUICK_ACTIONS_MENU.CREATE_CLIENT'),
+						icon: 'person-outline',
+						link: 'pages/contacts/clients',
+						data: {
+							action: 'createClient'
+						},
+						queryParams: {
+							openAddDialog: true
+						},
+						badge: {
+							text: this.formatShortcut(this.defaultShortcuts.createClient),
+							status: 'control'
 						}
-				  ]
+					}
+				]
 				: []),
 			...(!!this.user.employee
 				? [
-						{
-							title: this.getTranslation('QUICK_ACTIONS_MENU.VIEW_CLIENTS'),
-							icon: 'person-outline',
-							link: 'pages/contacts/clients',
-							data: {
-								action: 'viewClients'
-							},
-							badge: {
-								text: this.formatShortcut(this.defaultShortcuts.viewClients),
-								status: 'control'
-							}
+					{
+						title: this.getTranslation('QUICK_ACTIONS_MENU.VIEW_CLIENTS'),
+						icon: 'person-outline',
+						link: 'pages/contacts/clients',
+						data: {
+							action: 'viewClients'
+						},
+						badge: {
+							text: this.formatShortcut(this.defaultShortcuts.viewClients),
+							status: 'control'
 						}
-				  ]
+					}
+				]
 				: []),
 			// Divider (Time Tracking)
 			...(this.store.hasAnyPermission(PermissionsEnum.TIMESHEET_EDIT_TIME, PermissionsEnum.ALL_ORG_EDIT)
 				? [
-						{
-							title: this.getTranslation('QUICK_ACTIONS_MENU.TIME_LOG'),
-							icon: 'clock-outline',
-							link: 'pages/employees/timesheets/daily',
-							data: {
-								action: 'timeLog'
-							},
-							badge: {
-								text: this.formatShortcut(this.defaultShortcuts.timeLog),
-								status: 'control'
-							}
+					{
+						title: this.getTranslation('QUICK_ACTIONS_MENU.TIME_LOG'),
+						icon: 'clock-outline',
+						link: 'pages/employees/timesheets/daily',
+						data: {
+							action: 'timeLog'
+						},
+						badge: {
+							text: this.formatShortcut(this.defaultShortcuts.timeLog),
+							status: 'control'
 						}
-				  ]
+					}
+				]
 				: []),
 			...(this.store.hasAnyPermission(PermissionsEnum.TIME_TRACKER)
 				? [
-						{
-							title: this.getTranslation('QUICK_ACTIONS_MENU.VIEW_APPOINTMENTS'),
-							icon: 'calendar-outline',
-							link: 'pages/employees/appointments',
-							data: {
-								action: 'viewAppointments'
-							},
-							badge: {
-								text: this.formatShortcut(this.defaultShortcuts.viewAppointments),
-								status: 'control'
-							}
+					{
+						title: this.getTranslation('QUICK_ACTIONS_MENU.VIEW_APPOINTMENTS'),
+						icon: 'calendar-outline',
+						link: 'pages/employees/appointments',
+						data: {
+							action: 'viewAppointments'
+						},
+						badge: {
+							text: this.formatShortcut(this.defaultShortcuts.viewAppointments),
+							status: 'control'
 						}
-				  ]
+					}
+				]
 				: []),
 			...(this.store.hasAnyPermission(PermissionsEnum.TIME_TRACKER)
 				? [
-						{
-							title: this.getTranslation('QUICK_ACTIONS_MENU.VIEW_TIME_ACTIVITY'),
-							icon: 'activity-outline',
-							link: 'pages/employees/activity/time-activities',
-							data: {
-								action: 'viewTimeActivity'
-							},
-							badge: {
-								text: this.formatShortcut(this.defaultShortcuts.viewTimeActivity),
-								status: 'control'
-							}
+					{
+						title: this.getTranslation('QUICK_ACTIONS_MENU.VIEW_TIME_ACTIVITY'),
+						icon: 'activity-outline',
+						link: 'pages/employees/activity/time-activities',
+						data: {
+							action: 'viewTimeActivity'
+						},
+						badge: {
+							text: this.formatShortcut(this.defaultShortcuts.viewTimeActivity),
+							status: 'control'
 						}
-				  ]
+					}
+				]
 				: []),
 			...(!!this.user.employee
 				? [
-						{
-							title: this.getTranslation('QUICK_ACTIONS_MENU.START_TIMER'),
-							icon: 'play-circle-outline',
-							hidden: !this.isEmployee || this.isElectron,
-							data: {
-								action: this.actions.START_TIMER // -- Start the timer
-							},
-							badge: {
-								text: this.formatShortcut(this.defaultShortcuts.startTimer),
-								status: 'control'
-							}
+					{
+						title: this.getTranslation('QUICK_ACTIONS_MENU.START_TIMER'),
+						icon: 'play-circle-outline',
+						hidden: !this.isEmployee || this.isElectron,
+						data: {
+							action: this.actions.START_TIMER // -- Start the timer
+						},
+						badge: {
+							text: this.formatShortcut(this.defaultShortcuts.startTimer),
+							status: 'control'
 						}
-				  ]
+					}
+				]
 				: []),
 			...(!this.store.hasAnyPermission(PermissionsEnum.TIMESHEET_EDIT_TIME)
 				? [
-						{
-							title: this.getTranslation('QUICK_ACTIONS_MENU.STOP_TIMER'),
-							icon: 'pause-circle-outline',
-							hidden: !this.isEmployee || this.isElectron,
-							data: {
-								action: this.actions.STOP_TIMER // -- Stop the timer
-							},
-							badge: {
-								text: this.formatShortcut(this.defaultShortcuts.stopTimer),
-								status: 'control'
-							}
+					{
+						title: this.getTranslation('QUICK_ACTIONS_MENU.STOP_TIMER'),
+						icon: 'pause-circle-outline',
+						hidden: !this.isEmployee || this.isElectron,
+						data: {
+							action: this.actions.STOP_TIMER // -- Stop the timer
+						},
+						badge: {
+							text: this.formatShortcut(this.defaultShortcuts.stopTimer),
+							status: 'control'
 						}
-				  ]
+					}
+				]
 				: [])
 		];
 	}
@@ -1182,5 +1182,5 @@ export class HeaderComponent extends TranslationBaseComponent implements OnInit,
 		this.isCollapse = event;
 	}
 
-	ngOnDestroy() {}
+	ngOnDestroy() { }
 }

From 1f77885ed7ecb58d7fb36cee6d8453ef1a648c99 Mon Sep 17 00:00:00 2001
From: RAHUL RATHORE <41804588+rahul-rocket@users.noreply.github.com>
Date: Fri, 8 Dec 2023 12:51:09 +0530
Subject: [PATCH 30/34] fix: #7246 added screenshot description tooltip

---
 .../screenshots-item.component.html           |   9 ++
 .../screenshots-item.component.ts             | 122 ++++++++++--------
 .../screenshots-item.module.ts                |  28 ++--
 3 files changed, 91 insertions(+), 68 deletions(-)

diff --git a/apps/gauzy/src/app/@shared/timesheet/screenshots/screenshots-item/screenshots-item.component.html b/apps/gauzy/src/app/@shared/timesheet/screenshots/screenshots-item/screenshots-item.component.html
index d73f580f277..73de3ecb53a 100644
--- a/apps/gauzy/src/app/@shared/timesheet/screenshots/screenshots-item/screenshots-item.component.html
+++ b/apps/gauzy/src/app/@shared/timesheet/screenshots/screenshots-item/screenshots-item.component.html
@@ -35,6 +35,15 @@
 									(ngModelChange)="toggleSelect(timeSlot)"
 								></nb-checkbox>
 							</ng-container>
+							<button
+								*ngIf="lastScreenshot?.description"
+								class="ml-right"
+								status="info"
+								nbButton
+								size="tiny"
+							>
+								<nb-icon icon="info-outline" size="small" [nbTooltip]="lastScreenshot?.description"></nb-icon>
+							</button>
 							<button
 								class="ml-auto select-hidden"
 								status="basic"
diff --git a/apps/gauzy/src/app/@shared/timesheet/screenshots/screenshots-item/screenshots-item.component.ts b/apps/gauzy/src/app/@shared/timesheet/screenshots/screenshots-item/screenshots-item.component.ts
index d4779c31b29..4fd738acfca 100644
--- a/apps/gauzy/src/app/@shared/timesheet/screenshots/screenshots-item/screenshots-item.component.ts
+++ b/apps/gauzy/src/app/@shared/timesheet/screenshots/screenshots-item/screenshots-item.component.ts
@@ -16,11 +16,11 @@ import {
 import { NbDialogService } from '@nebular/theme';
 import { filter, take, tap } from 'rxjs/operators';
 import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
+import { sortBy } from 'underscore';
 import { TimesheetService } from '../../timesheet.service';
 import { GalleryItem } from '../../../gallery/gallery.directive';
 import { distinctUntilChange, progressStatus, toLocal } from '@gauzy/common-angular';
 import { ViewScreenshotsModalComponent } from '../view-screenshots-modal/view-screenshots-modal.component';
-import * as _ from 'underscore';
 import { GalleryService } from '../../../gallery/gallery.service';
 import { DEFAULT_SVG } from './../../../../@core/constants/app.constants';
 import { ErrorHandlingService, Store, ToastrService } from './../../../../@core/services';
@@ -32,7 +32,7 @@ import { ErrorHandlingService, Store, ToastrService } from './../../../../@core/
 	styleUrls: ['./screenshots-item.component.scss']
 })
 export class ScreenshotsItemComponent implements OnInit, OnDestroy {
-	
+
 	public organization: IOrganization;
 	progressStatus = progressStatus;
 	fallbackSvg = DEFAULT_SVG;
@@ -65,20 +65,27 @@ export class ScreenshotsItemComponent implements OnInit, OnDestroy {
 	}
 	@Input() set timeSlot(timeSlot: ITimeSlot) {
 		if (timeSlot) {
+			// Create a deep copy of the screenshots to avoid modifying the original array
 			let screenshots = JSON.parse(JSON.stringify(timeSlot.screenshots));
-			this.screenshots = screenshots.map((screenshot: IScreenshot) => {
-				return {
-					employeeId: timeSlot.employeeId,
-					...screenshot
-				}
-			}); 
+
+			// Map each screenshot with additional properties and employeeId
+			this.screenshots = screenshots.map((screenshot: IScreenshot) => ({
+				employeeId: timeSlot.employeeId,
+				...screenshot
+			}));
+
+			// Assign a new object to _timeSlot with modified properties
 			this._timeSlot = Object.assign({}, timeSlot, {
 				localStartedAt: toLocal(timeSlot.startedAt).toDate(),
 				localStoppedAt: toLocal(timeSlot.stoppedAt).toDate(),
 				isAllowDelete: this.isEnableDelete(timeSlot),
 				screenshots: this.screenshots
 			});
-			screenshots = _.sortBy(screenshots, 'recordedAt').reverse();
+
+			// Sort screenshots by recordedAt in descending order
+			screenshots = sortBy(screenshots, 'recordedAt').reverse();
+
+			// Update lastScreenshot with the first screenshot if available
 			if (screenshots.length) {
 				const [last] = screenshots;
 				this.lastScreenshot = last;
@@ -115,7 +122,7 @@ export class ScreenshotsItemComponent implements OnInit, OnDestroy {
 		private readonly toastrService: ToastrService,
 		private readonly errorHandler: ErrorHandlingService,
 		private readonly store: Store
-	) {}
+	) { }
 
 	ngOnInit(): void {
 		this.store.selectedOrganization$
@@ -135,75 +142,80 @@ export class ScreenshotsItemComponent implements OnInit, OnDestroy {
 		}
 	}
 
-	deleteSlot(timeSlot: ITimeSlot) {
+	/**
+ * Deletes a time slot if deletion is allowed and handles related tasks.
+ *
+ * @param timeSlot - The time slot to be deleted.
+ */
+	async deleteSlot(timeSlot: ITimeSlot): Promise<void> {
 		if (!timeSlot.isAllowDelete) {
 			return;
 		}
+
 		try {
 			const { id: organizationId } = this.organization;
 			const request = {
 				ids: [timeSlot.id],
 				organizationId
+			};
+
+			// Delete time slots
+			await this.timesheetService.deleteTimeSlots(request);
+
+			// Remove related screenshots from the gallery
+			const screenshots = this._screenshots.map(({ thumbUrl, fullUrl, ...screenshot }) => ({
+				thumbUrl,
+				fullUrl,
+				...screenshot
+			}));
+			this.galleryService.removeGalleryItems(screenshots);
+
+			// Display success message
+			const { employee } = timeSlot;
+			if (employee && employee.fullName) {
+				this.toastrService.success('TOASTR.MESSAGE.SCREENSHOT_DELETED', {
+					name: employee.fullName.trim(),
+					organization: this.organization.name
+				});
 			}
-			this.timesheetService.deleteTimeSlots(request).then(() => {
-				const screenshots = this._screenshots.map(
-					(screenshot: IScreenshot) => {
-						return {
-							thumbUrl: screenshot.thumbUrl,
-							fullUrl: screenshot.fullUrl,
-							...screenshot
-						};
-					}
-				);
-				this.galleryService.removeGalleryItems(screenshots);
-
-				const { employee } = timeSlot;
-				if (employee && employee.fullName) {
-					this.toastrService.success('TOASTR.MESSAGE.SCREENSHOT_DELETED', {
-						name: `${employee.fullName.trim()}`,
-						organization: this.organization.name
-					});
-				}
-				this.delete.emit();
-			});	
+
+			// Trigger delete event
+			this.delete.emit();
 		} catch (error) {
 			this.errorHandler.handleError(error);
 		}
 	}
 
 	/**
-	 * View Time Slot Info
-	 * 
-	 * @param timeSlot 
+	 * Opens a modal to view information about the provided time slot.
+	 *
+	 * @param timeSlot - The time slot for which information is to be viewed.
 	 */
-	viewInfo(timeSlot: ITimeSlot) {
+	viewInfo(timeSlot: ITimeSlot): void {
 		this.nbDialogService.open(ViewScreenshotsModalComponent, {
-			context: { 
+			context: {
 				timeSlot,
 				timeLogs: timeSlot.timeLogs
 			}
 		})
-		.onClose
-		.pipe(
-			filter(Boolean),
-			tap((data) => {
-				if (data && data['isDelete']) {
-					this.delete.emit();
-				}
-			}),
-			take(1),
-			untilDestroyed(this)
-		)
-		.subscribe();
+			.onClose.pipe(
+				filter(data => Boolean(data && data['isDelete'])),
+				tap(() => this.delete.emit()),
+				take(1),
+				untilDestroyed(this)
+			)
+			.subscribe();
 	}
 
+	/**
+	 * Checks if the provided time slot can be deleted based on certain conditions.
+	 *
+	 * @param timeSlot - The time slot to be checked for deletion.
+	 * @returns True if deletion is allowed, false otherwise.
+	 */
 	isEnableDelete(timeSlot: ITimeSlot): boolean {
-		let isAllow: boolean = true;
-		if (timeSlot.timeLogs.length > 0) {
-			isAllow = !timeSlot.timeLogs.find((log: ITimeLog) => log.isRunning);
-		}
-		return isAllow;
+		return timeSlot.timeLogs.every((log: ITimeLog) => !log.isRunning);
 	}
 
-	ngOnDestroy(): void {}
+	ngOnDestroy(): void { }
 }
diff --git a/apps/gauzy/src/app/@shared/timesheet/screenshots/screenshots-item/screenshots-item.module.ts b/apps/gauzy/src/app/@shared/timesheet/screenshots/screenshots-item/screenshots-item.module.ts
index a5219376176..1424377a37f 100644
--- a/apps/gauzy/src/app/@shared/timesheet/screenshots/screenshots-item/screenshots-item.module.ts
+++ b/apps/gauzy/src/app/@shared/timesheet/screenshots/screenshots-item/screenshots-item.module.ts
@@ -1,5 +1,6 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import {
 	NbButtonModule,
 	NbDialogModule,
@@ -7,27 +8,25 @@ import {
 	NbCheckboxModule,
 	NbProgressBarModule,
 	NbPopoverModule,
-	NbListModule
+	NbListModule,
+	NbTooltipModule
 } from '@nebular/theme';
-import { ScreenshotsItemComponent } from './screenshots-item.component';
-import { SharedModule } from '../../../shared.module';
-import { TranslateModule } from '@ngx-translate/core';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { MomentModule } from 'ngx-moment';
 import { GalleryModule } from '../../../gallery/gallery.module';
-import { DialogsModule } from '../../../dialogs';
+import { DialogsModule } from '../../../dialogs/dialogs.module';
 import { ViewScreenshotsModalModule } from '../view-screenshots-modal/view-screenshots-modal.module';
-import { TableComponentsModule } from '../../../table-components';
+import { TableComponentsModule } from '../../../table-components/table-components.module';
+import { SharedModule } from '../../../shared.module';
+import { TranslateModule } from '../../../translate/translate.module';
+import { ScreenshotsItemComponent } from './screenshots-item.component';
 
 @NgModule({
 	declarations: [ScreenshotsItemComponent],
 	exports: [ScreenshotsItemComponent],
 	imports: [
 		CommonModule,
-		DialogsModule,
 		FormsModule,
-		GalleryModule,
-		MomentModule,
+		ReactiveFormsModule,
 		NbButtonModule,
 		NbCheckboxModule,
 		NbDialogModule.forChild(),
@@ -35,11 +34,14 @@ import { TableComponentsModule } from '../../../table-components';
 		NbListModule,
 		NbPopoverModule,
 		NbProgressBarModule,
-		ReactiveFormsModule,
+		NbTooltipModule,
+		MomentModule,
+		TranslateModule,
 		SharedModule,
+		DialogsModule,
+		GalleryModule,
 		TableComponentsModule,
-		TranslateModule,
 		ViewScreenshotsModalModule
 	]
 })
-export class ScreenshotsItemModule {}
+export class ScreenshotsItemModule { }

From 319cb6cffe039b51d0a04ae78b63dbeaaabe7233 Mon Sep 17 00:00:00 2001
From: RAHUL RATHORE <41804588+rahul-rocket@users.noreply.github.com>
Date: Fri, 8 Dec 2023 12:51:41 +0530
Subject: [PATCH 31/34] fix: #7246 added screenshot description tooltip for
 gallery

---
 .../@shared/gallery/gallery.component.html    | 10 ++++++-
 .../app/@shared/gallery/gallery.component.ts  | 16 +++++------
 .../app/@shared/gallery/gallery.directive.ts  | 27 ++++++++++++++++---
 3 files changed, 40 insertions(+), 13 deletions(-)

diff --git a/apps/gauzy/src/app/@shared/gallery/gallery.component.html b/apps/gauzy/src/app/@shared/gallery/gallery.component.html
index df3bb782ecd..1d4a3e65294 100755
--- a/apps/gauzy/src/app/@shared/gallery/gallery.component.html
+++ b/apps/gauzy/src/app/@shared/gallery/gallery.component.html
@@ -2,7 +2,15 @@
 	<div class="gallery-header d-flex p-2">
 		<span class="spacer"></span>
 		<div class="ml-auto">
-			<button 
+			<button
+				*ngIf="item?.description"
+				nbButton
+				[nbTooltip]="item?.description"
+			>
+				<nb-icon icon="info-outline"></nb-icon>
+			</button>
+			<button
+				class="ml-2"
 				nbButton
 				(click)="downloadFile(item?.fullUrl)"
 				[nbTooltip]="'BUTTONS.DOWNLOAD' | translate"
diff --git a/apps/gauzy/src/app/@shared/gallery/gallery.component.ts b/apps/gauzy/src/app/@shared/gallery/gallery.component.ts
index c05cc5b5e99..a5b5dfba5ba 100755
--- a/apps/gauzy/src/app/@shared/gallery/gallery.component.ts
+++ b/apps/gauzy/src/app/@shared/gallery/gallery.component.ts
@@ -8,10 +8,10 @@ import {
 } from '@angular/core';
 import { trigger, style, animate, transition } from '@angular/animations';
 import { NbDialogRef } from '@nebular/theme';
-import { GalleryItem } from './gallery.directive';
-import { GalleryService } from './gallery.service';
 import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
 import { saveAs } from 'file-saver';
+import { GalleryItem } from './gallery.directive';
+import { GalleryService } from './gallery.service';
 
 export const fadeInOutAnimation = trigger('fadeInOut', [
 	transition(':enter', [
@@ -124,12 +124,12 @@ export class GalleryComponent implements OnInit, OnDestroy {
 	ngOnDestroy() { }
 
 	downloadFile(url: string) {
-		if(url) {
+		if (url) {
 			this.galleryService
-			.downloadFile(url)
-			.subscribe(blob => {
-				saveAs(blob, url.replace(/^.*[\\\/]/, ''))
-			});
-		}		
+				.downloadFile(url)
+				.subscribe(blob => {
+					saveAs(blob, url.replace(/^.*[\\\/]/, ''))
+				});
+		}
 	}
 }
diff --git a/apps/gauzy/src/app/@shared/gallery/gallery.directive.ts b/apps/gauzy/src/app/@shared/gallery/gallery.directive.ts
index f72ed155fa7..553c0ca528f 100644
--- a/apps/gauzy/src/app/@shared/gallery/gallery.directive.ts
+++ b/apps/gauzy/src/app/@shared/gallery/gallery.directive.ts
@@ -9,6 +9,7 @@ import {
 } from '@angular/core';
 import { NbDialogService } from '@nebular/theme';
 import { sortBy } from 'underscore';
+import { IScreenshot } from '@gauzy/contracts';
 import { GalleryComponent } from './gallery.component';
 import { GalleryService } from './gallery.service';
 
@@ -17,19 +18,22 @@ export interface GalleryItem {
 	fullUrl: string;
 	recordedAt?: Date;
 	employeeId?: string;
+	description?: IScreenshot['description'];
 }
 
 @Directive({
 	selector: '[ngxGallery]'
 })
 export class GalleryDirective implements OnDestroy, OnInit {
-	disableClick: boolean = false;
-	dialogRef: ComponentRef<GalleryComponent>;
+	public disableClick: boolean = false;
+	public dialogRef: ComponentRef<GalleryComponent>;
 
+	// Inputs
 	@Input() employeeId: string;
 	@Input() item: GalleryItem | GalleryItem[];
 	@Input() items: GalleryItem[] = [];
 
+	// Input with Setter
 	@Input() set disabled(value: any) {
 		this.disableClick = value || false;
 		if (this.disableClick) {
@@ -43,18 +47,28 @@ export class GalleryDirective implements OnDestroy, OnInit {
 		private readonly el: ElementRef,
 		private readonly nbDialogService: NbDialogService,
 		private readonly galleryService: GalleryService
-	) {}
+	) { }
 
+	/**
+	 * Host listener for click events
+	 */
 	@HostListener('click', [])
 	onClick(): void {
+		// Check if clicking is disabled
 		if (this.disableClick) {
 			return;
 		}
 
+		// Deep copy the 'item' property
 		let items = JSON.parse(JSON.stringify(this.item));
+
+		// Sort the items array by 'createdAt' in descending order
 		items = sortBy(items, 'createdAt').reverse();
 
+		// Extract the first item from the sorted array
 		const item = items instanceof Array ? items[0] : items;
+
+		// Open a dialog (possibly a gallery) using NbDialogService
 		this.nbDialogService.open(GalleryComponent, {
 			context: {
 				items: this.items,
@@ -66,10 +80,15 @@ export class GalleryDirective implements OnDestroy, OnInit {
 	}
 
 	ngOnInit() {
+		// Check if 'item' is an array; if not, convert it to a single-element array
 		const item = this.item instanceof Array ? this.item : [this.item];
+
+		// Sort the 'item' array by 'createdAt'
 		this.item = sortBy(item, 'createdAt');
+
+		// Append the sorted 'item' array to the gallery service
 		this.galleryService.appendItems(this.item);
 	}
 
-	ngOnDestroy() {}
+	ngOnDestroy() { }
 }

From 5a025a7f9ed98bab56be8fe06bb18de9d7d2275f Mon Sep 17 00:00:00 2001
From: RAHUL RATHORE <41804588+rahul-rocket@users.noreply.github.com>
Date: Fri, 8 Dec 2023 13:29:09 +0530
Subject: [PATCH 32/34] fix: #7246 added screenshot description tooltip for
 screenshot

---
 .../screenshots-item.component.html           |  20 +--
 .../view-screenshots-modal.component.html     |  22 ++-
 .../view-screenshots-modal.component.ts       | 137 ++++++++++++------
 .../view-screenshots-modal.module.ts          |  18 ++-
 4 files changed, 129 insertions(+), 68 deletions(-)

diff --git a/apps/gauzy/src/app/@shared/timesheet/screenshots/screenshots-item/screenshots-item.component.html b/apps/gauzy/src/app/@shared/timesheet/screenshots/screenshots-item/screenshots-item.component.html
index 73de3ecb53a..4af0f28c7f8 100644
--- a/apps/gauzy/src/app/@shared/timesheet/screenshots/screenshots-item/screenshots-item.component.html
+++ b/apps/gauzy/src/app/@shared/timesheet/screenshots/screenshots-item/screenshots-item.component.html
@@ -30,20 +30,12 @@
 						<ng-container *ngIf="timeSlot?.isAllowDelete">
 							<ng-container *ngIf="multiple">
 								<nb-checkbox
+									size="tiny"
 									[(ngModel)]="isSelected"
 									(click)="$event.stopPropagation()"
 									(ngModelChange)="toggleSelect(timeSlot)"
 								></nb-checkbox>
 							</ng-container>
-							<button
-								*ngIf="lastScreenshot?.description"
-								class="ml-right"
-								status="info"
-								nbButton
-								size="tiny"
-							>
-								<nb-icon icon="info-outline" size="small" [nbTooltip]="lastScreenshot?.description"></nb-icon>
-							</button>
 							<button
 								class="ml-auto select-hidden"
 								status="basic"
@@ -60,6 +52,16 @@
 								></nb-icon>
 							</button>
 						</ng-container>
+						<button
+							*ngIf="lastScreenshot?.description"
+							class="ml-2"
+							status="info"
+							nbButton
+							size="tiny"
+							[nbTooltip]="lastScreenshot?.description"
+						>
+							<nb-icon icon="info-outline" size="small"></nb-icon>
+						</button>
 					</div>
 					<div class="view-button select-hidden">
 						<ng-container *ngIf="timeSlot?.screenshots?.length > 0">
diff --git a/apps/gauzy/src/app/@shared/timesheet/screenshots/view-screenshots-modal/view-screenshots-modal.component.html b/apps/gauzy/src/app/@shared/timesheet/screenshots/view-screenshots-modal/view-screenshots-modal.component.html
index 14d15ec3c6d..b01ff950225 100644
--- a/apps/gauzy/src/app/@shared/timesheet/screenshots/view-screenshots-modal/view-screenshots-modal.component.html
+++ b/apps/gauzy/src/app/@shared/timesheet/screenshots/view-screenshots-modal/view-screenshots-modal.component.html
@@ -41,11 +41,19 @@ <h6>{{ 'TIMESHEET.SCREENSHOTS.SCREENSHOTS' | translate }}</h6>
 				<div class="row mb-3 justify-content-left">
 					<div class="col-3 mb-2" *ngFor="let image of screenshots">
 						<div class="screenshot">
-							<img
-								nb-card-image
-								draggable="false"
-								[src]="image?.thumbUrl"
-							/>
+							<img nb-card-image draggable="false" [src]="image?.thumbUrl"/>
+							<button
+								*ngIf="image?.description"
+								class="ml-right select-hidden"
+								status="info"
+								nbButton
+								size="tiny"
+								[nbTooltip]="image?.description"
+							>
+								<nb-icon
+									icon="info-outline"
+								></nb-icon>
+							</button>
 							<button
 								class="ml-auto select-hidden"
 								status="danger"
@@ -53,7 +61,9 @@ <h6>{{ 'TIMESHEET.SCREENSHOTS.SCREENSHOTS' | translate }}</h6>
 								size="tiny"
 								(click)="deleteImage(image, image?.employee)"
 							>
-								<nb-icon icon="trash-2-outline"></nb-icon>
+								<nb-icon
+									icon="trash-2-outline"
+								></nb-icon>
 							</button>
 							<div class="text-caption caption text-center mt-1">
 								{{ image?.recordedAt | dateTimeFormat }}
diff --git a/apps/gauzy/src/app/@shared/timesheet/screenshots/view-screenshots-modal/view-screenshots-modal.component.ts b/apps/gauzy/src/app/@shared/timesheet/screenshots/view-screenshots-modal/view-screenshots-modal.component.ts
index ccde0f75919..d4979e65454 100644
--- a/apps/gauzy/src/app/@shared/timesheet/screenshots/view-screenshots-modal/view-screenshots-modal.component.ts
+++ b/apps/gauzy/src/app/@shared/timesheet/screenshots/view-screenshots-modal/view-screenshots-modal.component.ts
@@ -29,18 +29,31 @@ export class ViewScreenshotsModalComponent implements OnInit {
 	get timeSlot(): ITimeSlot {
 		return this._timeSlot;
 	}
+	/**
+	 * Setter for the timeSlot property. Assigns the provided timeSlot value, processes
+	 * and formats the screenshots, and updates the local _timeSlot property accordingly.
+	 *
+	 * @param timeSlot - The TimeSlot object to be assigned.
+	 */
 	@Input() set timeSlot(timeSlot: ITimeSlot) {
-		let screenshots = JSON.parse(JSON.stringify(timeSlot.screenshots));
-		this.screenshots = sortBy(screenshots, 'recordedAt').map((screenshot: IScreenshot) => {
-			return {
+		if (timeSlot) {
+			// Destructure the timeSlot object
+			const { ...restTimeSlot } = timeSlot;
+			const screenshots = JSON.parse(JSON.stringify(timeSlot.screenshots));
+
+			// Process and format the screenshots array
+			this.screenshots = sortBy(screenshots, 'recordedAt').map((screenshot: IScreenshot) => ({
 				employee: timeSlot.employee,
 				...screenshot
-			}
-		});
-		this._timeSlot = Object.assign({}, timeSlot, {
-			localStartedAt: toLocal(timeSlot.startedAt).toDate(),
-			localStoppedAt: toLocal(timeSlot.stoppedAt).toDate()
-		});
+			}));
+
+			// Update the _timeSlot object with formatted timestamps and other properties
+			this._timeSlot = {
+				...restTimeSlot,
+				localStartedAt: toLocal(timeSlot.startedAt).toDate(),
+				localStoppedAt: toLocal(timeSlot.stoppedAt).toDate()
+			};
+		}
 	}
 
 	/*
@@ -64,13 +77,14 @@ export class ViewScreenshotsModalComponent implements OnInit {
 	@Input() set timeLogs(timeLogs: ITimeLog[]) {
 		this._timeLogs = sortBy(timeLogs, 'recordedAt');
 	}
+
 	constructor(
 		private readonly store: Store,
 		private readonly dialogRef: NbDialogRef<ViewScreenshotsModalComponent>,
 		private readonly timesheetService: TimesheetService,
 		private readonly nbDialogService: NbDialogService,
 		private readonly toastrService: ToastrService
-	) {}
+	) { }
 
 	ngOnInit(): void {
 		this.store.selectedOrganization$
@@ -83,99 +97,132 @@ export class ViewScreenshotsModalComponent implements OnInit {
 			.subscribe();
 	}
 
-	async getTimeSlot() {
+	/**
+	 * Asynchronously retrieves and sets the time slot and associated time logs.
+	 *
+	 * @returns A Promise that resolves when the operation is complete.
+	 */
+	async getTimeSlot(): Promise<void> {
 		try {
+			// Check if organization and time slot are available
+			if (!this.organization || !this.timeSlot) {
+				return;
+			}
+
+			// Retrieve time slot with specified relations
 			this.timeSlot = await this.timesheetService.getTimeSlot(this.timeSlot.id, {
 				relations: [
 					'employee.user',
 					'screenshots',
-					'timeLogs',
 					'timeLogs.project',
 					'timeLogs.task',
 					'timeLogs.organizationContact',
 					'timeLogs.employee.user',
-				]
+				],
 			});
+
+			// Set the time logs property to the time logs of the retrieved time slot
 			this.timeLogs = this.timeSlot.timeLogs;
 		} catch (error) {
-			console.log('Error while retrieve TimeSlot:', error);
+			// Handle errors by logging and displaying a toastr message
+			console.error('Error while retrieving TimeSlot:', error);
 			this.toastrService.danger(error);
 		}
 	}
 
-	close() {
+	/**
+	 * Closes the current dialog.
+	 */
+	close(): void {
 		this.dialogRef.close();
 	}
 
-	viewTimeLog(timeLog: ITimeLog) {
+	/**
+	 * Opens a modal to view details of a time log.
+	 *
+	 * @param timeLog - The time log to be viewed.
+	 */
+	viewTimeLog(timeLog: ITimeLog): void {
 		this.nbDialogService.open(ViewTimeLogModalComponent, {
-			context: { timeLog }
+			context: { timeLog },
 		});
 	}
 
 	/**
-	 * DELETE specific Screenshot
+	 * Deletes a specific screenshot associated with an employee.
 	 *
-	 * @param screenshot
-	 * @param employee
-	 * @returns
+	 * @param screenshot - The screenshot to be deleted.
+	 * @param employee - The employee associated with the screenshot.
+	 * @returns void
 	 */
-	async deleteImage(
-		screenshot: IScreenshot,
-		employee: IEmployee
-	) {
+	async deleteImage(screenshot: IScreenshot, employee: IEmployee): Promise<void> {
 		if (!screenshot || !this.organization) {
 			return;
 		}
+
 		try {
 			const { name } = this.organization;
 			const { organizationId, tenantId } = screenshot;
 
+			// Delete the specified screenshot
 			await this.timesheetService.deleteScreenshot(screenshot.id, {
 				organizationId,
 				tenantId
-			}).then(() => {
-				this.screenshots = this.screenshots.filter(
-					(item: IScreenshot) => item.id !== screenshot.id
-				);
 			});
+
+			// Remove the deleted screenshot from the local collection
+			this.screenshots = this.screenshots.filter(
+				(item: IScreenshot) => item.id !== screenshot.id
+			);
+
+			// Display success message
 			this.toastrService.success('TOASTR.MESSAGE.SCREENSHOT_DELETED', {
 				name: employee.fullName,
 				organization: name
 			});
 		} catch (error) {
-			console.log('Error while delete screenshot: ', error);
+			// Handle errors by logging and displaying a toastr message
+			console.error('Error while deleting screenshot:', error);
 			this.toastrService.danger(error);
 		}
 	}
 
 	/**
-	 * DELETE specific TimeLog
+	 * Deletes a specific time log associated with an employee.
 	 *
-	 * @param timeLog
+	 * @param timeLog - The time log to be deleted.
+	 * @param employee - The employee associated with the time log.
+	 * @returns void
 	 */
-	async deleteTimeLog(timeLog: ITimeLog, employee: IEmployee) {
+	async deleteTimeLog(timeLog: ITimeLog, employee: IEmployee): Promise<void> {
 		if (timeLog.isRunning) {
 			return;
 		}
+
 		try {
-			const { id: organizationId } = this.organization;
+			const { id: organizationId, name: organizationName } = this.organization;
 			const request = {
 				logIds: [timeLog.id],
 				organizationId
-			}
-			await this.timesheetService.deleteLogs(request).then(() => {
-				this.toastrService.success('TOASTR.MESSAGE.TIME_LOG_DELETED', {
-					name: employee.fullName,
-					organization: this.organization.name
-				});
-				this.dialogRef.close({
-					timeLog: timeLog,
-					isDelete: true
-				});
+			};
+
+			// Delete the specified time log
+			await this.timesheetService.deleteLogs(request);
+
+			// Display success message
+			this.toastrService.success('TOASTR.MESSAGE.TIME_LOG_DELETED', {
+				name: employee.fullName,
+				organization: organizationName
+			});
+
+			// Close the dialog and emit an event indicating time log deletion
+			this.dialogRef.close({
+				timeLog: timeLog,
+				isDelete: true
 			});
 		} catch (error) {
-			console.log('Error while delete TimeLog: ', error);
+			// Handle errors by logging and displaying a toastr message
+			console.error('Error while deleting TimeLog:', error);
 			this.toastrService.danger(error);
 		}
 	}
diff --git a/apps/gauzy/src/app/@shared/timesheet/screenshots/view-screenshots-modal/view-screenshots-modal.module.ts b/apps/gauzy/src/app/@shared/timesheet/screenshots/view-screenshots-modal/view-screenshots-modal.module.ts
index 5ccb34516fe..87993f88f91 100644
--- a/apps/gauzy/src/app/@shared/timesheet/screenshots/view-screenshots-modal/view-screenshots-modal.module.ts
+++ b/apps/gauzy/src/app/@shared/timesheet/screenshots/view-screenshots-modal/view-screenshots-modal.module.ts
@@ -1,21 +1,22 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { ViewScreenshotsModalComponent } from './view-screenshots-modal.component';
 import {
 	NbDialogModule,
 	NbCardModule,
 	NbButtonModule,
 	NbIconModule,
 	NbProgressBarModule,
-	NbAlertModule
+	NbAlertModule,
+	NbTooltipModule
 } from '@nebular/theme';
-import { SharedModule } from '../../../shared.module';
 import { MomentModule } from 'ngx-moment';
-import { TranslateModule } from '@ngx-translate/core';
+import { SharedModule } from '../../../shared.module';
 import { LabelModule } from '../../../components/label/label.module';
 import { GalleryModule } from '../../../gallery/gallery.module';
 import { DialogsModule } from '../../../dialogs/dialogs.module';
-import { TableComponentsModule } from '../../../table-components';
+import { TranslateModule } from '../../../translate/translate.module';
+import { TableComponentsModule } from '../../../table-components/table-components.module';
+import { ViewScreenshotsModalComponent } from './view-screenshots-modal.component';
 
 @NgModule({
 	declarations: [ViewScreenshotsModalComponent],
@@ -23,13 +24,14 @@ import { TableComponentsModule } from '../../../table-components';
 	imports: [
 		CommonModule,
 		NbAlertModule,
-		NbDialogModule.forChild(),
-		NbCardModule,
 		NbButtonModule,
+		NbCardModule,
+		NbDialogModule.forChild(),
 		NbIconModule,
-		SharedModule,
 		NbProgressBarModule,
+		NbTooltipModule,
 		MomentModule,
+		SharedModule,
 		TranslateModule,
 		LabelModule,
 		GalleryModule,

From 3a3bbfd6bff8de6ffbb3049daf3ceff4b3d9d254 Mon Sep 17 00:00:00 2001
From: RAHUL RATHORE <41804588+rahul-rocket@users.noreply.github.com>
Date: Fri, 8 Dec 2023 18:36:57 +0530
Subject: [PATCH 33/34] fix: #7246 screenshot gallery change button colors

---
 apps/gauzy/src/app/@shared/gallery/gallery.component.html | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/apps/gauzy/src/app/@shared/gallery/gallery.component.html b/apps/gauzy/src/app/@shared/gallery/gallery.component.html
index 1d4a3e65294..26eee4c0943 100755
--- a/apps/gauzy/src/app/@shared/gallery/gallery.component.html
+++ b/apps/gauzy/src/app/@shared/gallery/gallery.component.html
@@ -4,6 +4,7 @@
 		<div class="ml-auto">
 			<button
 				*ngIf="item?.description"
+				status="info"
 				nbButton
 				[nbTooltip]="item?.description"
 			>
@@ -11,6 +12,7 @@
 			</button>
 			<button
 				class="ml-2"
+				status="success"
 				nbButton
 				(click)="downloadFile(item?.fullUrl)"
 				[nbTooltip]="'BUTTONS.DOWNLOAD' | translate"
@@ -19,6 +21,7 @@
 			</button>
 			<button
 				class="ml-2"
+				status="danger"
 				nbButton (click)="close()"
 				[nbTooltip]="'BUTTONS.CLOSE' | translate"
 			>

From c0b8399ef4c8b3142386a74b6f87a2c2b611de3f Mon Sep 17 00:00:00 2001
From: RAHUL RATHORE <41804588+rahul-rocket@users.noreply.github.com>
Date: Fri, 8 Dec 2023 18:55:02 +0530
Subject: [PATCH 34/34] fix: #7246 same delete button style

---
 .../screenshots-item/screenshots-item.component.html           | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/apps/gauzy/src/app/@shared/timesheet/screenshots/screenshots-item/screenshots-item.component.html b/apps/gauzy/src/app/@shared/timesheet/screenshots/screenshots-item/screenshots-item.component.html
index 4af0f28c7f8..813cdb2b9e6 100644
--- a/apps/gauzy/src/app/@shared/timesheet/screenshots/screenshots-item/screenshots-item.component.html
+++ b/apps/gauzy/src/app/@shared/timesheet/screenshots/screenshots-item/screenshots-item.component.html
@@ -38,7 +38,7 @@
 							</ng-container>
 							<button
 								class="ml-auto select-hidden"
-								status="basic"
+								status="danger"
 								nbButton
 								size="tiny"
 								(click)="$event.stopPropagation()"
@@ -47,7 +47,6 @@
 								(confirm)="deleteSlot(timeSlot)"
 							>
 								<nb-icon
-									status="danger"
 									icon="trash-2-outline"
 								></nb-icon>
 							</button>