Skip to content

Commit 24e0432

Browse files
committed
Improve subtask filtering logic
1 parent 979f3ab commit 24e0432

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

alcs-frontend/src/app/features/board/dialogs/card-dialog/card-dialog.component.ts

+4-3
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,10 @@ export class CardDialogComponent implements OnInit, OnDestroy {
7979

8080
filterAssigneeList(term: string, item: AssigneeDto) {
8181
const termLower = term.toLocaleLowerCase();
82-
return item.email
83-
? item.email.toLocaleLowerCase().indexOf(termLower) > -1
84-
: false || item.prettyName.toLocaleLowerCase().indexOf(termLower) > -1;
82+
return (
83+
(item.email && item.email.toLocaleLowerCase().indexOf(termLower) > -1) ||
84+
item.prettyName.toLocaleLowerCase().indexOf(termLower) > -1
85+
);
8586
}
8687

8788
onArchiveCard() {

alcs-frontend/src/app/features/home/subtask/subtask-table/subtask-table.component.ts

+4-3
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,10 @@ export class SubtaskTableComponent {
5757

5858
filterAssigneeList(term: string, item: AssigneeDto) {
5959
const termLower = term.toLocaleLowerCase();
60-
return item.email
61-
? item.email.toLocaleLowerCase().indexOf(termLower) > -1
62-
: false || item.prettyName.toLocaleLowerCase().indexOf(termLower) > -1;
60+
return (
61+
(item.email && item.email.toLocaleLowerCase().indexOf(termLower) > -1) ||
62+
item.prettyName.toLocaleLowerCase().indexOf(termLower) > -1
63+
);
6364
}
6465

6566
async openCard(subtask: HomepageSubtaskDto) {

0 commit comments

Comments
 (0)