fix hang on starterpack creation
This commit is contained in:
@@ -16,7 +16,6 @@ import {useQueryClient} from '@tanstack/react-query'
|
|||||||
import chunk from 'lodash.chunk'
|
import chunk from 'lodash.chunk'
|
||||||
|
|
||||||
import {until} from '#/lib/async/until'
|
import {until} from '#/lib/async/until'
|
||||||
import {wait} from '#/lib/async/wait'
|
|
||||||
import {type NavigationProp} from '#/lib/routes/types'
|
import {type NavigationProp} from '#/lib/routes/types'
|
||||||
import {logger} from '#/logger'
|
import {logger} from '#/logger'
|
||||||
import {getAllListMembers} from '#/state/queries/list-members'
|
import {getAllListMembers} from '#/state/queries/list-members'
|
||||||
@@ -25,7 +24,6 @@ import {atoms as a, platform, useTheme, web} from '#/alf'
|
|||||||
import {Admonition} from '#/components/Admonition'
|
import {Admonition} from '#/components/Admonition'
|
||||||
import {Button, ButtonText} from '#/components/Button'
|
import {Button, ButtonText} from '#/components/Button'
|
||||||
import * as Dialog from '#/components/Dialog'
|
import * as Dialog from '#/components/Dialog'
|
||||||
import {Loader} from '#/components/Loader'
|
|
||||||
import * as Toast from '#/components/Toast'
|
import * as Toast from '#/components/Toast'
|
||||||
import {Text} from '#/components/Typography'
|
import {Text} from '#/components/Typography'
|
||||||
import {useAnalytics} from '#/analytics'
|
import {useAnalytics} from '#/analytics'
|
||||||
@@ -46,7 +44,6 @@ export function CreateListFromStarterPackDialog({
|
|||||||
const navigation = useNavigation<NavigationProp>()
|
const navigation = useNavigation<NavigationProp>()
|
||||||
const queryClient = useQueryClient()
|
const queryClient = useQueryClient()
|
||||||
const createDialogControl = Dialog.useDialogControl()
|
const createDialogControl = Dialog.useDialogControl()
|
||||||
const loadingDialogControl = Dialog.useDialogControl()
|
|
||||||
|
|
||||||
const record = starterPack.record as AppBskyGraphStarterpack.Record
|
const record = starterPack.record as AppBskyGraphStarterpack.Record
|
||||||
|
|
||||||
@@ -54,26 +51,11 @@ export function CreateListFromStarterPackDialog({
|
|||||||
control.close(() => createDialogControl.open())
|
control.close(() => createDialogControl.open())
|
||||||
}
|
}
|
||||||
|
|
||||||
const addMembersAndNavigate = async (listUri: string) => {
|
const addMembersToList = async (listUri: string) => {
|
||||||
const navigateToList = () => {
|
if (!starterPack.list || !currentAccount) return
|
||||||
const urip = new AtUri(listUri)
|
|
||||||
navigation.navigate('ProfileList', {
|
|
||||||
name: urip.hostname,
|
|
||||||
rkey: urip.rkey,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!starterPack.list || !currentAccount) {
|
|
||||||
loadingDialogControl.close(navigateToList)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
// Fetch all members and add them, with minimum 3s duration for UX
|
const items = await getAllListMembers(agent, starterPack.list.uri)
|
||||||
const listItems = await wait(
|
|
||||||
3000,
|
|
||||||
(async () => {
|
|
||||||
const items = await getAllListMembers(agent, starterPack.list!.uri)
|
|
||||||
|
|
||||||
if (items.length > 0) {
|
if (items.length > 0) {
|
||||||
const listitemWrites: $Typed<ComAtprotoRepoApplyWrites.Create>[] =
|
const listitemWrites: $Typed<ComAtprotoRepoApplyWrites.Create>[] =
|
||||||
@@ -112,15 +94,11 @@ export function CreateListFromStarterPackDialog({
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
return items
|
|
||||||
})(),
|
|
||||||
)
|
|
||||||
|
|
||||||
queryClient.invalidateQueries({queryKey: ['list-members', listUri]})
|
queryClient.invalidateQueries({queryKey: ['list-members', listUri]})
|
||||||
|
|
||||||
ax.metric('starterPack:convertToList', {
|
ax.metric('starterPack:convertToList', {
|
||||||
starterPack: starterPack.uri,
|
starterPack: starterPack.uri,
|
||||||
memberCount: listItems.length,
|
memberCount: items.length,
|
||||||
})
|
})
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
logger.error('Failed to add members to list', {safeMessage: e})
|
logger.error('Failed to add members to list', {safeMessage: e})
|
||||||
@@ -128,13 +106,15 @@ export function CreateListFromStarterPackDialog({
|
|||||||
type: 'error',
|
type: 'error',
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
loadingDialogControl.close(navigateToList)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const onListCreated = (listUri: string) => {
|
const onListCreated = (listUri: string) => {
|
||||||
loadingDialogControl.open()
|
const urip = new AtUri(listUri)
|
||||||
addMembersAndNavigate(listUri)
|
navigation.navigate('ProfileList', {
|
||||||
|
name: urip.hostname,
|
||||||
|
rkey: urip.rkey,
|
||||||
|
})
|
||||||
|
addMembersToList(listUri)
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
@@ -216,22 +196,6 @@ export function CreateListFromStarterPackDialog({
|
|||||||
avatar: starterPack.list?.avatar,
|
avatar: starterPack.list?.avatar,
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<Dialog.Outer
|
|
||||||
control={loadingDialogControl}
|
|
||||||
nativeOptions={{preventDismiss: true}}>
|
|
||||||
<Dialog.Handle />
|
|
||||||
<Dialog.ScrollableInner
|
|
||||||
label={_(msg`Adding members to list...`)}
|
|
||||||
style={web({maxWidth: 400})}>
|
|
||||||
<View style={[a.align_center, a.gap_lg, a.py_5xl]}>
|
|
||||||
<Loader size="xl" />
|
|
||||||
<Text style={[a.text_lg, t.atoms.text_contrast_high]}>
|
|
||||||
<Trans>Adding members to list...</Trans>
|
|
||||||
</Text>
|
|
||||||
</View>
|
|
||||||
</Dialog.ScrollableInner>
|
|
||||||
</Dialog.Outer>
|
|
||||||
</>
|
</>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user