org dashboard contract refactor #2837

gumaerc · 2026-01-05T17:14:20Z

What are the relevant tickets?

Closes https://github.com/mitodl/hq/issues/9679

Description (What does it do?)

This PR reworks functionality in the dashboard surrounding b2b organizations / contracts:

Instead of a tab per organization the user is in, there is now a tab per contract. Organizations can have multiple contracts, but previously we were just selecting the first one.
The URL structure for dashboard contract pages is set up as /dashboard/organization/org-slug/contract/contract-slug
The OrganizationContent component was refactored / renamed to ContractContent and now requires a contract ID along with the org ID.

Screenshots (if appropriate):

How can this be tested?

Follow the instructions in the readme to set up MITx Online locally and connect it to your instance of Learn. They need to be sharing the same instance of Keycloak / APISIX so your user is consistent in both apps.
In MITx Online:
- Create a B2B organization
- Add your user to the B2B organization
- Create multiple B2B contracts tied to said org
- Create multiple programs with courses, assigning some to the first contract and some to the second
Back in MIT Learn:
- Visit the dashboard
- Verify that you now see two tabs in the dashboard, one for the first contract and one for the second
- Visit these pages by clicking on the tabs
- Verify that the URL structure for each contract is correct (/dashboard/organization/org-slug/contract/contract-slug)
- Verify that each contract displays the programs / courses you would expect based on what you added above

Checklist:

Set up redirects for the current org dashboards to go to the first contract available

frontends/main/src/app/dashboard/organization/[orgSlug]/contract/[contractSlug]/page.tsx

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

jonkafton

👍

ChristopherChudzicki · 2026-01-08T14:53:46Z

Checklist:

Set up redirects for the current org dashboards to go to the first contract available

Another thing we probably want to do is change some contract slugs. Currently it would be, e.g., https://learn.mit.edu/dashboard/organization/mit-universal-ai/contracts/contract-504-universal-ai for MIT UAI. The contract slugs aren't used for anything public right now, so it's a good opportunity to clean them up.

ChristopherChudzicki

This is working well for me except the empty contract issue.

Suggestion: In the interest of caution, do you think we should leave /dashboard/organization/[orgSlug] route in place for now, rendering something like

<ContractContent // <-- modify to use first contract if contractSlug missing
  orgSlug={resolved.orgSlug}
  contractSlug={null}
/>

Edit: Alternatively, could add a nextjs redirect for organization/[slug] to /organization, which would then redirect to most recent org contract.

ChristopherChudzicki · 2026-01-08T15:38:04Z

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

+      if (!contract?.programs || contract.programs.length === 0) {
        return true
      }


Blocking Question: What's the point of this filter? I currently have an org with 3 contracts, one of which is empty. The empty contract shows all org content (but in a kinda buggy way).

Separately: I think the contract filtering should ideally be done at the request level, though probably the APIs don't support that filter yet.

ChristopherChudzicki · 2026-01-08T16:08:54Z

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

+                <Typography variant="subtitle2" component="span">
+                  {org.name}
+                </Typography>
+                {` - ${contract?.name}`}


github suggestions seem to have disappeared for me...

But contract.name would be fine, it's not nullable.

ChristopherChudzicki · 2026-01-08T16:14:03Z

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

