diff --git a/lib/hooks/invite-links.js b/lib/hooks/invite-links.js --- a/lib/hooks/invite-links.js +++ b/lib/hooks/invite-links.js @@ -1,6 +1,7 @@ // @flow -import React from 'react'; +import invariant from 'invariant'; +import * as React from 'react'; import { useCreateOrUpdatePublicLink, @@ -8,9 +9,18 @@ useDisableInviteLink, disableInviteLinkLinkActionTypes, } from '../actions/link-actions.js'; +import { + joinThreadActionTypes, + useJoinThread, +} from '../actions/thread-actions.js'; import { createLoadingStatusSelector } from '../selectors/loading-selectors.js'; +import type { CalendarQuery } from '../types/entry-types.js'; import type { SetState } from '../types/hook-types.js'; -import type { InviteLink } from '../types/link-types.js'; +import type { + InviteLink, + InviteLinkVerificationResponse, +} from '../types/link-types.js'; +import type { LoadingStatus } from '../types/loading-types.js'; import { useDispatchActionPromise } from '../utils/redux-promise-utils.js'; import { useSelector } from '../utils/redux-utils.js'; @@ -99,4 +109,87 @@ ); } -export { useInviteLinksActions }; +const joinThreadLoadingStatusSelector = createLoadingStatusSelector( + joinThreadActionTypes, +); + +type AcceptInviteLinkParams = { + +verificationResponse: InviteLinkVerificationResponse, + +inviteSecret: string, + +calendarQuery: () => CalendarQuery, + +onFinish: () => mixed, + +onInvalidLinkDetected: () => mixed, +}; +function useAcceptInviteLink(params: AcceptInviteLinkParams): { + +joinCommunity: () => mixed, + +joinThreadLoadingStatus: LoadingStatus, +} { + const { + verificationResponse, + inviteSecret, + calendarQuery, + onFinish, + onInvalidLinkDetected, + } = params; + + React.useEffect(() => { + if (verificationResponse.status === 'already_joined') { + onFinish(); + } + }, [onFinish, verificationResponse.status]); + + const callJoinThread = useJoinThread(); + const communityID = verificationResponse.community?.id; + const createJoinCommunityAction = React.useCallback(async () => { + invariant( + communityID, + 'CommunityID should be present while calling this function', + ); + const query = calendarQuery(); + try { + const result = await callJoinThread({ + threadID: communityID, + calendarQuery: { + startDate: query.startDate, + endDate: query.endDate, + filters: [ + ...query.filters, + { type: 'threads', threadIDs: [communityID] }, + ], + }, + inviteLinkSecret: inviteSecret, + }); + onFinish(); + return result; + } catch (e) { + onInvalidLinkDetected(); + throw e; + } + }, [ + calendarQuery, + callJoinThread, + communityID, + inviteSecret, + onFinish, + onInvalidLinkDetected, + ]); + const dispatchActionPromise = useDispatchActionPromise(); + const joinCommunity = React.useCallback(() => { + void dispatchActionPromise( + joinThreadActionTypes, + createJoinCommunityAction(), + ); + }, [createJoinCommunityAction, dispatchActionPromise]); + + const joinThreadLoadingStatus = useSelector(joinThreadLoadingStatusSelector); + + return React.useMemo( + () => ({ + joinCommunity, + joinThreadLoadingStatus, + }), + [joinCommunity, joinThreadLoadingStatus], + ); +} + +export { useInviteLinksActions, useAcceptInviteLink }; diff --git a/native/navigation/invite-link-modal.react.js b/native/navigation/invite-link-modal.react.js --- a/native/navigation/invite-link-modal.react.js +++ b/native/navigation/invite-link-modal.react.js @@ -1,16 +1,10 @@ // @flow -import invariant from 'invariant'; import * as React from 'react'; import { View, Text, ActivityIndicator } from 'react-native'; -import { - useJoinThread, - joinThreadActionTypes, -} from 'lib/actions/thread-actions.js'; -import { createLoadingStatusSelector } from 'lib/selectors/loading-selectors.js'; +import { useAcceptInviteLink } from 'lib/hooks/invite-links.js'; import type { InviteLinkVerificationResponse } from 'lib/types/link-types.js'; -import { useDispatchActionPromise } from 'lib/utils/redux-promise-utils.js'; import { nonThreadCalendarQuery } from './nav-selectors.js'; import { NavContext } from './navigation-context.js'; @@ -35,11 +29,30 @@ const styles = useStyles(unboundStyles); const { invitationDetails, secret } = props.route.params; - React.useEffect(() => { - if (invitationDetails.status === 'already_joined') { - props.navigation.goBack(); - } - }, [invitationDetails.status, props.navigation]); + const navContext = React.useContext(NavContext); + const calendarQuery = useSelector(state => + nonThreadCalendarQuery({ + redux: state, + navContext, + }), + ); + const onInvalidLinkDetected = React.useCallback( + () => + props.navigation.setParams({ + invitationDetails: { + status: 'invalid', + }, + secret, + }), + [props.navigation, secret], + ); + const { joinCommunity, joinThreadLoadingStatus } = useAcceptInviteLink({ + verificationResponse: invitationDetails, + inviteSecret: secret, + calendarQuery, + onFinish: props.navigation.goBack, + onInvalidLinkDetected, + }); const header = React.useMemo(() => { if (invitationDetails.status === 'valid') { @@ -69,55 +82,6 @@ styles.invitation, ]); - const callJoinThread = useJoinThread(); - const navContext = React.useContext(NavContext); - const calendarQuery = useSelector(state => - nonThreadCalendarQuery({ - redux: state, - navContext, - }), - ); - const communityID = invitationDetails.community?.id; - const createJoinCommunityAction = React.useCallback(async () => { - invariant( - communityID, - 'CommunityID should be present while calling this function', - ); - const query = calendarQuery(); - try { - const result = await callJoinThread({ - threadID: communityID, - calendarQuery: { - startDate: query.startDate, - endDate: query.endDate, - filters: [ - ...query.filters, - { type: 'threads', threadIDs: [communityID] }, - ], - }, - inviteLinkSecret: secret, - }); - props.navigation.goBack(); - return result; - } catch (e) { - props.navigation.setParams({ - invitationDetails: { - status: 'invalid', - }, - secret, - }); - throw e; - } - }, [calendarQuery, callJoinThread, communityID, props.navigation, secret]); - const dispatchActionPromise = useDispatchActionPromise(); - const joinCommunity = React.useCallback(() => { - void dispatchActionPromise( - joinThreadActionTypes, - createJoinCommunityAction(), - ); - }, [createJoinCommunityAction, dispatchActionPromise]); - const joinThreadLoadingStatus = useSelector(joinThreadLoadingStatusSelector); - const buttons = React.useMemo(() => { if (invitationDetails.status === 'valid') { const joinButtonContent = @@ -178,10 +142,6 @@ ); } -const joinThreadLoadingStatusSelector = createLoadingStatusSelector( - joinThreadActionTypes, -); - const unboundStyles = { modal: { backgroundColor: 'modalForeground', diff --git a/web/invite-links/accept-invite-modal.react.js b/web/invite-links/accept-invite-modal.react.js --- a/web/invite-links/accept-invite-modal.react.js +++ b/web/invite-links/accept-invite-modal.react.js @@ -1,17 +1,11 @@ // @flow -import invariant from 'invariant'; import * as React from 'react'; -import { - useJoinThread, - joinThreadActionTypes, -} from 'lib/actions/thread-actions.js'; import ModalOverlay from 'lib/components/modal-overlay.react.js'; import { useModalContext } from 'lib/components/modal-provider.react.js'; -import { createLoadingStatusSelector } from 'lib/selectors/loading-selectors.js'; +import { useAcceptInviteLink } from 'lib/hooks/invite-links.js'; import { type InviteLinkVerificationResponse } from 'lib/types/link-types.js'; -import { useDispatchActionPromise } from 'lib/utils/redux-promise-utils.js'; import css from './accept-invite-modal.css'; import Button, { buttonThemes } from '../components/button.react.js'; @@ -28,51 +22,20 @@ const [isLinkValid, setIsLinkValid] = React.useState( verificationResponse.status === 'valid', ); + const onInvalidLinkDetected = React.useCallback( + () => setIsLinkValid(false), + [], + ); const { popModal } = useModalContext(); - - React.useEffect(() => { - if (verificationResponse.status === 'already_joined') { - popModal(); - } - }, [popModal, verificationResponse.status]); - - const callJoinThread = useJoinThread(); const calendarQuery = useSelector(nonThreadCalendarQuery); - const communityID = verificationResponse.community?.id; - const createJoinCommunityAction = React.useCallback(async () => { - invariant( - communityID, - 'CommunityID should be present while calling this function', - ); - const query = calendarQuery(); - try { - const result = await callJoinThread({ - threadID: communityID, - calendarQuery: { - startDate: query.startDate, - endDate: query.endDate, - filters: [ - ...query.filters, - { type: 'threads', threadIDs: [communityID] }, - ], - }, - inviteLinkSecret: inviteSecret, - }); - popModal(); - return result; - } catch (e) { - setIsLinkValid(false); - throw e; - } - }, [calendarQuery, callJoinThread, communityID, inviteSecret, popModal]); - const dispatchActionPromise = useDispatchActionPromise(); - const joinCommunity = React.useCallback(() => { - void dispatchActionPromise( - joinThreadActionTypes, - createJoinCommunityAction(), - ); - }, [createJoinCommunityAction, dispatchActionPromise]); - const joinThreadLoadingStatus = useSelector(joinThreadLoadingStatusSelector); + + const { joinCommunity, joinThreadLoadingStatus } = useAcceptInviteLink({ + verificationResponse, + inviteSecret, + calendarQuery, + onFinish: popModal, + onInvalidLinkDetected, + }); let content; if (verificationResponse.status === 'valid' && isLinkValid) { @@ -126,8 +89,4 @@ ); } -const joinThreadLoadingStatusSelector = createLoadingStatusSelector( - joinThreadActionTypes, -); - export default AcceptInviteModal;