Skip to content

[CORE-8055] 2.4.y.z/search-box-where-appropriate-trunk #2668

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

Merged
trtshen merged 3 commits into from
Apr 15, 2026
Merged

[CORE-8055] 2.4.y.z/search-box-where-appropriate-trunk #2668

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1c036a4
Merge remote-tracking branch 'origin/prerelease' into 2.4.y.z/CORE-80…
trtshen Apr 1, 2026
4f64099
[CORE-8055] empty array fix
trtshen Apr 15, 2026
2adb54a
Merge remote-tracking branch 'origin/2.4.y.z/CORE-8055/search-box-whe…
trtshen Apr 15, 2026
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
15 changes: 9 additions & 6 deletions projects/v3/src/app/pages/home/home.page.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,10 +446,7 @@ describe('HomePage', () => {
component.activitySearchText = 'development';
component.filterActivities();

expect(component.filteredMilestones.length).toBe(1);
expect(component.filteredMilestones[0].id).toBe(2);
expect(component.filteredMilestones[0].activities.length).toBe(1);
expect(component.filteredMilestones[0].activities[0].id).toBe(3);
expect(component.filteredMilestones).toEqual([]);
});

it('should return empty milestones array when no activities match', () => {
Expand Down Expand Up @@ -506,9 +503,15 @@ describe('HomePage', () => {
component.activitySearchText = 'a';
component.filterActivities();

expect(component.filteredMilestones.length).toBe(2);
expect(component.filteredMilestones.length).toBe(1);
expect(component.filteredMilestones[0].activities.length).toBe(2);
expect(component.filteredMilestones[1].activities.length).toBe(1);
});

it('should skip locked activities even when they match search text', () => {
component.activitySearchText = 'task';
component.filterActivities();

expect(component.filteredMilestones).toEqual([]);
});

it('should trim whitespace from search text', () => {
Expand Down
12 changes: 8 additions & 4 deletions projects/v3/src/app/pages/home/home.page.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ export class HomePage implements OnInit, OnDestroy, AfterViewChecked {
// default card image (gracefully show broken url)
defaultLeadImage: string = "";

lastVisitedActivityId: number = null;
lastVisitedActivityId?: number;
bookmarkedActivities: {
[key: number]: boolean;
} = {};
Expand All @@ -65,7 +65,7 @@ export class HomePage implements OnInit, OnDestroy, AfterViewChecked {

// activity search/filter
activitySearchText = '';
filteredMilestones: Milestone[] = null;
filteredMilestones: Milestone[] | null = null;

// project brief data from team storage
projectBrief: ProjectBrief | null = null;
Expand Down Expand Up @@ -628,11 +628,15 @@ export class HomePage implements OnInit, OnDestroy, AfterViewChecked {
// filter milestones and their activities
this.filteredMilestones = this.milestones
.map(milestone => {
const filteredActivities = milestone.activities.filter(activity => {
const filteredActivities = milestone.activities?.filter(activity => {
if (activity?.isLocked) {
return false;
}

const titleMatch = activity.name?.toLowerCase().includes(searchText);
const descriptionMatch = activity.description?.toLowerCase().includes(searchText);
return titleMatch || descriptionMatch;
});
}) ?? [];

// only include milestone if it has matching activities
if (filteredActivities.length > 0) {
Expand Down
Loading