+            const contract = b2bOrganization.contracts[0]
+            if (contract) {
+              const contractUrl = contractView(
+                b2bOrganization.slug.replace("org-", ""),


We should remove all the org prefixes in prod, IMO, and drop all the org- stripping shenanigans.

Since wagtail slugs only need to be unique within their parent, and all organization pages are children of the organization index page, it should be fine to drop the prefix. And client side we've always stripped the prefix, so there should be no behavior change for users.

Separate issue, though.

ChristopherChudzicki · 2026-01-08T16:16:26Z

frontends/main/src/app/dashboard/organization/[orgSlug]/contract/[contractSlug]/page.tsx

+  invariant(resolved.orgSlug, "orgSlug is required")
+  invariant(resolved.contractSlug, "contractSlug is required")


These invariant calls are unnecessary:

The non-nullable string type here makes sense to me because the router will only match this file if orgSlug and contractSlug are not empty.

We may have similar invariant calls in place elsewhere. Before NextJS added that PageProps thing, it wouldn't have known that those params were non-nullale.

gumaerc · 2026-01-09T22:10:14Z

This is working well for me except the empty contract issue.

Suggestion: In the interest of caution, do you think we should leave /dashboard/organization/[orgSlug] route in place for now, rendering something like
<ContractContent // <-- modify to use first contract if contractSlug missing
  orgSlug={resolved.orgSlug}
  contractSlug={null}
/>
Edit: Alternatively, could add a nextjs redirect for organization/[slug] to /organization, which would then redirect to most recent org contract.

In the last commit (a5149ad) I added this functionality you suggested. It either displays the first available contract or redirects to the dashboard home if none are found. What do you think?

…a single contract as context, then iterate all contracts on the dashboard nav

… for that org or back to the dashboard home if no contracts are found

gumaerc added the Work in Progress label Jan 5, 2026

gumaerc changed the title ~~org dashboard contract refactor~~ [WIP] org dashboard contract refactor Jan 5, 2026

gumaerc force-pushed the cg/org-dashboard-contract-refactor branch from f226648 to 9a2411b Compare January 6, 2026 17:09

gumaerc added Needs Review An open Pull Request that is ready for review and removed Work in Progress labels Jan 6, 2026

gumaerc changed the title ~~[WIP] org dashboard contract refactor~~ org dashboard contract refactor Jan 6, 2026

jonkafton reviewed Jan 7, 2026

View reviewed changes

frontends/main/src/app/dashboard/organization/[orgSlug]/contract/[contractSlug]/page.tsx Show resolved Hide resolved

jonkafton reviewed Jan 7, 2026

View reviewed changes

frontends/main/src/app-pages/DashboardPage/ContractContent.tsx Outdated Show resolved Hide resolved

jonkafton reviewed Jan 7, 2026

View reviewed changes

frontends/main/src/app-pages/DashboardPage/ContractContent.tsx Outdated Show resolved Hide resolved

jonkafton reviewed Jan 7, 2026

View reviewed changes

frontends/main/src/app-pages/DashboardPage/ContractContent.tsx Show resolved Hide resolved

jonkafton approved these changes Jan 7, 2026

View reviewed changes

ChristopherChudzicki requested changes Jan 8, 2026

View reviewed changes

gumaerc added 12 commits January 9, 2026 17:19

Rename OrganizationContent to ContractContent and refactor it to use …

f4909a1

…a single contract as context, then iterate all contracts on the dashboard nav

update tests to pass contract_id as expected

a95b717

move back to release mitxonline api client

8874a57

fix yarn lock after rebase

1683166

update mitxonline api package again

03f057c

fix typescript issues

bd9ee7c

fix more tests

ec5bc96

Add contract handling to OrganizationRedirect

26e8b81

pass org to contract header in both spots

30fdfab

remove outdated comment

d85dddd

show more appropriate error messages if org or contract isn't found

a09dc40

add a redirect at the org root that either goes to the first contract…

e3d8e54

… for that org or back to the dashboard home if no contracts are found

gumaerc force-pushed the cg/org-dashboard-contract-refactor branch from a5149ad to e3d8e54 Compare January 9, 2026 22:19

fix up program filtering

19fba0c

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

org dashboard contract refactor #2837

org dashboard contract refactor #2837

Uh oh!

gumaerc commented Jan 5, 2026 •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

jonkafton left a comment

Uh oh!

ChristopherChudzicki commented Jan 8, 2026 •

edited

Loading

Uh oh!

ChristopherChudzicki left a comment •

edited

Loading

Uh oh!

ChristopherChudzicki Jan 8, 2026

Uh oh!

ChristopherChudzicki Jan 8, 2026

Uh oh!

ChristopherChudzicki Jan 8, 2026

Uh oh!

ChristopherChudzicki Jan 8, 2026

Uh oh!

ChristopherChudzicki Jan 8, 2026

Uh oh!

gumaerc commented Jan 9, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

		invariant(resolved.orgSlug, "orgSlug is required")
		invariant(resolved.contractSlug, "contractSlug is required")

org dashboard contract refactor #2837

Are you sure you want to change the base?

org dashboard contract refactor #2837

Uh oh!

Conversation

gumaerc commented Jan 5, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What are the relevant tickets?

Description (What does it do?)

Screenshots (if appropriate):

How can this be tested?

Checklist:

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

jonkafton left a comment

Choose a reason for hiding this comment

Uh oh!

ChristopherChudzicki commented Jan 8, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ChristopherChudzicki left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ChristopherChudzicki Jan 8, 2026

Choose a reason for hiding this comment

Uh oh!

ChristopherChudzicki Jan 8, 2026

Choose a reason for hiding this comment

Uh oh!

ChristopherChudzicki Jan 8, 2026

Choose a reason for hiding this comment

Uh oh!

ChristopherChudzicki Jan 8, 2026

Choose a reason for hiding this comment

Uh oh!

ChristopherChudzicki Jan 8, 2026

Choose a reason for hiding this comment

Uh oh!

gumaerc commented Jan 9, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

gumaerc commented Jan 5, 2026 •

edited

Loading

ChristopherChudzicki commented Jan 8, 2026 •

edited

Loading

ChristopherChudzicki left a comment •

edited

Loading