From f0ed991507aa36cc18188cc83e7471059312ccef Mon Sep 17 00:00:00 2001
From: Vasilica Olariu <olariu.vasilica@gmail.com>
Date: Thu, 14 May 2026 14:20:15 +0300
Subject: [PATCH 1/2] PM-5065 - fix budget approval list filtering by project

---
 .../BudgetApprovalsPage.tsx                   | 83 +++++++++----------
 1 file changed, 37 insertions(+), 46 deletions(-)

diff --git a/src/apps/work/src/pages/budget-approvals/BudgetApprovalsPage/BudgetApprovalsPage.tsx b/src/apps/work/src/pages/budget-approvals/BudgetApprovalsPage/BudgetApprovalsPage.tsx
index 94c2662a9..7a7407fd9 100644
--- a/src/apps/work/src/pages/budget-approvals/BudgetApprovalsPage/BudgetApprovalsPage.tsx
+++ b/src/apps/work/src/pages/budget-approvals/BudgetApprovalsPage/BudgetApprovalsPage.tsx
@@ -6,6 +6,7 @@ import {
     useState,
 } from 'react'
 import { Link } from 'react-router-dom'
+import Select, { SingleValue } from 'react-select'
 
 import { TableLoading } from '~/apps/admin/src/lib'
 import { PageWrapper } from '~/apps/review/src/lib'
@@ -31,6 +32,11 @@ import {
     WorkAppContextModel,
 } from '../../../lib/models'
 
