Core 1039 improve portal routing #2750
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
RoyEJohnson
force-pushed
the
core-1039-improve-portal-routing
branch
from
8966e8f to
b57c481
Compare
RoyEJohnson
commented
Jun 25, 2025
| @@ -0,0 +1,72 @@ | |||
| import React, {useEffect} from 'react'; | |||
There was a problem hiding this comment.
These were largely extracted from router.js
RoyEJohnson
commented
Jun 25, 2025
| import {ImportedPage} from './page-loaders'; | ||
| import {RouteAsPortalOrNot} from './portal-page-routes'; | ||
|
|
||
| type PageData = FlexPageData & { |
There was a problem hiding this comment.
This file is the bulk of the new routing process.
RoyEJohnson
commented
Jun 25, 2025
| import {ImportedPage} from './page-loaders'; | ||
|
|
||
| // eslint-disable-next-line complexity | ||
| export function RouteAsPortalOrNot() { |
There was a problem hiding this comment.
This file is the rest of the new routing process. I punted it back to JS because the tests were failing in strange and inscrutable ways (and JS files are exempt from the 100% coverage rule)
RoyEJohnson
commented
Jun 25, 2025
| @@ -0,0 +1,95 @@ | |||
| import React, {useEffect} from 'react'; | |||
There was a problem hiding this comment.
What was left in router.js is now TS.
RoyEJohnson
commented
Jun 25, 2025
| const loaders = { | ||
| default: () => import('~/layouts/default/default'), | ||
| landing: () => import('~/layouts/landing/landing') | ||
| }; | ||
|
|
||
| type LayoutParameters = { | ||
| name: LayoutName; | ||
| name: LayoutName | null; |
There was a problem hiding this comment.
To prevent flashing from one layout to another, I allow a null LayoutName.
RoyEJohnson
force-pushed
the
core-1039-improve-portal-routing
branch
5 times, most recently
from
0cb5b73 to
d9525c9
Compare
RoyEJohnson
commented
Jun 25, 2025
| @@ -7,17 +7,17 @@ import useMainClassContext, { | |||
| import useLanguageContext from '~/contexts/language'; | |||
| import ReactModal from 'react-modal'; | |||
| import cn from 'classnames'; | |||
| import { LinkFields } from '../../pages/flex-page/components/Link'; | |||
| import {LinkFields} from '../../pages/flex-page/components/Link'; | |||
There was a problem hiding this comment.
Changes here are just due to prettier
RoyEJohnson
force-pushed
the
core-1039-improve-portal-routing
branch
2 times, most recently
from
45df849 to
385171d
Compare
RoyEJohnson
force-pushed
the
core-1039-improve-portal-routing
branch
from
385171d to
a8b8f23
Compare
RoyEJohnson
force-pushed
the
core-1039-improve-portal-routing
branch
from
a8b8f23 to
cbcc979
Compare
RoyEJohnson
force-pushed
the
core-1039-improve-portal-routing
branch
from
cbcc979 to
c2ea0f5
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
CORE-1039
By examining the data from the CMS to determine what kind of page was being requested, I was able to get rid of the fallback process.