@planningcenter/chat-react-native 4.7.1-qa-staging.6 → 4.7.1-qa-staging.7

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.
Files changed (52) hide show
  1. package/build/hooks/groups/use_group_chat_conversation_payload.d.ts +11 -1
  2. package/build/hooks/groups/use_group_chat_conversation_payload.d.ts.map +1 -1
  3. package/build/hooks/groups/use_group_chat_conversation_payload.js +92 -47
  4. package/build/hooks/groups/use_group_chat_conversation_payload.js.map +1 -1
  5. package/build/hooks/groups/use_group_members_for_new_conversation.d.ts +27 -25
  6. package/build/hooks/groups/use_group_members_for_new_conversation.d.ts.map +1 -1
  7. package/build/hooks/groups/use_group_members_for_new_conversation.js +125 -110
  8. package/build/hooks/groups/use_group_members_for_new_conversation.js.map +1 -1
  9. package/build/hooks/groups/use_groups_conversation_create.d.ts.map +1 -1
  10. package/build/hooks/groups/use_groups_conversation_create.js +39 -31
  11. package/build/hooks/groups/use_groups_conversation_create.js.map +1 -1
  12. package/build/hooks/groups/use_groups_proxy.d.ts +2 -0
  13. package/build/hooks/groups/use_groups_proxy.d.ts.map +1 -0
  14. package/build/hooks/groups/use_groups_proxy.js +18 -0
  15. package/build/hooks/groups/use_groups_proxy.js.map +1 -0
  16. package/build/hooks/use_features.d.ts +1 -0
  17. package/build/hooks/use_features.d.ts.map +1 -1
  18. package/build/hooks/use_features.js +1 -0
  19. package/build/hooks/use_features.js.map +1 -1
  20. package/build/hooks/use_groups_groups.d.ts.map +1 -1
  21. package/build/hooks/use_groups_groups.js +25 -9
  22. package/build/hooks/use_groups_groups.js.map +1 -1
  23. package/build/hooks/use_new_conversation_from_filter.d.ts.map +1 -1
  24. package/build/hooks/use_new_conversation_from_filter.js +11 -1
  25. package/build/hooks/use_new_conversation_from_filter.js.map +1 -1
  26. package/build/screens/conversation_new/components/groups_form.d.ts.map +1 -1
  27. package/build/screens/conversation_new/components/groups_form.js +96 -93
  28. package/build/screens/conversation_new/components/groups_form.js.map +1 -1
  29. package/build/types/resources/groups/groups_group_resource.d.ts +1 -1
  30. package/build/types/resources/groups/groups_group_resource.d.ts.map +1 -1
  31. package/build/types/resources/groups/groups_group_resource.js.map +1 -1
  32. package/build/types/resources/groups/groups_membership_resource.d.ts +11 -0
  33. package/build/types/resources/groups/groups_membership_resource.d.ts.map +1 -0
  34. package/build/types/resources/groups/groups_membership_resource.js +2 -0
  35. package/build/types/resources/groups/groups_membership_resource.js.map +1 -0
  36. package/build/types/resources/groups/index.d.ts +1 -0
  37. package/build/types/resources/groups/index.d.ts.map +1 -1
  38. package/build/types/resources/groups/index.js +1 -0
  39. package/build/types/resources/groups/index.js.map +1 -1
  40. package/package.json +3 -3
  41. package/src/__tests__/hooks/use_group_chat_conversation_payload.test.tsx +31 -0
  42. package/src/hooks/groups/use_group_chat_conversation_payload.ts +30 -12
  43. package/src/hooks/groups/use_group_members_for_new_conversation.ts +49 -18
  44. package/src/hooks/groups/use_groups_conversation_create.ts +10 -14
  45. package/src/hooks/groups/use_groups_proxy.ts +6 -0
  46. package/src/hooks/use_features.ts +1 -0
  47. package/src/hooks/use_groups_groups.ts +21 -16
  48. package/src/hooks/use_new_conversation_from_filter.ts +13 -5
  49. package/src/screens/conversation_new/components/groups_form.tsx +11 -9
  50. package/src/types/resources/groups/groups_group_resource.ts +1 -1
  51. package/src/types/resources/groups/groups_membership_resource.ts +10 -0
  52. package/src/types/resources/groups/index.ts +1 -0
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@planningcenter/chat-react-native",
3
- "version": "4.7.1-qa-staging.6",
3
+ "version": "4.7.1-qa-staging.7",
4
4
  "description": "",
