Cleanup
This commit is contained in:
parent
f4fad28cee
commit
8e751f1471
|
@ -1,16 +1,14 @@
|
||||||
/* eslint-disable react-hooks/exhaustive-deps */
|
/* eslint-disable react-hooks/exhaustive-deps */
|
||||||
import algoliasearch from 'algoliasearch/lite'
|
import algoliasearch from 'algoliasearch/lite'
|
||||||
import { useInfiniteHits, useSortBy } from 'react-instantsearch-hooks-web'
|
|
||||||
|
|
||||||
import { Contract } from 'common/contract'
|
import { Contract } from 'common/contract'
|
||||||
import {
|
import {
|
||||||
Sort,
|
Sort,
|
||||||
useInitialQueryAndSort,
|
useInitialQueryAndSort,
|
||||||
useUpdateQueryAndSort,
|
|
||||||
} from '../hooks/use-sort-and-query-params'
|
} from '../hooks/use-sort-and-query-params'
|
||||||
import { ContractsGrid } from './contract/contracts-list'
|
import { ContractsGrid } from './contract/contracts-list'
|
||||||
import { Row } from './layout/row'
|
import { Row } from './layout/row'
|
||||||
import { useEffect, useMemo, useRef, useState } from 'react'
|
import { useEffect, useMemo, useState } from 'react'
|
||||||
import { Spacer } from './layout/spacer'
|
import { Spacer } from './layout/spacer'
|
||||||
import { ENV, IS_PRIVATE_MANIFOLD } from 'common/envs/constants'
|
import { ENV, IS_PRIVATE_MANIFOLD } from 'common/envs/constants'
|
||||||
import { useUser } from 'web/hooks/use-user'
|
import { useUser } from 'web/hooks/use-user'
|
||||||
|
@ -178,8 +176,6 @@ export function ContractSearch(props: {
|
||||||
.flat()
|
.flat()
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
console.log('page', page)
|
|
||||||
let mostRecentQuery = true
|
|
||||||
index
|
index
|
||||||
.search(query, {
|
.search(query, {
|
||||||
facetFilters,
|
facetFilters,
|
||||||
|
@ -188,10 +184,9 @@ export function ContractSearch(props: {
|
||||||
hitsPerPage: 20,
|
hitsPerPage: 20,
|
||||||
})
|
})
|
||||||
.then((results) => {
|
.then((results) => {
|
||||||
// if (mostRecentQuery) {
|
|
||||||
if (page === 0) {
|
if (page === 0) {
|
||||||
setHitsByPage({
|
setHitsByPage({
|
||||||
'0': results.hits as any as Contract[],
|
[0]: results.hits as any as Contract[],
|
||||||
})
|
})
|
||||||
} else {
|
} else {
|
||||||
setHitsByPage((hitsByPage) => ({
|
setHitsByPage((hitsByPage) => ({
|
||||||
|
@ -199,18 +194,10 @@ export function ContractSearch(props: {
|
||||||
[page]: results.hits,
|
[page]: results.hits,
|
||||||
}))
|
}))
|
||||||
}
|
}
|
||||||
// setHits(results.hits as any as Contract[])
|
console.log(results.page, '/', results.nbPages, results.hits)
|
||||||
console.log(results.page, results.nbPages, hits)
|
|
||||||
// }
|
|
||||||
})
|
})
|
||||||
|
|
||||||
return () => {
|
|
||||||
mostRecentQuery = false
|
|
||||||
}
|
|
||||||
}, [query, page, index, facetFilters, numericFilters])
|
}, [query, page, index, facetFilters, numericFilters])
|
||||||
|
|
||||||
console.log('query', query, 'index', index, 'hits', hits)
|
|
||||||
|
|
||||||
const showTime =
|
const showTime =
|
||||||
sort === 'close-date' || sort === 'resolve-date' ? sort : undefined
|
sort === 'close-date' || sort === 'resolve-date' ? sort : undefined
|
||||||
|
|
||||||
|
@ -338,84 +325,3 @@ export function ContractSearch(props: {
|
||||||
</Col>
|
</Col>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
export function ContractSearchInner(props: {
|
|
||||||
querySortOptions?: {
|
|
||||||
defaultSort: Sort
|
|
||||||
shouldLoadFromStorage?: boolean
|
|
||||||
}
|
|
||||||
onContractClick?: (contract: Contract) => void
|
|
||||||
overrideGridClassName?: string
|
|
||||||
hideQuickBet?: boolean
|
|
||||||
excludeContractIds?: string[]
|
|
||||||
}) {
|
|
||||||
const {
|
|
||||||
querySortOptions,
|
|
||||||
onContractClick,
|
|
||||||
overrideGridClassName,
|
|
||||||
hideQuickBet,
|
|
||||||
excludeContractIds,
|
|
||||||
} = props
|
|
||||||
const { initialQuery } = useInitialQueryAndSort(querySortOptions)
|
|
||||||
|
|
||||||
const { query, setQuery, setSort } = useUpdateQueryAndSort({
|
|
||||||
shouldLoadFromStorage: true,
|
|
||||||
})
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
setQuery(initialQuery)
|
|
||||||
}, [initialQuery])
|
|
||||||
|
|
||||||
const { currentRefinement: index } = useSortBy({
|
|
||||||
items: [],
|
|
||||||
})
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
setQuery(query)
|
|
||||||
}, [query])
|
|
||||||
|
|
||||||
const isFirstRender = useRef(true)
|
|
||||||
useEffect(() => {
|
|
||||||
if (isFirstRender.current) {
|
|
||||||
isFirstRender.current = false
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
const sort = index.split('contracts-')[1] as Sort
|
|
||||||
if (sort) {
|
|
||||||
setSort(sort)
|
|
||||||
}
|
|
||||||
}, [index])
|
|
||||||
|
|
||||||
const [isInitialLoad, setIsInitialLoad] = useState(true)
|
|
||||||
useEffect(() => {
|
|
||||||
const id = setTimeout(() => setIsInitialLoad(false), 1000)
|
|
||||||
return () => clearTimeout(id)
|
|
||||||
}, [])
|
|
||||||
|
|
||||||
const { showMore, hits, isLastPage } = useInfiniteHits()
|
|
||||||
let contracts = hits as any as Contract[]
|
|
||||||
|
|
||||||
if (isInitialLoad && contracts.length === 0) return <></>
|
|
||||||
|
|
||||||
const showTime = index.endsWith('close-date')
|
|
||||||
? 'close-date'
|
|
||||||
: index.endsWith('resolve-date')
|
|
||||||
? 'resolve-date'
|
|
||||||
: undefined
|
|
||||||
|
|
||||||
if (excludeContractIds)
|
|
||||||
contracts = contracts.filter((c) => !excludeContractIds.includes(c.id))
|
|
||||||
|
|
||||||
return (
|
|
||||||
<ContractsGrid
|
|
||||||
contracts={contracts}
|
|
||||||
loadMore={showMore}
|
|
||||||
hasMore={!isLastPage}
|
|
||||||
showTime={showTime}
|
|
||||||
onContractClick={onContractClick}
|
|
||||||
overrideGridClassName={overrideGridClassName}
|
|
||||||
hideQuickBet={hideQuickBet}
|
|
||||||
/>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user