Merge pull request #8824 from ever-co/fix/created-by-user-field

[Fix] Updated "creator" to "createdByUser" Field

Author: rahul-rocket

apps/gauzy/src/app/pages/approvals/approvals.component.ts

@@ -21,7 +21,7 @@ import {
 	PaginationFilterBaseComponent,
 	IPaginationBase,
 	PictureNameTagsComponent,
-	CreateByComponent,
+	CreatedByUserComponent,
 	DateViewComponent,
 	EmployeeWithLinksComponent,
 	TaskTeamsComponent,
@@ -167,7 +167,8 @@ export class ApprovalsComponent extends PaginationFilterBaseComponent implements
 						'employeeApprovals.employee.user',
 						'teamApprovals',
 						'teamApprovals.team',
-						'tags'
+						'tags',
+						'createdByUser'
 					],
 					{ organizationId, tenantId }
 				)
@@ -242,9 +243,10 @@ export class ApprovalsComponent extends PaginationFilterBaseComponent implements
 					title: this.getTranslation('APPROVAL_REQUEST_PAGE.CREATED_BY'),
 					type: 'custom',
 					isFilterable: false,
-					renderComponent: CreateByComponent,
-					componentInitFunction: (instance: CreateByComponent, cell: Cell) => {
+					renderComponent: CreatedByUserComponent<IRequestApproval>,
+					componentInitFunction: (instance: CreatedByUserComponent<IRequestApproval>, cell: Cell) => {
 						instance.rowData = cell.getRow().getData();
+						instance.value = cell.getRawValue();
 					}
 				},
 				createdAt: {

apps/gauzy/src/app/pages/pipelines/pipeline-deals/pipeline-deals.component.ts

@@ -10,8 +10,12 @@ import { DealsService, ErrorHandlingService, PipelinesService, Store, ToastrServ
 import { debounceTime, filter, tap } from 'rxjs/operators';
 import { catchError, combineLatest, firstValueFrom, map, Observable, of, Subject, switchMap } from 'rxjs';
 import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
-import { DeleteConfirmationComponent, IPaginationBase, PaginationFilterBaseComponent } from '@gauzy/ui-core/shared';
-import { PipelineDealCreatedByComponent } from '../table-components/pipeline-deal-created-by/pipeline-deal-created-by';
+import {
+	CreatedByUserComponent,
+	DeleteConfirmationComponent,
+	IPaginationBase,
+	PaginationFilterBaseComponent
+} from '@gauzy/ui-core/shared';
 import { PipelineDealExcerptComponent } from '../table-components/pipeline-deal-excerpt/pipeline-deal-excerpt.component';
 import { PipelineDealProbabilityComponent } from '../table-components/pipeline-deal-probability/pipeline-deal-probability.component';
 
@@ -96,10 +100,14 @@ export class PipelineDealsComponent extends PaginationFilterBaseComponent implem
 				const { id: pipelineId, organizationId, tenantId } = pipeline;
 
 				// Fetch pipeline deals
-				return this._pipelinesService.getPipelineDeals(pipelineId, {
-					organizationId,
-					tenantId
-				});
+				return this._pipelinesService.getPipelineDeals(
+					pipelineId,
+					{
+						organizationId,
+						tenantId
+					},
+					['stage', 'createdByUser']
+				);
 			}),
 			// Map the contacts to the clients property
 			map(({ items }: IPagination<IDeal>) => items),
@@ -240,13 +248,13 @@ export class PipelineDealsComponent extends PaginationFilterBaseComponent implem
 						instance.value = cell.getValue();
 					}
 				},