5
5
  "repository": {
6
6
  "type": "git",
@@ -33,7 +33,7 @@
33
33
  "dependencies": {
34
34
  "@fortawesome/fontawesome-svg-core": "^7.2.0",
35
35
  "@fortawesome/react-native-fontawesome": "^0.3.2",
36
- "@planningcenter/emoji-keyboard": "4.7.1-qa-staging.6",
36
+ "@planningcenter/emoji-keyboard": "4.7.1-qa-staging.7",
37
37
  "lodash-inflection": "^1.5.0"
38
38
  },
39
39
  "peerDependencies": {
@@ -84,5 +84,5 @@
84
84
  "sf-symbols-typescript": "^2.2.0",
85
85
  "typescript": "~6.0.3"
86
86
  },
87
- "gitHead": "8b0e0dd2325e3e6851c5730bd761c4665e1cd0c6"
87
+ "gitHead": "0b29d54eccb2151b5a6f26ad9c2a0bdec54cc251"
88
88
  }
@@ -5,6 +5,11 @@ import { buildTestQueryClient } from '../../__utils__/query_client'
5
5
  import { useGroupChatConversationPayload } from '../../hooks/groups/use_group_chat_conversation_payload'
6
6
  import * as useApiClientModule from '../../hooks/use_api_client'
7
7
 
