Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Fix] Switching Between Team and Employee in Approval Causes Selected Team/Employee to Be Lost #8450

Merged
merged 2 commits into from
Oct 17, 2024
Merged

[Fix] Switching Between Team and Employee in Approval Causes Selected Team/Employee to Be Lost #8450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e560ee8
[Fix] Switching Between Team and Employee in Approval Causes Selected…
samuelmbabhazi Oct 17, 2024
7d6cc97
Merge branch 'develop' into fix/#8430-switching-team-employee
samuelmbabhazi Oct 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
116 changes: 22 additions & 94 deletions packages/ui-core/shared/src/lib/approvals/approvals-mutation.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
<nb-card class="main">
<nb-card-header class="d-flex flex-column">
<span class="cancel"
><i class="fas fa-times" (click)="closeDialog()"></i
></span>
<span class="cancel"><i class="fas fa-times" (click)="closeDialog()"></i></span>
<h5 class="title">
{{
(requestApproval
Expand All @@ -13,37 +11,21 @@ <h5 class="title">
</h5>
</nb-card-header>
<nb-card-body class="body">
<form
[formGroup]="form"
(ngSubmit)="onSubmit()"
#formDirective="ngForm"
>
<form [formGroup]="form" (ngSubmit)="onSubmit()" #formDirective="ngForm">
<div class="row">
<div class="col-12 mb-3">
<label for="name" class="label">
{{
'APPROVAL_REQUEST_PAGE.APPROVAL_REQUEST_NAME'
| translate
}}
{{ 'APPROVAL_REQUEST_PAGE.APPROVAL_REQUEST_NAME' | translate }}
</label>
<input
nbInput
type="text"
formControlName="name"
fullWidth
[placeholder]="
'APPROVAL_REQUEST_PAGE.APPROVAL_REQUEST_NAME'
| translate
"
[placeholder]="'APPROVAL_REQUEST_PAGE.APPROVAL_REQUEST_NAME' | translate"
[ngClass]="{
'status-danger': FormHelpers.isInvalidControl(
form,
'name'
),
'status-success': FormHelpers.isValidControl(
form,
'name'
)
'status-danger': FormHelpers.isInvalidControl(form, 'name'),
'status-success': FormHelpers.isValidControl(form, 'name')
}"
/>
</div>
Expand All @@ -52,97 +34,53 @@ <h5 class="title">
<div class="row">
<div class="col-sm-6 mb-3">
<label for="min_count" class="label">
{{
'APPROVAL_REQUEST_PAGE.APPROVAL_REQUEST_MIN_COUNT'
| translate
}}
{{ 'APPROVAL_REQUEST_PAGE.APPROVAL_REQUEST_MIN_COUNT' | translate }}
</label>
<input
nbInput
type="number"
[min]="0"
formControlName="min_count"
fullWidth
[placeholder]="
'APPROVAL_REQUEST_PAGE.APPROVAL_REQUEST_MIN_COUNT'
| translate
"
[placeholder]="'APPROVAL_REQUEST_PAGE.APPROVAL_REQUEST_MIN_COUNT' | translate"
/>
</div>
<div class="col-sm-6 mb-3">
<label for="Approval Policy" class="label">
{{
'APPROVAL_REQUEST_PAGE.APPROVAL_REQUEST_APPROVAL_POLICY'
| translate
}}
{{ 'APPROVAL_REQUEST_PAGE.APPROVAL_REQUEST_APPROVAL_POLICY' | translate }}
</label>
<nb-select
formControlName="approvalPolicyId"
[selected]="selectedApprovalPolicy"
(selectedChange)="onApprovalPolicySelected($event)"
fullWidth
placeholder="{{
'APPROVAL_REQUEST_PAGE.CHOOSE_POLICIES' | translate
}}"
placeholder="{{ 'APPROVAL_REQUEST_PAGE.CHOOSE_POLICIES' | translate }}"
>
<nb-option
*ngFor="let approvalPolicy of approvalPolicies"
[value]="approvalPolicy.id"
>
<nb-option *ngFor="let approvalPolicy of approvalPolicies" [value]="approvalPolicy.id">
{{ approvalPolicy.name }}</nb-option
>
</nb-select>
</div>
</div>
<div class="row">
<div class="col-sm-12 mb-3">
<nb-radio-group
(valueChange)="onParticipantsChange($event)"
[value]="participants"
>
<nb-radio [value]="'employees'"
>{{ 'APPROVAL_REQUEST_PAGE.EMPLOYEES' | translate }}
</nb-radio>
<nb-radio [value]="'teams'"
>{{ 'APPROVAL_REQUEST_PAGE.TEAMS' | translate }}
</nb-radio>
<nb-radio-group (valueChange)="onParticipantsChange($event)" [value]="participants">
<nb-radio [value]="'employees'">{{ 'APPROVAL_REQUEST_PAGE.EMPLOYEES' | translate }} </nb-radio>
<nb-radio [value]="'teams'">{{ 'APPROVAL_REQUEST_PAGE.TEAMS' | translate }} </nb-radio>
</nb-radio-group>
</div>
</div>
<div class="row">
<div
class="col-sm-12 mb-3"
*ngIf="participants === 'employees'"
>
<div class="col-sm-12 mb-3" *ngIf="participants === 'employees'">
<label for="employees" class="label">
{{ 'APPROVAL_REQUEST_PAGE.EMPLOYEES' | translate }}
</label>
<nb-select
formControlName="employees"
multiple
[selected]="selectedEmployees"
[(ngModel)]="selectedEmployees"
<ga-employee-multi-select
[selectedEmployeeIds]="selectedEmployees"
[allEmployees]="employees"
(selectedChange)="onEmployeesSelected($event)"
fullWidth
placeholder="{{
'FORM.PLACEHOLDERS.CHOOSE_EMPLOYEES' | translate
}}"
>
<nb-option
*ngFor="let employee of employees"
[value]="employee.id"
>
<img
src="{{ employee.user.imageUrl }}"
alt="Employee picture"
height="40"
width="40"
style="margin-right: 10px"
/>
{{ employee.user.firstName }}
{{ employee.user.lastName }}</nb-option
>
</nb-select>
</ga-employee-multi-select>
</div>
<div class="col-sm-12 mb-3" *ngIf="participants === 'teams'">
<label for="teams" class="label">
Expand All @@ -155,13 +93,9 @@ <h5 class="title">
[(ngModel)]="selectedTeams"
(selectedChange)="onTeamsSelected($event)"
fullWidth
placeholder="{{
'FORM.PLACEHOLDERS.CHOOSE_TEAMS' | translate
}}"
placeholder="{{ 'FORM.PLACEHOLDERS.CHOOSE_TEAMS' | translate }}"
>
<nb-option *ngFor="let team of teams" [value]="team.id">
{{ team.name }}</nb-option
>
<nb-option *ngFor="let team of teams" [value]="team.id"> {{ team.name }}</nb-option>
</nb-select>
</div>
<div class="col-sm-12 mb-3">
Expand All @@ -179,13 +113,7 @@ <h5 class="title">
</nb-card-body>

