From c7ebcc320ebc1920d0e34166bad466c2bad42b1e Mon Sep 17 00:00:00 2001 From: "Rahul R." Date: Mon, 18 Nov 2024 10:46:33 +0530 Subject: [PATCH] fix: updated add project module --- .../add-project-module-dialog.component.ts | 206 +++++++++++------- .../tasks/task-select/task/task.component.ts | 3 +- 2 files changed, 128 insertions(+), 81 deletions(-) diff --git a/packages/ui-core/shared/src/lib/project/project-module/add-project-module-dialog/add-project-module-dialog.component.ts b/packages/ui-core/shared/src/lib/project/project-module/add-project-module-dialog/add-project-module-dialog.component.ts index 9d8befa1f0..0b29ed4d1c 100644 --- a/packages/ui-core/shared/src/lib/project/project-module/add-project-module-dialog/add-project-module-dialog.component.ts +++ b/packages/ui-core/shared/src/lib/project/project-module/add-project-module-dialog/add-project-module-dialog.component.ts @@ -17,7 +17,9 @@ import { ISelectedEmployee, ITask, ProjectModuleStatusEnum, - TaskParticipantEnum + TaskParticipantEnum, + IGetTaskOptions, + ID } from '@gauzy/contracts'; import { TranslationBaseComponent } from '@gauzy/ui-core/i18n'; import { @@ -48,67 +50,60 @@ export class AddProjectModuleDialogComponent extends TranslationBaseComponent im taskParticipantEnum = TaskParticipantEnum; participants = TaskParticipantEnum.EMPLOYEES; ckConfig: CKEditor4.Config = richTextCKEditorConfig; - @Input() createModule = false; - - form: UntypedFormGroup = AddProjectModuleDialogComponent.buildForm(this.fb); projectModuleStatuses = Object.values(ProjectModuleStatusEnum); + form: UntypedFormGroup = this.fb.group({ + name: ['', Validators.required], + description: [''], + status: [ProjectModuleStatusEnum.BACKLOG], + startDate: ['', Validators.required], + endDate: ['', Validators.required], + isFavorite: [false], + parentId: [], + projectId: [null, Validators.required], + managerId: [], + members: [], + organizationSprints: [], + teams: [], + tasks: [] + }); - constructor( - public dialogRef: NbDialogRef, - private fb: UntypedFormBuilder, - private store: Store, - public translateService: TranslateService, - private employeesService: EmployeesService, - private organizationTeamsService: OrganizationTeamsService, - private organizationProjectModuleService: OrganizationProjectModuleService, - private organizationSprintService: SprintService, - private readonly tasksService: TasksService - ) { - super(translateService); - } - - /** - * Initializes the form structure with default values and validators. - */ - static buildForm(fb: UntypedFormBuilder): UntypedFormGroup { - return fb.group({ - name: ['', Validators.required], - description: [''], - status: [ProjectModuleStatusEnum.BACKLOG], - startDate: ['', Validators.required], - endDate: ['', Validators.required], - isFavorite: [false], - parentId: [], - projectId: [null, Validators.required], - managerId: [], - members: [], - organizationSprints: [], - teams: [], - tasks: [] - }); - } + @Input() createModule = false; private _projectModule: IOrganizationProjectModule; - @Input() get projectModule(): IOrganizationProjectModule { return this._projectModule; } - set projectModule(value: IOrganizationProjectModule) { + @Input() set projectModule(value: IOrganizationProjectModule) { this._projectModule = value; this.populateForm(value); } private _project: IOrganizationProject; - @Input() get project(): IOrganizationProject { return this._project; } - set project(value: IOrganizationProject) { + @Input() set project(value: IOrganizationProject) { this._project = value; this.form.get('projectId').setValue(value?.id || null); } + constructor( + public dialogRef: NbDialogRef, + private fb: UntypedFormBuilder, + private store: Store, + public translateService: TranslateService, + private employeesService: EmployeesService, + private organizationTeamsService: OrganizationTeamsService, + private organizationProjectModuleService: OrganizationProjectModuleService, + private organizationSprintService: SprintService, + private readonly tasksService: TasksService + ) { + super(translateService); + } + + + /** * Initializes component and loads necessary data. */ @@ -199,61 +194,104 @@ export class AddProjectModuleDialogComponent extends TranslationBaseComponent im } /** - * Loads available employees for the selected organization. + * Loads the employees for the currently selected organization. + * + * Retrieves all employees associated with the current organization and tenant, + * including their user details, and assigns them to the `employees` property. */ - async loadEmployees() { + async loadEmployees(): Promise { if (!this.organization) return; - const { tenantId } = this.store.user; - const { id: organizationId } = this.organization; - const { items = [] } = await firstValueFrom( - this.employeesService.getAll(['user'], { organizationId, tenantId }) - ); - this.employees = items; + + const { id: organizationId, tenantId } = this.organization; + + try { + const { items: employees = [] } = await firstValueFrom( + this.employeesService.getAll(['user'], { organizationId, tenantId }) + ); + this.employees = employees; + } catch (error) { + console.error('Failed to load employees:', error); + this.employees = []; + } } /** * Loads available teams for the selected organization. + * + * Retrieves all teams associated with the current organization and tenant, + * including their members, and assigns them to the `teams` property. */ - async loadTeams() { + async loadTeams(): Promise { if (!this.organization) return; - const { tenantId } = this.store.user; - const { id: organizationId } = this.organization; - const { items = [] } = await this.organizationTeamsService.getAll(['members'], { organizationId, tenantId }); - this.teams = items; + + const { id: organizationId, tenantId } = this.organization; + + try { + const { items: teams = [] } = await this.organizationTeamsService.getAll( + ['members'], + { organizationId, tenantId } + ); + this.teams = teams; + } catch (error) { + this.teams = []; + } } - async loadTasks() { - const queryOption: any = { - projectId: this.form.get('projectId')?.value, - organizationId: this.organization.id, - tenantId: this.store.user.tenantId - }; + /** + * Loads available tasks for the selected project and organization. + * + * Retrieves all tasks associated with the current organization, tenant, + * and selected project, then assigns them to the `tasks` property. + */ + async loadTasks(): Promise { if (!this.organization) return; - const { items = [] } = await firstValueFrom(this.tasksService.getAllTasks({ ...queryOption })); - this.tasks = items; + + const { id: organizationId, tenantId } = this.organization; + const projectId = this.form.get('projectId')?.value; + + try { + const { items: tasks = [] } = await firstValueFrom( + this.tasksService.getAllTasks({ projectId, organizationId, tenantId }) + ); + this.tasks = tasks; + } catch (error) { + this.tasks = []; + } } /** * Loads available parent modules based on the selected project ID. + * + * Retrieves parent modules associated with the selected project and assigns + * them to the `availableParentModules` property. */ - private async loadAvailableParentModules() { + private async loadAvailableParentModules(): Promise { if (!this.organization) return; - const modules = await firstValueFrom( - this.organizationProjectModuleService.get({ - projectId: this.form.get('projectId')?.value - }) - ); - this.availableParentModules = modules?.items || []; + + const projectId = this.form.get('projectId')?.value; + + try { + const modules = await firstValueFrom( + this.organizationProjectModuleService.get({ projectId }) + ); + this.availableParentModules = modules?.items || []; + } catch (error) { + this.availableParentModules = []; + } } /** * Fetches sprints associated with the organization. */ - findOrganizationSprints() { - this.organizationSprintService.getAllSprints().subscribe( - (sprints) => (this.organizationSprints = sprints.items), - (error) => console.error('Error fetching organization sprints:', error) - ); + findOrganizationSprints(): void { + this.organizationSprintService.getAllSprints().subscribe({ + next: (sprints) => { + this.organizationSprints = sprints.items; + }, + error: (error) => { + console.error('Error fetching organization sprints:', error); + } + }); } /** @@ -265,11 +303,21 @@ export class AddProjectModuleDialogComponent extends TranslationBaseComponent im this.form.get('managerId').setValue(employee.id); } - onTeamsSelected(teamsSelection: string[]) { - this.selectedTeams = teamsSelection; + /** + * Updates the selected teams based on the user's selection. + * + * @param teamsSelection - An array of team IDs selected by the user. + */ + onTeamsSelected(teamsSelection: ID[]): void { + this.selectedTeams = [...teamsSelection]; } - onMembersSelected(members: string[]) { - this.selectedMembers = members; + /** + * Updates the selected members based on the user's selection. + * + * @param members - An array of member IDs selected by the user. + */ + onMembersSelected(members: ID[]): void { + this.selectedMembers = [...members]; } } diff --git a/packages/ui-core/shared/src/lib/tasks/task-select/task/task.component.ts b/packages/ui-core/shared/src/lib/tasks/task-select/task/task.component.ts index 29018c546f..7cd8a5cfc6 100644 --- a/packages/ui-core/shared/src/lib/tasks/task-select/task/task.component.ts +++ b/packages/ui-core/shared/src/lib/tasks/task-select/task/task.component.ts @@ -1,8 +1,8 @@ import { Component, OnInit, OnDestroy, Input, forwardRef } from '@angular/core'; import { NG_VALUE_ACCESSOR, ControlValueAccessor } from '@angular/forms'; -import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy'; import { Subject, firstValueFrom, Observable } from 'rxjs'; import { filter, tap } from 'rxjs/operators'; +import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy'; import { IOrganization, ITask, PermissionsEnum, TaskStatusEnum } from '@gauzy/contracts'; import { distinctUntilChange } from '@gauzy/ui-core/common'; import { AuthService, Store, TasksService, ToastrService } from '@gauzy/ui-core/core'; @@ -11,7 +11,6 @@ import { AuthService, Store, TasksService, ToastrService } from '@gauzy/ui-core/ @Component({ selector: 'ga-task-selector', templateUrl: './task.component.html', - providers: [ { provide: NG_VALUE_ACCESSOR,