diff --git a/src/app/features/time-tracking/services/time-tracking-management.spec.ts b/src/app/features/time-tracking/services/time-tracking-management.spec.ts
index ad1ecc5..110e3fe 100644
--- a/src/app/features/time-tracking/services/time-tracking-management.spec.ts
+++ b/src/app/features/time-tracking/services/time-tracking-management.spec.ts
@@ -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);
});
diff --git a/src/app/features/time-tracking/services/time-tracking-management.ts b/src/app/features/time-tracking/services/time-tracking-management.ts
index 97cad35..1ba8b86 100644
--- a/src/app/features/time-tracking/services/time-tracking-management.ts
+++ b/src/app/features/time-tracking/services/time-tracking-management.ts
@@ -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 => {
@@ -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;
});
}
diff --git a/src/app/features/time-tracking/time-tracking.html b/src/app/features/time-tracking/time-tracking.html
index bdd339a..466a8ce 100644
--- a/src/app/features/time-tracking/time-tracking.html
+++ b/src/app/features/time-tracking/time-tracking.html
@@ -262,7 +262,7 @@
-
+
@if (isOwnerOrAdmin() && tm.members().length > 0) {
-
+
diff --git a/src/app/features/time-tracking/time-tracking.spec.ts b/src/app/features/time-tracking/time-tracking.spec.ts
index 8fd72df..3cd377a 100644
--- a/src/app/features/time-tracking/time-tracking.spec.ts
+++ b/src/app/features/time-tracking/time-tracking.spec.ts
@@ -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);
diff --git a/src/app/features/time-tracking/time-tracking.ts b/src/app/features/time-tracking/time-tracking.ts
index 5ea70c2..2c11424 100644
--- a/src/app/features/time-tracking/time-tracking.ts
+++ b/src/app/features/time-tracking/time-tracking.ts
@@ -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,
})),
];
});
diff --git a/src/app/shared/components/select/select.spec.ts b/src/app/shared/components/select/select.spec.ts
index 6f432e1..aef47b5 100644
--- a/src/app/shared/components/select/select.spec.ts
+++ b/src/app/shared/components/select/select.spec.ts
@@ -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);
+ });
});
diff --git a/src/app/shared/components/select/select.ts b/src/app/shared/components/select/select.ts
index 1d7e132..19f2a70 100644
--- a/src/app/shared/components/select/select.ts
+++ b/src/app/shared/components/select/select.ts
@@ -11,7 +11,7 @@ import {
} from "@angular/core";
import { CdkConnectedOverlay, CdkOverlayOrigin, ConnectedPosition } from "@angular/cdk/overlay";
import { provideIcons } from "@ng-icons/core";
-import { lucideCheck, lucideChevronDown } from "@ng-icons/lucide";
+import { lucideCheck, lucideChevronDown, lucideSearch } from "@ng-icons/lucide";
import { Icons } from "../icons/icons";
export interface SelectOption
{
@@ -28,7 +28,7 @@ export type SELECT_VARIANTS = "outlined" | "filled" | "ghost";
selector: "aos-select",
standalone: true,
imports: [Icons, CdkOverlayOrigin, CdkConnectedOverlay],
- providers: [provideIcons({ lucideChevronDown, lucideCheck })],
+ providers: [provideIcons({ lucideChevronDown, lucideCheck, lucideSearch })],
host: {
class: "relative inline-block text-left",
"[class.w-full]": "fullWidth()",
@@ -74,37 +74,60 @@ export type SELECT_VARIANTS = "outlined" | "filled" | "ghost";
- @for (option of options(); track option.value; let idx = $index) {
-
-
-
{{ option.label }}
- @if (option.description) {
-
{{ option.description }}
- }
+ @if (searchable()) {
+
+
-
- @if (isSelected(option.value)) {
-
- }
}
+
+ @if (filteredOptions().length === 0) {
+
No options found
+ } @else {
+ @for (option of filteredOptions(); track option.value; let idx = $index) {
+
+
+ {{ option.label }}
+ @if (option.description) {
+ {{ option.description }}
+ }
+
+
+ @if (isSelected(option.value)) {
+
+ }
+
+ }
+ }
@@ -120,10 +143,26 @@ export class Select
{
readonly size = input("md");
readonly variant = input("outlined");
readonly fullWidth = input(true, { transform: booleanAttribute });
+ readonly searchable = input(false, { transform: booleanAttribute });
+ readonly searchPlaceholder = input("Search options...");
readonly valueChange = output();
readonly isOpen = signal(false);
+ readonly filterQuery = signal("");
+
+ readonly filteredOptions = computed(() => {
+ const opts = this.options();
+ const query = this.filterQuery().trim().toLowerCase();
+ if (!this.searchable() || !query) {
+ return opts;
+ }
+ return opts.filter(
+ opt =>
+ opt.label.toLowerCase().includes(query) ||
+ (opt.description?.toLowerCase().includes(query) ?? false),
+ );
+ });
readonly selectedOption = computed(() => {
const val = this.value();
@@ -136,7 +175,7 @@ export class Select {
readonly activeOptionId = computed(() => {
const val = this.value();
- const idx = this.options().findIndex(opt => opt.value === val);
+ const idx = this.filteredOptions().findIndex(opt => opt.value === val);
return idx >= 0 ? `select-opt-${idx}` : undefined;
});
@@ -223,6 +262,7 @@ export class Select {
if (!this.isOpen()) {
const width = this.elementRef.nativeElement?.getBoundingClientRect()?.width || 150;
this.overlayWidth.set(Math.max(width, 150));
+ this.filterQuery.set("");
}
this.isOpen.update(open => !open);
}
@@ -230,12 +270,19 @@ export class Select {
close(): void {
this.isOpen.set(false);
+ this.filterQuery.set("");
+ }
+
+ onSearchInput(event: Event): void {
+ const input = event.target as HTMLInputElement;
+ this.filterQuery.set(input.value);
}
selectOption(option: SelectOption): void {
if (option.disabled) return;
this.valueChange.emit(option.value);
this.isOpen.set(false);
+ this.filterQuery.set("");
}
isSelected(val: T): boolean {
@@ -247,6 +294,7 @@ export class Select {
if (event.key === "Escape") {
this.isOpen.set(false);
+ this.filterQuery.set("");
} else if (event.key === "Enter" || event.key === " ") {
event.preventDefault();
this.toggleOpen();
@@ -268,7 +316,7 @@ export class Select {
}
private navigateOptions(delta: number): void {
- const opts = this.options().filter(o => !o.disabled);
+ const opts = this.filteredOptions().filter(o => !o.disabled);
if (opts.length === 0) return;
const curIdx = opts.findIndex(o => o.value === this.value());
const nextIdx = (curIdx + delta + opts.length) % opts.length;