Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 6 additions & 4 deletions pdf-ui/src/components/ProposalsList/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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'));
Expand All @@ -69,6 +69,7 @@ const ProposalsList = ({
));

const fetchProposals = async (reset = true, page) => {
console.log('Fetching proposals');
const haveSubmittedFilter = statusList?.some(
(filter) => filter === 'submitted'
);
Expand All @@ -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`;
}
}
Expand Down Expand Up @@ -128,7 +129,8 @@ const ProposalsList = ({
}
}, [
mounted,
debouncedSearchValue,
// debouncedSearchValue,
searchText,
sortTypeString,
isDraft ? null : statusListString,
showAllActivated,
Expand Down
41 changes: 27 additions & 14 deletions pdf-ui/src/pages/ProposedGovernanceActions/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -259,13 +267,11 @@ const ProposedGovernanceActions = () => {
>
<Button
variant='contained'
disabled={
checkShowValidation(
false,
walletAPI,
user
)
}
disabled={checkShowValidation(
false,
walletAPI,
user
)}
onClick={async () =>
await loginUserToApp({
wallet: walletAPI,
Expand Down Expand Up @@ -303,15 +309,22 @@ const ProposedGovernanceActions = () => {
</Grid>

<Grid item md={6} sx={{ flexGrow: { xs: 1 } }}>
<TextField
<SearchInput
onDebouncedChange={
setProposalSearchText
}
placeholder='Search...'
/>
{/* <TextField
fullWidth
id='outlined-basic'
placeholder='Search...'
variant='outlined'
value={proposalSearchText || ''}
onChange={(e) =>
setProposalSearchText(e.target.value)
}
onChange={(e) => {
console.log(e.target.value);
setProposalSearchText(e.target.value);
}}
InputProps={{
startAdornment: (
<InputAdornment position='start'>
Expand Down Expand Up @@ -342,7 +355,7 @@ const ProposedGovernanceActions = () => {
},
},
}}
/>
/> */}
</Grid>
<Grid item>
<Box gap={1} display={'flex'}>
Expand Down