Skip to content

Commit 969ef7c

Browse files
committed
update the api and pull org content based on org id
1 parent 4313fa0 commit 969ef7c

File tree

6 files changed

+19
-38
lines changed

6 files changed

+19
-38
lines changed

frontends/api/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"ol-test-utilities": "0.0.0"
3131
},
3232
"dependencies": {
33-
"@mitodl/mitxonline-api-axios": "^2025.5.20",
33+
"@mitodl/mitxonline-api-axios": "^2025.5.23",
3434
"@tanstack/react-query": "^5.66.0",
3535
"axios": "^1.6.3"
3636
}
Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,27 @@
11
import { queryOptions } from "@tanstack/react-query"
22
import type { CourseRunEnrollment } from "@mitodl/mitxonline-api-axios/v1"
33

4-
import { AxiosRequestConfig } from "axios"
54
import { enrollmentsApi } from "../../clients"
6-
7-
type EnrollmentsListOptions = {
8-
/**
9-
* WARNING: This is not yet implemented in the API.
10-
*/
11-
orgId?: number
12-
}
5+
import { RawAxiosRequestConfig } from "axios"
136

147
const enrollmentKeys = {
158
root: ["mitxonline", "enrollments"],
16-
coursesList: (opts?: EnrollmentsListOptions) => [
9+
enrollmentsList: (opts: RawAxiosRequestConfig) => [
1710
...enrollmentKeys.root,
18-
"courses",
11+
"programEnrollments",
1912
"list",
2013
opts,
2114
],
2215
}
2316

2417
const enrollmentQueries = {
25-
coursesList: (opts: EnrollmentsListOptions = {}) =>
18+
enrollmentsList: (opts: RawAxiosRequestConfig) =>
2619
queryOptions({
27-
queryKey: enrollmentKeys.coursesList(opts),
20+
queryKey: enrollmentKeys.enrollmentsList(opts),
2821
queryFn: async (): Promise<CourseRunEnrollment[]> => {
29-
const axiosConfig = { params: opts } as AxiosRequestConfig
30-
return enrollmentsApi
31-
.enrollmentsList(axiosConfig)
32-
.then((res) => res.data)
22+
return enrollmentsApi.enrollmentsList(opts).then((res) => res.data)
3323
},
3424
}),
3525
}
3626

3727
export { enrollmentQueries, enrollmentKeys }
38-
export type { EnrollmentsListOptions }

frontends/api/src/mitxonline/hooks/programs/queries.ts

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,17 @@ import type {
55
} from "@mitodl/mitxonline-api-axios/v1"
66
import { programsApi } from "../../clients"
77

8-
type ProgramsListRequest = ProgramsApiProgramsListV2Request & {
9-
/**
10-
* NOT YET IMPLEMENTED
11-
*/
12-
orgId?: number
13-
}
14-
158
const programsKeys = {
169
root: ["mitxonline", "programs"],
17-
programsList: (opts?: ProgramsListRequest) => [
10+
programsList: (opts?: ProgramsApiProgramsListV2Request) => [
1811
...programsKeys.root,
1912
"list",
2013
opts,
2114
],
2215
}
2316

2417
const programsQueries = {
25-
programsList: (opts: ProgramsListRequest) =>
18+
programsList: (opts: ProgramsApiProgramsListV2Request) =>
2619
queryOptions({
2720
queryKey: programsKeys.programsList(opts),
2821
queryFn: async (): Promise<PaginatedV2ProgramList> => {
@@ -32,4 +25,3 @@ const programsQueries = {
3225
}
3326

3427
export { programsQueries, programsKeys }
35-
export type { ProgramsListRequest }

frontends/main/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"@emotion/cache": "^11.13.1",
1515
"@emotion/styled": "^11.11.0",
1616
"@mitodl/course-search-utils": "3.3.2",
17-
"@mitodl/mitxonline-api-axios": "^2025.5.20",
17+
"@mitodl/mitxonline-api-axios": "^2025.5.23",
1818
"@mitodl/smoot-design": "^6.2.2",
1919
"@next/bundle-analyzer": "^14.2.15",
2020
"@remixicon/react": "^4.2.0",

frontends/main/src/app-pages/DashboardPage/OrganizationContent.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -153,11 +153,11 @@ const OrganizationContent: React.FC<OrganizationContentProps> = ({ orgId }) => {
153153
)
154154
const organization = useQuery(
155155
organizationQueries.organizationsRetrieve({
156-
organization_slug: b2bOrganization?.slug,
156+
organization_slug: b2bOrganization?.slug || "",
157157
}),
158158
)
159-
const enrollments = useQuery(enrollmentQueries.coursesList({ orgId }))
160-
const programs = useQuery(programsQueries.programsList({ orgId }))
159+
const enrollments = useQuery(enrollmentQueries.enrollmentsList({}))
160+
const programs = useQuery(programsQueries.programsList({ org_id: orgId }))
161161
const courseGroups = useMitxonlineProgramsCourses(
162162
programs.data?.results ?? [],
163163
)

yarn.lock

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)