-				createdBy: {
+				createdByUser: {
 					title: this.getTranslation('SM_TABLE.CREATED_BY'),
 					type: 'custom',
 					width: '30%',
 					isFilterable: false,
-					renderComponent: PipelineDealCreatedByComponent,
-					componentInitFunction: (instance: PipelineDealCreatedByComponent, cell: Cell) => {
+					renderComponent: CreatedByUserComponent<IDeal>,
+					componentInitFunction: (instance: CreatedByUserComponent<IDeal>, cell: Cell) => {
 						instance.rowData = cell.getRow().getData();
 						instance.value = cell.getValue();
 					}

apps/gauzy/src/app/pages/pipelines/routes/pipeline.resolver.ts

@@ -29,7 +29,7 @@ export const PipelineResolver: ResolveFn<Observable<IPipeline>> = (
 	const { id: organizationId, tenantId } = store.selectedOrganization;
 
 	// Get pipeline entity from the service
-	return pipelinesService.getById(pipelineId, { organizationId, tenantId }, ['stages']).pipe(
+	return pipelinesService.getById(pipelineId, { organizationId, tenantId }, ['stages', 'createdByUser']).pipe(
 		map((pipeline: IPipeline) => {
 			if (pipeline.organizationId !== organizationId) {
 				router.navigate(['pages/sales/pipelines']);

apps/gauzy/src/app/pages/pipelines/table-components/pipeline-deal-created-by/pipeline-deal-created-by.ts

@@ -8,7 +8,7 @@
 		{{ probability }} - {{ 'PIPELINE_DEALS_PAGE.MEDIUM' | translate }}
 	</div>
 	<div *ngSwitchCase="5" class="badge-success">{{ probability }} - {{ 'PIPELINE_DEALS_PAGE.HIGH' | translate }}</div>
-	<div *ngSwitchDefault class="badge-default">
+	<div *ngSwitchDefault class="badge-primary">
 		{{ probability }} - {{ 'PIPELINE_DEALS_PAGE.UNKNOWN' | translate }}
 	</div>
 </div>

apps/gauzy/src/app/pages/pipelines/table-components/pipeline-deal-probability/pipeline-deal-probability.component.html

@@ -6,11 +6,9 @@ import { IDeal } from '@gauzy/contracts';
 	templateUrl: './pipeline-deal-probability.component.html'
 })
 export class PipelineDealProbabilityComponent implements OnInit {
-	@Input()
-	value: string | number;
+	@Input() value: string | number;
 
-	@Input()
-	rowData: IDeal;
+	@Input() rowData: IDeal;
 
 	probability: number;
 

apps/gauzy/src/app/pages/pipelines/table-components/pipeline-deal-probability/pipeline-deal-probability.component.ts

@@ -19,7 +19,7 @@ import {
 	AddTaskDialogComponent,
 	ALL_PROJECT_SELECTED,
 	AssignedToComponent,
-	CreateByComponent,
+	CreatedByUserComponent,
 	CreatedAtComponent,
 	DateViewComponent,
 	DeleteConfirmationComponent,
@@ -211,11 +211,11 @@ export class TaskComponent extends PaginationFilterBaseComponent implements OnIn
 						instance.value = cell.getValue();
 					}
 				},
-				creator: {
+				createdByUser: {
 					title: this.getTranslation('TASKS_PAGE.TASKS_CREATOR'),
 					type: 'custom',
-					renderComponent: CreateByComponent,
-					componentInitFunction: (instance: CreateByComponent, cell: Cell) => {
+					renderComponent: CreatedByUserComponent<ITask>,
+					componentInitFunction: (instance: CreatedByUserComponent<ITask>, cell: Cell) => {
 						instance.value = cell.getValue();
 						instance.rowData = cell.getRow().getData();
 					},
@@ -225,7 +225,7 @@ export class TaskComponent extends PaginationFilterBaseComponent implements OnIn
 					},
 					filterFunction: (value: string) => {
 						this.setFilter({
-							field: 'creator.firstName',
+							field: 'createdByUser.firstName',
 							search: value
 						});
 					}
@@ -427,7 +427,7 @@ export class TaskComponent extends PaginationFilterBaseComponent implements OnIn
 				'teams.members',
 				'teams.members.employee',
 				'teams.members.employee.user',
-				'creator',
+				'createdByUser',
 				'organizationSprint',
 				'taskStatus',
 				'taskSize',

apps/gauzy/src/app/pages/tasks/components/task/task.component.ts

@@ -12,7 +12,7 @@
 					<ngx-project [rowData]="task"></ngx-project>
 				</span>
 				<span class="col">
-					<ngx-create-by [rowData]="task"></ngx-create-by>
+					<ngx-created-by-user [rowData]="task"></ngx-created-by-user>
 				</span>
 				<span class="col">
 					<ngx-employee-with-links

apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/task/task.component.html

@@ -1,7 +1,7 @@
 import { IBasePerTenantAndOrganizationEntityModel, JsonData, OmitFields } from './base-entity.model';
 import { IDashboardWidget } from './dashboard-widget.model';
 import { IEmployeeEntityInput } from './employee.model';
-import { ExcludeUserCreatorFields } from './user.model';
+import { ExcludeCreatedByUserFields } from './user.model';
 
 /**
  * Interface representing a Dashboard entity.
@@ -20,7 +20,7 @@ export interface IDashboard extends IBasePerTenantAndOrganizationEntityModel, IE
  */
 export interface IDashboardCreateInput
 	extends OmitFields<IDashboard, 'isDefault'>,
-		ExcludeUserCreatorFields<IDashboard> {}
+		ExcludeCreatedByUserFields<IDashboard> {}
 
 /**
  * Input interface for updating a Dashboard entity.

packages/contracts/src/lib/dashboard.model.ts

@@ -12,7 +12,7 @@ interface IDealBase extends IBasePerTenantAndOrganizationEntityModel {
 	clientId?: ID;
 }
 
-// IDeal interface with the additional stage and user creator properties
+// IDeal interface with the additional stage and created by user fields
 export interface IDeal extends IDealBase {}
 
 // IDealCreateInput interface, omitting user-related fields from IDeal

packages/contracts/src/lib/deal.model.ts

@@ -30,7 +30,7 @@ export interface IFindMeUser extends IBaseRelationsEntityModel {
 /**
  * Utility type to exclude `createdByUser` and `createdByUserId` fields.
  */
-export type ExcludeUserCreatorFields<T, K extends keyof T = never> = Omit<T, 'createdByUser' | 'createdByUserId' | K>;
+export type ExcludeCreatedByUserFields<T, K extends keyof T = never> = Omit<T, 'createdByUser' | 'createdByUserId' | K>;
 
 export interface IRelationalUser {
 	user?: IUser; // User who performed the action (if applicable).

packages/contracts/src/lib/user.model.ts

@@ -81,7 +81,7 @@ export class CommentService extends TenantAwareCrudService<Comment> {
 				)
 			);
 
-			// Subscribe the comment creator to the entity.
+			// Subscribe the comment created by user to the entity.
 			this._eventBus.publish(
 				new CreateEntitySubscriptionEvent({
 					entity: input.entity,

packages/core/src/lib/comment/comment.service.ts

@@ -71,6 +71,7 @@ export class MentionService extends TenantAwareCrudService<Mention> {
 				new CreateEntitySubscriptionEvent({
 					entity: parentEntityType ?? entity,
 					entityId: parentEntityId ?? entityId,
+					employeeId: user.employeeId,
 					type: EntitySubscriptionTypeEnum.MENTION,
 					organizationId,
 					tenantId

packages/core/src/lib/mention/mention.service.ts

@@ -12,7 +12,7 @@ import {
 	UseGuards
 } from '@nestjs/common';
 import { ApiOperation, ApiResponse, ApiTags } from '@nestjs/swagger';
-import { DeleteResult, UpdateResult } from 'typeorm';
+import { DeleteResult, FindOptionsWhere, UpdateResult } from 'typeorm';
 import { ID, IDeal, IPagination, IPipeline, PermissionsEnum } from '@gauzy/contracts';
 import { CrudController, OptionParams, PaginationParams } from './../core/crud';
 import { Pipeline } from './pipeline.entity';
@@ -76,9 +76,10 @@ export class PipelineController extends CrudController<Pipeline> {
 	@Get('/:pipelineId/deals')
 	async getPipelineDeals(
 		@Param('pipelineId', UUIDValidationPipe) pipelineId: ID,
-		@Query() options: OptionParams<Pipeline>
+		@Query('where') where: FindOptionsWhere<Pipeline>,
+		@Query('relations') relations: string[]
 	): Promise<IPagination<IDeal>> {
-		return await this.pipelineService.getPipelineDeals(pipelineId, options.where);
+		return await this.pipelineService.getPipelineDeals(pipelineId, where, relations);
 	}
 
 	/**

packages/core/src/lib/pipeline/pipeline.controller.ts

@@ -5,7 +5,7 @@ import { ID, IDeal, IPagination, IPipeline, IPipelineStage } from '@gauzy/contra
 import { isPostgres } from '@gauzy/config';
 import { ConnectionEntityManager } from '../database/connection-entity-manager';
 import { Pipeline } from './pipeline.entity';
-import { PipelineStage } from './../core/entities/internal';
+import { Deal, PipelineStage } from './../core/entities/internal';
 import { RequestContext } from '../core/context/request-context';
 import { TenantAwareCrudService } from './../core/crud/tenant-aware-crud.service';
 import { TypeOrmDealRepository } from '../deal/repository/type-orm-deal.repository';
@@ -43,38 +43,40 @@ export class PipelineService extends TenantAwareCrudService<Pipeline> {
 	 * @param where - Additional conditions to filter the deals.
 	 * @returns An object containing an array of deals and the total number of deals.
 	 */
-	public async getPipelineDeals(pipelineId: ID, where?: FindOptionsWhere<Pipeline>): Promise<IPagination<IDeal>> {
-		// Retrieve the current tenant ID from the request context
+	public async getPipelineDeals(
+		pipelineId: ID,
+		where?: FindOptionsWhere<Pipeline>,
+		relations: string[] = []
+	): Promise<IPagination<IDeal>> {
+		// Destructure organizationId and tenantId from where; fallback to current tenant if not provided
+		const { organizationId } = where ?? {};
 		const tenantId = RequestContext.currentTenantId() ?? where?.tenantId;
-		const { organizationId } = where || {};
 
-		try {
-			// Fetch deals related to the specified pipeline
-			const items: IDeal[] = await this.typeOrmDealRepository.find({
-				relations: {
-					stage: true,
-					createdByUser: true
-				},
-				where: {
-					organizationId,
+		// Prepare query options with ordering; add relations only if provided
+		const queryOptions: FindManyOptions<Deal> = {
+			// Build the where clause for the query
+			where: {
+				organizationId,
+				tenantId,
+				stage: {
+					pipelineId,
 					tenantId,
-					stage: {
-						pipelineId,
-						tenantId,
-						organizationId
-					}
-				},
-				order: {
-					stage: {
-						index: 'ASC'
-					}
+					organizationId
 				}
-			});
+			},
+			order: { stage: { index: 'ASC' } }
+		};
 
-			// Return the deals and their total count
-			return { items, total: items.length };
+		if (relations.length) {
+			queryOptions.relations = relations;
+		}
+
+		try {
+			// Fetch deals and their total count
+			const [items, total] = await this.typeOrmDealRepository.findAndCount(queryOptions);
+			return { items, total };
 		} catch (error) {
-			console.error('Error fetching pipeline deals:', error);
+			console.error(`Error fetching pipeline deals: ${error.message}`, error);
 			return { items: [], total: 0 };
 		}
 	}

packages/core/src/lib/pipeline/pipeline.service.ts

@@ -131,6 +131,9 @@ export class AutomationTaskSyncHandler implements ICommandHandler<AutomationTask
 		entity: ITaskCreateInput | ITaskUpdateInput
 	): Promise<ITask> {
 		try {
+			// Retrieve current user
+			const user = RequestContext.currentUser();
+
 			// Retrieve the maximum task number for the project
 			const maxNumber = await this._taskService.getMaxTaskNumberByProject(options);
 
@@ -154,6 +157,7 @@ export class AutomationTaskSyncHandler implements ICommandHandler<AutomationTask
 				new CreateEntitySubscriptionEvent({
 					entity: BaseEntityEnum.Task,
 					entityId: createdTask.id,
+					employeeId: user.employeeId,
 					type: EntitySubscriptionTypeEnum.CREATED_ENTITY,
 					organizationId,
 					tenantId

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

@@ -138,6 +138,7 @@ export class TaskCreateHandler implements ICommandHandler<TaskCreateCommand> {
 				new CreateEntitySubscriptionEvent({
 					entity: BaseEntityEnum.Task,
 					entityId: task.id,
+					employeeId: user?.employeeId,
 					type: EntitySubscriptionTypeEnum.CREATED_ENTITY,
 					organizationId,
 					tenantId

packages/core/src/lib/tasks/commands/handlers/task-create.handler.ts

@@ -39,15 +39,15 @@ export class TaskSubscriber extends BaseEntityEventSubscriber<Task> {
 	}
 
 	/**
-	 * Called before a Task entity is inserted into the database. This method sets the creator ID
+	 * Called before a Task entity is inserted into the database. This method sets the created by user ID
 	 * of the task based on the current user context.
 	 *
 	 * @param entity The Task entity about to be created.
 	 * @returns {Promise<void>} A promise that resolves when the pre-creation processing is complete.
 	 */
 	async beforeEntityCreate(entity: Task): Promise<void> {
 		try {
-			// Retrieve the current user's ID from RequestContext and assign it as the creator
+			// Retrieve the current user's ID from RequestContext and assign it as the created by user
 			if (entity) {
 				entity.createdByUserId = RequestContext.currentUserId();
 			}

packages/core/src/lib/tasks/task.subscriber.ts

@@ -46,10 +46,14 @@ export class PipelinesService extends Service<IPipeline, IPipelineFindInput, IPi
 	 * @param where Filter conditions for fetching the deals
 	 * @returns A promise of paginated deals
 	 */
-	getPipelineDeals(pipelineId: ID, where?: IPipelineFindInput): Promise<IPagination<IDeal>> {
+	getPipelineDeals(
+		pipelineId: ID,
+		where?: IPipelineFindInput,
+		relations: string[] = []
+	): Promise<IPagination<IDeal>> {
 		return firstValueFrom(
 			this.http.get<IPagination<IDeal>>(`${this.basePath}/${pipelineId}/deals`, {
-				params: toParams({ where })
+				params: toParams({ where, relations })
 			})
 		);
 	}

packages/ui-core/core/src/lib/services/pipeline/pipelines.service.ts

@@ -4404,6 +4404,7 @@
 		"LOW": "منخفض",
 		"MEDIUM": "متوسط",
 		"HIGH": "عالي",
+		"UNKNOWN": "Unknown",
 		"DEAL_DELETED": "تمت إزالة الصفقة '{{ name }}'",
 		"DEAL_EDITED": "تم تغيير الصفقة '{{ name }}'",
 		"DEAL_ADDED": "تمت إضافة الصفقة '{{ name }}'"