Merge pull request #8520 from ever-co/stage

Stage

.circleci/config.yml

@@ -101,10 +101,7 @@ jobs:
           key: yarn-packages-sonarqube-root-{{ checksum "yarn.lock" }}
           paths:
             - ~/.cache/yarn
-      - persist_to_workspace:
-          root: /tmp/workspace/sonarqube-root
-          paths:
-            - '*'
+
   build-monorepo-root:
     <<: *defaults
     machine:
@@ -131,10 +128,7 @@ jobs:
           key: yarn-packages-monorepo-root-{{ checksum "yarn.lock" }}
           paths:
             - ~/.cache/yarn
-      - persist_to_workspace:
-          root: /tmp/workspace/monorepo-root
-          paths:
-            - '*'
+
   build-desktop:
     <<: *defaults
     machine:
@@ -165,10 +159,7 @@ jobs:
           key: yarn-packages-desktop-{{ checksum "yarn.lock" }}
           paths:
             - ~/.cache/yarn
-      - persist_to_workspace:
-          root: /tmp/workspace/desktop
-          paths:
-            - '*'
+
   build-api:
     <<: *defaults
     machine:
@@ -203,10 +194,7 @@ jobs:
           key: yarn-packages-api-{{ checksum "yarn.lock" }}
           paths:
             - ~/.cache/yarn
-      - persist_to_workspace:
-          root: /tmp/workspace/api
-          paths:
-            - '*'
+
   build-web:
     <<: *defaults
     machine:
@@ -241,10 +229,6 @@ jobs:
           key: yarn-packages-web-{{ checksum "yarn.lock" }}
           paths:
             - ~/.cache/yarn
-      - persist_to_workspace:
-          root: /tmp/workspace/web
-          paths:
-            - '*'
 
   test-e2e:
     <<: *defaults
@@ -289,11 +273,6 @@ jobs:
           name: Kill API Background Process
           command: pgrep node &> /dev/null && killall -w node || true
 
-      - persist_to_workspace:
-          root: /tmp/workspace/test-e2e
-          paths:
-            - '*'
-
   pulumi_deploy:
     <<: *defaults
     machine:
@@ -333,11 +312,6 @@ jobs:
           paths:
             - ~/.cache/yarn
 
-      - persist_to_workspace:
-          root: /tmp/workspace/pulumi
-          paths:
-            - '*'
-
 workflows:
   version: 2
   build:

angular.json

@@ -85,7 +85,8 @@
 							"randomcolor",
 							"underscore.string",
 							"slugify",
