Skip to content

Commit bc2a3c1

Browse files
committed
Move over to v6 groups and members APIs
1 parent b9a69b8 commit bc2a3c1

File tree

8 files changed

+56
-15
lines changed

8 files changed

+56
-15
lines changed

src/apps/admin/src/lib/services/groups.service.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ export const findGroupByMember = async (params: {
2727
membershipType: 'user'
2828
}): Promise<UserGroup[]> => {
2929
const result = await xhrGetAsync<UserGroup[]>(
30-
`${EnvironmentConfig.API.V5}/groups/?${qs.stringify(params)}`,
30+
`${EnvironmentConfig.API.V6}/groups/?${qs.stringify(params)}`,
3131
)
3232
return result.map(adjustUserGroupResponse)
3333
}
@@ -44,7 +44,7 @@ export const findGroupById = async (
4444
): Promise<UserGroup> => {
4545
const fieldsQuery = fields ? `?fields=${fields.join(',')}` : ''
4646
const result = await xhrGetAsync<UserGroup>(
47-
`${EnvironmentConfig.API.V5}/groups/${groupId}${fieldsQuery}`,
47+
`${EnvironmentConfig.API.V6}/groups/${groupId}${fieldsQuery}`,
4848
)
4949
return adjustUserGroupResponse(result)
5050
}
@@ -63,7 +63,7 @@ export const fetchGroupMembers = async (
6363
},
6464
): Promise<UserGroupMember[]> => {
6565
const result = await xhrGetAsync<UserGroupMember[]>(
66-
`${EnvironmentConfig.API.V5}/groups/${groupId}/members?${qs.stringify(
66+
`${EnvironmentConfig.API.V6}/groups/${groupId}/members?${qs.stringify(
6767
params,
6868
)}`,
6969
)
@@ -79,7 +79,7 @@ export const fetchGroups = async (params: {
7979
perPage: number
8080
}): Promise<UserGroup[]> => {
8181
const result = await xhrGetAsync<UserGroup[]>(
82-
`${EnvironmentConfig.API.V5}/groups?${qs.stringify(params)}`,
82+
`${EnvironmentConfig.API.V6}/groups?${qs.stringify(params)}`,
8383
)
8484
return _.orderBy(result.map(adjustUserGroupResponse), ['createdAt'], ['desc'])
8585
}
@@ -92,7 +92,7 @@ export const fetchGroups = async (params: {
9292
/** */
9393
export const createGroup = async (data: FormAddGroup): Promise<UserGroup> => {
9494
const result = await xhrPostAsync<FormAddGroup, UserGroup>(
95-
`${EnvironmentConfig.API.V5}/groups`,
95+
`${EnvironmentConfig.API.V6}/groups`,
9696
data,
9797
)
9898

@@ -127,7 +127,7 @@ export const addGroupMember = async (
127127
membershipType: 'user' | 'group'
128128
},
129129
string
130-
>(`${EnvironmentConfig.API.V5}/groups/${groupId}/members`, entity)
130+
>(`${EnvironmentConfig.API.V6}/groups/${groupId}/members`, entity)
131131
return result
132132
}
133133

@@ -142,7 +142,7 @@ export const removeGroupMember = async (
142142
memberId: number,
143143
): Promise<string> => {
144144
const result = await xhrDeleteAsync<string>(
145-
`${EnvironmentConfig.API.V5}/groups/${groupId}/members/${memberId}`,
145+
`${EnvironmentConfig.API.V6}/groups/${groupId}/members/${memberId}`,
146146
)
147147
return result
148148
}

src/apps/admin/src/lib/services/user.service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ export const getMembersByHandle = async (
4545
})
4646

4747
return xhrGetAsync<Array<{ handle: string }>>(
48-
`${EnvironmentConfig.API.V5}/members?fields=userId,handle${qs}`,
48+
`${EnvironmentConfig.API.V6}/members?fields=userId,handle${qs}`,
4949
)
5050
}
5151

src/apps/admin/src/platform/gamification-admin/src/game-lib/member-autocomplete/input-handle-functions.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@ export async function membersAutocompete(term: string): Promise<Array<MembersAut
1919
term,
2020
}
2121

22-
return xhrGetAsync(`${EnvironmentConfig.API.V5}/members/autocomplete?${qs.stringify(query)}`)
22+
return xhrGetAsync(`${EnvironmentConfig.API.V6}/members/autocomplete?${qs.stringify(query)}`)
2323
}

src/apps/copilots/src/services/members.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ export const getMembersByUserIds = async (
3636
})
3737

3838
return xhrGetAsync<Array<{ userId: string }>>(
39-
`${EnvironmentConfig.API.V5}/members?${qs}`,
39+
`${EnvironmentConfig.API.V6}/members?${qs}`,
4040
)
4141
}
4242

@@ -57,7 +57,7 @@ export const useMembers = (userIds: number[]): MembersResponse => {
5757
userIds.forEach(userId => {
5858
qs += `&userIds[]=${userId}`
5959
})
60-
const url = `${EnvironmentConfig.API.V5}/members?${qs}`
60+
const url = `${EnvironmentConfig.API.V6}/members?${qs}`
6161

6262
const fetcher = (urlp: string): Promise<FormattedMembers[]> => xhrGetAsync<FormattedMembers[]>(urlp)
6363
.then(data => membersFactory(data))
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
/**
2+
* The router outlet.
3+
*/
4+
5+
import { FC, PropsWithChildren, useContext, useMemo } from 'react'
6+
import { Outlet, Routes } from 'react-router-dom'
7+
8+
import { routerContext, RouterContextData } from '~/libs/core'
9+
10+
import { reviewRoutes } from '../../review-app.routes'
11+
import { activeReviewAssigmentsRouteId, challengeDetailRouteId } from '../../config/routes.config'
12+
import { ChallengeDetailContextProvider } from '../../lib'
13+
14+
export const ChallengeDetailContainer: FC<PropsWithChildren> = () => {
15+
const childRoutes = useChildRoutes()
16+
17+
return (
18+
<ChallengeDetailContextProvider>
19+
<Outlet />
20+
<Routes>{childRoutes}</Routes>
21+
</ChallengeDetailContextProvider>
22+
)
23+
}
24+
25+
/**
26+
* Get child routes of challenge detail page
27+
* @returns child routes
28+
*/
29+
function useChildRoutes(): Array<JSX.Element> | undefined {
30+
const { getRouteElement }: RouterContextData = useContext(routerContext)
31+
const childRoutes = useMemo(
32+
() => reviewRoutes[0].children
33+
?.find(r => r.id === activeReviewAssigmentsRouteId)
34+
?.children?.find(r => r.id === challengeDetailRouteId)
35+
?.children?.map(getRouteElement),
36+
[getRouteElement],
37+
)
38+
return childRoutes
39+
}
40+
41+
export default ChallengeDetailContainer

src/apps/talent-search/src/lib/services/use-fetch-talent-matches.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ export function useFetchTalentMatches(
2929
`perPage=${pageSize}`,
3030
].join('&')
3131

32-
const url = `${EnvironmentConfig.API.V5}/members/searchBySkills?${searchParams}`
32+
const url = `${EnvironmentConfig.API.V6}/members/searchBySkills?${searchParams}`
3333

3434
const { data, error }: SWRResponse<PaginatedResponse<Member[]>> = useSWR(url, xhrGetPaginatedAsync<Member[]>, {
3535
isPaused: () => !skills?.length,

src/apps/wallet-admin/src/lib/services/wallet.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import { PayoutAudit } from '../models/PayoutAudit'
1313
import ApiResponse from '../models/ApiResponse'
1414

1515
const baseUrl = `${EnvironmentConfig.API.V5}/payments`
16-
const memberApiBaseUrl = `${EnvironmentConfig.API.V5}/members`
16+
const memberApiBaseUrl = `${EnvironmentConfig.API.V6}/members`
1717

1818
export async function getWalletDetails(): Promise<WalletDetails> {
1919
const response = await xhrGetAsync<ApiResponse<WalletDetails>>(`${baseUrl}/wallet`)

src/libs/core/lib/profile/profile-functions/profile-store/profile-endpoint.config.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { EnvironmentConfig } from '~/config'
22

33
export function profile(handle: string): string {
4-
return `${EnvironmentConfig.API.V5}/members/${handle}`
4+
return `${EnvironmentConfig.API.V6}/members/${handle}`
55
}
66

77
export function verify(): string {
@@ -26,7 +26,7 @@ export function learnBaseURL(): string {
2626
}
2727

2828
export function memberStatsDistroURL(): string {
29-
return `${EnvironmentConfig.API.V5}/members/stats/distribution`
29+
return `${EnvironmentConfig.API.V6}/members/stats/distribution`
3030
}
3131

3232
export function memberModifyURL(): string {

0 commit comments

Comments
 (0)