Refactor lists to use new queries (#1875)

* Refactor lists queries to react-query

* Delete old lists-list model

* Implement list, list-members, and list-memberships react-queries

* Update CreateOrEditList modal

* First pass at my-follows and actor-autocomplete queries

* Update ListAddUserModal to use new queries, change to ListAddRemoveUsersModal

* Update UserAddRemoveLists modal

* Remove old TODO

* Fix indent, autocomplete query

* Add a todo

---------

Co-authored-by: Eric Bailey <git@esb.lol>
This commit is contained in:
Paul Frazee 2023-11-12 12:45:25 -08:00 committed by GitHub
parent 05b728fffc
commit d9e0a927c1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
25 changed files with 1303 additions and 1545 deletions

View file

@ -8,68 +8,59 @@ import {
View,
ViewStyle,
} from 'react-native'
import {observer} from 'mobx-react-lite'
import {AppBskyGraphDefs as GraphDefs} from '@atproto/api'
import {ListCard} from './ListCard'
import {MyListsFilter, useMyListsQuery} from '#/state/queries/my-lists'
import {ErrorMessage} from '../util/error/ErrorMessage'
import {LoadMoreRetryBtn} from '../util/LoadMoreRetryBtn'
import {Text} from '../util/text/Text'
import {ListsListModel} from 'state/models/lists/lists-list'
import {useAnalytics} from 'lib/analytics/analytics'
import {usePalette} from 'lib/hooks/usePalette'
import {FlatList} from '../util/Views'
import {s} from 'lib/styles'
import {logger} from '#/logger'
import {Trans} from '@lingui/macro'
import {cleanError} from '#/lib/strings/errors'
const LOADING = {_reactKey: '__loading__'}
const EMPTY = {_reactKey: '__empty__'}
const ERROR_ITEM = {_reactKey: '__error__'}
const LOAD_MORE_ERROR_ITEM = {_reactKey: '__load_more_error__'}
export const ListsList = observer(function ListsListImpl({
listsList,
export function ListsList({
filter,
inline,
style,
onPressTryAgain,
renderItem,
testID,
}: {
listsList: ListsListModel
filter: MyListsFilter
inline?: boolean
style?: StyleProp<ViewStyle>
onPressTryAgain?: () => void
renderItem?: (list: GraphDefs.ListView, index: number) => JSX.Element
testID?: string
}) {
const pal = usePalette('default')
const {track} = useAnalytics()
const [isRefreshing, setIsRefreshing] = React.useState(false)
const {data, isFetching, isFetched, isError, error, refetch} =
useMyListsQuery(filter)
const isEmpty = !isFetching && !data?.length
const data = React.useMemo(() => {
const items = React.useMemo(() => {
let items: any[] = []
if (listsList.hasError) {
if (isError && isEmpty) {
items = items.concat([ERROR_ITEM])
}
if (!listsList.hasLoaded && listsList.isLoading) {
if (!isFetched && isFetching) {
items = items.concat([LOADING])
} else if (listsList.isEmpty) {
} else if (isEmpty) {
items = items.concat([EMPTY])
} else {
items = items.concat(listsList.lists)
}
if (listsList.loadMoreError) {
items = items.concat([LOAD_MORE_ERROR_ITEM])
items = items.concat(data)
}
return items
}, [
listsList.hasError,
listsList.hasLoaded,
listsList.isLoading,
listsList.lists,
listsList.isEmpty,
listsList.loadMoreError,
])
}, [isError, isEmpty, isFetched, isFetching, data])
// events
// =
@ -78,25 +69,12 @@ export const ListsList = observer(function ListsListImpl({
track('Lists:onRefresh')
setIsRefreshing(true)
try {
await listsList.refresh()
await refetch()
} catch (err) {
logger.error('Failed to refresh lists', {error: err})
}
setIsRefreshing(false)
}, [listsList, track, setIsRefreshing])
const onEndReached = React.useCallback(async () => {
track('Lists:onEndReached')
try {
await listsList.loadMore()
} catch (err) {
logger.error('Failed to load more lists', {error: err})
}
}, [listsList, track])
const onPressRetryLoadMore = React.useCallback(() => {
listsList.retryLoadMore()
}, [listsList])
}, [refetch, track, setIsRefreshing])
// rendering
// =
@ -116,15 +94,15 @@ export const ListsList = observer(function ListsListImpl({
} else if (item === ERROR_ITEM) {
return (
<ErrorMessage
message={listsList.error}
onPressTryAgain={onPressTryAgain}
message={cleanError(error)}
onPressTryAgain={onRefresh}
/>
)
} else if (item === LOAD_MORE_ERROR_ITEM) {
return (
<LoadMoreRetryBtn
label="There was an issue fetching your lists. Tap here to try again."
onPress={onPressRetryLoadMore}
onPress={onRefresh}
/>
)
} else if (item === LOADING) {
@ -144,16 +122,16 @@ export const ListsList = observer(function ListsListImpl({
/>
)
},
[listsList, onPressTryAgain, onPressRetryLoadMore, renderItem, pal],
[error, onRefresh, renderItem, pal],
)
const FlatListCom = inline ? RNFlatList : FlatList
return (
<View testID={testID} style={style}>
{data.length > 0 && (
{items.length > 0 && (
<FlatListCom
testID={testID ? `${testID}-flatlist` : undefined}
data={data}
data={items}
keyExtractor={(item: any) => item._reactKey}
renderItem={renderItemInner}
refreshControl={
@ -165,8 +143,6 @@ export const ListsList = observer(function ListsListImpl({
/>
}
contentContainerStyle={[s.contentContainer]}
onEndReached={onEndReached}
onEndReachedThreshold={0.6}
removeClippedSubviews={true}
// @ts-ignore our .web version only -prf
desktopFixedHeight
@ -174,7 +150,7 @@ export const ListsList = observer(function ListsListImpl({
)}
</View>
)
})
}
const styles = StyleSheet.create({
item: {