-							"eva-icons"
+							"eva-icons",
+							"localforage"
 						]
 					},
 					"configurations": {

apps/gauzy/src/app/pages/employees/edit-employee/edit-employee-profile/edit-employee-settings/edit-employee-other-settings.component.ts

@@ -74,68 +74,63 @@ export class EditEmployeeOtherSettingsComponent implements OnInit, OnDestroy {
 	}
 
 	/**
+	 * Patches the form with employee data or default values if data is unavailable.
 	 *
-	 * @param employee
-	 * @returns
+	 * @param {IEmployee} employee - The employee object containing user data.
+	 * @returns {void}
 	 */
-	private _patchFormValue(employee: IEmployee) {
-		if (!employee) {
-			return;
-		}
-		const { user } = employee;
+	private _patchFormValue(employee: IEmployee): void {
+		if (!employee) return;
+
+		const { user, upworkId, linkedInId, allowManualTime, allowDeleteTime, allowModifyTime, allowScreenshotCapture } = employee;
 		this.form.patchValue({
-			timeZone: user.timeZone || moment.tz.guess(), // set current timezone, if employee don't have any timezone
-			timeFormat: user.timeFormat,
-			upworkId: employee.upworkId,
-			linkedInId: employee.linkedInId,
-			allowManualTime: employee.allowManualTime,
-			allowDeleteTime: employee.allowDeleteTime,
-			allowModifyTime: employee.allowModifyTime,
-			allowScreenshotCapture: employee.allowScreenshotCapture
+			timeZone: user?.timeZone ?? moment.tz.guess(),
+			timeFormat: user?.timeFormat,
+			upworkId,
+			linkedInId,
+			allowManualTime,
+			allowDeleteTime,
+			allowModifyTime,
+			allowScreenshotCapture
 		});
 		this.form.updateValueAndValidity();
 	}
 
 	/**
+	 * Handles the form submission, updating employee and user settings if valid.
 	 *
-	 * @param form
-	 * @returns
+	 * @param {NgForm} form - The form reference for submission.
+	 * @returns {void}
 	 */
-	onSubmit(form: NgForm) {
-		if (form.invalid) {
-			return;
-		}
+	onSubmit(form: NgForm): void {
+		if (form.invalid) return;
+
 		const { organizationId, tenantId } = this.selectedEmployee;
 		const {
 			timeZone,
 			timeFormat,
 			upworkId,
 			linkedInId,
-			allowScreenshotCapture,
 			allowManualTime,
+			allowDeleteTime,
 			allowModifyTime,
-			allowDeleteTime
+			allowScreenshotCapture
 		} = this.form.value;
 
-		/** Update user fields */
-		this.employeeStore.userForm = {
-			timeZone,
-			timeFormat
-		};
-
-		/** Update employee fields */
-		this.employeeStore.employeeForm = {
+		this.employeeStore.updateUserForm({ timeZone, timeFormat });
+		this.employeeStore.updateEmployeeForm({
 			upworkId,
 			linkedInId,
 			organizationId,
 			tenantId,
 			allowManualTime,
-			allowModifyTime,
 			allowDeleteTime,
+			allowModifyTime,
 			allowScreenshotCapture
-		};
+		});
 	}
 
+
 	/**
 	 *
 	 */

apps/gauzy/src/app/pages/users/edit-user-profile/edit-user-organizations/edit-user-organizations.component.ts

@@ -1,5 +1,5 @@
 import { Component, OnInit, OnDestroy } from '@angular/core';
-import { IOrganization, IUserOrganizationCreateInput, RolesEnum } from '@gauzy/contracts';
+import { IOrganization, IUserOrganizationCreateInput } from '@gauzy/contracts';
 import { filter, tap, debounceTime } from 'rxjs/operators';
 import { Subject, firstValueFrom } from 'rxjs';
 import { TranslateService } from '@ngx-translate/core';
@@ -84,22 +84,25 @@ export class EditUserOrganizationsComponent extends TranslationBaseComponent imp
 
 	async remove(id: string) {
 		const { tenantId } = this.store.user;
-		const user = await this.usersService.getUserById(this.selectedUserId);
-		const { items } = await this.userOrganizationsService.getAll(['user', 'user.role'], { tenantId });
+		const { items } = await this.userOrganizationsService.getAll(['user', 'user.role'], {
+			tenantId,
+			userId: this.selectedUserId
+		});
 
 		let counter = 0;
 		let userName: string;
 
-		for (const orgUser of items) {
-			if (orgUser.isActive && (!orgUser.user.role || orgUser.user.role.name !== RolesEnum.EMPLOYEE)) {
-				this.userToRemove = orgUser;
-				userName = orgUser.user.firstName + ' ' + orgUser.user.lastName;
+		this.userToRemove = items.find((orgUser) => orgUser.organizationId === id && orgUser.isActive);
 
-				if (orgUser.organizationId === id) this.orgUserId = orgUser.id;
-				if (this.userToRemove.user.id === user.id) counter++;
-			}
+		if (!this.userToRemove?.user) {
+			this.toastrService.danger('User organization record not found');
+			return;
 		}
 
+		userName = [this.userToRemove.user.firstName, this.userToRemove.user.lastName].filter(Boolean).join(' ');
+		this.orgUserId = this.userToRemove.id;
+		counter = items.filter((orgUser) => orgUser.isActive).length;
+
 		if (counter - 1 < 1) {
 			this.dialogService
 				.open(DeleteConfirmationComponent, {

apps/server-api/src/package.json

@@ -199,9 +199,9 @@
 			"node_modules/linebreak/src/classes.trie"
 		],
 		"targets": [
-			"node16-linux-x64",
-			"node16-mac-x64",
-			"node16-win-x64"
+			"node20-linux-x64",
+			"node20-mac-x64",
+			"node20-win-x64"
 		]
 	}
 }

apps/server/src/package.json

@@ -212,9 +212,9 @@
 			"node_modules/linebreak/src/classes.trie"
 		],
 		"targets": [
-			"node16-linux-x64",
-			"node16-mac-x64",
-			"node16-win-x64"
+			"node20-linux-x64",
+			"node20-mac-x64",
+			"node20-win-x64"
 		]
 	}
 }

packages/contracts/src/base-entity.model.ts

@@ -87,5 +87,6 @@ export enum BaseEntityEnum {
 	OrganizationVendor = 'OrganizationVendor',
 	Task = 'Task',
 	TaskView = 'TaskView',
+	TaskLinkedIssue = 'TaskLinkedIssue',
 	User = 'User'
 }

packages/contracts/src/task-linked-issue.model.ts

@@ -1,4 +1,4 @@
-import { IBasePerTenantAndOrganizationEntityModel } from './base-entity.model';
+import { IBasePerTenantAndOrganizationEntityModel, ID } from './base-entity.model';
 import { ITask } from './task.model';
 
 export enum TaskRelatedIssuesRelationEnum {
@@ -8,23 +8,21 @@ export enum TaskRelatedIssuesRelationEnum {
 	CLONES = 4,
 	IS_DUPLICATED_BY = 5,
 	DUPLICATES = 6,
-	RELATES_TO = 7,
+	RELATES_TO = 7
 }
 
-export interface ITaskLinkedIssue
-	extends IBasePerTenantAndOrganizationEntityModel {
+export interface ITaskLinkedIssue extends IBasePerTenantAndOrganizationEntityModel {
 	action: TaskRelatedIssuesRelationEnum;
 	taskFrom?: ITask;
-	taskFromId: ITask['id'];
+	taskFromId: ID;
 	taskTo?: ITask;
-	taskToId: ITask['id'];
+	taskToId: ID;
 }
 
 export interface ITaskLinkedIssueCreateInput extends ITaskLinkedIssue {}
 
-export interface ITaskLinkedIssueUpdateInput
-	extends Partial<ITaskLinkedIssueCreateInput> {
-	id?: string;
+export interface ITaskLinkedIssueUpdateInput extends Partial<ITaskLinkedIssueCreateInput> {
+	id?: ID;
 }
 
 export interface ILinkedIssueFindInput

packages/core/src/activity-log/activity-log.service.ts

@@ -122,7 +122,7 @@ export class ActivityLogService extends TenantAwareCrudService<ActivityLog> {
 	/**
 	 * @description Create or Update Activity Log
 	 * @template T
-	 * @param {BaseEntityEnum} entityType - Entity type for whom creating activity log (E.g : Task, OrganizationProject, etc.)
+	 * @param {BaseEntityEnum} entity - Entity type for whom creating activity log (E.g : Task, OrganizationProject, etc.)
 	 * @param {string} entityName - Name or Title of the entity
 	 * @param {ActorTypeEnum} actor - The actor type performing the action (User or System)
 	 * @param {ID} organizationId

packages/core/src/organization-project-module/organization-project-module.service.ts

@@ -81,12 +81,14 @@ export class OrganizationProjectModuleService extends TenantAwareCrudService<Org
 		const tenantId = RequestContext.currentTenantId() || entity.tenantId;
 
 		try {
+			// Find Organization Project Module relations
+			const relations = this.typeOrmProjectModuleRepository.metadata.relations.map(
+				(relation) => relation.propertyName
+			);
+
 			// Retrieve existing module.
 			const existingProjectModule = await this.findOneByIdString(id, {
-				relations: {
-					members: true,
-					manager: true
-				}
+				relations
 			});
 
 			if (!existingProjectModule) {

packages/core/src/organization-project/organization-project.service.ts

@@ -155,8 +155,14 @@ export class OrganizationProjectService extends TenantAwareCrudService<Organizat
 		const tenantId = RequestContext.currentTenantId() || input.tenantId;
 		const { memberIds = [], managerIds = [], organizationId } = input;
 
+		// Find Organization Project relations
+		const relations = this.typeOrmOrganizationProjectRepository.metadata.relations.map(
+			(relation) => relation.propertyName
+		);
+
 		let organizationProject = await super.findOneByIdString(id, {
-			where: { organizationId, tenantId }
+			where: { organizationId, tenantId },
+			relations
 		});
 
 		try {

packages/core/src/organization-sprint/organization-sprint.service.ts

@@ -148,13 +148,15 @@ export class OrganizationSprintService extends TenantAwareCrudService<Organizati
 		const { memberIds = [], managerIds = [], organizationId, projectId } = input;
 
 		try {
+			// Find Organization Sprint relations
+			const relations = this.typeOrmOrganizationSprintRepository.metadata.relations.map(
+				(relation) => relation.propertyName
+			);
+
 			// Search for existing Organization Sprint
 			const organizationSprint = await super.findOneByIdString(id, {
 				where: { organizationId, tenantId, projectId },
-				relations: {
-					members: true,
-					modules: true
-				}
+				relations
 			});
 
 			// Retrieve members and managers IDs

packages/core/src/resource-link/resource-link.service.ts

@@ -80,7 +80,12 @@ export class ResourceLinkService extends TenantAwareCrudService<ResourceLink> {
 	 */
 	async update(id: ID, input: IResourceLinkUpdateInput): Promise<IResourceLink | UpdateResult> {
 		try {
-			const resourceLink = await this.findOneByIdString(id);
+			// Find Resource Link relations
+			const relations = this.typeOrmResourceLinkRepository.metadata.relations.map(
+				(relation) => relation.propertyName
+			);
+
+			const resourceLink = await this.findOneByIdString(id, { relations });
 
 			if (!resourceLink) {
 				throw new BadRequestException('Resource Link not found');

packages/core/src/tasks/commands/handlers/automation-task.sync.handler.ts

@@ -175,8 +175,11 @@ export class AutomationTaskSyncHandler implements ICommandHandler<AutomationTask
 	 */
 	async updateTask(id: ID, entity: ITaskUpdateInput): Promise<ITask> {
 		try {
+			// Find task relations
+			const relations = this.typeOrmTaskRepository.metadata.relations.map((relation) => relation.propertyName);
+
 			// Find the existing task by its ID
-			const existingTask = await this._taskService.findOneByIdString(id);
+			const existingTask = await this._taskService.findOneByIdString(id, { relations });
 			if (!existingTask) {
 				return;
 			}

packages/core/src/tasks/linked-issue/commands/handlers/index.ts

@@ -0,0 +1,4 @@
+import { TaskLinkedIssueCreateHandler } from './task-linked-issue-create.handler';
+import { TaskLinkedIssueUpdateHandler } from './task-linked-issue-update.handler';
+
+export const CommandHandlers = [TaskLinkedIssueCreateHandler, TaskLinkedIssueUpdateHandler];