@planningcenter/chat-react-native 4.7.1-qa-staging.0 → 4.7.1-qa-staging.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/components/conversations/conversation_actions.d.ts.map +1 -1
- package/build/components/conversations/conversation_actions.js +204 -200
- package/build/components/conversations/conversation_actions.js.map +1 -1
- package/build/components/conversations/conversation_preview.d.ts.map +1 -1
- package/build/components/conversations/conversation_preview.js +106 -91
- package/build/components/conversations/conversation_preview.js.map +1 -1
- package/build/components/conversations/conversations.d.ts.map +1 -1
- package/build/components/conversations/conversations.js +63 -56
- package/build/components/conversations/conversations.js.map +1 -1
- package/build/components/conversations/conversations_blank_state.d.ts +2 -1
- package/build/components/conversations/conversations_blank_state.d.ts.map +1 -1
- package/build/components/conversations/conversations_blank_state.js +71 -39
- package/build/components/conversations/conversations_blank_state.js.map +1 -1
- package/build/components/conversations/hidden_indicator.d.ts +4 -0
- package/build/components/conversations/hidden_indicator.d.ts.map +1 -0
- package/build/components/conversations/hidden_indicator.js +52 -0
- package/build/components/conversations/hidden_indicator.js.map +1 -0
- package/build/components/conversations/hidden_results_footer.d.ts +2 -0
- package/build/components/conversations/hidden_results_footer.d.ts.map +1 -0
- package/build/components/conversations/hidden_results_footer.js +34 -0
- package/build/components/conversations/hidden_results_footer.js.map +1 -0
- package/build/contexts/conversations_context.d.ts.map +1 -1
- package/build/contexts/conversations_context.js +20 -17
- package/build/contexts/conversations_context.js.map +1 -1
- package/build/hooks/groups/use_group_members_for_new_conversation.d.ts +6 -0
- package/build/hooks/groups/use_group_members_for_new_conversation.d.ts.map +1 -1
- package/build/hooks/use_api.d.ts +6 -0
- package/build/hooks/use_api.d.ts.map +1 -1
- package/build/hooks/use_api.js +8 -5
- package/build/hooks/use_api.js.map +1 -1
- package/build/hooks/use_clear_conversation_filters.d.ts.map +1 -1
- package/build/hooks/use_clear_conversation_filters.js +1 -0
- package/build/hooks/use_clear_conversation_filters.js.map +1 -1
- package/build/hooks/use_groups.d.ts +6 -0
- package/build/hooks/use_groups.d.ts.map +1 -1
- package/build/hooks/use_groups_groups.d.ts +6 -0
- package/build/hooks/use_groups_groups.d.ts.map +1 -1
- package/build/hooks/use_hidden_conversations_count.d.ts +2 -0
- package/build/hooks/use_hidden_conversations_count.d.ts.map +1 -0
- package/build/hooks/use_hidden_conversations_count.js +32 -0
- package/build/hooks/use_hidden_conversations_count.js.map +1 -0
- package/build/hooks/use_hide_conversation.d.ts +2 -1
- package/build/hooks/use_hide_conversation.d.ts.map +1 -1
- package/build/hooks/use_hide_conversation.js +100 -95
- package/build/hooks/use_hide_conversation.js.map +1 -1
- package/build/hooks/use_teams.d.ts +6 -0
- package/build/hooks/use_teams.d.ts.map +1 -1
- package/build/screens/conversation_filters/components/conversation_filters.d.ts.map +1 -1
- package/build/screens/conversation_filters/components/conversation_filters.js +53 -12
- package/build/screens/conversation_filters/components/conversation_filters.js.map +1 -1
- package/build/screens/conversation_filters/components/rows.d.ts +6 -3
- package/build/screens/conversation_filters/components/rows.d.ts.map +1 -1
- package/build/screens/conversation_filters/components/rows.js +99 -62
- package/build/screens/conversation_filters/components/rows.js.map +1 -1
- package/build/screens/conversation_filters/context/conversation_filter_context.d.ts.map +1 -1
- package/build/screens/conversation_filters/context/conversation_filter_context.js +4 -0
- package/build/screens/conversation_filters/context/conversation_filter_context.js.map +1 -1
- package/build/screens/conversation_filters/filter_types.d.ts +1 -0
- package/build/screens/conversation_filters/filter_types.d.ts.map +1 -1
- package/build/screens/conversation_filters/filter_types.js +1 -0
- package/build/screens/conversation_filters/filter_types.js.map +1 -1
- package/build/screens/conversation_filters/hooks/filters.d.ts +12 -0
- package/build/screens/conversation_filters/hooks/filters.d.ts.map +1 -1
- package/build/screens/conversation_filters/screen_props.d.ts +1 -0
- package/build/screens/conversation_filters/screen_props.d.ts.map +1 -1
- package/build/screens/conversation_filters/screen_props.js.map +1 -1
- package/build/screens/conversations/components/filter_dropdown_list_header_component.d.ts.map +1 -1
- package/build/screens/conversations/components/filter_dropdown_list_header_component.js +138 -126
- package/build/screens/conversations/components/filter_dropdown_list_header_component.js.map +1 -1
- package/build/screens/conversations/components/list_header_component.d.ts.map +1 -1
- package/build/screens/conversations/components/list_header_component.js +95 -90
- package/build/screens/conversations/components/list_header_component.js.map +1 -1
- package/build/screens/conversations/components/search_list_header_component.d.ts.map +1 -1
- package/build/screens/conversations/components/search_list_header_component.js +100 -95
- package/build/screens/conversations/components/search_list_header_component.js.map +1 -1
- package/build/screens/conversations/conversations_screen.d.ts +1 -0
- package/build/screens/conversations/conversations_screen.d.ts.map +1 -1
- package/build/screens/conversations/conversations_screen.js.map +1 -1
- package/build/utils/request/conversation.d.ts +3 -1
- package/build/utils/request/conversation.d.ts.map +1 -1
- package/build/utils/request/conversation.js +4 -0
- package/build/utils/request/conversation.js.map +1 -1
- package/build/vendor/font_awesome_pro_solid_icons.d.ts +1 -0
- package/build/vendor/font_awesome_pro_solid_icons.d.ts.map +1 -1
- package/build/vendor/font_awesome_pro_solid_icons.js +5 -0
- package/build/vendor/font_awesome_pro_solid_icons.js.map +1 -1
- package/package.json +3 -3
- package/src/__tests__/screens/conversation_filters/components/conversation_filters.test.tsx +6 -0
- package/src/components/conversations/__tests__/conversation_actions.test.tsx +1 -0
- package/src/components/conversations/__tests__/conversation_preview.test.tsx +29 -0
- package/src/components/conversations/__tests__/conversations.test.tsx +26 -0
- package/src/components/conversations/__tests__/conversations_blank_state.test.tsx +17 -0
- package/src/components/conversations/conversation_actions.tsx +7 -2
- package/src/components/conversations/conversation_preview.tsx +12 -1
- package/src/components/conversations/conversations.tsx +9 -0
- package/src/components/conversations/conversations_blank_state.tsx +18 -0
- package/src/components/conversations/hidden_indicator.tsx +30 -0
- package/src/components/conversations/hidden_results_footer.tsx +25 -0
- package/src/contexts/conversations_context.tsx +2 -0
- package/src/hooks/__tests__/use_hide_conversation.test.tsx +44 -2
- package/src/hooks/use_api.ts +2 -1
- package/src/hooks/use_clear_conversation_filters.ts +1 -0
- package/src/hooks/use_hidden_conversations_count.ts +14 -0
- package/src/hooks/use_hide_conversation.ts +18 -8
- package/src/screens/conversation_filters/__tests__/conversation_filters.test.tsx +42 -0
- package/src/screens/conversation_filters/components/conversation_filters.tsx +22 -3
- package/src/screens/conversation_filters/components/rows.tsx +44 -10
- package/src/screens/conversation_filters/context/conversation_filter_context.tsx +4 -0
- package/src/screens/conversation_filters/filter_types.ts +1 -0
- package/src/screens/conversation_filters/screen_props.ts +1 -0
- package/src/screens/conversations/components/__tests__/filter_dropdown_list_header_component.test.tsx +42 -0
- package/src/screens/conversations/components/__tests__/list_header_component.test.tsx +1 -0
- package/src/screens/conversations/components/filter_dropdown_list_header_component.tsx +21 -5
- package/src/screens/conversations/components/list_header_component.tsx +14 -4
- package/src/screens/conversations/components/search_list_header_component.tsx +14 -4
- package/src/screens/conversations/conversations_screen.tsx +1 -0
- package/src/utils/request/conversation.ts +6 -0
- package/src/vendor/font_awesome_pro_solid_icons.ts +12 -0
|
@@ -1,9 +1,14 @@
|
|
|
1
1
|
import React from 'react'
|
|
2
2
|
import { renderWithQueryClient } from '../../../__utils__/render_with_query_client'
|
|
3
|
+
import { ConversationFiltersParams } from '../../../screens/conversation_filters/screen_props'
|
|
3
4
|
import type { ConversationPreviewData, ConversationResource } from '../../../types'
|
|
4
5
|
import { formatDatePreview } from '../../../utils/date'
|
|
5
6
|
import { ConversationPreview } from '../conversation_preview'
|
|
6
7
|
|
|
8
|
+
let mockArgs: ConversationFiltersParams = {}
|
|
9
|
+
jest.mock('../../../contexts/conversations_context', () => ({
|
|
10
|
+
useConversationsContext: () => ({ args: mockArgs }),
|
|
11
|
+
}))
|
|
7
12
|
jest.mock('../conversation_actions', () => ({
|
|
8
13
|
ConversationActions: ({
|
|
9
14
|
children,
|
|
@@ -102,4 +107,28 @@ describe('ConversationPreview', () => {
|
|
|
102
107
|
).toBeNull()
|
|
103
108
|
expect(view.getByLabelText(/^Select Worship Team, Disabled,/)).toBeTruthy()
|
|
104
109
|
})
|
|
110
|
+
|
|
111
|
+
describe('hidden indicator', () => {
|
|
112
|
+
afterEach(() => {
|
|
113
|
+
mockArgs = {}
|
|
114
|
+
})
|
|
115
|
+
|
|
116
|
+
it('marks rows in the hidden list as hidden', () => {
|
|
117
|
+
mockArgs = { show_hidden: true }
|
|
118
|
+
const view = renderPreview(messagePreview)
|
|
119
|
+
|
|
120
|
+
expect(
|
|
121
|
+
view.getByTestId('conversation-hidden-icon', { includeHiddenElements: true })
|
|
122
|
+
).toBeTruthy()
|
|
123
|
+
expect(view.getByLabelText(/^Select Worship Team, Hidden,/)).toBeTruthy()
|
|
124
|
+
})
|
|
125
|
+
|
|
126
|
+
it('leaves rows outside the hidden list unmarked', () => {
|
|
127
|
+
const view = renderPreview(messagePreview)
|
|
128
|
+
|
|
129
|
+
expect(
|
|
130
|
+
view.queryByTestId('conversation-hidden-icon', { includeHiddenElements: true })
|
|
131
|
+
).toBeNull()
|
|
132
|
+
})
|
|
133
|
+
})
|
|
105
134
|
})
|
|
@@ -91,3 +91,29 @@ describe('Conversations archived footer', () => {
|
|
|
91
91
|
expect(view.queryByLabelText('View active conversations')).toBeNull()
|
|
92
92
|
})
|
|
93
93
|
})
|
|
94
|
+
|
|
95
|
+
describe('Conversations hidden footer', () => {
|
|
96
|
+
beforeEach(() => {
|
|
97
|
+
mockFilterDropdownEnabled = true
|
|
98
|
+
mockHasNextPage = false
|
|
99
|
+
mockArgs = { show_hidden: true }
|
|
100
|
+
})
|
|
101
|
+
|
|
102
|
+
it('ends the hidden list with a note on how conversations come back', () => {
|
|
103
|
+
const view = render(<Conversations />)
|
|
104
|
+
|
|
105
|
+
expect(
|
|
106
|
+
view.getByText(
|
|
107
|
+
'Hidden just for you. A conversation comes back to your list when someone sends a new message, unless it’s also silenced.'
|
|
108
|
+
)
|
|
109
|
+
).toBeTruthy()
|
|
110
|
+
expect(view.queryByText('You’re viewing filtered results')).toBeNull()
|
|
111
|
+
})
|
|
112
|
+
|
|
113
|
+
it('waits for the last page before showing the hidden note', () => {
|
|
114
|
+
mockHasNextPage = true
|
|
115
|
+
const view = render(<Conversations />)
|
|
116
|
+
|
|
117
|
+
expect(view.queryByText(/Hidden just for you/)).toBeNull()
|
|
118
|
+
})
|
|
119
|
+
})
|
|
@@ -41,6 +41,7 @@ describe('ConversationsBlankState', () => {
|
|
|
41
41
|
group_source_app_name: undefined,
|
|
42
42
|
show_direct_messages: undefined,
|
|
43
43
|
show_archived: undefined,
|
|
44
|
+
show_hidden: undefined,
|
|
44
45
|
show_unread: undefined,
|
|
45
46
|
})
|
|
46
47
|
})
|
|
@@ -71,4 +72,20 @@ describe('ConversationsBlankState', () => {
|
|
|
71
72
|
expect(view.queryByText('View all conversations')).toBeNull()
|
|
72
73
|
})
|
|
73
74
|
})
|
|
75
|
+
|
|
76
|
+
it('explains how to hide a conversation when the hidden list is empty', () => {
|
|
77
|
+
mockUseFilterDropdownEnabled.mockReturnValue(true)
|
|
78
|
+
|
|
79
|
+
const view = render(
|
|
80
|
+
<ConversationsBlankState
|
|
81
|
+
isFilterApplied={true}
|
|
82
|
+
isHiddenFilterApplied={true}
|
|
83
|
+
canCreateConversations={true}
|
|
84
|
+
/>
|
|
85
|
+
)
|
|
86
|
+
|
|
87
|
+
expect(view.getByText('No hidden conversations')).toBeTruthy()
|
|
88
|
+
expect(view.getByText('Swipe left on a conversation to hide it from your list.')).toBeTruthy()
|
|
89
|
+
expect(view.queryByText('View all conversations')).toBeNull()
|
|
90
|
+
})
|
|
74
91
|
})
|
|
@@ -42,7 +42,8 @@ export function ConversationActions({
|
|
|
42
42
|
const swipeableRef = useRef<SwipeableMethods>(null)
|
|
43
43
|
const navigation = useNavigation()
|
|
44
44
|
const styles = useStyles()
|
|
45
|
-
const { activeConversationId, setActiveConversationId, hideable } =
|
|
45
|
+
const { activeConversationId, setActiveConversationId, hideable, args } =
|
|
46
|
+
useConversationsContext()
|
|
46
47
|
const [disabled, setDisabled] = useState(false)
|
|
47
48
|
const overshootLeft = Platform.OS === 'ios'
|
|
48
49
|
const androidRippleColor = useCreateAndroidRippleColor({
|
|
@@ -56,7 +57,11 @@ export function ConversationActions({
|
|
|
56
57
|
} = useConversationsMarkRead({
|
|
57
58
|
conversation,
|
|
58
59
|
})
|
|
59
|
-
const {
|
|
60
|
+
const {
|
|
61
|
+
hidden,
|
|
62
|
+
setHidden,
|
|
63
|
+
isPending: isHiddenPending,
|
|
64
|
+
} = useHideConversation({ conversation, hidden: args.show_hidden || undefined })
|
|
60
65
|
const hideConversationsEnabled = useHideConversationsEnabled()
|
|
61
66
|
|
|
62
67
|
const isConversationEmpty = conversation.lastMessageCreatedAt === null
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import React from 'react'
|
|
2
2
|
import { StyleSheet, View, ViewStyle } from 'react-native'
|
|
3
|
+
import { useConversationsContext } from '../../contexts/conversations_context'
|
|
3
4
|
import {
|
|
4
5
|
useTheme,
|
|
5
6
|
useAtFontScaleBreakpoint,
|
|
@@ -21,6 +22,7 @@ import {
|
|
|
21
22
|
type BadgeProps,
|
|
22
23
|
} from '../display'
|
|
23
24
|
import { ConversationActions } from './conversation_actions'
|
|
25
|
+
import { HiddenIndicator } from './hidden_indicator'
|
|
24
26
|
import { MuteIndicator } from './mute_indicator'
|
|
25
27
|
import { UnreadCountBadge } from './unread_count_badge'
|
|
26
28
|
|
|
@@ -40,6 +42,9 @@ export const ConversationPreview = ({
|
|
|
40
42
|
style,
|
|
41
43
|
}: ConversationPreviewProps) => {
|
|
42
44
|
const styles = useStyles()
|
|
45
|
+
const {
|
|
46
|
+
args: { show_hidden: hidden = false },
|
|
47
|
+
} = useConversationsContext()
|
|
43
48
|
const {
|
|
44
49
|
conversationPreview,
|
|
45
50
|
lastMessageCreatedAt,
|
|
@@ -54,7 +59,7 @@ export const ConversationPreview = ({
|
|
|
54
59
|
const archived = isArchivedConversation(conversation)
|
|
55
60
|
const emptyConversation = !lastMessageCreatedAt
|
|
56
61
|
const fallbackIconName = emptyConversation ? 'people.noTextMessage' : 'general.person'
|
|
57
|
-
const hasMetaContent = lastMessageCreatedAt || unreadCount > 0 || muted
|
|
62
|
+
const hasMetaContent = lastMessageCreatedAt || unreadCount > 0 || muted || hidden
|
|
58
63
|
const isUnread = unreadCount > 0 || unreadReaction
|
|
59
64
|
|
|
60
65
|
const numberOfLinesScaledTitle = useScalableNumberOfLines(1)
|
|
@@ -68,6 +73,7 @@ export const ConversationPreview = ({
|
|
|
68
73
|
conversation,
|
|
69
74
|
showBadges,
|
|
70
75
|
archived,
|
|
76
|
+
hidden,
|
|
71
77
|
})
|
|
72
78
|
|
|
73
79
|
return (
|
|
@@ -117,6 +123,7 @@ export const ConversationPreview = ({
|
|
|
117
123
|
<View style={styles.statusContainer}>
|
|
118
124
|
<UnreadCountBadge count={unreadCount} unreadReaction={unreadReaction} showDot={muted} />
|
|
119
125
|
<MuteIndicator muted={muted} />
|
|
126
|
+
<HiddenIndicator hidden={hidden} />
|
|
120
127
|
</View>
|
|
121
128
|
</View>
|
|
122
129
|
)}
|
|
@@ -214,11 +221,13 @@ interface GetConversationAccessibilityLabelProps {
|
|
|
214
221
|
conversation: ConversationResource
|
|
215
222
|
showBadges: boolean
|
|
216
223
|
archived: boolean
|
|
224
|
+
hidden: boolean
|
|
217
225
|
}
|
|
218
226
|
const getConversationAccessibilityLabel = ({
|
|
219
227
|
conversation,
|
|
220
228
|
showBadges,
|
|
221
229
|
archived,
|
|
230
|
+
hidden,
|
|
222
231
|
}: GetConversationAccessibilityLabelProps) => {
|
|
223
232
|
const { badges, title, conversationPreview, muted, disabled, unreadCount, unreadReaction } =
|
|
224
233
|
conversation
|
|
@@ -231,6 +240,7 @@ const getConversationAccessibilityLabel = ({
|
|
|
231
240
|
badge: hasBadges ? `for ${badges[0]?.pcoResourceType} ${badges[0]?.text || ''}` : '',
|
|
232
241
|
disabled: archived ? 'Archived' : disabled ? 'Disabled' : '',
|
|
233
242
|
muted: muted ? 'Muted' : '',
|
|
243
|
+
hidden: hidden ? 'Hidden' : '',
|
|
234
244
|
readStatus: hasUnreadMessages
|
|
235
245
|
? `${unreadCount} unread messages`
|
|
236
246
|
: unreadReaction
|
|
@@ -246,6 +256,7 @@ const getConversationAccessibilityLabel = ({
|
|
|
246
256
|
label.badge,
|
|
247
257
|
label.disabled,
|
|
248
258
|
label.muted,
|
|
259
|
+
label.hidden,
|
|
249
260
|
label.readStatus,
|
|
250
261
|
label.lastMessage,
|
|
251
262
|
]
|
|
@@ -12,6 +12,7 @@ import { ArchivedResultsFooter } from './archived_results_footer'
|
|
|
12
12
|
import { ConversationPreview, ConversationPreviewSkeleton } from './conversation_preview'
|
|
13
13
|
import { ConversationsBlankState } from './conversations_blank_state'
|
|
14
14
|
import { FilteredResultsFooter } from './filtered_results_footer'
|
|
15
|
+
import { HiddenResultsFooter } from './hidden_results_footer'
|
|
15
16
|
|
|
16
17
|
interface ConversationsProps {
|
|
17
18
|
ListHeaderComponent?:
|
|
@@ -36,6 +37,7 @@ export const Conversations = ({ ListHeaderComponent }: ConversationsProps) => {
|
|
|
36
37
|
group_source_app_name,
|
|
37
38
|
show_direct_messages,
|
|
38
39
|
show_archived,
|
|
40
|
+
show_hidden,
|
|
39
41
|
show_unread,
|
|
40
42
|
},
|
|
41
43
|
} = useConversationsContext()
|
|
@@ -48,12 +50,16 @@ export const Conversations = ({ ListHeaderComponent }: ConversationsProps) => {
|
|
|
48
50
|
!!group_source_app_name ||
|
|
49
51
|
!!show_direct_messages ||
|
|
50
52
|
!!show_archived ||
|
|
53
|
+
!!show_hidden ||
|
|
51
54
|
!!show_unread
|
|
52
55
|
const showArchivedResultsFooter = !!show_archived && !isLoading && !hasNextPage
|
|
56
|
+
const showHiddenResultsFooter =
|
|
57
|
+
!!show_hidden && !isLoading && !hasNextPage && conversations.length > 0
|
|
53
58
|
const showFilteredResultsFooter =
|
|
54
59
|
filterDropdownEnabled &&
|
|
55
60
|
isFilterApplied &&
|
|
56
61
|
!show_archived &&
|
|
62
|
+
!show_hidden &&
|
|
57
63
|
!hasNextPage &&
|
|
58
64
|
!isLoading &&
|
|
59
65
|
conversations.length > 0
|
|
@@ -86,12 +92,15 @@ export const Conversations = ({ ListHeaderComponent }: ConversationsProps) => {
|
|
|
86
92
|
ListEmptyComponent={
|
|
87
93
|
<ConversationsBlankState
|
|
88
94
|
isFilterApplied={isFilterApplied}
|
|
95
|
+
isHiddenFilterApplied={!!show_hidden}
|
|
89
96
|
canCreateConversations={canCreateConversations}
|
|
90
97
|
/>
|
|
91
98
|
}
|
|
92
99
|
ListFooterComponent={
|
|
93
100
|
showArchivedResultsFooter ? (
|
|
94
101
|
<ArchivedResultsFooter onViewActiveConversations={clearFilters} />
|
|
102
|
+
) : showHiddenResultsFooter ? (
|
|
103
|
+
<HiddenResultsFooter />
|
|
95
104
|
) : showFilteredResultsFooter ? (
|
|
96
105
|
<FilteredResultsFooter />
|
|
97
106
|
) : null
|
|
@@ -6,16 +6,34 @@ import BlankState from '../primitive/blank_state_primitive'
|
|
|
6
6
|
|
|
7
7
|
interface ConversationsBlankStateProps {
|
|
8
8
|
isFilterApplied: boolean
|
|
9
|
+
isHiddenFilterApplied?: boolean
|
|
9
10
|
canCreateConversations: boolean
|
|
10
11
|
}
|
|
11
12
|
|
|
12
13
|
export function ConversationsBlankState({
|
|
13
14
|
isFilterApplied,
|
|
15
|
+
isHiddenFilterApplied = false,
|
|
14
16
|
canCreateConversations,
|
|
15
17
|
}: ConversationsBlankStateProps) {
|
|
16
18
|
const filterDropdownEnabled = useFilterDropdownEnabled()
|
|
17
19
|
const clearFilters = useClearConversationFilters()
|
|
18
20
|
|
|
21
|
+
if (isHiddenFilterApplied) {
|
|
22
|
+
return (
|
|
23
|
+
<View style={styles.container}>
|
|
24
|
+
<BlankState.Root>
|
|
25
|
+
<BlankState.Imagery name="general.hideEye" />
|
|
26
|
+
<BlankState.Content>
|
|
27
|
+
<BlankState.Heading>No hidden conversations</BlankState.Heading>
|
|
28
|
+
<BlankState.Text>
|
|
29
|
+
Swipe left on a conversation to hide it from your list.
|
|
30
|
+
</BlankState.Text>
|
|
31
|
+
</BlankState.Content>
|
|
32
|
+
</BlankState.Root>
|
|
33
|
+
</View>
|
|
34
|
+
)
|
|
35
|
+
}
|
|
36
|
+
|
|
19
37
|
if (filterDropdownEnabled && isFilterApplied) {
|
|
20
38
|
return (
|
|
21
39
|
<View style={styles.container}>
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
import React from 'react'
|
|
2
|
+
import { StyleSheet } from 'react-native'
|
|
3
|
+
import { useTheme } from '../../hooks'
|
|
4
|
+
import { MAX_FONT_SIZE_MULTIPLIER } from '../../utils'
|
|
5
|
+
import { Icon } from '../display'
|
|
6
|
+
|
|
7
|
+
export const HiddenIndicator = ({ hidden }: { hidden: boolean }) => {
|
|
8
|
+
const styles = useStyles()
|
|
9
|
+
|
|
10
|
+
if (!hidden) return null
|
|
11
|
+
|
|
12
|
+
return (
|
|
13
|
+
<Icon
|
|
14
|
+
name="general.hideEye"
|
|
15
|
+
style={styles.hiddenIcon}
|
|
16
|
+
testID="conversation-hidden-icon"
|
|
17
|
+
maxFontSizeMultiplier={MAX_FONT_SIZE_MULTIPLIER}
|
|
18
|
+
/>
|
|
19
|
+
)
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
const useStyles = () => {
|
|
23
|
+
const { colors } = useTheme()
|
|
24
|
+
return StyleSheet.create({
|
|
25
|
+
hiddenIcon: {
|
|
26
|
+
color: colors.iconColorDefaultDim,
|
|
27
|
+
fontSize: 16,
|
|
28
|
+
},
|
|
29
|
+
})
|
|
30
|
+
}
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
import React from 'react'
|
|
2
|
+
import { StyleSheet, View } from 'react-native'
|
|
3
|
+
import { Text } from '../display'
|
|
4
|
+
|
|
5
|
+
export function HiddenResultsFooter() {
|
|
6
|
+
return (
|
|
7
|
+
<View style={styles.container}>
|
|
8
|
+
<Text variant="tertiary" style={styles.text}>
|
|
9
|
+
Hidden just for you. A conversation comes back to your list when someone sends a new
|
|
10
|
+
message, unless it’s also silenced.
|
|
11
|
+
</Text>
|
|
12
|
+
</View>
|
|
13
|
+
)
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
const styles = StyleSheet.create({
|
|
17
|
+
container: {
|
|
18
|
+
alignItems: 'center',
|
|
19
|
+
paddingVertical: 24,
|
|
20
|
+
paddingHorizontal: 16,
|
|
21
|
+
},
|
|
22
|
+
text: {
|
|
23
|
+
textAlign: 'center',
|
|
24
|
+
},
|
|
25
|
+
})
|
|
@@ -54,6 +54,7 @@ export const ConversationsContextProvider = ({
|
|
|
54
54
|
group_source_app_name,
|
|
55
55
|
show_direct_messages,
|
|
56
56
|
show_archived,
|
|
57
|
+
show_hidden,
|
|
57
58
|
show_unread,
|
|
58
59
|
} = args
|
|
59
60
|
|
|
@@ -63,6 +64,7 @@ export const ConversationsContextProvider = ({
|
|
|
63
64
|
group_source_app_name,
|
|
64
65
|
show_direct_messages,
|
|
65
66
|
show_archived,
|
|
67
|
+
show_hidden,
|
|
66
68
|
show_unread,
|
|
67
69
|
},
|
|
68
70
|
paginatorOptions
|
|
@@ -26,6 +26,7 @@ const allKey = getRequestQueryKey(getConversationsRequestArgs({ gids: 'all' }))
|
|
|
26
26
|
const unreadKey = getRequestQueryKey(
|
|
27
27
|
getConversationsRequestArgs({ gids: 'all', show_unread: true })
|
|
28
28
|
)
|
|
29
|
+
const hiddenKey = getRequestQueryKey(getConversationsRequestArgs({ show_hidden: true }))
|
|
29
30
|
|
|
30
31
|
const listData = (conversations: ConversationResource[]) => ({
|
|
31
32
|
pages: [{ data: conversations, links: {}, meta: { count: conversations.length } }],
|
|
@@ -46,8 +47,8 @@ const wrapper = ({ children }: { children: React.ReactNode }) => (
|
|
|
46
47
|
<QueryClientProvider client={queryClient}>{children}</QueryClientProvider>
|
|
47
48
|
)
|
|
48
49
|
|
|
49
|
-
const renderHide = (target: ConversationResource = conversation) =>
|
|
50
|
-
renderHook(() => useHideConversation({ conversation: target }), { wrapper })
|
|
50
|
+
const renderHide = (target: ConversationResource = conversation, hidden?: boolean) =>
|
|
51
|
+
renderHook(() => useHideConversation({ conversation: target, hidden }), { wrapper })
|
|
51
52
|
|
|
52
53
|
describe('useHideConversation', () => {
|
|
53
54
|
beforeEach(() => {
|
|
@@ -144,4 +145,45 @@ describe('useHideConversation', () => {
|
|
|
144
145
|
"Couldn't hide this conversation. Please try again."
|
|
145
146
|
)
|
|
146
147
|
})
|
|
148
|
+
|
|
149
|
+
describe('from the hidden list', () => {
|
|
150
|
+
beforeEach(() => {
|
|
151
|
+
queryClient.setQueryData(hiddenKey, listData([conversation, otherConversation]))
|
|
152
|
+
})
|
|
153
|
+
|
|
154
|
+
it('removes the conversation from the hidden list before the request resolves', async () => {
|
|
155
|
+
mockPatch.mockReturnValue(new Promise(() => {}))
|
|
156
|
+
const { result } = renderHide(conversation, true)
|
|
157
|
+
|
|
158
|
+
expect(result.current.hidden).toBe(true)
|
|
159
|
+
|
|
160
|
+
await act(async () => result.current.setHidden(false))
|
|
161
|
+
|
|
162
|
+
expect(listIds(hiddenKey)).toEqual([8])
|
|
163
|
+
expect(listIds(allKey)).toEqual([7, 8])
|
|
164
|
+
})
|
|
165
|
+
|
|
166
|
+
it('puts the conversation back in the hidden list when unhiding fails', async () => {
|
|
167
|
+
mockPatch.mockRejectedValue(new Error('nope'))
|
|
168
|
+
const { result } = renderHide(conversation, true)
|
|
169
|
+
|
|
170
|
+
await act(() => result.current.mutateAsync(false).catch(() => {}))
|
|
171
|
+
|
|
172
|
+
expect(listIds(hiddenKey)).toEqual([7, 8])
|
|
173
|
+
expect(Alert.alert).toHaveBeenCalledWith(
|
|
174
|
+
'Oops',
|
|
175
|
+
"Couldn't unhide this conversation. Please try again."
|
|
176
|
+
)
|
|
177
|
+
})
|
|
178
|
+
|
|
179
|
+
it('refreshes the hidden list after hiding elsewhere', async () => {
|
|
180
|
+
mockPatch.mockResolvedValue({ data: {} })
|
|
181
|
+
const { result } = renderHide(otherConversation)
|
|
182
|
+
|
|
183
|
+
await act(() => result.current.mutateAsync(true))
|
|
184
|
+
|
|
185
|
+
expect(queryClient.getQueryState(hiddenKey)?.isInvalidated).toBe(true)
|
|
186
|
+
expect(queryClient.getQueryState(unreadKey)?.isInvalidated).toBe(false)
|
|
187
|
+
})
|
|
188
|
+
})
|
|
147
189
|
})
|
package/src/hooks/use_api.ts
CHANGED
|
@@ -84,6 +84,7 @@ export const useApiPaginator = <T extends ResourceObject>(
|
|
|
84
84
|
})
|
|
85
85
|
|
|
86
86
|
const data: T[] = query.data?.pages?.flatMap(page => page.data) || []
|
|
87
|
+
const totalCount = query.data?.pages?.[0]?.meta?.totalCount ?? data.length
|
|
87
88
|
|
|
88
|
-
return { ...query, data }
|
|
89
|
+
return { ...query, data, totalCount }
|
|
89
90
|
}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import { ConversationResource } from '../types'
|
|
2
|
+
import { getConversationsRequestArgs } from '../utils/request/conversation'
|
|
3
|
+
import { useApiPaginator } from './use_api'
|
|
4
|
+
import { useHideConversationsEnabled } from './use_hide_conversations_enabled'
|
|
5
|
+
|
|
6
|
+
export function useHiddenConversationsCount() {
|
|
7
|
+
const enabled = useHideConversationsEnabled()
|
|
8
|
+
const { totalCount } = useApiPaginator<ConversationResource>(
|
|
9
|
+
getConversationsRequestArgs({ show_hidden: true }),
|
|
10
|
+
{ enabled }
|
|
11
|
+
)
|
|
12
|
+
|
|
13
|
+
return enabled ? totalCount : 0
|
|
14
|
+
}
|
|
@@ -8,7 +8,10 @@ import {
|
|
|
8
8
|
} from '../types'
|
|
9
9
|
import { deleteRecordInPagesData } from '../utils/cache/page_mutations'
|
|
10
10
|
import { Haptic } from '../utils/native_adapters'
|
|
11
|
-
import {
|
|
11
|
+
import {
|
|
12
|
+
getConversationsRequestArgs,
|
|
13
|
+
HIDDEN_CONVERSATIONS_FILTER,
|
|
14
|
+
} from '../utils/request/conversation'
|
|
12
15
|
import { showToast } from '../utils/toast_store'
|
|
13
16
|
import { useApiClient } from './use_api_client'
|
|
14
17
|
import { getConversationRequestArgs } from './use_conversation'
|
|
@@ -22,14 +25,21 @@ export const HIDDEN_TOAST_SUBTITLE = "It'll come back if someone sends a new mes
|
|
|
22
25
|
export const HIDDEN_AND_SILENCED_TOAST_SUBTITLE =
|
|
23
26
|
"It's silenced too, so it stays hidden until you unhide it."
|
|
24
27
|
|
|
25
|
-
export const useHideConversation = ({
|
|
28
|
+
export const useHideConversation = ({
|
|
29
|
+
conversation,
|
|
30
|
+
hidden: knownHidden,
|
|
31
|
+
}: {
|
|
32
|
+
conversation: ConversationResource
|
|
33
|
+
hidden?: boolean
|
|
34
|
+
}) => {
|
|
26
35
|
const apiClient = useApiClient()
|
|
27
36
|
const queryClient = useQueryClient()
|
|
28
37
|
const listsQueryKey = [getConversationsRequestArgs().url]
|
|
38
|
+
const hiddenListsQueryKey = [...listsQueryKey, { filter: HIDDEN_CONVERSATIONS_FILTER }]
|
|
29
39
|
const conversationQueryKey = getRequestQueryKey(
|
|
30
40
|
getConversationRequestArgs({ conversation_id: conversation.id })
|
|
31
41
|
)
|
|
32
|
-
const hidden = !!conversation.conversationMembership?.hidden
|
|
42
|
+
const hidden = knownHidden ?? !!conversation.conversationMembership?.hidden
|
|
33
43
|
|
|
34
44
|
const setMembershipHidden = (value: boolean) =>
|
|
35
45
|
queryClient.setQueryData<ApiResource<ConversationResource>>(conversationQueryKey, prev => {
|
|
@@ -44,8 +54,8 @@ export const useHideConversation = ({ conversation }: { conversation: Conversati
|
|
|
44
54
|
}
|
|
45
55
|
})
|
|
46
56
|
|
|
47
|
-
const removeFromLists = () =>
|
|
48
|
-
queryClient.setQueriesData<ConversationsData>({ queryKey
|
|
57
|
+
const removeFromLists = (queryKey: QueryKey) =>
|
|
58
|
+
queryClient.setQueriesData<ConversationsData>({ queryKey }, prev => {
|
|
49
59
|
if (!prev?.pages) return prev
|
|
50
60
|
|
|
51
61
|
return deleteRecordInPagesData({ data: prev, record: { id: conversation.id } })
|
|
@@ -66,7 +76,7 @@ export const useHideConversation = ({ conversation }: { conversation: Conversati
|
|
|
66
76
|
queryKey: listsQueryKey,
|
|
67
77
|
})
|
|
68
78
|
|
|
69
|
-
|
|
79
|
+
removeFromLists(value ? listsQueryKey : hiddenListsQueryKey)
|
|
70
80
|
setMembershipHidden(value)
|
|
71
81
|
|
|
72
82
|
return { previousLists }
|
|
@@ -87,6 +97,7 @@ export const useHideConversation = ({ conversation }: { conversation: Conversati
|
|
|
87
97
|
return
|
|
88
98
|
}
|
|
89
99
|
|
|
100
|
+
queryClient.invalidateQueries({ queryKey: hiddenListsQueryKey })
|
|
90
101
|
showToast({
|
|
91
102
|
title: HIDDEN_TOAST_TITLE,
|
|
92
103
|
subtitle: conversation.muted ? HIDDEN_AND_SILENCED_TOAST_SUBTITLE : HIDDEN_TOAST_SUBTITLE,
|
|
@@ -100,8 +111,7 @@ export const useHideConversation = ({ conversation }: { conversation: Conversati
|
|
|
100
111
|
})
|
|
101
112
|
},
|
|
102
113
|
onError: (_error, value, context) => {
|
|
103
|
-
if (
|
|
104
|
-
else if (context) restoreLists(context.previousLists)
|
|
114
|
+
if (context) restoreLists(context.previousLists)
|
|
105
115
|
setMembershipHidden(!value)
|
|
106
116
|
Alert.alert(
|
|
107
117
|
'Oops',
|
|
@@ -18,6 +18,14 @@ let mockCanBrowseArchived = false
|
|
|
18
18
|
jest.mock('../../../hooks/use_can_browse_archived_conversations', () => ({
|
|
19
19
|
useCanBrowseArchivedConversations: () => mockCanBrowseArchived,
|
|
20
20
|
}))
|
|
21
|
+
let mockHideEnabled = false
|
|
22
|
+
jest.mock('../../../hooks/use_hide_conversations_enabled', () => ({
|
|
23
|
+
useHideConversationsEnabled: () => mockHideEnabled,
|
|
24
|
+
}))
|
|
25
|
+
let mockHiddenCount = 0
|
|
26
|
+
jest.mock('../../../hooks/use_hidden_conversations_count', () => ({
|
|
27
|
+
useHiddenConversationsCount: () => mockHiddenCount,
|
|
28
|
+
}))
|
|
21
29
|
jest.mock('../../../hooks/use_direct_messages_eligible', () => ({
|
|
22
30
|
useDirectMessagesEligible: () => false,
|
|
23
31
|
}))
|
|
@@ -66,6 +74,7 @@ describe('ConversationFilters archived option', () => {
|
|
|
66
74
|
|
|
67
75
|
expect(view.queryByText('Other')).toBeNull()
|
|
68
76
|
expect(view.queryByText('Archived conversations')).toBeNull()
|
|
77
|
+
expect(view.queryByText('Hidden conversations')).toBeNull()
|
|
69
78
|
})
|
|
70
79
|
|
|
71
80
|
it('offers Archived under Other when the person can browse archived conversations', () => {
|
|
@@ -99,3 +108,36 @@ describe('ConversationFilters archived option', () => {
|
|
|
99
108
|
expect(within(selected).getByText('Archived conversations')).toBeTruthy()
|
|
100
109
|
})
|
|
101
110
|
})
|
|
111
|
+
|
|
112
|
+
describe('ConversationFilters hidden option', () => {
|
|
113
|
+
beforeEach(() => {
|
|
114
|
+
mockSetAppFilter.mockClear()
|
|
115
|
+
mockCanBrowseArchived = false
|
|
116
|
+
mockHideEnabled = true
|
|
117
|
+
mockHiddenCount = 3
|
|
118
|
+
})
|
|
119
|
+
|
|
120
|
+
it('offers Hidden conversations under Other with the hidden count', () => {
|
|
121
|
+
const view = renderFilters()
|
|
122
|
+
|
|
123
|
+
expect(view.getByText('Other')).toBeTruthy()
|
|
124
|
+
expect(view.getByText('Hidden conversations')).toBeTruthy()
|
|
125
|
+
expect(view.getByText('Hidden for just you')).toBeTruthy()
|
|
126
|
+
expect(view.getByTestId('filter-row-count')).toHaveTextContent('3')
|
|
127
|
+
})
|
|
128
|
+
|
|
129
|
+
it('selecting Hidden conversations sets the hidden filter param', () => {
|
|
130
|
+
const view = renderFilters()
|
|
131
|
+
|
|
132
|
+
fireEvent.press(view.getByText('Hidden conversations'))
|
|
133
|
+
|
|
134
|
+
expect(mockSetAppFilter).toHaveBeenCalledWith({ show_hidden: true })
|
|
135
|
+
})
|
|
136
|
+
|
|
137
|
+
it('preselects Hidden conversations when it is the active filter', () => {
|
|
138
|
+
const view = renderFilters({ show_hidden: true })
|
|
139
|
+
|
|
140
|
+
const selected = view.getByRole('button', { selected: true })
|
|
141
|
+
expect(within(selected).getByText('Hidden conversations')).toBeTruthy()
|
|
142
|
+
})
|
|
143
|
+
})
|
|
@@ -10,7 +10,9 @@ import {
|
|
|
10
10
|
useTheme,
|
|
11
11
|
} from '../../../hooks'
|
|
12
12
|
import { useFilterDropdownEnabled } from '../../../hooks/use_filter_dropdown_enabled'
|
|
13
|
-
import {
|
|
13
|
+
import { useHiddenConversationsCount } from '../../../hooks/use_hidden_conversations_count'
|
|
14
|
+
import { useHideConversationsEnabled } from '../../../hooks/use_hide_conversations_enabled'
|
|
15
|
+
import { faBoxArchive, faEyeSlash } from '../../../vendor/font_awesome_pro_solid_icons'
|
|
14
16
|
import { FilterContext, useFilterContext } from '../context/conversation_filter_context'
|
|
15
17
|
import { FilterTypes } from '../filter_types'
|
|
16
18
|
import { useGroupsToFilter, useTeamsToFilter } from '../hooks/filters'
|
|
@@ -69,6 +71,7 @@ export const ConversationFilters = () => {
|
|
|
69
71
|
group_source_app_name = '',
|
|
70
72
|
show_direct_messages,
|
|
71
73
|
show_archived,
|
|
74
|
+
show_hidden,
|
|
72
75
|
} = params
|
|
73
76
|
|
|
74
77
|
const filterDropdownEnabled = useFilterDropdownEnabled()
|
|
@@ -76,6 +79,9 @@ export const ConversationFilters = () => {
|
|
|
76
79
|
const hasDirectMessages = useHasDirectMessages()
|
|
77
80
|
const canFilterByDMs = directMessagesEligible && hasDirectMessages
|
|
78
81
|
const canFilterByArchived = useCanBrowseArchivedConversations()
|
|
82
|
+
const canFilterByHidden = useHideConversationsEnabled()
|
|
83
|
+
const hiddenCount = useHiddenConversationsCount()
|
|
84
|
+
const showOtherFilters = canFilterByArchived || canFilterByHidden
|
|
79
85
|
|
|
80
86
|
const activeFilter: FilterTypes = useMemo(() => {
|
|
81
87
|
if (chat_group_graph_id) {
|
|
@@ -88,10 +94,12 @@ export const ConversationFilters = () => {
|
|
|
88
94
|
return FilterTypes.DirectMessages
|
|
89
95
|
} else if (show_archived) {
|
|
90
96
|
return FilterTypes.Archived
|
|
97
|
+
} else if (show_hidden) {
|
|
98
|
+
return FilterTypes.Hidden
|
|
91
99
|
}
|
|
92
100
|
|
|
93
101
|
return FilterTypes.All
|
|
94
|
-
}, [chat_group_graph_id, group_source_app_name, show_direct_messages, show_archived])
|
|
102
|
+
}, [chat_group_graph_id, group_source_app_name, show_direct_messages, show_archived, show_hidden])
|
|
95
103
|
|
|
96
104
|
const { groups = [] } = useGroupsToFilter()
|
|
97
105
|
const { teams = [] } = useTeamsToFilter()
|
|
@@ -173,7 +181,7 @@ export const ConversationFilters = () => {
|
|
|
173
181
|
data: { routeName: 'TeamFilters' },
|
|
174
182
|
},
|
|
175
183
|
{
|
|
176
|
-
type:
|
|
184
|
+
type: showOtherFilters ? SectionTypes.header : SectionTypes.hidden,
|
|
177
185
|
data: { title: 'Other', style: styles.extraHeaderScalableSpace },
|
|
178
186
|
},
|
|
179
187
|
{
|
|
@@ -186,6 +194,17 @@ export const ConversationFilters = () => {
|
|
|
186
194
|
isActive: activeFilter === FilterTypes.Archived,
|
|
187
195
|
},
|
|
188
196
|
},
|
|
197
|
+
{
|
|
198
|
+
type: canFilterByHidden ? SectionTypes.other : SectionTypes.hidden,
|
|
199
|
+
data: {
|
|
200
|
+
filter: FilterTypes.Hidden,
|
|
201
|
+
description: 'Hidden for just you',
|
|
202
|
+
icon: faEyeSlash,
|
|
203
|
+
show_hidden: true,
|
|
204
|
+
count: hiddenCount,
|
|
205
|
+
isActive: activeFilter === FilterTypes.Hidden,
|
|
206
|
+
},
|
|
207
|
+
},
|
|
189
208
|
]
|
|
190
209
|
|
|
191
210
|
return (
|