Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -170,18 +170,60 @@ describe("TimeTrackingManagement", () => {
expect(service.filteredEntries()[0].isBillable).toBe(false);
});

it("should filter entries by task search query", () => {
it("should filter entries by task, project, and member search query", () => {
service.loadInitialData();
// Task query
service.searchQuery.set("Review");
expect(service.filteredEntries()).toHaveLength(1);
expect(service.filteredEntries()[0].id).toBe("te-2");

// Project name query
service.searchQuery.set("Acme");
expect(service.filteredEntries()).toHaveLength(1);
expect(service.filteredEntries()[0].id).toBe("te-1");

// Member name query
service.members.set([
{
userId: "db-u-1",
keycloakId: "u-1",
username: "sarah_chen",
firstName: "Sarah",
lastName: "Chen",
email: "sarah@example.com",
role: "MEMBER",
},
]);
service.searchQuery.set("Sarah");
expect(service.filteredEntries()).toHaveLength(2);

service.searchQuery.set("@sarah_chen");
expect(service.filteredEntries()).toHaveLength(2);
});

it("should filter entries by member", () => {
it("should filter entries by member correctly when member has keycloakId or database userId", () => {
service.loadInitialData();
service.members.set([
{
userId: "db-u-1",
keycloakId: "u-1",
username: "sarah_chen",
firstName: "Sarah",
lastName: "Chen",
email: "sarah@example.com",
role: "MEMBER",
},
]);

// Filtering by database userId should match entries with keycloakId "u-1"
service.memberFilter.set("db-u-1");
expect(service.filteredEntries()).toHaveLength(2);

// Filtering by keycloakId directly should match
service.memberFilter.set("u-1");
expect(service.filteredEntries()).toHaveLength(2);

// Non-existent member returns empty list
service.memberFilter.set("non-existent-user");
expect(service.filteredEntries()).toHaveLength(0);
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -341,6 +341,7 @@ export class TimeTrackingManagement implements OnDestroy {
const memberF = this.memberFilter();
const query = this.searchQuery().trim().toLowerCase();
const taskMap = this.taskMap();
const projectMap = this.projectMap();

if (projectF !== "ALL") {
entries = entries.filter(e => {
Expand All @@ -356,13 +357,71 @@ export class TimeTrackingManagement implements OnDestroy {
}

if (memberF !== "ALL") {
entries = entries.filter(e => e.userId === memberF);
const targetMember = this.getMember(memberF);
entries = entries.filter(e => {
if (e.userId === memberF) return true;
const entryMember = this.getMember(e.userId);
if (targetMember && entryMember) {
return (
entryMember.userId === targetMember.userId ||
(!!entryMember.keycloakId &&
!!targetMember.keycloakId &&
entryMember.keycloakId === targetMember.keycloakId)
);
}
if (entryMember) {
return (
entryMember.userId === memberF ||
entryMember.keycloakId === memberF ||
entryMember.username === memberF
);
}
if (targetMember) {
return (
targetMember.userId === e.userId ||
targetMember.keycloakId === e.userId ||
targetMember.username === e.userId
);
}
return false;
});
}

if (query) {
const cleanQuery = query.startsWith("@") ? query.substring(1) : query;
entries = entries.filter(e => {
const task = taskMap.get(e.taskId);
return task?.title.toLowerCase().includes(query) ?? false;
const taskMatches =
(task?.title.toLowerCase().includes(query) ||
(cleanQuery ? task?.title.toLowerCase().includes(cleanQuery) : false)) ??
false;
const project = task ? projectMap.get(task.projectId) : null;
const projectMatches =
(project?.name.toLowerCase().includes(query) ||
(cleanQuery ? project?.name.toLowerCase().includes(cleanQuery) : false)) ??
false;

const member = this.getMember(e.userId);
const memberFullName = member ? `${member.firstName} ${member.lastName}`.toLowerCase() : "";
const memberUsername = member?.username ? member.username.toLowerCase() : "";
const memberUsernameWithAt = member?.username ? `@${member.username.toLowerCase()}` : "";
const memberEmail = member?.email ? member.email.toLowerCase() : "";
const memberDisplayName = this.getMemberDisplayName(e.userId).toLowerCase();
const rawUserId = e.userId ? e.userId.toLowerCase() : "";

const memberMatches =
memberFullName.includes(query) ||
(cleanQuery ? memberFullName.includes(cleanQuery) : false) ||
memberUsername.includes(query) ||
memberUsername.includes(cleanQuery) ||
memberUsernameWithAt.includes(query) ||
memberEmail.includes(query) ||
(cleanQuery ? memberEmail.includes(cleanQuery) : false) ||
memberDisplayName.includes(query) ||
(cleanQuery ? memberDisplayName.includes(cleanQuery) : false) ||
rawUserId.includes(query);

return taskMatches || projectMatches || memberMatches;
});
}

Expand Down
8 changes: 5 additions & 3 deletions src/app/features/time-tracking/time-tracking.html
Original file line number Diff line number Diff line change
Expand Up @@ -262,15 +262,15 @@ <h2 class="text-ink font-display text-lg font-bold">
<!-- Filter and Search Bar -->
<div class="flex flex-col gap-3 sm:flex-row sm:items-center sm:justify-between">
<div class="relative max-w-xs flex-1">
<label for="search-task-input" class="sr-only">Search by task title</label>
<label for="search-task-input" class="sr-only">Search by task or member name</label>
<aos-icons
name="lucideSearch"
class="text-muted pointer-events-none absolute top-1/2 left-3 size-4 -translate-y-1/2"
/>
<input
id="search-task-input"
type="text"
placeholder="Search by task title..."
placeholder="Search by task or member name..."
[ngModel]="tm.searchQuery()"
(ngModelChange)="tm.searchQuery.set($event)"
class="border-hairline bg-canvas text-ink placeholder:text-muted focus:border-ink/60 focus:ring-ink/20 w-full rounded-sm border py-2 pr-3 pl-9 text-xs focus:ring-1 focus:outline-hidden"
Expand All @@ -279,11 +279,13 @@ <h2 class="text-ink font-display text-lg font-bold">

<div class="flex flex-wrap items-center gap-2">
@if (isOwnerOrAdmin() && tm.members().length > 0) {
<div class="w-48">
<div class="w-56">
<aos-select
[options]="memberFilterOptions()"
[value]="tm.memberFilter()"
(valueChange)="tm.memberFilter.set($event)"
[searchable]="true"
searchPlaceholder="Search member..."
[fullWidth]="true"
/>
</div>
Expand Down
1 change: 1 addition & 0 deletions src/app/features/time-tracking/time-tracking.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,7 @@ describe("TimeTrackingComponent", () => {
expect(options[0].value).toBe("ALL");
expect(options[1].value).toBe("u-1");
expect(options[1].label).toBe("Sarah Chen (@sarah_member)");
expect(options[1].description).toBe("MEMBER");

expect(component.isOwnerOrAdmin()).toBe(true);
expect(component.isMember()).toBe(false);
Expand Down
1 change: 1 addition & 0 deletions src/app/features/time-tracking/time-tracking.ts
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ export class TimeTrackingComponent {
...this.tm.members().map(m => ({
label: `${m.firstName} ${m.lastName} (@${m.username})`,
value: m.userId,
description: m.role,
})),
];
});
Expand Down
25 changes: 25 additions & 0 deletions src/app/shared/components/select/select.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -134,4 +134,29 @@ describe("Select Component", () => {
fixture.detectChanges();
expect(fixture.nativeElement.textContent).toContain("Member");
});

it("should filter options when searchable is enabled and query is entered", () => {
fixture.componentRef.setInput("searchable", true);
fixture.componentRef.setInput("searchPlaceholder", "Search roles...");
fixture.detectChanges();

component.isOpen.set(true);
expect(component.filteredOptions()).toHaveLength(3);

// Filter by query "adm"
const inputEvent = { target: { value: "adm" } } as unknown as Event;
component.onSearchInput(inputEvent);
expect(component.filteredOptions()).toHaveLength(1);
expect(component.filteredOptions()[0].value).toBe("ADMIN");

// Filter by query matching description "access"
component.onSearchInput({ target: { value: "access" } } as unknown as Event);
expect(component.filteredOptions()).toHaveLength(1);
expect(component.filteredOptions()[0].value).toBe("MEMBER");

// Clear filter on close
component.close();
expect(component.filterQuery()).toBe("");
expect(component.filteredOptions()).toHaveLength(3);
});
});
Loading
Loading