+interface ProjectOption {
+    label: string
+    value: string
+}
+
 import styles from './BudgetApprovalsPage.module.scss'
 
 function normalizeSearchValue(value: string): string {
@@ -70,7 +76,7 @@ export const BudgetApprovalsPage: FC = () => {
     }: WorkAppContextModel = useContext(WorkAppContext)
 
     const [challengeNameSearch, setChallengeNameSearch] = useState<string>('')
-    const [projectNameSearch, setProjectNameSearch] = useState<string>('')
+    const [selectedProjectId, setSelectedProjectId] = useState<string>('')
     const [page, setPage] = useState<number>(1)
     const [perPage, setPerPage] = useState<number>(PAGE_SIZE)
 
@@ -85,6 +91,7 @@ export const BudgetApprovalsPage: FC = () => {
         name: normalizeSearchValue(challengeNameSearch) || undefined,
         page,
         perPage,
+        projectId: selectedProjectId || undefined,
         sortBy: 'updated',
         sortOrder: 'desc',
         status: CHALLENGE_STATUS.DRAFT,
@@ -111,14 +118,19 @@ export const BudgetApprovalsPage: FC = () => {
         return map
     }, [projectsResult.projects])
 
-    const accessibleProjectIds = useMemo(
-        () => new Set(projectsResult.projects.map(project => String(project.id || ''))),
+    const projectOptions = useMemo<ProjectOption[]>(
+        () => projectsResult.projects
+            .filter(project => !!project.id)
+            .map(project => ({
+                label: project.name || String(project.id),
+                value: String(project.id),
+            })),
         [projectsResult.projects],
     )
 
-    const normalizedProjectNameSearch = useMemo(
-        () => normalizeSearchValue(projectNameSearch),
-        [projectNameSearch],
+    const selectedProjectOption = useMemo<ProjectOption | null>(
+        () => projectOptions.find(opt => opt.value === selectedProjectId) ?? null,
+        [projectOptions, selectedProjectId],
     )
 
     const filteredChallenges = useMemo(
@@ -126,33 +138,9 @@ export const BudgetApprovalsPage: FC = () => {
             .filter(challenge => {
                 const projectId = getProjectId(challenge)
 
-                if (!projectId) {
-                    return false
-                }
-
-                if (isAdmin) {
-                    return true
-                }
-
-                return accessibleProjectIds.has(projectId)
-            })
-            .filter(challenge => {
-                if (!normalizedProjectNameSearch) {
-                    return true
-                }
-
-                const projectName = getProjectName(projectMap, getProjectId(challenge))
-
-                return normalizeSearchValue(projectName)
-                    .includes(normalizedProjectNameSearch)
+                return !!projectId
             }),
-        [
-            accessibleProjectIds,
-            challengesResult.challenges,
-            isAdmin,
-            normalizedProjectNameSearch,
-            projectMap,
-        ],
+        [challengesResult.challenges],
     )
 
     function handleChallengeNameSearch(event: ChangeEvent<HTMLInputElement>): void {
@@ -160,8 +148,8 @@ export const BudgetApprovalsPage: FC = () => {
         setPage(1)
     }
 
-    function handleProjectNameSearch(event: ChangeEvent<HTMLInputElement>): void {
-        setProjectNameSearch(event.target.value)
+    function handleProjectSelect(option: SingleValue<ProjectOption>): void {
+        setSelectedProjectId(option?.value ?? '')
         setPage(1)
     }
 
@@ -174,10 +162,6 @@ export const BudgetApprovalsPage: FC = () => {
         setPage(1)
     }
 
-    if (challengesResult.isLoading || (!isAdmin && projectsResult.isLoading)) {
-        return <TableLoading />
-    }
-
     const errorMessage = challengesResult.error?.message || projectsResult.error?.message
     const totalPendingApprovals = challengesResult.metadata.total ?? 0
     const shouldShowPagination = !errorMessage && totalPendingApprovals > 0
@@ -193,14 +177,17 @@ export const BudgetApprovalsPage: FC = () => {
 
             <div className={styles.searchRow}>
                 <div className={styles.searchField}>
-                    <label htmlFor='budget-approvals-project-search'>Project name</label>
-                    <input
-                        id='budget-approvals-project-search'
-                        className={styles.searchInput}
-                        onChange={handleProjectNameSearch}
+                    <label htmlFor='budget-approvals-project-select'>Project</label>
+                    <Select
+                        inputId='budget-approvals-project-select'
+                        className='react-select-container'
+                        classNamePrefix='select'
+                        isClearable
+                        isLoading={projectsResult.isLoading}
+                        onChange={handleProjectSelect}
+                        options={projectOptions}
                         placeholder='Search project name'
-                        type='text'
-                        value={projectNameSearch}
+                        value={selectedProjectOption}
                     />
                 </div>
                 <div className={styles.searchField}>
@@ -235,7 +222,11 @@ export const BudgetApprovalsPage: FC = () => {
                         ? (
                             <tr>
                                 <td colSpan={3} className={styles.emptyCell}>
-                                    No pending budget approvals found.
+                                    {challengesResult.isLoading || (!isAdmin && projectsResult.isLoading) ? (
+                                        'Loading ...'
+                                    ) : (
+                                        'No pending budget approvals found.'
+                                    )}
                                 </td>
                             </tr>
                         )

From 45c839969f751bec0b33c66ebb4cfe98d60eed23 Mon Sep 17 00:00:00 2001
From: Vasilica Olariu <olariu.vasilica@gmail.com>
Date: Thu, 14 May 2026 14:23:31 +0300
Subject: [PATCH 2/2] lint

---
 .../BudgetApprovalsPage/BudgetApprovalsPage.tsx          | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/apps/work/src/pages/budget-approvals/BudgetApprovalsPage/BudgetApprovalsPage.tsx b/src/apps/work/src/pages/budget-approvals/BudgetApprovalsPage/BudgetApprovalsPage.tsx
index 7a7407fd9..8066cc7a9 100644
--- a/src/apps/work/src/pages/budget-approvals/BudgetApprovalsPage/BudgetApprovalsPage.tsx
+++ b/src/apps/work/src/pages/budget-approvals/BudgetApprovalsPage/BudgetApprovalsPage.tsx
@@ -8,7 +8,6 @@ import {
 import { Link } from 'react-router-dom'
 import Select, { SingleValue } from 'react-select'
 
-import { TableLoading } from '~/apps/admin/src/lib'
 import { PageWrapper } from '~/apps/review/src/lib'
 import { IconOutline } from '~/libs/ui'
 
@@ -32,13 +31,13 @@ import {
     WorkAppContextModel,
 } from '../../../lib/models'
 
+import styles from './BudgetApprovalsPage.module.scss'
+
 interface ProjectOption {
     label: string
     value: string
 }
 
-import styles from './BudgetApprovalsPage.module.scss'
-
 function normalizeSearchValue(value: string): string {
     return value
         .trim()
@@ -128,8 +127,8 @@ export const BudgetApprovalsPage: FC = () => {
         [projectsResult.projects],
     )
 
-    const selectedProjectOption = useMemo<ProjectOption | null>(
-        () => projectOptions.find(opt => opt.value === selectedProjectId) ?? null,
+    const selectedProjectOption = useMemo<ProjectOption | undefined>(
+        () => projectOptions.find(opt => opt.value === selectedProjectId) ?? undefined,
         [projectOptions, selectedProjectId],
     )