@planningcenter/chat-react-native 4.7.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 +333 -193
- 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/components/display/toast.d.ts +3 -0
- package/build/components/display/toast.d.ts.map +1 -0
- package/build/components/display/toast.js +224 -0
- package/build/components/display/toast.js.map +1 -0
- package/build/components/group_conversation_list.d.ts.map +1 -1
- package/build/components/group_conversation_list.js +1 -0
- package/build/components/group_conversation_list.js.map +1 -1
- package/build/contexts/conversations_context.d.ts +3 -1
- package/build/contexts/conversations_context.d.ts.map +1 -1
- package/build/contexts/conversations_context.js +39 -31
- 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_conversation.d.ts.map +1 -1
- package/build/hooks/use_conversation.js +1 -1
- package/build/hooks/use_conversation.js.map +1 -1
- package/build/hooks/use_features.d.ts +1 -0
- package/build/hooks/use_features.d.ts.map +1 -1
- package/build/hooks/use_features.js +2 -1
- package/build/hooks/use_features.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 +108 -0
- package/build/hooks/use_hide_conversation.d.ts.map +1 -0
- package/build/hooks/use_hide_conversation.js +243 -0
- package/build/hooks/use_hide_conversation.js.map +1 -0
- package/build/hooks/use_hide_conversations_enabled.d.ts +2 -0
- package/build/hooks/use_hide_conversations_enabled.d.ts.map +1 -0
- package/build/hooks/use_hide_conversations_enabled.js +18 -0
- package/build/hooks/use_hide_conversations_enabled.js.map +1 -0
- package/build/hooks/use_teams.d.ts +6 -0
- package/build/hooks/use_teams.d.ts.map +1 -1
- package/build/navigation/index.d.ts +5 -0
- package/build/navigation/index.d.ts.map +1 -1
- package/build/navigation/index.js +5 -0
- package/build/navigation/index.js.map +1 -1
- package/build/screens/conversation_actions_screen.d.ts +7 -0
- package/build/screens/conversation_actions_screen.d.ts.map +1 -0
- package/build/screens/conversation_actions_screen.js +89 -0
- package/build/screens/conversation_actions_screen.js.map +1 -0
- package/build/screens/conversation_details_screen.d.ts.map +1 -1
- package/build/screens/conversation_details_screen.js +460 -394
- package/build/screens/conversation_details_screen.js.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 +18 -10
- package/build/screens/conversations/conversations_screen.js.map +1 -1
- package/build/screens/index.d.ts +1 -0
- package/build/screens/index.d.ts.map +1 -1
- package/build/screens/index.js +1 -0
- package/build/screens/index.js.map +1 -1
- package/build/types/resources/conversation_membership.d.ts +1 -0
- package/build/types/resources/conversation_membership.d.ts.map +1 -1
- package/build/types/resources/conversation_membership.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/utils/toast_store.d.ts +21 -0
- package/build/utils/toast_store.d.ts.map +1 -0
- package/build/utils/toast_store.js +27 -0
- package/build/utils/toast_store.js.map +1 -0
- 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 +77 -2
- 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 +73 -4
- 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/components/display/__tests__/toast.test.tsx +55 -0
- package/src/components/display/toast.tsx +115 -0
- package/src/components/group_conversation_list.tsx +4 -1
- package/src/contexts/conversations_context.tsx +8 -1
- package/src/hooks/__tests__/use_hide_conversation.test.tsx +189 -0
- package/src/hooks/use_api.ts +2 -1
- package/src/hooks/use_clear_conversation_filters.ts +1 -0
- package/src/hooks/use_conversation.ts +1 -0
- package/src/hooks/use_features.ts +1 -0
- package/src/hooks/use_hidden_conversations_count.ts +14 -0
- package/src/hooks/use_hide_conversation.ts +128 -0
- package/src/hooks/use_hide_conversations_enabled.ts +7 -0
- package/src/navigation/index.tsx +8 -0
- package/src/screens/__tests__/conversation_actions_screen.test.tsx +79 -0
- package/src/screens/__tests__/conversation_details_screen.test.tsx +49 -1
- package/src/screens/conversation_actions_screen.tsx +53 -0
- package/src/screens/conversation_details_screen.tsx +19 -0
- 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/__tests__/conversations_screen.test.tsx +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 +3 -0
- package/src/screens/index.ts +1 -0
- package/src/types/resources/conversation_membership.ts +1 -0
- package/src/utils/request/conversation.ts +6 -0
- package/src/utils/toast_store.ts +45 -0
- package/src/vendor/font_awesome_pro_solid_icons.ts +12 -0
|
@@ -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 (
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { IconDefinition } from '@fortawesome/fontawesome-svg-core'
|
|
2
2
|
import { PlatformPressable } from '@react-navigation/elements'
|
|
3
3
|
import { NavigationProp, useNavigation } from '@react-navigation/native'
|
|
4
|
-
import React, { PropsWithChildren, useContext } from 'react'
|
|
4
|
+
import React, { PropsWithChildren, ReactNode, useContext } from 'react'
|
|
5
5
|
import { StyleSheet, View, ViewStyle } from 'react-native'
|
|
6
6
|
import { Heading, Icon, IconTile, Image, Text, TextButton } from '../../../components'
|
|
7
7
|
import {
|
|
@@ -118,18 +118,38 @@ export const TeamRow = ({ team }: TeamRowProps) => {
|
|
|
118
118
|
|
|
119
119
|
export type OtherRowProps = {
|
|
120
120
|
show_archived?: boolean
|
|
121
|
+
show_hidden?: boolean
|
|
122
|
+
count?: number
|
|
121
123
|
isActive: boolean
|
|
122
124
|
filter: FilterTypes
|
|
123
125
|
description: string
|
|
124
126
|
icon: IconDefinition
|
|
125
127
|
}
|
|
126
128
|
|
|
127
|
-
export const OtherRow = ({
|
|
129
|
+
export const OtherRow = ({
|
|
130
|
+
show_archived,
|
|
131
|
+
show_hidden,
|
|
132
|
+
count,
|
|
133
|
+
isActive,
|
|
134
|
+
filter,
|
|
135
|
+
description,
|
|
136
|
+
icon,
|
|
137
|
+
}: OtherRowProps) => {
|
|
128
138
|
const styles = useRowStyles()
|
|
129
139
|
const { setAppFilter } = useContext(FilterContext)
|
|
130
140
|
|
|
131
141
|
return (
|
|
132
|
-
<PressableRow
|
|
142
|
+
<PressableRow
|
|
143
|
+
onPress={() => setAppFilter({ show_archived, show_hidden })}
|
|
144
|
+
isActive={isActive}
|
|
145
|
+
trailing={
|
|
146
|
+
count !== undefined && (
|
|
147
|
+
<Text variant="tertiary" testID="filter-row-count">
|
|
148
|
+
{count}
|
|
149
|
+
</Text>
|
|
150
|
+
)
|
|
151
|
+
}
|
|
152
|
+
>
|
|
133
153
|
<IconTile icon={icon} shape="square" size="lg" />
|
|
134
154
|
<View style={styles.rowTextContainer}>
|
|
135
155
|
<Heading variant="h3" style={styles.rowTitle}>
|
|
@@ -163,7 +183,13 @@ export const PressableRow = ({
|
|
|
163
183
|
isActive,
|
|
164
184
|
onPress,
|
|
165
185
|
style,
|
|
166
|
-
|
|
186
|
+
trailing,
|
|
187
|
+
}: PropsWithChildren<{
|
|
188
|
+
isActive: boolean
|
|
189
|
+
onPress: () => void
|
|
190
|
+
style?: ViewStyle
|
|
191
|
+
trailing?: ReactNode
|
|
192
|
+
}>) => {
|
|
167
193
|
const styles = useRowStyles({ isActive })
|
|
168
194
|
return (
|
|
169
195
|
<PlatformPressable
|
|
@@ -174,12 +200,15 @@ export const PressableRow = ({
|
|
|
174
200
|
>
|
|
175
201
|
<View style={styles.row}>
|
|
176
202
|
<View style={[styles.rowInner, style]}>{children}</View>
|
|
177
|
-
<
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
203
|
+
<View style={styles.rowTrailing}>
|
|
204
|
+
{trailing}
|
|
205
|
+
<Icon
|
|
206
|
+
name="general.check"
|
|
207
|
+
style={styles.rowIconRight}
|
|
208
|
+
accessibilityElementsHidden
|
|
209
|
+
maxFontSizeMultiplier={2.5}
|
|
210
|
+
/>
|
|
211
|
+
</View>
|
|
183
212
|
</View>
|
|
184
213
|
</PlatformPressable>
|
|
185
214
|
)
|
|
@@ -219,6 +248,11 @@ const useRowStyles = ({ isActive = false }: { isActive?: boolean } = {}) => {
|
|
|
219
248
|
rowTextContainer: {
|
|
220
249
|
flexShrink: 1,
|
|
221
250
|
},
|
|
251
|
+
rowTrailing: {
|
|
252
|
+
flexDirection: 'row',
|
|
253
|
+
alignItems: 'center',
|
|
254
|
+
gap: 12,
|
|
255
|
+
},
|
|
222
256
|
rowWithoutBorder: {
|
|
223
257
|
flexDirection: 'row',
|
|
224
258
|
alignItems: 'center',
|
|
@@ -23,6 +23,7 @@ export const FilterContext = createContext<{
|
|
|
23
23
|
group_source_app_name: undefined,
|
|
24
24
|
show_direct_messages: undefined,
|
|
25
25
|
show_archived: undefined,
|
|
26
|
+
show_hidden: undefined,
|
|
26
27
|
show_unread: undefined,
|
|
27
28
|
},
|
|
28
29
|
scrollOffset: 0,
|
|
@@ -60,6 +61,7 @@ export const FilterProvider = ({ children }: PropsWithChildren) => {
|
|
|
60
61
|
group_source_app_name: undefined,
|
|
61
62
|
show_direct_messages: undefined,
|
|
62
63
|
show_archived: undefined,
|
|
64
|
+
show_hidden: undefined,
|
|
63
65
|
show_unread: undefined,
|
|
64
66
|
})
|
|
65
67
|
)
|
|
@@ -70,6 +72,7 @@ export const FilterProvider = ({ children }: PropsWithChildren) => {
|
|
|
70
72
|
group_source_app_name: undefined,
|
|
71
73
|
show_direct_messages: undefined,
|
|
72
74
|
show_archived: undefined,
|
|
75
|
+
show_hidden: undefined,
|
|
73
76
|
show_unread: undefined,
|
|
74
77
|
})
|
|
75
78
|
},
|
|
@@ -79,6 +82,7 @@ export const FilterProvider = ({ children }: PropsWithChildren) => {
|
|
|
79
82
|
group_source_app_name: params.group_source_app_name,
|
|
80
83
|
show_direct_messages: params.show_direct_messages,
|
|
81
84
|
show_archived: params.show_archived,
|
|
85
|
+
show_hidden: params.show_hidden,
|
|
82
86
|
show_unread: undefined,
|
|
83
87
|
})
|
|
84
88
|
},
|
|
@@ -27,6 +27,7 @@ jest.mock('../../../components', () => ({
|
|
|
27
27
|
<ListHeaderComponent />
|
|
28
28
|
),
|
|
29
29
|
}))
|
|
30
|
+
jest.mock('../../../components/display/toast', () => ({ Toast: () => null }))
|
|
30
31
|
jest.mock('../components/list_header_component', () => {
|
|
31
32
|
const { Text } = require('react-native')
|
|
32
33
|
return { ListHeaderComponent: () => <Text>Default header</Text> }
|
|
@@ -19,6 +19,7 @@ const mockRouteParams: Record<string, unknown> = {}
|
|
|
19
19
|
const mockCanDisplayGroups = jest.fn()
|
|
20
20
|
const mockSearchEnabled = jest.fn()
|
|
21
21
|
const mockCanBrowseArchived = jest.fn()
|
|
22
|
+
const mockHideEnabled = jest.fn()
|
|
22
23
|
const mockGroupsByGraphId: Record<string, { name: string }> = {}
|
|
23
24
|
|
|
24
25
|
jest.mock('@react-navigation/native', () => ({
|
|
@@ -44,6 +45,9 @@ jest.mock('../../../../hooks/use_has_direct_messages', () => ({
|
|
|
44
45
|
jest.mock('../../../../hooks/use_can_browse_archived_conversations', () => ({
|
|
45
46
|
useCanBrowseArchivedConversations: () => mockCanBrowseArchived(),
|
|
46
47
|
}))
|
|
48
|
+
jest.mock('../../../../hooks/use_hide_conversations_enabled', () => ({
|
|
49
|
+
useHideConversationsEnabled: () => mockHideEnabled(),
|
|
50
|
+
}))
|
|
47
51
|
jest.mock('../../../../hooks/use_chat_permissions', () => ({
|
|
48
52
|
useCanCreateConversations: () => true,
|
|
49
53
|
}))
|
|
@@ -140,6 +144,7 @@ describe('FilterDropdownListHeaderComponent', () => {
|
|
|
140
144
|
mockSetParams.mockClear()
|
|
141
145
|
mockSearchEnabled.mockReturnValue(true)
|
|
142
146
|
mockCanBrowseArchived.mockReturnValue(false)
|
|
147
|
+
mockHideEnabled.mockReturnValue(false)
|
|
143
148
|
setCapabilities({ groups: true, teams: true })
|
|
144
149
|
setRouteParams({})
|
|
145
150
|
})
|
|
@@ -272,6 +277,43 @@ describe('FilterDropdownListHeaderComponent', () => {
|
|
|
272
277
|
expect(view.queryByText('Mark all read')).toBeNull()
|
|
273
278
|
})
|
|
274
279
|
|
|
280
|
+
it('offers More filters when hidden conversations are the only extra filter', () => {
|
|
281
|
+
setCapabilities({ groups: false, teams: false })
|
|
282
|
+
mockHideEnabled.mockReturnValue(true)
|
|
283
|
+
|
|
284
|
+
render(<FilterDropdownListHeaderComponent />)
|
|
285
|
+
|
|
286
|
+
expect(menuItemNames()).toEqual(['All', 'DMs', 'Unread', 'More filters'])
|
|
287
|
+
})
|
|
288
|
+
|
|
289
|
+
it('labels the hidden list and carries it into More filters', () => {
|
|
290
|
+
setRouteParams({ show_hidden: true })
|
|
291
|
+
|
|
292
|
+
render(<FilterDropdownListHeaderComponent />)
|
|
293
|
+
|
|
294
|
+
expect(screen.getByRole('button', { name: 'Hidden' })).toBeTruthy()
|
|
295
|
+
expect(screen.queryByText('Mark all read')).toBeNull()
|
|
296
|
+
|
|
297
|
+
fireEvent.press(screen.getByRole('menuitem', { name: 'More filters' }))
|
|
298
|
+
|
|
299
|
+
expect(mockNavigate).toHaveBeenCalledWith(
|
|
300
|
+
'ConversationFilters',
|
|
301
|
+
expect.objectContaining({ show_hidden: true })
|
|
302
|
+
)
|
|
303
|
+
})
|
|
304
|
+
|
|
305
|
+
it('leaves the hidden list when another filter is picked', () => {
|
|
306
|
+
setRouteParams({ show_hidden: true })
|
|
307
|
+
|
|
308
|
+
render(<FilterDropdownListHeaderComponent />)
|
|
309
|
+
|
|
310
|
+
fireEvent.press(screen.getByRole('menuitem', { name: 'Unread' }))
|
|
311
|
+
|
|
312
|
+
expect(mockSetParams).toHaveBeenCalledWith(
|
|
313
|
+
expect.objectContaining({ show_unread: true, show_hidden: undefined })
|
|
314
|
+
)
|
|
315
|
+
})
|
|
316
|
+
|
|
275
317
|
it('leaves the archived list when another filter is picked', () => {
|
|
276
318
|
setRouteParams({ show_archived: true })
|
|
277
319
|
|
|
@@ -19,6 +19,7 @@ import {
|
|
|
19
19
|
import { useApiGet } from '../../../hooks/use_api'
|
|
20
20
|
import { useMarkAllRead } from '../../../hooks/use_conversations_actions'
|
|
21
21
|
import { useCanDisplayGroups } from '../../../hooks/use_groups'
|
|
22
|
+
import { useHideConversationsEnabled } from '../../../hooks/use_hide_conversations_enabled'
|
|
22
23
|
import { useNewConversationFromFilter } from '../../../hooks/use_new_conversation_from_filter'
|
|
23
24
|
import { useSearchEnabled } from '../../../hooks/use_search_enabled'
|
|
24
25
|
import { GraphId, GroupResource } from '../../../types/resources/group_resource'
|
|
@@ -34,6 +35,7 @@ const TRIGGER_CAP_SLACK = 2
|
|
|
34
35
|
const LAYOUT_JITTER = 1
|
|
35
36
|
const ALL_CONVERSATIONS_LABEL = 'All conversations'
|
|
36
37
|
const ARCHIVED_LABEL = 'Archived'
|
|
38
|
+
const HIDDEN_LABEL = 'Hidden'
|
|
37
39
|
|
|
38
40
|
enum FilterTypes {
|
|
39
41
|
All = 'All',
|
|
@@ -63,6 +65,7 @@ export const FilterDropdownListHeaderComponent = () => {
|
|
|
63
65
|
const hasDirectMessages = useHasDirectMessages()
|
|
64
66
|
const canFilterByDMs = directMessagesEligible && hasDirectMessages
|
|
65
67
|
const canBrowseArchived = useCanBrowseArchivedConversations()
|
|
68
|
+
const hideConversationsEnabled = useHideConversationsEnabled()
|
|
66
69
|
const searchEnabled = useSearchEnabled()
|
|
67
70
|
const route = useRoute<RouteProp<ConversationsScreenProps['route']>>()
|
|
68
71
|
const {
|
|
@@ -71,6 +74,7 @@ export const FilterDropdownListHeaderComponent = () => {
|
|
|
71
74
|
group_source_app_name = '',
|
|
72
75
|
show_direct_messages,
|
|
73
76
|
show_archived,
|
|
77
|
+
show_hidden,
|
|
74
78
|
show_unread,
|
|
75
79
|
} = route.params || {}
|
|
76
80
|
const currentPersonCache = useCurrentPersonCache()
|
|
@@ -86,7 +90,7 @@ export const FilterDropdownListHeaderComponent = () => {
|
|
|
86
90
|
)
|
|
87
91
|
|
|
88
92
|
const active: FilterTypes = useMemo(() => {
|
|
89
|
-
if (chat_group_graph_id || show_archived) {
|
|
93
|
+
if (chat_group_graph_id || show_archived || show_hidden) {
|
|
90
94
|
return FilterTypes.More
|
|
91
95
|
} else if (/groups/i.test(group_source_app_name)) {
|
|
92
96
|
return FilterTypes.Groups
|
|
@@ -99,7 +103,14 @@ export const FilterDropdownListHeaderComponent = () => {
|
|
|
99
103
|
}
|
|
100
104
|
|
|
101
105
|
return FilterTypes.All
|
|
102
|
-
}, [
|
|
106
|
+
}, [
|
|
107
|
+
chat_group_graph_id,
|
|
108
|
+
group_source_app_name,
|
|
109
|
+
show_direct_messages,
|
|
110
|
+
show_archived,
|
|
111
|
+
show_hidden,
|
|
112
|
+
show_unread,
|
|
113
|
+
])
|
|
103
114
|
|
|
104
115
|
const options: FilterDropdownOption[] = useMemo(
|
|
105
116
|
() => [
|
|
@@ -115,10 +126,11 @@ export const FilterDropdownListHeaderComponent = () => {
|
|
|
115
126
|
const triggerLabel = useMemo(() => {
|
|
116
127
|
if (chat_group_graph_id) return group?.name || title || ALL_CONVERSATIONS_LABEL
|
|
117
128
|
if (show_archived) return ARCHIVED_LABEL
|
|
129
|
+
if (show_hidden) return HIDDEN_LABEL
|
|
118
130
|
if (active === FilterTypes.All) return ALL_CONVERSATIONS_LABEL
|
|
119
131
|
|
|
120
132
|
return active
|
|
121
|
-
}, [chat_group_graph_id, group?.name, title, show_archived, active])
|
|
133
|
+
}, [chat_group_graph_id, group?.name, title, show_archived, show_hidden, active])
|
|
122
134
|
|
|
123
135
|
const handleNewConversationNavigation = useCallback(() => {
|
|
124
136
|
if (newConversationFromFilter || entryMode === 'select_type') {
|
|
@@ -158,6 +170,7 @@ export const FilterDropdownListHeaderComponent = () => {
|
|
|
158
170
|
group_source_app_name: undefined,
|
|
159
171
|
show_direct_messages: undefined,
|
|
160
172
|
show_archived: undefined,
|
|
173
|
+
show_hidden: undefined,
|
|
161
174
|
show_unread: undefined,
|
|
162
175
|
...params,
|
|
163
176
|
})
|
|
@@ -187,6 +200,7 @@ export const FilterDropdownListHeaderComponent = () => {
|
|
|
187
200
|
group_source_app_name,
|
|
188
201
|
show_direct_messages,
|
|
189
202
|
show_archived,
|
|
203
|
+
show_hidden,
|
|
190
204
|
show_unread,
|
|
191
205
|
})
|
|
192
206
|
}, [
|
|
@@ -195,6 +209,7 @@ export const FilterDropdownListHeaderComponent = () => {
|
|
|
195
209
|
group_source_app_name,
|
|
196
210
|
show_direct_messages,
|
|
197
211
|
show_archived,
|
|
212
|
+
show_hidden,
|
|
198
213
|
show_unread,
|
|
199
214
|
])
|
|
200
215
|
|
|
@@ -213,7 +228,8 @@ export const FilterDropdownListHeaderComponent = () => {
|
|
|
213
228
|
])
|
|
214
229
|
}, [active, handleMarkAllRead])
|
|
215
230
|
|
|
216
|
-
const showMoreFilters =
|
|
231
|
+
const showMoreFilters =
|
|
232
|
+
canFilterByGroups || canFilterByTeams || canBrowseArchived || hideConversationsEnabled
|
|
217
233
|
|
|
218
234
|
const styles = useStyles()
|
|
219
235
|
|
|
@@ -301,7 +317,7 @@ export const FilterDropdownListHeaderComponent = () => {
|
|
|
301
317
|
)}
|
|
302
318
|
</View>
|
|
303
319
|
</View>
|
|
304
|
-
{!show_archived && (
|
|
320
|
+
{!show_archived && !show_hidden && (
|
|
305
321
|
<View style={styles.markAllReadRow}>
|
|
306
322
|
<TextButton
|
|
307
323
|
onPress={alertMarkAllRead}
|
|
@@ -45,6 +45,7 @@ export const ListHeaderComponent = () => {
|
|
|
45
45
|
group_source_app_name = '',
|
|
46
46
|
show_direct_messages,
|
|
47
47
|
show_archived,
|
|
48
|
+
show_hidden,
|
|
48
49
|
} = route.params || {}
|
|
49
50
|
const currentPersonCache = useCurrentPersonCache()
|
|
50
51
|
const { markAllRead, isPending } = useMarkAllRead()
|
|
@@ -55,7 +56,7 @@ export const ListHeaderComponent = () => {
|
|
|
55
56
|
)
|
|
56
57
|
|
|
57
58
|
const active: FilterTypes = useMemo(() => {
|
|
58
|
-
if (chat_group_graph_id || show_archived) {
|
|
59
|
+
if (chat_group_graph_id || show_archived || show_hidden) {
|
|
59
60
|
return FilterTypes.More
|
|
60
61
|
} else if (/groups/i.test(group_source_app_name)) {
|
|
61
62
|
return FilterTypes.Groups
|
|
@@ -66,7 +67,7 @@ export const ListHeaderComponent = () => {
|
|
|
66
67
|
}
|
|
67
68
|
|
|
68
69
|
return FilterTypes.All
|
|
69
|
-
}, [chat_group_graph_id, group_source_app_name, show_direct_messages, show_archived])
|
|
70
|
+
}, [chat_group_graph_id, group_source_app_name, show_direct_messages, show_archived, show_hidden])
|
|
70
71
|
|
|
71
72
|
const handleNewConversationNavigation = useCallback(() => {
|
|
72
73
|
if (newConversationFromFilter || entryMode === 'select_type') {
|
|
@@ -106,6 +107,7 @@ export const ListHeaderComponent = () => {
|
|
|
106
107
|
group_source_app_name: undefined,
|
|
107
108
|
show_direct_messages: undefined,
|
|
108
109
|
show_archived: undefined,
|
|
110
|
+
show_hidden: undefined,
|
|
109
111
|
...params,
|
|
110
112
|
})
|
|
111
113
|
},
|
|
@@ -122,8 +124,16 @@ export const ListHeaderComponent = () => {
|
|
|
122
124
|
group_source_app_name,
|
|
123
125
|
show_direct_messages,
|
|
124
126
|
show_archived,
|
|
127
|
+
show_hidden,
|
|
125
128
|
})
|
|
126
|
-
}, [
|
|
129
|
+
}, [
|
|
130
|
+
navigation,
|
|
131
|
+
chat_group_graph_id,
|
|
132
|
+
group_source_app_name,
|
|
133
|
+
show_direct_messages,
|
|
134
|
+
show_archived,
|
|
135
|
+
show_hidden,
|
|
136
|
+
])
|
|
127
137
|
|
|
128
138
|
const handleMarkAllRead = useCallback(() => {
|
|
129
139
|
currentPersonCache.update({ unreadCount: 0 })
|
|
@@ -164,7 +174,7 @@ export const ListHeaderComponent = () => {
|
|
|
164
174
|
<Heading numberOfLines={1} variant="h2">
|
|
165
175
|
Conversations
|
|
166
176
|
</Heading>
|
|
167
|
-
{!show_archived && (
|
|
177
|
+
{!show_archived && !show_hidden && (
|
|
168
178
|
<TextButton
|
|
169
179
|
onPress={alertMarkAllRead}
|
|
170
180
|
disabled={isPending}
|
|
@@ -45,6 +45,7 @@ export const SearchListHeaderComponent = () => {
|
|
|
45
45
|
group_source_app_name = '',
|
|
46
46
|
show_direct_messages,
|
|
47
47
|
show_archived,
|
|
48
|
+
show_hidden,
|
|
48
49
|
} = route.params || {}
|
|
49
50
|
const currentPersonCache = useCurrentPersonCache()
|
|
50
51
|
const { markAllRead, isPending } = useMarkAllRead()
|
|
@@ -55,7 +56,7 @@ export const SearchListHeaderComponent = () => {
|
|
|
55
56
|
)
|
|
56
57
|
|
|
57
58
|
const active: FilterTypes = useMemo(() => {
|
|
58
|
-
if (chat_group_graph_id || show_archived) {
|
|
59
|
+
if (chat_group_graph_id || show_archived || show_hidden) {
|
|
59
60
|
return FilterTypes.More
|
|
60
61
|
} else if (/groups/i.test(group_source_app_name)) {
|
|
61
62
|
return FilterTypes.Groups
|
|
@@ -66,7 +67,7 @@ export const SearchListHeaderComponent = () => {
|
|
|
66
67
|
}
|
|
67
68
|
|
|
68
69
|
return FilterTypes.All
|
|
69
|
-
}, [chat_group_graph_id, group_source_app_name, show_direct_messages, show_archived])
|
|
70
|
+
}, [chat_group_graph_id, group_source_app_name, show_direct_messages, show_archived, show_hidden])
|
|
70
71
|
|
|
71
72
|
const handleNewConversationNavigation = useCallback(() => {
|
|
72
73
|
if (newConversationFromFilter || entryMode === 'select_type') {
|
|
@@ -106,6 +107,7 @@ export const SearchListHeaderComponent = () => {
|
|
|
106
107
|
group_source_app_name: undefined,
|
|
107
108
|
show_direct_messages: undefined,
|
|
108
109
|
show_archived: undefined,
|
|
110
|
+
show_hidden: undefined,
|
|
109
111
|
...params,
|
|
110
112
|
})
|
|
111
113
|
},
|
|
@@ -126,8 +128,16 @@ export const SearchListHeaderComponent = () => {
|
|
|
126
128
|
group_source_app_name,
|
|
127
129
|
show_direct_messages,
|
|
128
130
|
show_archived,
|
|
131
|
+
show_hidden,
|
|
129
132
|
})
|
|
130
|
-
}, [
|
|
133
|
+
}, [
|
|
134
|
+
navigation,
|
|
135
|
+
chat_group_graph_id,
|
|
136
|
+
group_source_app_name,
|
|
137
|
+
show_direct_messages,
|
|
138
|
+
show_archived,
|
|
139
|
+
show_hidden,
|
|
140
|
+
])
|
|
131
141
|
|
|
132
142
|
const handleMarkAllRead = useCallback(() => {
|
|
133
143
|
currentPersonCache.update({ unreadCount: 0 })
|
|
@@ -168,7 +178,7 @@ export const SearchListHeaderComponent = () => {
|
|
|
168
178
|
<Heading numberOfLines={1} variant="h2">
|
|
169
179
|
Conversations
|
|
170
180
|
</Heading>
|
|
171
|
-
{!show_archived && (
|
|
181
|
+
{!show_archived && !show_hidden && (
|
|
172
182
|
<TextButton
|
|
173
183
|
onPress={alertMarkAllRead}
|
|
174
184
|
disabled={isPending}
|
|
@@ -2,6 +2,7 @@ import { StaticScreenProps } from '@react-navigation/native'
|
|
|
2
2
|
import React from 'react'
|
|
3
3
|
import { StyleSheet, View } from 'react-native'
|
|
4
4
|
import { Conversations } from '../../components'
|
|
5
|
+
import { Toast } from '../../components/display/toast'
|
|
5
6
|
import { ConversationsContextProvider } from '../../contexts/conversations_context'
|
|
6
7
|
import { useFilterDropdownEnabled } from '../../hooks/use_filter_dropdown_enabled'
|
|
7
8
|
import { analyticsEvents, usePublishProductAnalyticsEvent } from '../../hooks/use_product_analytics'
|
|
@@ -18,6 +19,7 @@ export type ConversationsScreenProps = StaticScreenProps<{
|
|
|
18
19
|
group_source_app_name?: AppName
|
|
19
20
|
show_direct_messages?: boolean
|
|
20
21
|
show_archived?: boolean
|
|
22
|
+
show_hidden?: boolean
|
|
21
23
|
show_unread?: boolean
|
|
22
24
|
}>
|
|
23
25
|
|
|
@@ -32,6 +34,7 @@ export function ConversationsScreen({ route }: ConversationsScreenProps) {
|
|
|
32
34
|
<ConversationsContextProvider args={route.params} opts={{ throwOnError: true }}>
|
|
33
35
|
<Conversations ListHeaderComponent={Header} />
|
|
34
36
|
</ConversationsContextProvider>
|
|
37
|
+
<Toast />
|
|
35
38
|
</View>
|
|
36
39
|
)
|
|
37
40
|
}
|
package/src/screens/index.ts
CHANGED
|
@@ -8,6 +8,7 @@ export * from './preferred_app_selection_screen'
|
|
|
8
8
|
export * from './group_notification_settings_screen'
|
|
9
9
|
export * from './conversation_filter_recipients/conversation_filter_recipients_screen'
|
|
10
10
|
export * from './message_actions_screen'
|
|
11
|
+
export * from './conversation_actions_screen'
|
|
11
12
|
export * from './message_report_screen'
|
|
12
13
|
export * from './send_giphy_screen'
|
|
13
14
|
export * from './not_found'
|
|
@@ -5,6 +5,7 @@ export type NotificationLevelDescription = string
|
|
|
5
5
|
|
|
6
6
|
export interface ConversationMembershipResource extends ResourceObject {
|
|
7
7
|
type: 'ConversationMembership'
|
|
8
|
+
hidden?: boolean
|
|
8
9
|
lastReadMessageSortKey: string
|
|
9
10
|
muted: boolean
|
|
10
11
|
notificationLevel: NotificationLevelValue
|
|
@@ -7,15 +7,19 @@ export interface ConversationRequestArgs {
|
|
|
7
7
|
group_source_app_name?: string
|
|
8
8
|
show_direct_messages?: boolean
|
|
9
9
|
show_archived?: boolean
|
|
10
|
+
show_hidden?: boolean
|
|
10
11
|
show_unread?: boolean
|
|
11
12
|
}
|
|
12
13
|
|
|
14
|
+
export const HIDDEN_CONVERSATIONS_FILTER = 'mine_or_not_empty,hidden'
|
|
15
|
+
|
|
13
16
|
export const getConversationsRequestArgs = ({
|
|
14
17
|
gids,
|
|
15
18
|
chat_group_graph_id,
|
|
16
19
|
group_source_app_name,
|
|
17
20
|
show_direct_messages,
|
|
18
21
|
show_archived,
|
|
22
|
+
show_hidden,
|
|
19
23
|
show_unread,
|
|
20
24
|
}: Partial<ConversationRequestArgs> = {}): GetRequest => {
|
|
21
25
|
let filter: string
|
|
@@ -23,6 +27,8 @@ export const getConversationsRequestArgs = ({
|
|
|
23
27
|
filter = 'mine_or_not_empty,group'
|
|
24
28
|
} else if (show_archived) {
|
|
25
29
|
filter = 'mine_or_not_empty,archived'
|
|
30
|
+
} else if (show_hidden) {
|
|
31
|
+
filter = HIDDEN_CONVERSATIONS_FILTER
|
|
26
32
|
} else if (show_unread) {
|
|
27
33
|
filter = 'mine_or_not_empty,unread'
|
|
28
34
|
} else if (show_direct_messages) {
|