diff --git a/pdf-ui/src/components/ProposalsList/index.jsx b/pdf-ui/src/components/ProposalsList/index.jsx index 28b3c4f..7297e84 100644 --- a/pdf-ui/src/components/ProposalsList/index.jsx +++ b/pdf-ui/src/components/ProposalsList/index.jsx @@ -43,7 +43,7 @@ const ProposalsList = ({ const [pageCount, setPageCount] = useState(0); const [currentPage, setCurrentPage] = useState(1); const [mounted, setMounted] = useState(false); - const debouncedSearchValue = useDebounce(searchText.trim()); + // const debouncedSearchValue = useDebounce(searchText.trim()); const [shouldRefresh, setShouldRefresh] = useState(false); const isXs = useMediaQuery(theme.breakpoints.only('xs')); const isSm = useMediaQuery(theme.breakpoints.only('sm')); @@ -69,6 +69,7 @@ const ProposalsList = ({ )); const fetchProposals = async (reset = true, page) => { + console.log('Fetching proposals'); const haveSubmittedFilter = statusList?.some( (filter) => filter === 'submitted' ); @@ -87,14 +88,14 @@ const ProposalsList = ({ query = `filters[$and][0][gov_action_type_id]=${ governanceAction?.id }&filters[$and][1][prop_name][$containsi]=${ - debouncedSearchValue || '' + searchText || '' }&pagination[page]=${page}&pagination[pageSize]=25&sort[${sortType.fieldId}]=${sortType.type}&populate[0]=proposal_links&populate[1]=proposal_withdrawals&populate[2]=proposal_constitution_content&populate[3]=proposal`; } else { const isSubmitted = haveSubmittedFilter ? 'true' : 'false'; query = `filters[$and][0][gov_action_type_id]=${ governanceAction?.id }&filters[$and][1][prop_name][$containsi]=${ - debouncedSearchValue || '' + searchText || '' }&filters[$and][2][prop_submitted]=${isSubmitted}&pagination[page]=${page}&pagination[pageSize]=25&sort[${sortType.fieldId}]=${sortType.type}&populate[0]=proposal_links&populate[1]=proposal_withdrawals&populate[2]=proposal_constitution_content&populate[3]=proposal`; } } @@ -128,7 +129,8 @@ const ProposalsList = ({ } }, [ mounted, - debouncedSearchValue, + // debouncedSearchValue, + searchText, sortTypeString, isDraft ? null : statusListString, showAllActivated, diff --git a/pdf-ui/src/pages/ProposedGovernanceActions/index.jsx b/pdf-ui/src/pages/ProposedGovernanceActions/index.jsx index dfc46f8..4cce897 100644 --- a/pdf-ui/src/pages/ProposedGovernanceActions/index.jsx +++ b/pdf-ui/src/pages/ProposedGovernanceActions/index.jsx @@ -26,10 +26,18 @@ import { Divider, } from '@mui/material'; import { useEffect, useState } from 'react'; -import { ProposalsList, CreateGovernanceActionDialog } from '../../components'; +import { + ProposalsList, + CreateGovernanceActionDialog, + SearchInput, +} from '../../components'; import { getGovernanceActionTypes } from '../../lib/api'; import { useAppContext } from '../../context/context'; -import { checkIfDrepIsSignedIn, checkShowValidation, loginUserToApp } from '../../lib/helpers'; +import { + checkIfDrepIsSignedIn, + checkShowValidation, + loginUserToApp, +} from '../../lib/helpers'; import { useLocation } from 'react-router-dom'; import { decodeJWT } from '../../lib/utils'; import UserValidation from '../../components/UserValidation/UserValidation'; @@ -259,13 +267,11 @@ const ProposedGovernanceActions = () => { >