Skip to content
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

fix: Restore loading bar and FlowEditor state on Editor-only routes #3772

Merged
merged 1 commit into from
Oct 8, 2024
Merged

fix: Restore loading bar and FlowEditor state on Editor-only routes #3772

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
74 changes: 42 additions & 32 deletions editor.planx.uk/src/routes/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,38 +57,48 @@ const editorRoutes = mount({
),
});

const mountPayRoutes = () =>
map(async () => {
compose(withView(loadingView));
return lazy(() => import("./pay"));
});
const loadPayRoutes = () =>
compose(
withView(loadingView),
lazy(() => import("./pay")),
);

export default isPreviewOnlyDomain
? compose(
withView(loadingView),
const loadPublishedRoutes = () =>
compose(
withView(loadingView),
lazy(() => import("./published")),
);

const loadPreviewRoutes = () =>
compose(
withView(loadingView),
lazy(() => import("./preview")),
);

mount({
"/:team/:flow/published": lazy(() => import("./published")), // XXX: keeps old URL working, but only for the team listed in the domain.
"/:flow": lazy(() => import("./published")),
"/:flow/pay": mountPayRoutes(),
// XXX: We're not sure where to redirect `/` to so for now we'll just return the default 404
// "/": redirect("somewhere?"),
}),
)
: compose(
withView(loadingView),
const loadDraftRoutes = () =>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice refactor - much easier to read :)

compose(
withView(loadingView),
lazy(() => import("./draft")),
);

mount({
"/:team/:flow/published": lazy(() => import("./published")), // loads current published flow if exists, or throws Not Found if unpublished
"/canterbury/find-out-if-you-need-planning-permission/preview": map(
async (req) =>
redirect(
`/canterbury/find-out-if-you-need-planning-permission/published${req?.search}`,
),
), // temporary redirect while Canterbury works with internal IT to update advertised service links
"/:team/:flow/preview": lazy(() => import("./preview")), // loads current draft flow and latest published external portals, or throws Not Found if any external portal is unpublished
"/:team/:flow/draft": lazy(() => import("./draft")), // loads current draft flow and draft external portals
"/:team/:flow/pay": mountPayRoutes(),
"*": editorRoutes,
}),
);
export default isPreviewOnlyDomain
? mount({
"/:team/:flow/published": loadPublishedRoutes(), // XXX: keeps old URL working, but only for the team listed in the domain.
"/:flow": loadPublishedRoutes(),
"/:flow/pay": loadPayRoutes(),
// XXX: We're not sure where to redirect `/` to so for now we'll just return the default 404
// "/": redirect("somewhere?"),
})
: mount({
"/:team/:flow/published": loadPublishedRoutes(), // loads current published flow if exists, or throws Not Found if unpublished
"/canterbury/find-out-if-you-need-planning-permission/preview": map(
async (req) =>
redirect(
`/canterbury/find-out-if-you-need-planning-permission/published${req?.search}`,
),
), // temporary redirect while Canterbury works with internal IT to update advertised service links
"/:team/:flow/preview": loadPreviewRoutes(), // loads current draft flow and latest published external portals, or throws Not Found if any external portal is unpublished
"/:team/:flow/draft": loadDraftRoutes(), // loads current draft flow and draft external portals
"/:team/:flow/pay": loadPayRoutes(),
"*": editorRoutes,
});
Loading