22541 consolidate breadcrumb mapped route maps into grouped constants
This commit is contained in:
+19
-37
@@ -113,7 +113,6 @@ const Breadcrumbs = (props) => {
|
||||
return staticTextCrumbByPath[path] || null;
|
||||
};
|
||||
|
||||
const getSimpleRouteRenderer = (path) => {
|
||||
const simpleRouteRenderersByPath = {
|
||||
"/myportal": () => renderTextCrumb(t("myportal:page-title")),
|
||||
"/searchresults": () =>
|
||||
@@ -130,10 +129,6 @@ const Breadcrumbs = (props) => {
|
||||
renderMyPortalSectionCrumbs(t("dnsCommon:service-name"))
|
||||
};
|
||||
|
||||
return simpleRouteRenderersByPath[path] || null;
|
||||
};
|
||||
|
||||
const getSimpleLinkTextPairRenderer = (path) => {
|
||||
const simpleLinkTextPairRenderersByPath = {
|
||||
"/addresssearchresults": () => (
|
||||
<>
|
||||
@@ -143,9 +138,7 @@ const Breadcrumbs = (props) => {
|
||||
: "/addresssearch",
|
||||
t("common:breadcrumb-address-search")
|
||||
)}
|
||||
{renderTextCrumb(
|
||||
t("common:breadcrumb-address-search-results")
|
||||
)}
|
||||
{renderTextCrumb(t("common:breadcrumb-address-search-results"))}
|
||||
</>
|
||||
),
|
||||
"/advancedsearchresults": () => (
|
||||
@@ -163,10 +156,6 @@ const Breadcrumbs = (props) => {
|
||||
)
|
||||
};
|
||||
|
||||
return simpleLinkTextPairRenderersByPath[path] || null;
|
||||
};
|
||||
|
||||
const getSimpleMyPortalRouteRenderer = (path) => {
|
||||
const simpleMyPortalRouteRenderersByPath = {
|
||||
"/myportal/searchresults": () => (
|
||||
<>
|
||||
@@ -178,22 +167,16 @@ const Breadcrumbs = (props) => {
|
||||
</>
|
||||
),
|
||||
"/myportal/addresssearch": () =>
|
||||
renderMyPortalSectionCrumbs(
|
||||
t("common:breadcrumb-address-search")
|
||||
),
|
||||
renderMyPortalSectionCrumbs(t("common:breadcrumb-address-search")),
|
||||
"/myportal/advancedsearch": () =>
|
||||
renderMyPortalSectionCrumbs(
|
||||
t("common:breadcrumb-advanced-search")
|
||||
),
|
||||
renderMyPortalSectionCrumbs(t("common:breadcrumb-advanced-search")),
|
||||
"/myportal/contactus": () =>
|
||||
renderMyPortalSectionCrumbs(
|
||||
t("common:footer-contact-us-link-label")
|
||||
),
|
||||
"/myportal/viewall": () =>
|
||||
renderMyPortalSectionCrumbs(
|
||||
getViewAllLabel(
|
||||
currentViewState.viewKey || router.query.key
|
||||
)
|
||||
getViewAllLabel(currentViewState.viewKey || router.query.key)
|
||||
),
|
||||
"/myportal/advancedsearchresults": () => (
|
||||
<>
|
||||
@@ -214,31 +197,30 @@ const Breadcrumbs = (props) => {
|
||||
{renderMyPortalCrumb()}
|
||||
{renderLinkCrumb(
|
||||
isWelsh
|
||||
? "/" +
|
||||
router.locale +
|
||||
"/fymhorth/chwiliadcyfeiriadau"
|
||||
? "/" + router.locale + "/fymhorth/chwiliadcyfeiriadau"
|
||||
: "/myportal/addresssearch",
|
||||
t("common:breadcrumb-address-search")
|
||||
)}
|
||||
{renderTextCrumb(
|
||||
t("common:breadcrumb-address-search-results")
|
||||
)}
|
||||
{renderTextCrumb(t("common:breadcrumb-address-search-results"))}
|
||||
</>
|
||||
)
|
||||
};
|
||||
|
||||
return simpleMyPortalRouteRenderersByPath[path] || null;
|
||||
};
|
||||
|
||||
const resolveMappedRouteRenderer = (path) => {
|
||||
const mappedResolvers = [
|
||||
getSimpleRouteRenderer,
|
||||
getSimpleLinkTextPairRenderer,
|
||||
getSimpleMyPortalRouteRenderer
|
||||
const mappedRouteRendererMaps = [
|
||||
simpleRouteRenderersByPath,
|
||||
simpleLinkTextPairRenderersByPath,
|
||||
simpleMyPortalRouteRenderersByPath
|
||||
];
|
||||
|
||||
for (const resolveRenderer of mappedResolvers) {
|
||||
const routeRenderer = resolveRenderer(path);
|
||||
const getMappedRendererByPath = (path, routeRendererMap) =>
|
||||
routeRendererMap[path] || null;
|
||||
|
||||
const resolveMappedRouteRenderer = (path) => {
|
||||
for (const routeRendererMap of mappedRouteRendererMaps) {
|
||||
const routeRenderer = getMappedRendererByPath(
|
||||
path,
|
||||
routeRendererMap
|
||||
);
|
||||
if (routeRenderer) {
|
||||
return routeRenderer;
|
||||
}
|
||||
|
||||
@@ -459,6 +459,39 @@ Follow-ups:
|
||||
|
||||
- Next wider slice candidate: split map resolver sections into clearly named grouped constants (simple/public/myportal) near one composition point, then optionally move map-only route renderers to a local pure helper module if continued growth impacts scanability.
|
||||
|
||||
### CL-22541-P: breadcrumbs grouped route-map constants + unified map composition point
|
||||
|
||||
date: 2026-04-09
|
||||
author: Cline
|
||||
scope: `components/breadcrumbs.js`, `tests/phase22/breadcrumbs-route-map-structure.test.cjs`
|
||||
type: change
|
||||
rationale: Execute the next wider slice by replacing per-group resolver functions with grouped route-map constants and a single composition array to further improve scanability while preserving route precedence semantics.
|
||||
impact: Refactor-only structural readability improvement; no intended route/auth/session/API/EN-CY/a11y behavior change.
|
||||
status: completed
|
||||
|
||||
Summary:
|
||||
|
||||
- Replaced function-based map accessors with grouped route-map constants in `components/breadcrumbs.js`:
|
||||
- `simpleRouteRenderersByPath`
|
||||
- `simpleLinkTextPairRenderersByPath`
|
||||
- `simpleMyPortalRouteRenderersByPath`
|
||||
- Added unified map composition point:
|
||||
- `mappedRouteRendererMaps` (ordered array preserving precedence)
|
||||
- `getMappedRendererByPath(path, routeRendererMap)` helper
|
||||
- Updated `resolveMappedRouteRenderer(path)` to iterate the composed map list while retaining previous resolution order and behavior.
|
||||
- Kept dynamic/callback branches explicit and unchanged outside map-driven paths.
|
||||
- Expanded structure tests to assert grouped map composition contracts (`mappedRouteRendererMaps`, `getMappedRendererByPath`) in addition to existing resolver and invocation guardrails.
|
||||
|
||||
Validation:
|
||||
|
||||
- `npx eslint components/breadcrumbs.js tests/phase22/breadcrumbs-route-map-structure.test.cjs tests/phase22/index.test.cjs` -> pass.
|
||||
- `node tests/phase22/index.test.cjs` -> pass (combined suite; breadcrumbs-route-map tests 3/3).
|
||||
|
||||
Follow-ups:
|
||||
|
||||
- Next slice option A (larger): extract map constants + resolver helpers into a local `lib/routing/breadcrumbRouteMaps.js` pure module with focused tests, keeping callback/stateful branch rendering in component.
|
||||
- Next slice option B (smaller): expand structure tests to assert explicit map ordering invariants so future reordering regressions are caught early.
|
||||
|
||||
### CL-00X: 22500 `components/elements/index.js` Phase 1 helper extraction
|
||||
|
||||
date: 2026-04-07
|
||||
|
||||
@@ -59,6 +59,20 @@ test("breadcrumbs/simple-link-text map includes address and advanced search resu
|
||||
test("breadcrumbs/merged resolver renders mapped routes through single helper invocation", async () => {
|
||||
const source = loadBreadcrumbSource();
|
||||
|
||||
assert.strictEqual(
|
||||
source.includes("const mappedRouteRendererMaps = ["),
|
||||
true,
|
||||
"Expected grouped mapped route renderer map composition to exist"
|
||||
);
|
||||
|
||||
assert.strictEqual(
|
||||
source.includes(
|
||||
"const getMappedRendererByPath = (path, routeRendererMap) =>"
|
||||
),
|
||||
true,
|
||||
"Expected shared mapped renderer lookup helper to exist"
|
||||
);
|
||||
|
||||
assert.strictEqual(
|
||||
source.includes("const resolveMappedRouteRenderer = (path) =>"),
|
||||
true,
|
||||
|
||||
Reference in New Issue
Block a user