Skip to content

RR7 3/5: Clean up admin/billing and collections splat routes #2000

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
GregorShear wants to merge 1 commit into
base: greg/rr7-2-data-router
Choose a base branch
from
+13 −21
Open

RR7 3/5: Clean up admin/billing and collections splat routes #2000

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 13 additions & 21 deletions src/context/Router/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,10 @@ const routes: RouteObject[] = [
},

{
path: `${authenticatedRoutes.collections.path}/*`,
// Splat handled by the `*` child below rather
// than a `path: 'collections/*'` parent, per
// react-router's v7_relativeSplatPath guidance.
path: authenticatedRoutes.collections.path,
children: [
// Check details first as collections create
// opens as dialog meaning we include the
Expand Down Expand Up @@ -477,38 +480,27 @@ const routes: RouteObject[] = [
.path,
element: suspended(<AdminApi />),
},
// TODO (routing cleanup): the `billing/*`
// subtree below produces /admin/billing and
// /admin/billing/billing, and is duplicated
// by the standalone billing route that
// follows it. Preserved verbatim during the
// data-router migration; worth pruning.
{
path: `${authenticatedRoutes.admin.billing.path}/*`,
path: authenticatedRoutes.admin.billing
.path,
children: [
{
index: true,
element: lazyElement(
<AdminBilling />
),
},
{
path: authenticatedRoutes.admin
.billing.addPayment.path,
element: suspended(
element: lazyElement(
<AdminBilling
showAddPayment
/>
),
},
{
path: authenticatedRoutes.admin
.billing.path,
element: suspended(
<AdminBilling />
),
},
],
},
{
path: authenticatedRoutes.admin.billing
.path,
element: lazyElement(<AdminBilling />),
},
{
path: authenticatedRoutes.admin.settings
.path,
Expand Down