From 858ae527f79e6d472df59c4803b7f0edc04d562c Mon Sep 17 00:00:00 2001 From: himaniraghav3 Date: Mon, 4 Aug 2025 17:22:26 +0530 Subject: [PATCH 1/2] PM-1270 Filter inactive projects in copilot request form --- .../copilots/src/pages/copilot-request-form/index.tsx | 9 ++++++++- src/apps/copilots/src/services/projects.ts | 4 ++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/apps/copilots/src/pages/copilot-request-form/index.tsx b/src/apps/copilots/src/pages/copilot-request-form/index.tsx index b93dd89e9..9ffb6df29 100644 --- a/src/apps/copilots/src/pages/copilot-request-form/index.tsx +++ b/src/apps/copilots/src/pages/copilot-request-form/index.tsx @@ -45,6 +45,7 @@ const CopilotRequestForm: FC<{}> = () => { const [formErrors, setFormErrors] = useState({}) const [paymentType, setPaymentType] = useState('') const [projectFromQuery, setProjectFromQuery] = useState() + const isActiveProject = ['active', 'approved', 'draft', 'new'] const { data: copilotRequestData }: CopilotRequestResponse = useCopilotRequest(routeParams.requestId) @@ -114,7 +115,13 @@ const CopilotRequestForm: FC<{}> = () => { label: string; value: string; }>> { - const response = await getProjects(inputValue) + const response = await getProjects(inputValue, { + filter: { + status: { + $in: [isActiveProject], + }, + }, + }) return response.map(project => ({ label: project.name, value: project.id })) } diff --git a/src/apps/copilots/src/services/projects.ts b/src/apps/copilots/src/services/projects.ts index 096c373ef..2c31d88b7 100644 --- a/src/apps/copilots/src/services/projects.ts +++ b/src/apps/copilots/src/services/projects.ts @@ -63,8 +63,8 @@ export const getProject = (projectId: string): Promise => { return xhrGetAsync(url) } -export const getProjects = (search?: string, filter?: any): Promise => { - const params = { name: `"${search}"`, ...filter } +export const getProjects = (search?: string, config?: {filter: any}): Promise => { + const params = { name: search, ...config?.filter } const url = buildUrl(baseUrl, params) return xhrGetAsync(url) } From fb804da1797e33788ebdd3ff046cd15ef976dc0e Mon Sep 17 00:00:00 2001 From: himaniraghav3 Date: Mon, 4 Aug 2025 17:35:50 +0530 Subject: [PATCH 2/2] Update variable name --- src/apps/copilots/src/pages/copilot-request-form/index.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/apps/copilots/src/pages/copilot-request-form/index.tsx b/src/apps/copilots/src/pages/copilot-request-form/index.tsx index 9ffb6df29..fd3370889 100644 --- a/src/apps/copilots/src/pages/copilot-request-form/index.tsx +++ b/src/apps/copilots/src/pages/copilot-request-form/index.tsx @@ -45,7 +45,7 @@ const CopilotRequestForm: FC<{}> = () => { const [formErrors, setFormErrors] = useState({}) const [paymentType, setPaymentType] = useState('') const [projectFromQuery, setProjectFromQuery] = useState() - const isActiveProject = ['active', 'approved', 'draft', 'new'] + const activeProjectStatuses = ['active', 'approved', 'draft', 'new'] const { data: copilotRequestData }: CopilotRequestResponse = useCopilotRequest(routeParams.requestId) @@ -118,7 +118,7 @@ const CopilotRequestForm: FC<{}> = () => { const response = await getProjects(inputValue, { filter: { status: { - $in: [isActiveProject], + $in: [activeProjectStatuses], }, }, })