8
+ const mockGroupsProxy = jest.fn(() => false)
9
+ jest.mock('../../hooks/groups/use_groups_proxy', () => ({
10
+ useGroupsProxy: () => mockGroupsProxy(),
11
+ }))
12
+
8
13
  const mockGroupsPost = (impl: jest.Mock) => {
9
14
  jest.spyOn(useApiClientModule, 'useApiClient').mockReturnValue({
10
15
  groups: { post: impl },
@@ -22,6 +27,7 @@ const resolveWith = (value: string) =>
22
27
  describe('useGroupChatConversationPayload', () => {
23
28
  afterEach(() => {
24
29
  jest.restoreAllMocks()
30
+ mockGroupsProxy.mockReturnValue(false)
25
31
  })
26
32
 
27
33
  it('refetches on mount even when a fresh payload is already cached', async () => {
@@ -47,4 +53,29 @@ describe('useGroupChatConversationPayload', () => {
47
53
  await waitFor(() => expect(post).toHaveBeenCalledTimes(1))
48
54
  await waitFor(() => expect(result.current.payload).toBe('fresh'))
49
55
  })
56
+
57
+ it('asks Chat for the payload when Groups loads through Chat', async () => {
58
+ mockGroupsProxy.mockReturnValue(true)
59
+ const post = resolveWith('proxied')
60
+ const groupsPost = jest.fn()
61
+ jest.spyOn(useApiClientModule, 'useApiClient').mockReturnValue({
62
+ chat: { post },
63
+ groups: { post: groupsPost },
64
+ } as unknown as ReturnType<typeof useApiClientModule.useApiClient>)
65
+ const queryClient = buildTestQueryClient()
66
+ const wrapper = ({ children }: { children: React.ReactNode }) => (
67
+ <QueryClientProvider client={queryClient}>{children}</QueryClientProvider>
68
+ )
69
+
70
+ const { result } = renderHook(() => useGroupChatConversationPayload({ groupId: 1 }), {
71
+ wrapper,
72
+ })
73
+
74
+ await waitFor(() => expect(result.current.payload).toBe('proxied'))
75
+ expect(post).toHaveBeenCalledWith({
76
+ url: '/me/groups_groups/1/chat_conversation_payload',
77
+ data: { data: { type: 'GroupsChatConversationPayload', attributes: { title: '' } } },
78
+ })
79
+ expect(groupsPost).not.toHaveBeenCalled()
80
+ })
50
81
  })
@@ -1,7 +1,8 @@
1
1
  import { useQuery } from '@tanstack/react-query'
2
2
  import { ApiResource, ResourceObject } from '../../types'
3
3
  import { toMs } from '../../utils/time'
4
- import { useApiClient } from '../use_api_client'
4
+ import { App, useApiClient } from '../use_api_client'
5
+ import { useGroupsProxy } from './use_groups_proxy'
5
6
 
6
7
  const STALE_TIME_MS = toMs(25, 'minutes') // under Groups' 30-min server-side expiry
7
8
 
@@ -12,20 +13,13 @@ interface Props {
12
13
 
13
14
  export function useGroupChatConversationPayload({ groupId, enabled = true }: Props) {
14
15
  const apiClient = useApiClient()
15
- const url = `/me/groups/${groupId}/chat_conversation_payload`
16
+ const proxied = useGroupsProxy()
17
+ const { app, url, data: body } = groupChatConversationPayloadRequest({ groupId, proxied })
16
18
 
17
19
  const { data, ...rest } = useQuery({
18
20
  queryKey: ['groups', url],
19
21
  queryFn: () =>
20
- apiClient.groups.post<ApiResource<GroupChatConversationPayload>>({
21
- url,
22
- data: {
23
- data: {
24
- type: 'GroupChatConversationPayload',
25
- attributes: { title: '' },
26
- },
27
- },
28
- }),
22
+ apiClient[app].post<ApiResource<GroupChatConversationPayload>>({ url, data: body }),
29
23
  staleTime: STALE_TIME_MS,
30
24
  refetchOnMount: 'always',
31
25
  enabled,
@@ -34,7 +28,31 @@ export function useGroupChatConversationPayload({ groupId, enabled = true }: Pro
34
28
  return { payload: data?.data.value, ...rest }
35
29
  }
36
30
 
31
+ export function groupChatConversationPayloadRequest({
32
+ groupId,
33
+ title = '',
34
+ proxied,
35
+ }: {
36
+ groupId: number
37
+ title?: string
38
+ proxied: boolean
39
+ }): { app: App; url: string; data: object } {
40
+ if (proxied) {
41
+ return {
42
+ app: 'chat',
43
+ url: `/me/groups_groups/${groupId}/chat_conversation_payload`,
44
+ data: { data: { type: 'GroupsChatConversationPayload', attributes: { title } } },
45
+ }
46
+ }
47
+
48
+ return {
49
+ app: 'groups',
50
+ url: `/me/groups/${groupId}/chat_conversation_payload`,
51
+ data: { data: { type: 'GroupChatConversationPayload', attributes: { title } } },
52
+ }
53
+ }
54
+
37
55
  interface GroupChatConversationPayload extends ResourceObject {
38
- type: 'GroupChatConversationPayload'
56
+ type: 'GroupChatConversationPayload' | 'GroupsChatConversationPayload'
39
57
  value: string
40
58
  }
@@ -1,14 +1,18 @@
1
1
  import { keepPreviousData } from '@tanstack/react-query'
2
2
  import { useMemo } from 'react'
3
3
  import { MemberResource, ResourceObject } from '../../types'
4
+ import { GroupsMembershipResource } from '../../types/resources/groups'
4
5
  import { GroupsGroupMemberResource } from '../../types/resources/groups/groups_member_resource_with_person'
5
6
  import { useApiPaginator } from '../use_api'
6
7
  import { useEnrichPeople } from '../use_enrich_people'
8
+ import { useGroupsProxy } from './use_groups_proxy'
9
+
10
+ type Membership = GroupsGroupMemberResource | GroupsMembershipResource
7
11
 
8
12
  type UseApiPaginatorResult<T extends ResourceObject> = ReturnType<typeof useApiPaginator<T>>
9
13
 
10
14
  export type GroupMembersForNewConversationResult = Omit<
11
- UseApiPaginatorResult<GroupsGroupMemberResource>, // We are passing our own "members" data shape
15
+ UseApiPaginatorResult<Membership>, // We are passing our own "members" data shape
12
16
  'data'
13
17
  > & {
14
18
  data: MemberResource[]
@@ -23,20 +27,41 @@ export function useGroupMembersForNewConversation({
23
27
  id: number
24
28
  gender: string | null
25
29
  }) {
26
- const response = useApiPaginator<GroupsGroupMemberResource>(
27
- {
28
- url: `/me/groups/${id}/memberships`,
29
- data: {
30
- perPage: 100,
31
- include: ['person'],
32
- fields: {
33
- Membership: ['person, role'],
34
- Person: ['avatar_url', 'name', 'first_name', 'last_name', 'child', 'gender'],
30
+ const proxied = useGroupsProxy()
31
+ const where = gender ? { where: { gender } } : {}
32
+ const response = useApiPaginator<Membership>(
33
+ proxied
34
+ ? {
35
+ url: `/me/groups_groups/${id}/memberships`,
36
+ data: {
37
+ perPage: 100,
38
+ fields: {
39
+ GroupsMembership: [
40
+ 'role',
41
+ 'first_name',
42
+ 'last_name',
43
+ 'avatar_url',
44
+ 'gender',
45
+ 'child',
46
+ ],
47
+ },
48
+ ...where,
49
+ },
50
+ app: 'chat',
51
+ }
52
+ : {
53
+ url: `/me/groups/${id}/memberships`,
54
+ data: {
55
+ perPage: 100,
56
+ include: ['person'],
57
+ fields: {
58
+ Membership: ['person, role'],
59
+ Person: ['avatar_url', 'name', 'first_name', 'last_name', 'child', 'gender'],
60
+ },
61
+ ...where,
62
+ },
63
+ app: 'groups',
35
64
  },
36
- ...(gender ? { where: { gender } } : {}),
37
- },
38
- app: 'groups',
39
- },
40
65
  {
41
66
  throwOnError: (_error, query) => query.state.data === undefined,
42
67
  placeholderData: keepPreviousData,
@@ -44,11 +69,11 @@ export function useGroupMembersForNewConversation({
44
69
  )
45
70
 
46
71
  const { data: memberships = [] } = response
47
- const personIds = useMemo(() => memberships.map(m => +m.person.id), [memberships])
72
+ const people = useMemo(() => memberships.map(membershipPerson), [memberships])
73
+ const personIds = useMemo(() => people.map(person => +person.id), [people])
48
74
  const enrichmentMap = useEnrichPeople({ personIds, groupId: id })
49
75
 
50
- const members: MemberResource[] = memberships.map(membership => {
51
- const { person } = membership
76
+ const members: MemberResource[] = people.map(person => {
52
77
  const enrichment = enrichmentMap.get(+person.id)
53
78
  return {
54
79
  type: 'Member',
@@ -59,7 +84,7 @@ export function useGroupMembersForNewConversation({
59
84
  id: +person.id,
60
85
  name: `${person.firstName} ${person.lastName}`,
61
86
  source: [],
62
- role: membership.role,
87
+ role: person.role,
63
88
  }
64
89
  })
65
90
 
@@ -73,3 +98,9 @@ export function useGroupMembersForNewConversation({
73
98
  childMembers,
74
99
  }
75
100
  }
101
+
102
+ function membershipPerson(membership: Membership) {
103
+ if (membership.type === 'GroupsMembership') return membership
104
+
105
+ return { ...membership.person, role: membership.role }
106
+ }
@@ -2,6 +2,8 @@ import { useMutation } from '@tanstack/react-query'
2
2
  import { ApiResource, ConversationResource, ResourceObject } from '../../types'
3
3
  import { throwResponseError } from '../../utils/response_error'
4
4
  import { useApiClient } from '../use_api_client'
5
+ import { groupChatConversationPayloadRequest } from './use_group_chat_conversation_payload'
6
+ import { useGroupsProxy } from './use_groups_proxy'
5
7
 
6
8
  interface Props {
7
9
  groupId: number
@@ -12,25 +14,18 @@ interface Props {
12
14
 
13
15
  export function useGroupsConversationCreate({ groupId, title, genderId, onSuccess }: Props) {
14
16
  const apiClient = useApiClient()
17
+ const proxied = useGroupsProxy()
15
18
 
16
19
  return useMutation({
17
20
  throwOnError: true,
18
21
  onSuccess: result => {
19
22
  onSuccess(result.data.id)
20
23
  },
21
- mutationFn: () =>
22
- apiClient.groups
23
- .post<ApiResource<ChatConversationPayload>>({
24
- url: `/me/groups/${groupId}/chat_conversation_payload`,
25
- data: {
26
- data: {
27
- type: 'GroupChatConversationPayload',
28
- attributes: {
29
- title,
30
- },
31
- },
32
- },
33
- })
24
+ mutationFn: () => {
25
+ const { app, url, data } = groupChatConversationPayloadRequest({ groupId, title, proxied })
26
+
27
+ return apiClient[app]
28
+ .post<ApiResource<ChatConversationPayload>>({ url, data })
34
29
  .then(res => res.data.value)
35
30
  .then(payload =>
36
31
  apiClient.chat.post<ApiResource<ConversationResource>>({
@@ -46,7 +41,8 @@ export function useGroupsConversationCreate({ groupId, title, genderId, onSucces
46
41
  },
47
42
  })
48
43
  )
49
- .catch(throwResponseError),
44
+ .catch(throwResponseError)
45
+ },
50
46
  })
51
47
  }
52
48
 
@@ -0,0 +1,6 @@
1
+ import { availableFeatures, useFeatures } from '../use_features'
2
+
3
+ export function useGroupsProxy() {
4
+ const { featureEnabled } = useFeatures()
5
+ return featureEnabled(availableFeatures.groups_proxy)
6
+ }
@@ -61,6 +61,7 @@ export const availableFeatures = {
61
61
  filter_dropdown_rollout: 'ROLLOUT_MOBILE_filter_dropdown',
62
62
  manual_archiving: 'QA_MOBILE_manual_archiving',
63
63
  manual_archiving_rollout: 'ROLLOUT_MOBILE_manual_archiving',
64
+ groups_proxy: 'ROLLOUT_groups_proxy',
64
65
  hide_conversations: 'ROLLOUT_hide_conversations',
65
66
  } as const satisfies Record<string, `${'QA' | 'ROLLOUT'}_${string}`>
66
67
 
@@ -1,26 +1,31 @@
1
1
  import { GroupsGroupResource } from '../types'
2
2
  import { FIVE_MINUTES } from '../utils/time'
3
+ import { useGroupsProxy } from './groups/use_groups_proxy'
3
4
  import { useApiPaginator } from './use_api'
4
5
 
6
+ const GROUP_FIELDS = [
7
+ 'can_create_conversation',
8
+ 'can_create_conversation_reason_code',
9
+ 'name',
10
+ 'header_image',
11
+ 'memberships_count',
12
+ ]
13
+
5
14
  export const useGroupsGroups = () => {
15
+ const proxied = useGroupsProxy()
16
+
6
17
  return useApiPaginator<GroupsGroupResource>(
7
- {
8
- url: '/me/groups',
9
- data: {
10
- perPage: 100,
11
- fields: {
12
- Group: [
13
- 'can_create_conversation',
14
- 'can_create_conversation_reason_code',
15
- 'name',
16
- 'header_image',
17
- 'memberships_count',
18
- ],
18
+ proxied
19
+ ? {
20
+ url: '/me/groups_groups',
21
+ data: { perPage: 100, fields: { GroupsGroup: GROUP_FIELDS } },
22
+ app: 'chat',
23
+ }
24
+ : {
25
+ url: '/me/groups',
26
+ data: { perPage: 100, fields: { Group: GROUP_FIELDS }, order: 'name' },
27
+ app: 'groups',
19
28
  },
20
- order: 'name',
21
- },
22
- app: 'groups',
23
- },
24
29
  { staleTime: FIVE_MINUTES }
25
30
  )
26
31
  }
@@ -2,6 +2,7 @@ import { useMemo } from 'react'
2
2
  import { GroupResource, GraphId } from '../types/resources/group_resource'
3
3
  import { GroupsGroupResource } from '../types/resources/groups/groups_group_resource'
4
4
  import { destructureChatGroupGraphId } from '../utils'
5
+ import { useGroupsProxy } from './groups/use_groups_proxy'
5
6
  import { useApiGet } from './use_api'
6
7
  import { useNewConversationEntry } from './use_new_conversation_entry'
7
8
 
@@ -22,6 +23,7 @@ export function useNewConversationFromFilter(
22
23
  ): NewConversationFromFilter | undefined {
23
24
  const { sourceAppName, sourceType, sourceId } = destructureChatGroupGraphId(chatGroupGraphId)
24
25
  const entryMode = useNewConversationEntry()
26
+ const proxied = useGroupsProxy()
25
27
  const isGroupsGroup = sourceAppName === 'Groups' && sourceType === 'Group'
26
28
  const isServicesTeam = sourceAppName === 'Services' && sourceType === 'Team'
27
29
 
@@ -31,11 +33,17 @@ export function useNewConversationFromFilter(
31
33
  )
32
34
 
33
35
  const { data: groupsGroup } = useApiGet<GroupsGroupResource>(
34
- {
35
- url: `/me/groups/${sourceId}`,
36
- data: { fields: { Group: ['can_create_conversation'] } },
37
- app: 'groups',
38
- },
36
+ proxied
37
+ ? {
38
+ url: `/me/groups_groups/${sourceId}`,
39
+ data: { fields: { GroupsGroup: ['can_create_conversation'] } },
40
+ app: 'chat',
41
+ }
42
+ : {
43
+ url: `/me/groups/${sourceId}`,
44
+ data: { fields: { Group: ['can_create_conversation'] } },
45
+ app: 'groups',
46
+ },
39
47
  { enabled: isGroupsGroup && !!sourceId }
40
48
  )
41
49
 
@@ -12,6 +12,7 @@ import {
12
12
  useGroupMembersForNewConversation,
13
13
  } from '../../../hooks/groups/use_group_members_for_new_conversation'
14
14
  import { useGroupsConversationCreate } from '../../../hooks/groups/use_groups_conversation_create'
15
+ import { useGroupsProxy } from '../../../hooks/groups/use_groups_proxy'
15
16
  import {
16
17
  type AvatarUpdatePayload,
17
18
  patchConversationAvatar,
@@ -50,15 +51,16 @@ export const GroupsForm = ({ groupId, chat_group_graph_id, avatarSelection }: Gr
50
51
  genderValue,
51
52
  isFetching: genderFetching,
52
53
  } = useMyGender()
53
- const { data: group } = useSuspenseGet<GroupsGroupResource>({
54
- url: `/me/groups/${groupId}`,
55
- data: {
56
- fields: {
57
- Group: [],
58
- },
59
- },
60
- app: 'groups',
61
- })
54
+ const groupsProxied = useGroupsProxy()
55
+ const { data: group } = useSuspenseGet<GroupsGroupResource>(
56
+ groupsProxied
57
+ ? {
58
+ url: `/me/groups_groups/${groupId}`,
59
+ data: { fields: { GroupsGroup: ['name', 'memberships_count'] } },
60
+ app: 'chat',
61
+ }
62
+ : { url: `/me/groups/${groupId}`, data: { fields: { Group: [] } }, app: 'groups' }
63
+ )
62
64
 
63
65
  const activeGenderId = genderFilterEnabled ? genderId : null
64
66
  const activeGenderValue = genderFilterEnabled ? genderValue : null
@@ -2,7 +2,7 @@ import { ResourceObject } from '../../api_primitives'
2
2
 
3
3
  export interface GroupsGroupResource extends ResourceObject {
4
4
  id: number
5
- type: 'Group'
5
+ type: 'Group' | 'GroupsGroup'
6
6
  headerImage: {
7
7
  thumbnail: string
8
8
  medium: string
@@ -0,0 +1,10 @@
1
+ export interface GroupsMembershipResource {
2
+ type: 'GroupsMembership'
3
+ id: number
4
+ role?: string
5
+ firstName: string
6
+ lastName: string
7
+ avatarUrl: string
8
+ child: boolean
9
+ gender: string | null
10
+ }
@@ -1 +1,2 @@
1
1
  export * from './groups_group_resource'
2
+ export * from './groups_membership_resource'