<nb-card-footer class="text-left">
<button
(click)="dialogRef.close()"
status="basic"
outline
class="mr-3"
nbButton
>
<button (click)="dialogRef.close()" status="basic" outline class="mr-3" nbButton>
{{ 'BUTTONS.CANCEL' | translate }}
</button>
<button
Expand Down
20 changes: 15 additions & 5 deletions packages/ui-core/shared/src/lib/approvals/approvals-mutation.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,9 +217,12 @@ export class RequestApprovalMutationComponent extends TranslationBaseComponent i
return;
}

this.setParticipantsValues(); // Ensure participants are set properly

if (!this.form.get('id').value) {
delete this.form.value['id'];
}

const requestApproval: IRequestApprovalCreateInput = {
name: this.form.value['name'],
approvalPolicyId: this.form.value['approvalPolicyId'],
Expand Down Expand Up @@ -255,14 +258,21 @@ export class RequestApprovalMutationComponent extends TranslationBaseComponent i

onParticipantsChange(participants: string) {
this.participants = participants;
if (participants === 'employees') {
this.form.get('teams').setValue([]);
} else {
this.form.get('employees').setValue([]);
}
this.form.updateValueAndValidity();
}

/**
* Handle setting the participant values based on type
*/
setParticipantsValues() {
if (this.participants === 'employees') {
this.form.get('employees').setValue(this.selectedEmployees);
this.form.get('teams').setValue([]); // Clear teams if employees are selected
} else if (this.participants === 'teams') {
this.form.get('employees').setValue([]); // Clear employees if teams are selected
}
}

/**
* Reset approval request mutation form after save
*/
Expand Down
Loading