diff --git a/src/Pages/Search.js b/src/Pages/Search.js index fe891acf76a6ca83813a6cbd0aa680d11848bfc1..d38792b576d3a729bd6618115533fe262c93ebd6 100644 --- a/src/Pages/Search.js +++ b/src/Pages/Search.js @@ -42,6 +42,7 @@ import {getRequest} from '../Components/HelperFunctions/getAxiosConfig' let order = "review_average"; let currFilter = ""; +let currOption; export default function Search(props) { const { state, dispatch } = useContext(Store); @@ -73,11 +74,12 @@ export default function Search(props) { new URLSearchParams(window.location.search).get("search_class") ); const [optionResult, setOptionResult] = useState(option); + currOption = option; function handleSuccessfulGet (data) { - if (option === "LearningObject") setResultsResource(data); - else if (option === "Collection") setResultsCollection(data); - else if (option === "User") setResultsUser(data); + if (currOption === "LearningObject") setResultsResource(data); + else if (currOption === "Collection") setResultsCollection(data); + else if (currOption === "User") setResultsUser(data); setOptionResult(option); dispatch({ type: "SAVE_SEARCH", @@ -86,7 +88,9 @@ export default function Search(props) { class: option, }, }); + console.log(data); setTotalResults(data.length); + setOptionResult(currOption); setIsLoading(false); setIsFiltering(false); setLoadingMoreData(false); @@ -97,11 +101,8 @@ export default function Search(props) { currFilter = filtro; if (filtro) setIsFiltering(true); - const url = `/search?page=${page}&results_per_page=${resultsPerPage}&order=${order}&query=${state.search.query}${currFilter ? currFilter : ""}&search_class=${tipoBusca}` - getRequest(url, handleSuccessfulGet, (error) => {console.log(error)}) - }; useEffect(() => { @@ -154,10 +155,12 @@ export default function Search(props) { MOSTRAR </span> </div> - <Dropdown options={options} value={optionResult} onChange={(e) => { + <Dropdown options={options} value={optionResult} + onChange={(e) => { setIsLoading(true); - setOption(e.value); - collectStuff(e.value, ""); + currOption = e.value; + setOption(currOption); + collectStuff(currOption, ""); }} placeholder="Selecione um tipo" /> @@ -199,7 +202,7 @@ export default function Search(props) { optionResult === "Collection" ? ( <GridBuscaCollection container spacing={2}> <Grid item xs> - <Grid container spacing={2}> + <Grid container justify="center" alignItems="center" spacing={2}> {resultsCollection.map((card) => ( <Grid item xs key={card.id}> <CollectionCardFunction @@ -253,7 +256,7 @@ export default function Search(props) { </Grid> </Grid> <Grid item xs> - <Grid container spacing={2}> + <Grid container justify="center" alignItems="center" spacing={2}> {resultsResource.map((card) => ( <Grid item xs={12} sm={6} md={4} lg={3} key={card.id}> <ResourceCardFunction @@ -309,7 +312,7 @@ export default function Search(props) { optionResult === "User" && ( <GridBuscaUser container spacing={2}> <Grid item xs > - <Grid container spacing={2}> + <Grid container spacing={2} justify="center" alignItems="center"> {resultsUser.map((card) => ( <Grid item xs key={card.id}> <ContactCard