From 1c06ef1639877e8d199440eed92d581260c10860 Mon Sep 17 00:00:00 2001 From: robbond Date: Thu, 9 Apr 2026 09:23:22 +0100 Subject: [PATCH 01/33] 22541 extract breadcrumb route-state helper and align phase22 auth locale test --- components/breadcrumbs.js | 72 ++++------ components/case/summary.js | 63 ++------- lib/routing/routeState.js | 62 +++++++++ memory-bank/change-log.md | 34 +++++ tests/phase22/auth-redirect-safety.test.cjs | 12 +- tests/phase22/index.test.cjs | 2 + tests/phase22/route-state-helper.test.cjs | 139 ++++++++++++++++++++ 7 files changed, 279 insertions(+), 105 deletions(-) create mode 100644 lib/routing/routeState.js create mode 100644 tests/phase22/route-state-helper.test.cjs diff --git a/components/breadcrumbs.js b/components/breadcrumbs.js index 94dffcc5..8cad3c16 100644 --- a/components/breadcrumbs.js +++ b/components/breadcrumbs.js @@ -12,6 +12,10 @@ import { setRepresentationCapacity, setRepresentationSubmit } from "../store/currentView/action"; +import { + normalizeRouteStateQuery, + resolveSearchResultsHref +} from "../lib/routing/routeState"; const Breadcrumbs = (props) => { const { currentView, @@ -69,9 +73,8 @@ const Breadcrumbs = (props) => { ? 9 : ""; - const { va, adv, ads, key } = router.query; - const isAdv = adv === "true"; - const isAds = ads === "true"; + const routeState = normalizeRouteStateQuery(router.query); + const { viewAll, advanced, address, key } = routeState; const hideServiceNamePaths = [ "/myportal/[appealtypes]", @@ -95,55 +98,33 @@ const Breadcrumbs = (props) => { return labelsByKey[viewKey] || null; }; - const breadcrumbHref = (() => { - if (va === "true") { - return { - pathname: "/myportal/viewall", - query: { key } - }; - } + const breadcrumbHref = resolveSearchResultsHref({ + query: router.query, + hasSession: Boolean(session), + includeViewAll: true, + fallbackToMyPortalWhenNoFlags: true + }); - const base = session ? "/myportal" : ""; - - if (!va && !adv && !ads) { - return { - pathname: "/myportal" - }; - } - - if (adv === "true") { - return { - pathname: `${base}/advancedsearchresults`, - query: router.query - }; - } - - if (ads === "true") { - return { - pathname: `${base}/addresssearchresults`, - query: router.query - }; - } - - return { - pathname: `${base}/searchresults`, - query: router.query - }; - })(); + const caseResultsHref = resolveSearchResultsHref({ + query: router.query, + hasSession: Boolean(session), + includeViewAll: false, + fallbackToMyPortalWhenNoFlags: false + }); const breadcrumbLabel = (() => { - if (va === "true") { + if (viewAll) { return getViewAllLabel(key); } const keyedLabel = getViewAllLabel(key); if (keyedLabel) return keyedLabel; - if (isAdv) { + if (advanced) { return t("common:breadcrumb-advanced-search-results"); } - if (isAds) { + if (address) { return t("common:breadcrumb-address-search-results"); } @@ -518,16 +499,7 @@ const Breadcrumbs = (props) => { <>
  • {breadcrumbLabel} diff --git a/components/case/summary.js b/components/case/summary.js index 9958de55..cbbe4b7c 100644 --- a/components/case/summary.js +++ b/components/case/summary.js @@ -45,6 +45,7 @@ import { showRepsEnded, getBilingualText } from "./summary/utils/helpers"; +import { resolveSearchResultsHref } from "../../lib/routing/routeState"; import CaseNoticeBanner from "./caseNoticeBanner"; import WatchModal from "./watchmodal"; @@ -324,52 +325,19 @@ const CaseSummary = (props) => { const zoom = isNaN(parseFloat(siteCoords.latitude)) ? 7 : 12; - const buildSearchHref = (router, session) => { - const { va, adv, ads, key } = router.query; + const isDnsRoute = + router.pathname === "/dns" || + router.pathname.startsWith("/dns/") || + router.pathname === "/myportal/dns" || + router.pathname.startsWith("/myportal/dns/"); - const isDnsRoute = - router.pathname === "/dns" || - router.pathname.startsWith("/dns/") || - router.pathname === "/myportal/dns" || - router.pathname.startsWith("/myportal/dns/"); - - const base = session ? "/myportal" : ""; - - if (!va && !adv && !ads) { - return { - pathname: "/myportal" - }; - } - - if (isDnsRoute) { - return { - pathname: `${base}/dnsapplications` - }; - } - - if (va === "true") { - return { - pathname: "/myportal/viewall", - query: { key } - }; - } - - if (adv === "true") { - return { - pathname: `${base}/advancedsearchresults`, - query: router.query - }; - } - - if (ads === "true") { - return { - pathname: `${base}/addresssearchresults`, - query: router.query - }; - } - - return { pathname: `${base}/searchresults`, query: router.query }; - }; + const searchHref = resolveSearchResultsHref({ + query: router.query, + hasSession: Boolean(session), + includeViewAll: true, + fallbackToMyPortalWhenNoFlags: true, + isDnsRoute + }); let showDetailsBlock = showDetails == true ? ( @@ -1043,10 +1011,7 @@ const CaseSummary = (props) => { {" "} {t( diff --git a/lib/routing/routeState.js b/lib/routing/routeState.js new file mode 100644 index 00000000..3784751d --- /dev/null +++ b/lib/routing/routeState.js @@ -0,0 +1,62 @@ +export const normalizeRouteStateQuery = (query = {}) => { + const viewAll = query?.va === "true"; + const advanced = query?.adv === "true"; + const address = query?.ads === "true"; + + return { + viewAll, + advanced, + address, + key: query?.key + }; +}; + +export const resolveSearchResultsHref = ({ + query = {}, + hasSession = false, + includeViewAll = true, + fallbackToMyPortalWhenNoFlags = false, + isDnsRoute = false +} = {}) => { + const routeState = normalizeRouteStateQuery(query); + const { viewAll, advanced, address, key } = routeState; + const base = hasSession ? "/myportal" : ""; + + if (fallbackToMyPortalWhenNoFlags && !viewAll && !advanced && !address) { + return { + pathname: "/myportal" + }; + } + + if (isDnsRoute) { + return { + pathname: `${base}/dnsapplications` + }; + } + + if (includeViewAll && viewAll) { + return { + pathname: "/myportal/viewall", + query: { key } + }; + } + + if (advanced) { + return { + pathname: `${base}/advancedsearchresults`, + query + }; + } + + if (address) { + return { + pathname: `${base}/addresssearchresults`, + query + }; + } + + return { + pathname: `${base}/searchresults`, + query + }; +}; diff --git a/memory-bank/change-log.md b/memory-bank/change-log.md index 28f12758..ee5ba512 100644 --- a/memory-bank/change-log.md +++ b/memory-bank/change-log.md @@ -18,6 +18,40 @@ Follow-ups: --- +### CL-22541: breadcrumb/back-link route-state helper extraction (`va/adv/ads/key`) + +date: 2026-04-09 +author: Cline +scope: `lib/routing/routeState.js`, `components/breadcrumbs.js`, `components/case/summary.js`, `tests/phase22/{route-state-helper.test.cjs,index.test.cjs}` +type: change +rationale: Action Priority 3 refactor backlog item by extracting duplicated route-state decision logic (`va/adv/ads/key`) into a shared pure helper and reusing it from breadcrumb and case-summary back-link flows to reduce drift/regression risk. +impact: Refactor-only decision-layer consolidation for search/case/myportal navigation; no auth/session/CSP/API contract changes; EN/CY behavior intended unchanged as helper only resolves route targets and preserves existing query forwarding behavior. +status: completed + +Summary: + +- Created branch from `origin/SIPS-Development`: `22541-breadcrumb-route-state-helper`. +- Added `lib/routing/routeState.js` with: + - `normalizeRouteStateQuery(query)` + - `resolveSearchResultsHref(options)` +- Updated `components/breadcrumbs.js` to consume the shared helper for: + - breadcrumb href resolution (`/myportal/viewall`, advanced/address/default results) + - case-results breadcrumb target on `/case/[ticketnumber]` + - preserving existing label selection behavior via normalized flags. +- Updated `components/case/summary.js` to replace local `buildSearchHref` with shared helper output (`searchHref`), including DNS-route override and no-flag fallback behavior. +- Added table-driven unit coverage in `tests/phase22/route-state-helper.test.cjs` and registered it in `tests/phase22/index.test.cjs`. + +Validation: + +- `npx eslint lib/routing/routeState.js components/breadcrumbs.js components/case/summary.js tests/phase22/route-state-helper.test.cjs tests/phase22/index.test.cjs` -> pass with 1 pre-existing warning in `components/case/summary.js` (`react-hooks/exhaustive-deps`). +- `node tests/phase22/route-state-helper.test.cjs` -> pass (5/5). +- `node tests/phase22/index.test.cjs` -> fails in existing auth suite (`tests/phase22/auth-redirect-safety.test.cjs`) with `ReferenceError: resolveLocale is not defined` in `pages/api/auth/[...nextauth].js`; unrelated to route-state changes. + +Follow-ups: + +- If needed, triage/fix the existing phase22 auth redirect test harness failure separately to restore full combined suite execution. +- Expand helper adoption in future slices to other navigation decision call sites if additional duplication emerges. + ### CL-00X: 22500 `components/elements/index.js` Phase 1 helper extraction date: 2026-04-07 diff --git a/tests/phase22/auth-redirect-safety.test.cjs b/tests/phase22/auth-redirect-safety.test.cjs index 7020109c..9cbf80d8 100644 --- a/tests/phase22/auth-redirect-safety.test.cjs +++ b/tests/phase22/auth-redirect-safety.test.cjs @@ -21,7 +21,7 @@ const loadAuthInternals = () => { source = source.replace(/import[\s\S]*?from\s+"[^"]+";\n?/g, ""); source = source.replace( /export default NextAuthPEDW;\s*$/, - "module.exports = { appendParamsAndPathToNewUrl, resolveLocale, authOptions, NextAuthPEDW };" + "module.exports = { appendParamsAndPathToNewUrl, resolveRequestLocale, authOptions, NextAuthPEDW };" ); const context = { @@ -68,11 +68,11 @@ const loadAuthInternals = () => { return context.module.exports; }; -test("auth/resolveLocale prefers query then body then cookie then default", async () => { +test("auth/resolveRequestLocale prefers query then body then cookie then default", async () => { const mod = loadAuthInternals(); assert.strictEqual( - mod.resolveLocale({ + mod.resolveRequestLocale({ query: { locale: "cy" }, body: { locale: "en" }, cookies: { pedw_locale: "en" } @@ -81,7 +81,7 @@ test("auth/resolveLocale prefers query then body then cookie then default", asyn ); assert.strictEqual( - mod.resolveLocale({ + mod.resolveRequestLocale({ body: { locale: "cy" }, cookies: { pedw_locale: "en" } }), @@ -89,13 +89,13 @@ test("auth/resolveLocale prefers query then body then cookie then default", asyn ); assert.strictEqual( - mod.resolveLocale({ + mod.resolveRequestLocale({ cookies: { pedw_locale: "cy" } }), "cy" ); - assert.strictEqual(mod.resolveLocale({}), "en"); + assert.strictEqual(mod.resolveRequestLocale({}), "en"); }); test("auth/redirect callback keeps relative URLs on same base", async () => { diff --git a/tests/phase22/index.test.cjs b/tests/phase22/index.test.cjs index 02d4341c..a8e2ea0f 100644 --- a/tests/phase22/index.test.cjs +++ b/tests/phase22/index.test.cjs @@ -6,6 +6,7 @@ const runPortalServiceTests = require("./portal-service-behaviour.test.cjs"); const runAuthRedirectSafetyTests = require("./auth-redirect-safety.test.cjs"); const runI18nRouteParityTests = require("./i18n-route-parity.test.cjs"); const runAzurestorageHelperTests = require("./azurestorage-helper-behaviour.test.cjs"); +const runRouteStateHelperTests = require("./route-state-helper.test.cjs"); const run = async () => { await runCoreTokenTests(); @@ -16,6 +17,7 @@ const run = async () => { await runAuthRedirectSafetyTests(); await runI18nRouteParityTests(); await runAzurestorageHelperTests(); + await runRouteStateHelperTests(); console.log("Phase 22 combined suite passed."); }; diff --git a/tests/phase22/route-state-helper.test.cjs b/tests/phase22/route-state-helper.test.cjs new file mode 100644 index 00000000..6b2ac398 --- /dev/null +++ b/tests/phase22/route-state-helper.test.cjs @@ -0,0 +1,139 @@ +const fs = require("fs"); +const path = require("path"); +const vm = require("vm"); +const assert = require("assert"); + +const rootDir = path.resolve(__dirname, "..", ".."); + +const loadRouteStateModule = () => { + const filePath = path.join(rootDir, "lib", "routing", "routeState.js"); + let source = fs.readFileSync(filePath, "utf8"); + + source = source.replace(/export const\s+/g, "const "); + source += + "\nmodule.exports = { normalizeRouteStateQuery, resolveSearchResultsHref };\n"; + + const context = { + module: { exports: {} }, + exports: {}, + require + }; + + vm.runInNewContext(source, context, { filename: filePath }); + return context.module.exports; +}; + +const tests = []; +const test = (name, fn) => tests.push({ name, fn }); + +test("routing/routeState normalizes va/adv/ads flags and key", async () => { + const mod = loadRouteStateModule(); + + const normalized = mod.normalizeRouteStateQuery({ + va: "true", + adv: "false", + ads: "true", + key: "myCases" + }); + + assert.deepStrictEqual(JSON.parse(JSON.stringify(normalized)), { + viewAll: true, + advanced: false, + address: true, + key: "myCases" + }); +}); + +test("routing/routeState resolves view-all href when va=true", async () => { + const mod = loadRouteStateModule(); + + const href = mod.resolveSearchResultsHref({ + query: { va: "true", key: "myCases", adv: "true" }, + hasSession: true + }); + + assert.deepStrictEqual(JSON.parse(JSON.stringify(href)), { + pathname: "/myportal/viewall", + query: { key: "myCases" } + }); +}); + +test("routing/routeState resolves advanced/address/default result hrefs", async () => { + const mod = loadRouteStateModule(); + + const advancedHref = mod.resolveSearchResultsHref({ + query: { adv: "true", q: "abc" }, + hasSession: false + }); + const addressHref = mod.resolveSearchResultsHref({ + query: { ads: "true", q: "abc" }, + hasSession: true + }); + const defaultHref = mod.resolveSearchResultsHref({ + query: { q: "abc" }, + hasSession: true + }); + + assert.deepStrictEqual(JSON.parse(JSON.stringify(advancedHref)), { + pathname: "/advancedsearchresults", + query: { adv: "true", q: "abc" } + }); + assert.deepStrictEqual(JSON.parse(JSON.stringify(addressHref)), { + pathname: "/myportal/addresssearchresults", + query: { ads: "true", q: "abc" } + }); + assert.deepStrictEqual(JSON.parse(JSON.stringify(defaultHref)), { + pathname: "/myportal/searchresults", + query: { q: "abc" } + }); +}); + +test("routing/routeState supports fallback to /myportal when no route flags", async () => { + const mod = loadRouteStateModule(); + + const href = mod.resolveSearchResultsHref({ + query: { q: "abc" }, + hasSession: false, + fallbackToMyPortalWhenNoFlags: true + }); + + assert.deepStrictEqual(JSON.parse(JSON.stringify(href)), { + pathname: "/myportal" + }); +}); + +test("routing/routeState supports DNS route override", async () => { + const mod = loadRouteStateModule(); + + const href = mod.resolveSearchResultsHref({ + query: { adv: "true", q: "abc" }, + hasSession: true, + isDnsRoute: true + }); + + assert.deepStrictEqual(JSON.parse(JSON.stringify(href)), { + pathname: "/myportal/dnsapplications" + }); +}); + +const run = async () => { + let passed = 0; + + for (const currentTest of tests) { + await currentTest.fn(); + passed += 1; + } + + console.log( + `Phase 22 route-state helper tests passed (${passed}/${tests.length}).` + ); +}; + +module.exports = run; + +if (require.main === module) { + run().catch((error) => { + console.error(error); + process.exit(1); + }); +} From 59d3ed287ca82b22eccb2c9e11ff5b7f677cbc3d Mon Sep 17 00:00:00 2001 From: robbond Date: Thu, 9 Apr 2026 09:26:19 +0100 Subject: [PATCH 02/33] 22541 expand breadcrumb route-state helpers for label and dns path reuse --- components/breadcrumbs.js | 32 +++++------------ components/case/summary.js | 11 +++--- lib/routing/routeState.js | 32 +++++++++++++++++ memory-bank/change-log.md | 31 ++++++++++++++++ tests/phase22/route-state-helper.test.cjs | 44 ++++++++++++++++++++++- 5 files changed, 120 insertions(+), 30 deletions(-) diff --git a/components/breadcrumbs.js b/components/breadcrumbs.js index 8cad3c16..bf48acf2 100644 --- a/components/breadcrumbs.js +++ b/components/breadcrumbs.js @@ -13,8 +13,8 @@ import { setRepresentationSubmit } from "../store/currentView/action"; import { - normalizeRouteStateQuery, - resolveSearchResultsHref + resolveSearchResultsHref, + resolveSearchBreadcrumbLabel } from "../lib/routing/routeState"; const Breadcrumbs = (props) => { const { @@ -73,9 +73,6 @@ const Breadcrumbs = (props) => { ? 9 : ""; - const routeState = normalizeRouteStateQuery(router.query); - const { viewAll, advanced, address, key } = routeState; - const hideServiceNamePaths = [ "/myportal/[appealtypes]", "/newappeal", @@ -112,24 +109,13 @@ const Breadcrumbs = (props) => { fallbackToMyPortalWhenNoFlags: false }); - const breadcrumbLabel = (() => { - if (viewAll) { - return getViewAllLabel(key); - } - - const keyedLabel = getViewAllLabel(key); - if (keyedLabel) return keyedLabel; - - if (advanced) { - return t("common:breadcrumb-advanced-search-results"); - } - - if (address) { - return t("common:breadcrumb-address-search-results"); - } - - return t("common:breadcrumb-search-results"); - })(); + const breadcrumbLabel = resolveSearchBreadcrumbLabel({ + query: router.query, + getViewAllLabel, + advancedLabel: t("common:breadcrumb-advanced-search-results"), + addressLabel: t("common:breadcrumb-address-search-results"), + defaultLabel: t("common:breadcrumb-search-results") + }); return ( <>
    • -
  • - {t("common:breadcrumb-case-reference")}:{" "} - {currentReference} -
    • + {renderCaseReferenceCrumb(currentReference)} )} {isPath("/case/[ticketnumber]") && ( @@ -435,10 +438,7 @@ const Breadcrumbs = (props) => { {breadcrumbLabel} -
  • - {t("common:breadcrumb-case-reference")}:{" "} - {fallbackSearchTitle} -
    • + {renderCaseReferenceCrumb(fallbackSearchTitle)} )} {isPath("/case/id/[incident]") && ( @@ -475,10 +475,7 @@ const Breadcrumbs = (props) => { )} -
  • - {t("common:breadcrumb-case-reference")}:{" "} - {currentReference} -
    • + {renderCaseReferenceCrumb(currentReference)} )} {isPath("/myportal/case/id/[incident]") && ( @@ -521,10 +518,7 @@ const Breadcrumbs = (props) => { )} -
  • - {t("common:breadcrumb-case-reference")}:{" "} - {currentReference} -
    • + {renderCaseReferenceCrumb(currentReference)} )} {isPath("/myportal/case/[ticketnumber]") && ( @@ -538,10 +532,7 @@ const Breadcrumbs = (props) => { {breadcrumbLabel} -
  • - {t("common:breadcrumb-case-reference")}:{" "} - {caseReferenceDisplay} -
    • + {renderCaseReferenceCrumb(caseReferenceDisplay)} )} {isPath("/myportal/dnsapplications") && ( @@ -564,10 +555,7 @@ const Breadcrumbs = (props) => { {t("dnsCommon:service-name")} -
  • - {t("common:breadcrumb-case-reference")}:{" "} - {currentReference} -
    • + {renderCaseReferenceCrumb(currentReference)} )} {isPath("/myportal/dns/[developmentName]") && ( @@ -592,10 +580,7 @@ const Breadcrumbs = (props) => { {t("dnsCommon:service-name")} -
  • - {t("common:breadcrumb-case-reference")}:{" "} - {caseReferenceDisplay} -
    • + {renderCaseReferenceCrumb(caseReferenceDisplay)} )} {isPath("/case") && ( @@ -623,10 +608,7 @@ const Breadcrumbs = (props) => { {t("common:breadcrumb-search-results")} -
  • - {t("common:breadcrumb-case-reference")}:{" "} - {currentReference} -
    • + {renderCaseReferenceCrumb(currentReference)} )} {isPath("/myportal/representation") && ( @@ -758,10 +740,7 @@ const Breadcrumbs = (props) => { {t("dnsCommon:service-name")} -
  • - {t("common:breadcrumb-case-reference")}:{" "} - {currentReference} -
    • + {renderCaseReferenceCrumb(currentReference)} )} {isPath("/dns/[developmentName]") && ( @@ -779,10 +758,7 @@ const Breadcrumbs = (props) => { {t("dnsCommon:service-name")} -
  • - {t("common:breadcrumb-case-reference")}:{" "} - {caseReferenceDisplay} -
    • + {renderCaseReferenceCrumb(caseReferenceDisplay)} )} {isPath("/dns/application-process") && ( diff --git a/memory-bank/change-log.md b/memory-bank/change-log.md index 27ba7296..cc893885 100644 --- a/memory-bank/change-log.md +++ b/memory-bank/change-log.md @@ -137,6 +137,31 @@ Follow-ups: - Next bounded slice can target additional repeated breadcrumb list-item patterns (e.g., repeated case-reference tail item blocks) with same behavior parity approach. +### CL-22541-E: breadcrumbs case-reference crumb helper extraction + +date: 2026-04-09 +author: Cline +scope: `components/breadcrumbs.js` +type: change +rationale: Continue bounded breadcrumbs decomposition by extracting repeated case-reference tail breadcrumb markup into one local helper and replacing repeated inline blocks. +impact: Refactor-only JSX deduplication in breadcrumb rendering; no intended route/auth/session/API/EN-CY/a11y behavior change. +status: completed + +Summary: + +- Added local `renderCaseReferenceCrumb(referenceValue)` helper in `components/breadcrumbs.js`. +- Replaced repeated `{t("common:breadcrumb-case-reference")}: ...` list-item blocks across case/dns route branches with helper calls. +- Corrected initial over-wrap by using helper calls directly (so generated `
  • ` is not nested in another `
  • `). + +Validation: + +- `npx eslint components/breadcrumbs.js` -> pass. +- `node tests/phase22/index.test.cjs` -> pass (combined suite). + +Follow-ups: + +- Next bounded slice can target remaining repeated linked breadcrumb list-item patterns (e.g., recurring address-search result link pairs) via small local render helpers. + ### CL-00X: 22500 `components/elements/index.js` Phase 1 helper extraction date: 2026-04-07 From d576987fcf7542c4d2b18eb9157202479dbed0a8 Mon Sep 17 00:00:00 2001 From: robbond Date: Thu, 9 Apr 2026 09:38:14 +0100 Subject: [PATCH 06/33] 22541 extract shared text and link breadcrumb render helpers --- components/breadcrumbs.js | 264 +++++++++++++++++--------------------- memory-bank/change-log.md | 28 ++++ 2 files changed, 144 insertions(+), 148 deletions(-) diff --git a/components/breadcrumbs.js b/components/breadcrumbs.js index 7ea706bd..4ba0a75f 100644 --- a/components/breadcrumbs.js +++ b/components/breadcrumbs.js @@ -106,6 +106,22 @@ const Breadcrumbs = (props) => {
    • ); + const renderTextCrumb = (label) => ( +
  • {label}
    • + ); + + const renderLinkCrumb = (href, label, onClick) => ( +
  • + + {label} + +
    • + ); + const { breadcrumbHref, caseResultsHref, breadcrumbLabel } = resolveCaseBreadcrumbState({ query: router.query, @@ -157,147 +173,121 @@ const Breadcrumbs = (props) => { )} {isPath("/searchresults") && ( <> -
  • - {t("common:breadcrumb-search-results")} -
    • + {renderTextCrumb( + t("common:breadcrumb-search-results") + )} )} {isPath("/advancedsearch") && ( <> -
  • - {t("common:breadcrumb-advanced-search")} -
    • + {renderTextCrumb( + t("common:breadcrumb-advanced-search") + )} )} {isPath("/addresssearch") && ( <> -
  • - {t("common:breadcrumb-address-search")} -
    • + {renderTextCrumb( + t("common:breadcrumb-address-search") + )} )} {isPath("/myportal/addresssearch") && ( <> {renderMyPortalCrumb()} -
  • - {t("common:breadcrumb-address-search")} -
    • + {renderTextCrumb( + t("common:breadcrumb-address-search") + )} )} {isPath("/myportal/advancedsearch") && ( <> {renderMyPortalCrumb()} -
  • - {t("common:breadcrumb-advanced-search")} -
    • + {renderTextCrumb( + t("common:breadcrumb-advanced-search") + )} )} {isPath("/myportal/contactus") && ( <> {renderMyPortalCrumb()} -
  • - {t("common:footer-contact-us-link-label")} -
    • + {renderTextCrumb( + t("common:footer-contact-us-link-label") + )} )} {isPath("/contactus") && ( <> -
  • - {t("common:footer-contact-us-link-label")} -
    • + {renderTextCrumb( + t("common:footer-contact-us-link-label") + )} )} {isPath("/addresssearchresults") && ( <> {" "} -
  • - - {t("common:breadcrumb-address-search")} - -
    • -
  • - {t( + {renderLinkCrumb( + isWelsh + ? router.locale + "/chwiliadcyfeiriadau" + : "/addresssearch", + t("common:breadcrumb-address-search") + )} + {renderTextCrumb( + t( "common:breadcrumb-address-search-results" - )} -
    • + ) + )} )} {isPath("/advancedsearchresults") && ( <> {" "} -
  • - - {t("common:breadcrumb-advanced-search")} - -
    • -
  • - {t( + {renderLinkCrumb( + isWelsh + ? router.locale + "/advancedsearch" + : "/advancedsearch", + t("common:breadcrumb-advanced-search") + )} + {renderTextCrumb( + t( "common:breadcrumb-advanced-search-results" - )} -
    • + ) + )} )} {isPath("/myportal/advancedsearchresults") && ( <> {renderMyPortalCrumb()} -
  • - - {t("common:breadcrumb-advanced-search")} - -
    • -
  • - {t( + {renderLinkCrumb( + isWelsh + ? router.locale + + "/myportal/advancedsearch" + : "/myportal/advancedsearch", + t("common:breadcrumb-advanced-search") + )} + {renderTextCrumb( + t( "common:breadcrumb-advanced-search-results" - )} -
    • + ) + )} )} {isPath("/myportal/addresssearchresults") && ( <> {renderMyPortalCrumb()} -
  • - - {t("common:breadcrumb-address-search")} - -
    • -
  • - {t( + {renderLinkCrumb( + isWelsh + ? "/" + + router.locale + + "/fymhorth/chwiliadcyfeiriadau" + : "/myportal/addresssearch", + t("common:breadcrumb-address-search") + )} + {renderTextCrumb( + t( "common:breadcrumb-address-search-results" - )} -
    • + ) + )} )} {isPath("/newappeal") && <>} @@ -393,9 +383,9 @@ const Breadcrumbs = (props) => { {isPath("/viewall") && ( <> {renderMyPortalCrumb()} -
  • - {t("common:breadcrumb-your-cases")} -
    • + {renderTextCrumb( + t("common:breadcrumb-your-cases") + )} )} {isPath("/myportal/viewall") && ( @@ -482,42 +472,30 @@ const Breadcrumbs = (props) => { <> {" "} {renderMyPortalCrumb()} -
  • - - {t("common:breadcrumb-address-search")} - -
    • -
  • - { - // spinnerState(); - router.back(); - }} - className="govuk-breadcrumbs__link" - > - {t( - "common:breadcrumb-address-search-results" - )} - -
    • + {renderLinkCrumb( + isWelsh + ? "/" + + router.locale + + "/fymhorth/chwiliadcyfeiriadau" + : "/myportal/addresssearch", + t("common:breadcrumb-address-search") + )} + {renderLinkCrumb( + isWelsh + ? "/" + + router.locale + + "/fymhorth/canlyniadaucyfeiriadau?" + + nestedSearchString + : "/myportal/addresssearchresults?" + + nestedSearchString, + t( + "common:breadcrumb-address-search-results" + ), + () => { + // spinnerState(); + router.back(); + } + )} {renderCaseReferenceCrumb(currentReference)} )} @@ -539,22 +517,16 @@ const Breadcrumbs = (props) => { <> {" "} {renderMyPortalCrumb()} -
  • - {t("dnsCommon:service-name")} -
    • + {renderTextCrumb(t("dnsCommon:service-name"))} )} {isPath("/myportal/dnsdetails") && ( <> {renderMyPortalCrumb()} -
  • - - {t("dnsCommon:service-name")} - -
    • + {renderLinkCrumb( + "/myportal/dnsapplications", + t("dnsCommon:service-name") + )} {renderCaseReferenceCrumb(currentReference)} )} @@ -572,14 +544,10 @@ const Breadcrumbs = (props) => { {t("common:breadcrumb-my-portal")} -
  • - - {t("dnsCommon:service-name")} - -
    • + {renderLinkCrumb( + "/myportal/dnsapplications", + t("dnsCommon:service-name") + )} {renderCaseReferenceCrumb(caseReferenceDisplay)} )} diff --git a/memory-bank/change-log.md b/memory-bank/change-log.md index cc893885..879906df 100644 --- a/memory-bank/change-log.md +++ b/memory-bank/change-log.md @@ -162,6 +162,34 @@ Follow-ups: - Next bounded slice can target remaining repeated linked breadcrumb list-item patterns (e.g., recurring address-search result link pairs) via small local render helpers. +### CL-22541-F: breadcrumbs multi-pattern helper bundle (text + link crumbs) + +date: 2026-04-09 +author: Cline +scope: `components/breadcrumbs.js` +type: change +rationale: Deliver a slightly larger bounded slice by extracting and reusing multiple breadcrumb rendering patterns (plain text crumb and linked crumb) across several route branches. +impact: Refactor-only JSX deduplication and consistency improvement in breadcrumb rendering; no intended route/auth/session/API/EN-CY/a11y behavior change. +status: completed + +Summary: + +- Added reusable helpers in `components/breadcrumbs.js`: + - `renderTextCrumb(label)` + - `renderLinkCrumb(href, label, onClick)` +- Replaced multiple repeated inline breadcrumb blocks across search/address/myportal/dns branches with helper calls. +- Included onClick-capable link helper usage in the `/myportal/case/id/[incident]` address-results breadcrumb branch to preserve `router.back()` behavior. +- Combined with existing `renderMyPortalCrumb` and `renderCaseReferenceCrumb` helpers for more consistent branch composition. + +Validation: + +- `npx eslint components/breadcrumbs.js` -> pass. +- `node tests/phase22/index.test.cjs` -> pass (combined suite). + +Follow-ups: + +- Next slice recommendation: extract remaining repeated inline link crumbs for case/DNS branches that still hardcode `
  • ` (e.g., `/myportal/case`, `/myportal/case/[ticketnumber]`, `/dnsdetails`, `/dns/[developmentName]`) to complete link-pattern consolidation. + ### CL-00X: 22500 `components/elements/index.js` Phase 1 helper extraction date: 2026-04-07 From 30bc729c7057d9ceac8b8d3d64261e26f229d05a Mon Sep 17 00:00:00 2001 From: robbond Date: Thu, 9 Apr 2026 09:41:33 +0100 Subject: [PATCH 07/33] 22541 consolidate remaining inline Link breadcrumb patterns --- components/breadcrumbs.js | 236 +++++++++++++------------------------- memory-bank/change-log.md | 29 +++++ 2 files changed, 108 insertions(+), 157 deletions(-) diff --git a/components/breadcrumbs.js b/components/breadcrumbs.js index 4ba0a75f..e0b50d4e 100644 --- a/components/breadcrumbs.js +++ b/components/breadcrumbs.js @@ -140,16 +140,11 @@ const Breadcrumbs = (props) => { >
      - {shouldShowServiceName && ( -
    1. - - {t("common:service-name-breadcrumb")} - -
      2. - )} + {shouldShowServiceName && + renderLinkCrumb( + "/", + t("common:service-name-breadcrumb") + )} {isPath("/myportal") && (
    2. @@ -359,22 +354,14 @@ const Breadcrumbs = (props) => { )} {isPath("/newappeal/selectappeal") && ( <> -
    3. - - {t("newappeal:parent-page-title")} - -
      4. -
    4. - - {t("newappeal:page-title")} - -
      5. + {renderLinkCrumb( + myPortalHref, + t("newappeal:parent-page-title") + )} + {renderLinkCrumb( + myPortalHref, + t("newappeal:page-title") + )}
    5. Select Appeal
      6. @@ -401,70 +388,46 @@ const Breadcrumbs = (props) => { )} {isPath("/myportal/case") && ( <> -
    6. - - {t("common:breadcrumb-my-portal")} - -
      7. + {renderLinkCrumb( + isWelsh + ? "/" + router.locale + "/fymhorth" + : "/myportal", + t("common:breadcrumb-my-portal") + )} {renderCaseReferenceCrumb(currentReference)} )} {isPath("/case/[ticketnumber]") && ( <> -
    7. - - {breadcrumbLabel} - -
      8. + {renderLinkCrumb( + caseResultsHref, + breadcrumbLabel + )} {renderCaseReferenceCrumb(fallbackSearchTitle)} )} {isPath("/case/id/[incident]") && ( <> -
    8. - - {t("common:breadcrumb-address-search")} - -
      9. -
    9. - - {t( - "common:breadcrumb-address-search-results" - )} - -
      10. + {renderLinkCrumb( + isWelsh + ? "/" + + router.locale + + "/chwiliadcyfeiriadau" + : "/addresssearch", + t("common:breadcrumb-address-search") + )} + {renderLinkCrumb( + isWelsh + ? "/" + + router.locale + + "/canlyniadaucyfeiriadau?" + + nestedSearchString + : "/addresssearchresults?" + + nestedSearchString, + t( + "common:breadcrumb-address-search-results" + ) + )} {renderCaseReferenceCrumb(currentReference)} )} @@ -502,14 +465,10 @@ const Breadcrumbs = (props) => { {isPath("/myportal/case/[ticketnumber]") && ( <> {renderMyPortalCrumb()} -
    10. - - {breadcrumbLabel} - -
      11. + {renderLinkCrumb( + breadcrumbHref, + breadcrumbLabel + )} {renderCaseReferenceCrumb(caseReferenceDisplay)} )} @@ -532,18 +491,12 @@ const Breadcrumbs = (props) => { )} {isPath("/myportal/dns/[developmentName]") && ( <> -
    11. - - {t("common:breadcrumb-my-portal")} - -
      12. + {renderLinkCrumb( + isWelsh + ? router.locale + "/fymhorth" + : "/myportal", + t("common:breadcrumb-my-portal") + )} {renderLinkCrumb( "/myportal/dnsapplications", t("dnsCommon:service-name") @@ -643,14 +596,10 @@ const Breadcrumbs = (props) => { )} {isPath("/account/personaldetails") && ( <> -
    12. - - {t("common:breadcrumb-my-portal")} - -
      13. + {renderLinkCrumb( + cyMyPortalHref, + t("common:breadcrumb-my-portal") + )}
    13. {t("account:account-title")}
      14. @@ -665,14 +614,10 @@ const Breadcrumbs = (props) => { )} {isPath("/account/changepassword") && ( <> -
    14. - - {t("common:breadcrumb-my-portal")} - -
      15. + {renderLinkCrumb( + cyMyPortalHref, + t("common:breadcrumb-my-portal") + )}
    15. Update your password
      16. @@ -695,37 +640,23 @@ const Breadcrumbs = (props) => { )} {isPath("/dnsdetails") && ( <> -
    16. - - {t("dnsCommon:service-name")} - -
      17. + {renderLinkCrumb( + isWelsh + ? router.locale + "/dnsapplications" + : "/dnsapplications", + t("dnsCommon:service-name") + )} {renderCaseReferenceCrumb(currentReference)} )} {isPath("/dns/[developmentName]") && ( <> -
    17. - - {t("dnsCommon:service-name")} - -
      18. + {renderLinkCrumb( + isWelsh + ? router.locale + "/dnsapplications" + : "/dnsapplications", + t("dnsCommon:service-name") + )} {renderCaseReferenceCrumb(caseReferenceDisplay)} )} @@ -759,21 +690,12 @@ const Breadcrumbs = (props) => { )} {isPath("/dns/application-view") && ( <> -
    18. - - {t( - "dnsApplicationView:page-parent-title" - )} - -
      19. + {renderLinkCrumb( + isWelsh + ? router.locale + "/dns/applications" + : "/dns/applications", + t("dnsApplicationView:page-parent-title") + )}
    19. TWA - Morlais Demonstration Zone
      20. diff --git a/memory-bank/change-log.md b/memory-bank/change-log.md index 879906df..0e69d8bc 100644 --- a/memory-bank/change-log.md +++ b/memory-bank/change-log.md @@ -190,6 +190,35 @@ Follow-ups: - Next slice recommendation: extract remaining repeated inline link crumbs for case/DNS branches that still hardcode `
    20. ` (e.g., `/myportal/case`, `/myportal/case/[ticketnumber]`, `/dnsdetails`, `/dns/[developmentName]`) to complete link-pattern consolidation. +### CL-22541-G: breadcrumbs inline Link-crumb consolidation bundle + +date: 2026-04-09 +author: Cline +scope: `components/breadcrumbs.js` +type: change +rationale: Continue the larger bounded breadcrumb refactor cadence by replacing the next batch of repeated inline `
    21. ` crumbs with the shared link helper. +impact: Refactor-only JSX deduplication and consistency improvement in breadcrumb rendering; no intended route/auth/session/API/EN-CY/a11y behavior change. +status: completed + +Summary: + +- Reused `renderLinkCrumb(href, label, onClick)` for another broad set of previously inline Link crumbs, including: + - service-name crumb in the shared shell + - new appeal select-appeal parent/title crumbs + - case and ticketnumber branches (`/myportal/case`, `/case/[ticketnumber]`, `/case/id/[incident]`, `/myportal/case/[ticketnumber]`) + - additional myportal/dns/account branches (`/myportal/dns/[developmentName]`, `/dnsdetails`, `/dns/[developmentName]`, `/dns/application-view`, account crumbs) +- Kept special behavior intact where needed (e.g., existing callback-based crumbs that already use helper `onClick`). +- Increased consistency of crumb rendering style by routing most link crumbs through one helper. + +Validation: + +- `npx eslint components/breadcrumbs.js` -> pass. +- `node tests/phase22/index.test.cjs` -> pass (combined suite). + +Follow-ups: + +- Next slice recommendation: target remaining anchor/back-link duplication (`` and occasional ``) by introducing a bounded helper for action/back crumbs while preserving existing non-Link semantics. + ### CL-00X: 22500 `components/elements/index.js` Phase 1 helper extraction date: 2026-04-07 From e3e893ed5813c086e06a9cb0e2b601deae272a5a Mon Sep 17 00:00:00 2001 From: robbond Date: Thu, 9 Apr 2026 09:45:00 +0100 Subject: [PATCH 08/33] 22541 extract shared anchor/back breadcrumb helper patterns --- components/breadcrumbs.js | 152 +++++++++++++++++--------------------- memory-bank/change-log.md | 28 +++++++ 2 files changed, 96 insertions(+), 84 deletions(-) diff --git a/components/breadcrumbs.js b/components/breadcrumbs.js index e0b50d4e..ad41a3fc 100644 --- a/components/breadcrumbs.js +++ b/components/breadcrumbs.js @@ -122,6 +122,23 @@ const Breadcrumbs = (props) => {
      22. ); + const renderAnchorCrumb = ( + href, + label, + onClick, + listItemClass = "govuk-breadcrumbs__list-item" + ) => ( +
    22. + + {label} + +
      23. + ); + const { breadcrumbHref, caseResultsHref, breadcrumbLabel } = resolveCaseBreadcrumbState({ query: router.query, @@ -153,14 +170,10 @@ const Breadcrumbs = (props) => { )} {isPath("/myportal/searchresults") && ( <> -
    23. - - {t("common:breadcrumb-my-portal")} - -
      24. + {renderAnchorCrumb( + myPortalHref, + t("common:breadcrumb-my-portal") + )}
    24. {t("common:breadcrumb-search-results")}
      25. @@ -301,20 +314,16 @@ const Breadcrumbs = (props) => { ) : ( -
    25. - - setCurrentSection( - appealType.currentSection - - 1 - ) - } - > - {t("common:back-link")} - -
      26. + renderAnchorCrumb( + "#", + t("common:back-link"), + () => + setCurrentSection( + appealType.currentSection - + 1 + ), + "govuk-breadcrumbs__link-item" + ) ))} )} @@ -333,22 +342,16 @@ const Breadcrumbs = (props) => { ) : ( - <> -
    26. - - setCurrentSection( - appealType.currentSection - - 1 - ) - } - > - {t("common:back-link")} - -
      27. - + renderAnchorCrumb( + "#", + t("common:back-link"), + () => + setCurrentSection( + appealType.currentSection - + 1 + ), + "govuk-breadcrumbs__list-item backChevron" + ) ))} )} @@ -536,61 +539,42 @@ const Breadcrumbs = (props) => { <> {currentView.representationSubmit === true && currentView.representationSubmitConfirmation !== - true && ( -
    27. - { - setRepresentationSubmit( - qcount - ); - }} - > - {t("common:back-link")} - -
      28. + true && + renderAnchorCrumb( + "#", + t("common:back-link"), + () => { + setRepresentationSubmit(qcount); + }, + "govuk-breadcrumbs__link-item backChevron" )} {currentView.representationSubmit !== true && hasRepDetails && repDetails?.representationType !== - "Questionnaire" && ( -
    28. - { - setRepresentationSubmit( - false - ); - }} - > - {t("common:back-link")} - -
      29. + "Questionnaire" && + renderAnchorCrumb( + "#", + t("common:back-link"), + () => { + setRepresentationSubmit(false); + }, + "govuk-breadcrumbs__link-item backChevron" )} {currentView.representationSubmit !== true && hasRepDetails && repDetails?.representationType === "Questionnaire" && - showQuestionnaireSection > 1 && ( -
    29. - { - setShowQuestionnaireSection( - showQuestionnaireSection - - 1 - ); - setRepresentationSubmit( - false - ); - }} - > - {t("common:back-link")} - -
      30. + showQuestionnaireSection > 1 && + renderAnchorCrumb( + "#", + t("common:back-link"), + () => { + setShowQuestionnaireSection( + showQuestionnaireSection - 1 + ); + setRepresentationSubmit(false); + }, + "govuk-breadcrumbs__link-item backChevron" )} )} diff --git a/memory-bank/change-log.md b/memory-bank/change-log.md index 0e69d8bc..00b1ed2b 100644 --- a/memory-bank/change-log.md +++ b/memory-bank/change-log.md @@ -219,6 +219,34 @@ Follow-ups: - Next slice recommendation: target remaining anchor/back-link duplication (`` and occasional ``) by introducing a bounded helper for action/back crumbs while preserving existing non-Link semantics. +### CL-22541-H: breadcrumbs anchor/back-link helper consolidation bundle + +date: 2026-04-09 +author: Cline +scope: `components/breadcrumbs.js` +type: change +rationale: Continue the larger bounded breadcrumbs refactor cadence by extracting repeated anchor/back-link crumb markup into one local helper while preserving non-Link semantics. +impact: Refactor-only JSX deduplication and consistency improvement in breadcrumb rendering; no intended route/auth/session/API/EN-CY/a11y behavior change. +status: completed + +Summary: + +- Added `renderAnchorCrumb(href, label, onClick, listItemClass)` in `components/breadcrumbs.js` for repeated `` breadcrumb actions. +- Replaced repeated anchor/back-link crumb blocks in: + - `/myportal/searchresults` my-portal anchor crumb + - `/newappeal/[appealtypes]` and `/myportal/[appealtypes]` step-back crumbs + - `/myportal/representation` back-chevron action crumbs (all three state branches) +- Preserved original click handlers, href values, and class semantics (`govuk-breadcrumbs__link-item`, `backChevron`) to keep behavior parity. + +Validation: + +- `npx eslint components/breadcrumbs.js` -> pass. +- `node tests/phase22/index.test.cjs` -> pass (combined suite). + +Follow-ups: + +- Next slice recommendation: consolidate remaining one-off inline breadcrumb `
    30. ` blocks still present in edge branches (e.g., `/newappeal/[appealtypes]`, `/myportal/[appealtypes]`, `/case`) and consider introducing an optional `renderBackCrumb(...)` semantic wrapper for readability. + ### CL-00X: 22500 `components/elements/index.js` Phase 1 helper extraction date: 2026-04-07 From dd2ef694f856db605c1334fe68022401693148b8 Mon Sep 17 00:00:00 2001 From: robbond Date: Thu, 9 Apr 2026 09:47:53 +0100 Subject: [PATCH 09/33] 22541 add semantic back crumb helper and consolidate edge breadcrumb branches --- components/breadcrumbs.js | 157 +++++++++++++++----------------------- memory-bank/change-log.md | 28 +++++++ 2 files changed, 89 insertions(+), 96 deletions(-) diff --git a/components/breadcrumbs.js b/components/breadcrumbs.js index ad41a3fc..6763bd83 100644 --- a/components/breadcrumbs.js +++ b/components/breadcrumbs.js @@ -139,6 +139,11 @@ const Breadcrumbs = (props) => {
      31. ); + const renderBackCrumb = ( + onClick, + listItemClass = "govuk-breadcrumbs__link-item backChevron" + ) => renderAnchorCrumb("#", t("common:back-link"), onClick, listItemClass); + const { breadcrumbHref, caseResultsHref, breadcrumbLabel } = resolveCaseBreadcrumbState({ query: router.query, @@ -302,57 +307,38 @@ const Breadcrumbs = (props) => { {isPath("/newappeal/[appealtypes]") && ( <> {appealType.currentSection > 1 && - (appealType.currentSection === 9999 ? ( -
    31. - - {t( - "common:service-name-breadcrumb" - )} - -
      32. - ) : ( - renderAnchorCrumb( - "#", - t("common:back-link"), - () => - setCurrentSection( - appealType.currentSection - - 1 - ), - "govuk-breadcrumbs__link-item" - ) - ))} + (appealType.currentSection === 9999 + ? renderLinkCrumb( + "/", + t( + "common:service-name-breadcrumb" + ) + ) + : renderBackCrumb( + () => + setCurrentSection( + appealType.currentSection - + 1 + ), + "govuk-breadcrumbs__link-item" + ))} )} {isPath("/myportal/[appealtypes]") && ( <> {appealType.currentSection > 1 && - (appealType.currentSection === 9999 ? ( -
    32. - - {t( - "common:service-name-breadcrumb" - )} - -
      33. - ) : ( - renderAnchorCrumb( - "#", - t("common:back-link"), - () => - setCurrentSection( - appealType.currentSection - - 1 - ), - "govuk-breadcrumbs__list-item backChevron" - ) - ))} + (appealType.currentSection === 9999 + ? renderLinkCrumb( + "/", + t( + "common:service-name-breadcrumb" + ) + ) + : renderBackCrumb(() => + setCurrentSection( + appealType.currentSection - 1 + ) + ))} )} {isPath("/newappeal/selectappeal") && ( @@ -509,29 +495,23 @@ const Breadcrumbs = (props) => { )} {isPath("/case") && ( <> -
    33. - - {t("common:breadcrumb-search-results")} - -
      34. + {renderLinkCrumb( + isWelsh + ? router.locale + + "/searchresults?q=" + + router.query.q + + "&page=" + + router.query.page + : "/searchresults?q=" + + router.query.q + + "&page=" + + router.query.page, + t("common:breadcrumb-search-results"), + () => { + // spinnerState(); + router.back(); + } + )} {renderCaseReferenceCrumb(currentReference)} )} @@ -540,42 +520,27 @@ const Breadcrumbs = (props) => { {currentView.representationSubmit === true && currentView.representationSubmitConfirmation !== true && - renderAnchorCrumb( - "#", - t("common:back-link"), - () => { - setRepresentationSubmit(qcount); - }, - "govuk-breadcrumbs__link-item backChevron" - )} + renderBackCrumb(() => { + setRepresentationSubmit(qcount); + })} {currentView.representationSubmit !== true && hasRepDetails && repDetails?.representationType !== "Questionnaire" && - renderAnchorCrumb( - "#", - t("common:back-link"), - () => { - setRepresentationSubmit(false); - }, - "govuk-breadcrumbs__link-item backChevron" - )} + renderBackCrumb(() => { + setRepresentationSubmit(false); + })} {currentView.representationSubmit !== true && hasRepDetails && repDetails?.representationType === "Questionnaire" && showQuestionnaireSection > 1 && - renderAnchorCrumb( - "#", - t("common:back-link"), - () => { - setShowQuestionnaireSection( - showQuestionnaireSection - 1 - ); - setRepresentationSubmit(false); - }, - "govuk-breadcrumbs__link-item backChevron" - )} + renderBackCrumb(() => { + setShowQuestionnaireSection( + showQuestionnaireSection - 1 + ); + setRepresentationSubmit(false); + })} )} {isPath("/account/personaldetails") && ( diff --git a/memory-bank/change-log.md b/memory-bank/change-log.md index 00b1ed2b..393cffac 100644 --- a/memory-bank/change-log.md +++ b/memory-bank/change-log.md @@ -247,6 +247,34 @@ Follow-ups: - Next slice recommendation: consolidate remaining one-off inline breadcrumb `
    34. ` blocks still present in edge branches (e.g., `/newappeal/[appealtypes]`, `/myportal/[appealtypes]`, `/case`) and consider introducing an optional `renderBackCrumb(...)` semantic wrapper for readability. +### CL-22541-I: breadcrumbs edge branch consolidation + semantic back-crumb wrapper + +date: 2026-04-09 +author: Cline +scope: `components/breadcrumbs.js` +type: change +rationale: Continue the same bounded breadcrumbs refactor cadence by consolidating remaining edge inline Link/back crumbs and introducing a semantic back-crumb wrapper for readability. +impact: Refactor-only JSX deduplication/readability improvement; no intended route/auth/session/API/EN-CY/a11y behavior change. +status: completed + +Summary: + +- Added semantic helper `renderBackCrumb(onClick, listItemClass?)` that delegates to `renderAnchorCrumb(...)` with existing back-link text. +- Replaced remaining one-off inline edge crumbs in: + - `/newappeal/[appealtypes]` and `/myportal/[appealtypes]` (`currentSection === 9999` service-name link and back-link branch) + - `/case` search-results link crumb (including existing `router.back()` callback) + - `/myportal/representation` back-link branches now use `renderBackCrumb(...)`. +- Preserved existing href targets, callback behavior, and class semantics (including special `govuk-breadcrumbs__link-item` usage). + +Validation: + +- `npx eslint components/breadcrumbs.js` -> pass. +- `node tests/phase22/index.test.cjs` -> pass (combined suite). + +Follow-ups: + +- Next slice recommendation: consider extracting a small, route-keyed breadcrumb branch map/helper grouping in `components/breadcrumbs.js` (purely structural) to reduce the long inline conditional chain while keeping one-slice behavior parity. + ### CL-00X: 22500 `components/elements/index.js` Phase 1 helper extraction date: 2026-04-07 From e24ab89e83cb70d1732bfea32e4f2de09f789f36 Mon Sep 17 00:00:00 2001 From: robbond Date: Thu, 9 Apr 2026 09:50:41 +0100 Subject: [PATCH 10/33] 22541 consolidate static text breadcrumb route branches --- components/breadcrumbs.js | 124 +++++++------------------------------- memory-bank/change-log.md | 30 +++++++++ 2 files changed, 53 insertions(+), 101 deletions(-) diff --git a/components/breadcrumbs.js b/components/breadcrumbs.js index 6763bd83..47ccd1e4 100644 --- a/components/breadcrumbs.js +++ b/components/breadcrumbs.js @@ -92,6 +92,27 @@ const Breadcrumbs = (props) => { return labelsByKey[viewKey] || null; }; + const getStaticTextCrumbLabel = (path) => { + const staticTextCrumbByPath = { + "/account/register": t("account:register-new-account-heading"), + "/dns": t("dnsCommon:service-name"), + "/dnsapplications": t("dnsCommon:service-name"), + "/dns/application-process": "Guidance", + "/dns/help": "Help", + "/dns/contact-us": t("common:footer-contact-us-link-label"), + "/dns/applications": t("dnsApplications:page-title"), + "/help/cookies": t("cookies:cookie-breadcrumb"), + "/privacy": t("common:footer-privacy-link-label"), + "/accessibility": t("common:footer-accessibility-link-label"), + "/details-about-cookies": t("cookies:cookie-policy-title-heading"), + "/auth/signin": t("auth:auth-page-title"), + "/auth/verify-request": t("auth:auth-check-email-page-title"), + "/auth/error": t("auth:auth-error-signin-error-title") + }; + + return staticTextCrumbByPath[path] || null; + }; + const renderMyPortalCrumb = () => (
    35. @@ -554,13 +575,6 @@ const Breadcrumbs = (props) => {
      36. )} - {isPath("/account/register") && ( - <> -
    36. - {t("account:register-new-account-heading")} -
      37. - - )} {isPath("/account/changepassword") && ( <> {renderLinkCrumb( @@ -572,21 +586,6 @@ const Breadcrumbs = (props) => { )} - {isPath("/dns") && ( - <> -
    37. - {t("dnsCommon:service-name")} -
      38. - - )} - - {isPath("/dnsapplications") && ( - <> -
    38. - {t("dnsCommon:service-name")} -
      39. - - )} {isPath("/dnsdetails") && ( <> {renderLinkCrumb( @@ -609,34 +608,6 @@ const Breadcrumbs = (props) => { {renderCaseReferenceCrumb(caseReferenceDisplay)} )} - {isPath("/dns/application-process") && ( - <> -
    39. - Guidance -
      40. - - )} - {isPath("/dns/help") && ( - <> -
    40. - Help -
      41. - - )} - {isPath("/dns/contact-us") && ( - <> -
    41. - {t("common:footer-contact-us-link-label")} -
      42. - - )} - {isPath("/dns/applications") && ( - <> -
    42. - {t("dnsApplications:page-title")} -
      43. - - )} {isPath("/dns/application-view") && ( <> {renderLinkCrumb( @@ -650,57 +621,8 @@ const Breadcrumbs = (props) => { )} - {isPath("/help/cookies") && ( - <> -
    43. - {t("cookies:cookie-breadcrumb")} -
      44. - - )} - {isPath("/privacy") && ( - <> -
    44. - {t("common:footer-privacy-link-label")} -
      45. - - )} - {isPath("/accessibility") && ( - <> -
    45. - {t( - "common:footer-accessibility-link-label" - )} -
      46. - - )} - {isPath("/details-about-cookies") && ( - <> -
    46. - {t("cookies:cookie-policy-title-heading")} -
      47. - - )} - {isPath("/auth/signin") && ( - <> -
    47. - {t("auth:auth-page-title")} -
      48. - - )} - {isPath("/auth/verify-request") && ( - <> -
    48. - {t("auth:auth-check-email-page-title")} -
      49. - - )} - {isPath("/auth/error") && ( - <> -
    49. - {t("auth:auth-error-signin-error-title")} -
      50. - - )} + {getStaticTextCrumbLabel(pathname) && + renderTextCrumb(getStaticTextCrumbLabel(pathname))}
    diff --git a/memory-bank/change-log.md b/memory-bank/change-log.md index 393cffac..61b80235 100644 --- a/memory-bank/change-log.md +++ b/memory-bank/change-log.md @@ -275,6 +275,36 @@ Follow-ups: - Next slice recommendation: consider extracting a small, route-keyed breadcrumb branch map/helper grouping in `components/breadcrumbs.js` (purely structural) to reduce the long inline conditional chain while keeping one-slice behavior parity. +### CL-22541-J: breadcrumbs static text-only route crumb consolidation + +date: 2026-04-09 +author: Cline +scope: `components/breadcrumbs.js` +type: change +rationale: Continue the same bounded refactor cadence by consolidating repeated static text-only breadcrumb route branches into one route-label resolver. +impact: Refactor-only structural deduplication/readability improvement; no intended route/auth/session/API/EN-CY/a11y behavior change. +status: completed + +Summary: + +- Added `getStaticTextCrumbLabel(path)` in `components/breadcrumbs.js` to centralize static text-only crumb labels by pathname. +- Replaced repeated single-line static crumb branches with one generic render path: + - `renderTextCrumb(getStaticTextCrumbLabel(pathname))` when mapping returns a label. +- Consolidated static branch handling for routes including: + - account register + - DNS index/help/contact/applications process pages + - cookies/privacy/accessibility/static auth routes. +- Preserved route labels (including translation keys and legacy hardcoded labels where already present). + +Validation: + +- `npx eslint components/breadcrumbs.js` -> pass. +- `node tests/phase22/index.test.cjs` -> pass (combined suite). + +Follow-ups: + +- Next slice recommendation: extract a small grouped helper for recurring two-crumb route pairs (e.g., my-portal + section label, dns list + case reference) to reduce the remaining conditional chain while preserving explicit route behavior. + ### CL-00X: 22500 `components/elements/index.js` Phase 1 helper extraction date: 2026-04-07 From a8ef55c65a1277776a6bbbc132cdd6e170fa47da Mon Sep 17 00:00:00 2001 From: robbond Date: Thu, 9 Apr 2026 09:52:42 +0100 Subject: [PATCH 11/33] 22541 extract grouped breadcrumb pair helpers for myportal and dns routes --- components/breadcrumbs.js | 81 +++++++++++++++++---------------------- memory-bank/change-log.md | 28 ++++++++++++++ 2 files changed, 63 insertions(+), 46 deletions(-) diff --git a/components/breadcrumbs.js b/components/breadcrumbs.js index 47ccd1e4..92a51c49 100644 --- a/components/breadcrumbs.js +++ b/components/breadcrumbs.js @@ -121,6 +121,13 @@ const Breadcrumbs = (props) => {
    • ); + const renderMyPortalSectionCrumbs = (sectionLabel) => ( + <> + {renderMyPortalCrumb()} + {renderTextCrumb(sectionLabel)} + + ); + const renderCaseReferenceCrumb = (referenceValue) => (
  • {t("common:breadcrumb-case-reference")}: {referenceValue} @@ -165,6 +172,18 @@ const Breadcrumbs = (props) => { listItemClass = "govuk-breadcrumbs__link-item backChevron" ) => renderAnchorCrumb("#", t("common:back-link"), onClick, listItemClass); + const renderDnsCaseReferenceCrumbs = (referenceValue) => ( + <> + {renderLinkCrumb( + isWelsh + ? router.locale + "/dnsapplications" + : "/dnsapplications", + t("dnsCommon:service-name") + )} + {renderCaseReferenceCrumb(referenceValue)} + + ); + const { breadcrumbHref, caseResultsHref, breadcrumbLabel } = resolveCaseBreadcrumbState({ query: router.query, @@ -226,30 +245,18 @@ const Breadcrumbs = (props) => { )} )} - {isPath("/myportal/addresssearch") && ( - <> - {renderMyPortalCrumb()} - {renderTextCrumb( - t("common:breadcrumb-address-search") - )} - - )} - {isPath("/myportal/advancedsearch") && ( - <> - {renderMyPortalCrumb()} - {renderTextCrumb( - t("common:breadcrumb-advanced-search") - )} - - )} - {isPath("/myportal/contactus") && ( - <> - {renderMyPortalCrumb()} - {renderTextCrumb( - t("common:footer-contact-us-link-label") - )} - - )} + {isPath("/myportal/addresssearch") && + renderMyPortalSectionCrumbs( + t("common:breadcrumb-address-search") + )} + {isPath("/myportal/advancedsearch") && + renderMyPortalSectionCrumbs( + t("common:breadcrumb-advanced-search") + )} + {isPath("/myportal/contactus") && + renderMyPortalSectionCrumbs( + t("common:footer-contact-us-link-label") + )} {isPath("/contactus") && ( <> {renderTextCrumb( @@ -586,28 +593,10 @@ const Breadcrumbs = (props) => {
    • )} - {isPath("/dnsdetails") && ( - <> - {renderLinkCrumb( - isWelsh - ? router.locale + "/dnsapplications" - : "/dnsapplications", - t("dnsCommon:service-name") - )} - {renderCaseReferenceCrumb(currentReference)} - - )} - {isPath("/dns/[developmentName]") && ( - <> - {renderLinkCrumb( - isWelsh - ? router.locale + "/dnsapplications" - : "/dnsapplications", - t("dnsCommon:service-name") - )} - {renderCaseReferenceCrumb(caseReferenceDisplay)} - - )} + {isPath("/dnsdetails") && + renderDnsCaseReferenceCrumbs(currentReference)} + {isPath("/dns/[developmentName]") && + renderDnsCaseReferenceCrumbs(caseReferenceDisplay)} {isPath("/dns/application-view") && ( <> {renderLinkCrumb( diff --git a/memory-bank/change-log.md b/memory-bank/change-log.md index 61b80235..bfd6019b 100644 --- a/memory-bank/change-log.md +++ b/memory-bank/change-log.md @@ -305,6 +305,34 @@ Follow-ups: - Next slice recommendation: extract a small grouped helper for recurring two-crumb route pairs (e.g., my-portal + section label, dns list + case reference) to reduce the remaining conditional chain while preserving explicit route behavior. +### CL-22541-K: breadcrumbs grouped two-crumb helper extraction + +date: 2026-04-09 +author: Cline +scope: `components/breadcrumbs.js` +type: change +rationale: Continue the same bounded refactor cadence by extracting recurring two-crumb patterns into small grouped helpers while preserving explicit route branches. +impact: Refactor-only readability/deduplication improvement; no intended route/auth/session/API/EN-CY/a11y behavior change. +status: completed + +Summary: + +- Added grouped helper `renderMyPortalSectionCrumbs(sectionLabel)` for recurring my-portal + section text pairs. +- Added grouped helper `renderDnsCaseReferenceCrumbs(referenceValue)` for recurring DNS applications link + case-reference pairs. +- Replaced duplicated route branches with grouped helper usage for: + - `/myportal/addresssearch`, `/myportal/advancedsearch`, `/myportal/contactus` + - `/dnsdetails`, `/dns/[developmentName]` +- Preserved existing href behavior (including EN/CY DNS applications link), labels, and case-reference rendering. + +Validation: + +- `npx eslint components/breadcrumbs.js` -> pass. +- `node tests/phase22/index.test.cjs` -> pass (combined suite). + +Follow-ups: + +- Next slice recommendation: extract a small route-to-renderer map for static single-branch crumbs (where branch has no bespoke side-effects) so the main JSX conditional chain shrinks further without altering explicit behavior in dynamic/sensitive branches. + ### CL-00X: 22500 `components/elements/index.js` Phase 1 helper extraction date: 2026-04-07 From c464fbf13b44af4ada89b3cbcb5e5eec200db9e1 Mon Sep 17 00:00:00 2001 From: robbond Date: Thu, 9 Apr 2026 09:54:49 +0100 Subject: [PATCH 12/33] 22541 introduce simple route renderer map for static breadcrumb branches --- components/breadcrumbs.js | 75 ++++++++++++++------------------------- memory-bank/change-log.md | 28 +++++++++++++++ 2 files changed, 55 insertions(+), 48 deletions(-) diff --git a/components/breadcrumbs.js b/components/breadcrumbs.js index 92a51c49..9d6ffd51 100644 --- a/components/breadcrumbs.js +++ b/components/breadcrumbs.js @@ -113,6 +113,26 @@ const Breadcrumbs = (props) => { return staticTextCrumbByPath[path] || null; }; + const getSimpleRouteRenderer = (path) => { + const simpleRouteRenderersByPath = { + "/myportal": () => renderTextCrumb(t("myportal:page-title")), + "/searchresults": () => + renderTextCrumb(t("common:breadcrumb-search-results")), + "/advancedsearch": () => + renderTextCrumb(t("common:breadcrumb-advanced-search")), + "/addresssearch": () => + renderTextCrumb(t("common:breadcrumb-address-search")), + "/contactus": () => + renderTextCrumb(t("common:footer-contact-us-link-label")), + "/viewall": () => + renderMyPortalSectionCrumbs(t("common:breadcrumb-your-cases")), + "/myportal/dnsapplications": () => + renderMyPortalSectionCrumbs(t("dnsCommon:service-name")) + }; + + return simpleRouteRenderersByPath[path] || null; + }; + const renderMyPortalCrumb = () => (
  • @@ -208,11 +228,13 @@ const Breadcrumbs = (props) => { t("common:service-name-breadcrumb") )} - {isPath("/myportal") && ( -
  • - {t("myportal:page-title")} -
    • - )} + {(() => { + const renderSimpleRoute = + getSimpleRouteRenderer(pathname); + return renderSimpleRoute + ? renderSimpleRoute() + : null; + })()} {isPath("/myportal/searchresults") && ( <> {renderAnchorCrumb( @@ -224,27 +246,6 @@ const Breadcrumbs = (props) => { )} - {isPath("/searchresults") && ( - <> - {renderTextCrumb( - t("common:breadcrumb-search-results") - )} - - )} - {isPath("/advancedsearch") && ( - <> - {renderTextCrumb( - t("common:breadcrumb-advanced-search") - )} - - )} - {isPath("/addresssearch") && ( - <> - {renderTextCrumb( - t("common:breadcrumb-address-search") - )} - - )} {isPath("/myportal/addresssearch") && renderMyPortalSectionCrumbs( t("common:breadcrumb-address-search") @@ -257,13 +258,6 @@ const Breadcrumbs = (props) => { renderMyPortalSectionCrumbs( t("common:footer-contact-us-link-label") )} - {isPath("/contactus") && ( - <> - {renderTextCrumb( - t("common:footer-contact-us-link-label") - )} - - )} {isPath("/addresssearchresults") && ( <> {" "} @@ -384,14 +378,6 @@ const Breadcrumbs = (props) => { )} - {isPath("/viewall") && ( - <> - {renderMyPortalCrumb()} - {renderTextCrumb( - t("common:breadcrumb-your-cases") - )} - - )} {isPath("/myportal/viewall") && ( <> {renderMyPortalCrumb()} @@ -489,13 +475,6 @@ const Breadcrumbs = (props) => { {renderCaseReferenceCrumb(caseReferenceDisplay)} )} - {isPath("/myportal/dnsapplications") && ( - <> - {" "} - {renderMyPortalCrumb()} - {renderTextCrumb(t("dnsCommon:service-name"))} - - )} {isPath("/myportal/dnsdetails") && ( <> {renderMyPortalCrumb()} diff --git a/memory-bank/change-log.md b/memory-bank/change-log.md index bfd6019b..90f5a707 100644 --- a/memory-bank/change-log.md +++ b/memory-bank/change-log.md @@ -333,6 +333,34 @@ Follow-ups: - Next slice recommendation: extract a small route-to-renderer map for static single-branch crumbs (where branch has no bespoke side-effects) so the main JSX conditional chain shrinks further without altering explicit behavior in dynamic/sensitive branches. +### CL-22541-L: breadcrumbs simple-route renderer map introduction + +date: 2026-04-09 +author: Cline +scope: `components/breadcrumbs.js` +type: change +rationale: Continue bounded readability refactor by introducing a small route-to-renderer map for simple static branches, reducing conditional-chain length while preserving explicit dynamic branches. +impact: Refactor-only structural deduplication/readability improvement; no intended route/auth/session/API/EN-CY/a11y behavior change. +status: completed + +Summary: + +- Added `getSimpleRouteRenderer(path)` in `components/breadcrumbs.js` for simple routes with no bespoke side effects. +- Introduced a single invocation block that resolves and renders mapped simple routes when present. +- Migrated simple route branches into the map, including: + - `/myportal`, `/searchresults`, `/advancedsearch`, `/addresssearch`, `/contactus` + - `/viewall`, `/myportal/dnsapplications` +- Preserved existing label text, helper usage, and rendered crumb sequence semantics. + +Validation: + +- `npx eslint components/breadcrumbs.js` -> pass. +- `node tests/phase22/index.test.cjs` -> pass (combined suite). + +Follow-ups: + +- Next slice recommendation: extract a second tiny map for simple "link + text" pair routes (no callbacks, no side effects) to further shrink the conditional chain while keeping callback/dynamic branches explicit. + ### CL-00X: 22500 `components/elements/index.js` Phase 1 helper extraction date: 2026-04-07 From 04dc8fd2b9718d1624cda61e744950ac575b78d3 Mon Sep 17 00:00:00 2001 From: robbond Date: Thu, 9 Apr 2026 09:58:22 +0100 Subject: [PATCH 13/33] 22541 extract simple link-text breadcrumb route map and add structure tests --- components/breadcrumbs.js | 72 ++++++++++--------- memory-bank/change-log.md | 31 ++++++++ .../breadcrumbs-route-map-structure.test.cjs | 71 ++++++++++++++++++ tests/phase22/index.test.cjs | 2 + 4 files changed, 144 insertions(+), 32 deletions(-) create mode 100644 tests/phase22/breadcrumbs-route-map-structure.test.cjs diff --git a/components/breadcrumbs.js b/components/breadcrumbs.js index 9d6ffd51..0e4d513a 100644 --- a/components/breadcrumbs.js +++ b/components/breadcrumbs.js @@ -133,6 +133,39 @@ const Breadcrumbs = (props) => { return simpleRouteRenderersByPath[path] || null; }; + const getSimpleLinkTextPairRenderer = (path) => { + const simpleLinkTextPairRenderersByPath = { + "/addresssearchresults": () => ( + <> + {renderLinkCrumb( + isWelsh + ? router.locale + "/chwiliadcyfeiriadau" + : "/addresssearch", + t("common:breadcrumb-address-search") + )} + {renderTextCrumb( + t("common:breadcrumb-address-search-results") + )} + + ), + "/advancedsearchresults": () => ( + <> + {renderLinkCrumb( + isWelsh + ? router.locale + "/advancedsearch" + : "/advancedsearch", + t("common:breadcrumb-advanced-search") + )} + {renderTextCrumb( + t("common:breadcrumb-advanced-search-results") + )} + + ) + }; + + return simpleLinkTextPairRenderersByPath[path] || null; + }; + const renderMyPortalCrumb = () => (
  • @@ -235,6 +268,13 @@ const Breadcrumbs = (props) => { ? renderSimpleRoute() : null; })()} + {(() => { + const renderSimpleLinkTextPair = + getSimpleLinkTextPairRenderer(pathname); + return renderSimpleLinkTextPair + ? renderSimpleLinkTextPair() + : null; + })()} {isPath("/myportal/searchresults") && ( <> {renderAnchorCrumb( @@ -258,38 +298,6 @@ const Breadcrumbs = (props) => { renderMyPortalSectionCrumbs( t("common:footer-contact-us-link-label") )} - {isPath("/addresssearchresults") && ( - <> - {" "} - {renderLinkCrumb( - isWelsh - ? router.locale + "/chwiliadcyfeiriadau" - : "/addresssearch", - t("common:breadcrumb-address-search") - )} - {renderTextCrumb( - t( - "common:breadcrumb-address-search-results" - ) - )} - - )} - {isPath("/advancedsearchresults") && ( - <> - {" "} - {renderLinkCrumb( - isWelsh - ? router.locale + "/advancedsearch" - : "/advancedsearch", - t("common:breadcrumb-advanced-search") - )} - {renderTextCrumb( - t( - "common:breadcrumb-advanced-search-results" - ) - )} - - )} {isPath("/myportal/advancedsearchresults") && ( <> {renderMyPortalCrumb()} diff --git a/memory-bank/change-log.md b/memory-bank/change-log.md index 90f5a707..be7d909b 100644 --- a/memory-bank/change-log.md +++ b/memory-bank/change-log.md @@ -361,6 +361,37 @@ Follow-ups: - Next slice recommendation: extract a second tiny map for simple "link + text" pair routes (no callbacks, no side effects) to further shrink the conditional chain while keeping callback/dynamic branches explicit. +### CL-22541-M: breadcrumbs simple link+text pair map + focused structure coverage + +date: 2026-04-09 +author: Cline +scope: `components/breadcrumbs.js`, `tests/phase22/{breadcrumbs-route-map-structure,index}.test.cjs` +type: change +rationale: Execute the next bounded slice by extracting simple link+text pair route branches into a tiny renderer map and adding focused regression checks that mapped and dynamic callback branches remain in the intended structure. +impact: Refactor-only structural deduplication/readability improvement plus focused test coverage; no intended route/auth/session/API/EN-CY/a11y behavior change. +status: completed + +Summary: + +- Added `getSimpleLinkTextPairRenderer(path)` in `components/breadcrumbs.js` for simple no-callback "link + text" pair routes. +- Migrated these routes into the new pair map: + - `/addresssearchresults` + - `/advancedsearchresults` +- Kept dynamic/callback-driven branches explicit and untouched (e.g., `/myportal/case/id/[incident]` with `router.back()`). +- Added focused phase22 suite `tests/phase22/breadcrumbs-route-map-structure.test.cjs` asserting: + - mapped simple pair routes exist in the new map + - explicit dynamic callback branch remains present. +- Registered the new suite in `tests/phase22/index.test.cjs`. + +Validation: + +- `npx eslint components/breadcrumbs.js tests/phase22/index.test.cjs tests/phase22/breadcrumbs-route-map-structure.test.cjs` -> pass. +- `node tests/phase22/index.test.cjs` -> pass (combined suite, including new breadcrumbs-route-map tests 2/2). + +Follow-ups: + +- Next slice recommendation: introduce a tiny local `renderMappedRoute(path, resolver)` helper to remove repeated inline IIFE map invocations, then optionally merge simple maps under one top-level resolver while preserving explicit ordering and side-effect-free constraints. + ### CL-00X: 22500 `components/elements/index.js` Phase 1 helper extraction date: 2026-04-07 diff --git a/tests/phase22/breadcrumbs-route-map-structure.test.cjs b/tests/phase22/breadcrumbs-route-map-structure.test.cjs new file mode 100644 index 00000000..c3a6f99c --- /dev/null +++ b/tests/phase22/breadcrumbs-route-map-structure.test.cjs @@ -0,0 +1,71 @@ +const assert = require("assert"); +const fs = require("fs"); +const path = require("path"); + +const tests = []; +const test = (name, fn) => tests.push({ name, fn }); + +const loadBreadcrumbSource = () => { + const filePath = path.join( + __dirname, + "..", + "..", + "components", + "breadcrumbs.js" + ); + return fs.readFileSync(filePath, "utf8"); +}; + +test("breadcrumbs/simple-link-text map includes address and advanced search result routes", async () => { + const source = loadBreadcrumbSource(); + + assert.strictEqual( + source.includes('"/addresssearchresults": () => ('), + true, + "Expected /addresssearchresults to be mapped in getSimpleLinkTextPairRenderer" + ); + + assert.strictEqual( + source.includes('"/advancedsearchresults": () => ('), + true, + "Expected /advancedsearchresults to be mapped in getSimpleLinkTextPairRenderer" + ); +}); + +test("breadcrumbs/dynamic callback branch remains explicit for myportal case incident route", async () => { + const source = loadBreadcrumbSource(); + + assert.strictEqual( + source.includes('isPath("/myportal/case/id/[incident]")'), + true, + "Expected dynamic /myportal/case/id/[incident] breadcrumb branch to remain explicit" + ); + + assert.strictEqual( + source.includes("router.back();"), + true, + "Expected callback-driven router.back() behavior to remain explicit" + ); +}); + +const run = async () => { + let passed = 0; + + for (const currentTest of tests) { + await currentTest.fn(); + passed += 1; + } + + console.log( + `Phase 22 breadcrumbs-route-map tests passed (${passed}/${tests.length}).` + ); +}; + +module.exports = run; + +if (require.main === module) { + run().catch((error) => { + console.error(error); + process.exit(1); + }); +} diff --git a/tests/phase22/index.test.cjs b/tests/phase22/index.test.cjs index a8e2ea0f..b3996055 100644 --- a/tests/phase22/index.test.cjs +++ b/tests/phase22/index.test.cjs @@ -7,6 +7,7 @@ const runAuthRedirectSafetyTests = require("./auth-redirect-safety.test.cjs"); const runI18nRouteParityTests = require("./i18n-route-parity.test.cjs"); const runAzurestorageHelperTests = require("./azurestorage-helper-behaviour.test.cjs"); const runRouteStateHelperTests = require("./route-state-helper.test.cjs"); +const runBreadcrumbsRouteMapStructureTests = require("./breadcrumbs-route-map-structure.test.cjs"); const run = async () => { await runCoreTokenTests(); @@ -18,6 +19,7 @@ const run = async () => { await runI18nRouteParityTests(); await runAzurestorageHelperTests(); await runRouteStateHelperTests(); + await runBreadcrumbsRouteMapStructureTests(); console.log("Phase 22 combined suite passed."); }; From 786f906ab81c145d5206a1972c7a8bfb3a6eb354 Mon Sep 17 00:00:00 2001 From: robbond Date: Thu, 9 Apr 2026 10:02:02 +0100 Subject: [PATCH 14/33] 22541 unify breadcrumb mapped-route resolver and widen route-map coverage --- components/breadcrumbs.js | 105 ++++++++++-------- memory-bank/change-log.md | 37 ++++++ .../breadcrumbs-route-map-structure.test.cjs | 36 ++++++ 3 files changed, 130 insertions(+), 48 deletions(-) diff --git a/components/breadcrumbs.js b/components/breadcrumbs.js index 0e4d513a..672f9a0e 100644 --- a/components/breadcrumbs.js +++ b/components/breadcrumbs.js @@ -166,6 +166,62 @@ const Breadcrumbs = (props) => { return simpleLinkTextPairRenderersByPath[path] || null; }; + const getSimpleMyPortalRouteRenderer = (path) => { + const simpleMyPortalRouteRenderersByPath = { + "/myportal/searchresults": () => ( + <> + {renderAnchorCrumb( + myPortalHref, + t("common:breadcrumb-my-portal") + )} + {renderTextCrumb(t("common:breadcrumb-search-results"))} + + ), + "/myportal/addresssearch": () => + renderMyPortalSectionCrumbs( + t("common:breadcrumb-address-search") + ), + "/myportal/advancedsearch": () => + 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 + ) + ) + }; + + return simpleMyPortalRouteRenderersByPath[path] || null; + }; + + const resolveMappedRouteRenderer = (path) => { + const mappedResolvers = [ + getSimpleRouteRenderer, + getSimpleLinkTextPairRenderer, + getSimpleMyPortalRouteRenderer + ]; + + for (const resolveRenderer of mappedResolvers) { + const routeRenderer = resolveRenderer(path); + if (routeRenderer) { + return routeRenderer; + } + } + + return null; + }; + + const renderMappedRoute = (path, resolver = resolveMappedRouteRenderer) => { + const routeRenderer = resolver(path); + return routeRenderer ? routeRenderer() : null; + }; + const renderMyPortalCrumb = () => (
  • @@ -261,43 +317,7 @@ const Breadcrumbs = (props) => { t("common:service-name-breadcrumb") )} - {(() => { - const renderSimpleRoute = - getSimpleRouteRenderer(pathname); - return renderSimpleRoute - ? renderSimpleRoute() - : null; - })()} - {(() => { - const renderSimpleLinkTextPair = - getSimpleLinkTextPairRenderer(pathname); - return renderSimpleLinkTextPair - ? renderSimpleLinkTextPair() - : null; - })()} - {isPath("/myportal/searchresults") && ( - <> - {renderAnchorCrumb( - myPortalHref, - t("common:breadcrumb-my-portal") - )} -
  • - {t("common:breadcrumb-search-results")} -
    • - - )} - {isPath("/myportal/addresssearch") && - renderMyPortalSectionCrumbs( - t("common:breadcrumb-address-search") - )} - {isPath("/myportal/advancedsearch") && - renderMyPortalSectionCrumbs( - t("common:breadcrumb-advanced-search") - )} - {isPath("/myportal/contactus") && - renderMyPortalSectionCrumbs( - t("common:footer-contact-us-link-label") - )} + {renderMappedRoute(pathname)} {isPath("/myportal/advancedsearchresults") && ( <> {renderMyPortalCrumb()} @@ -386,17 +406,6 @@ const Breadcrumbs = (props) => { )} - {isPath("/myportal/viewall") && ( - <> - {renderMyPortalCrumb()} -
  • - {getViewAllLabel( - currentViewState.viewKey || - router.query.key - )} -
    • - - )} {isPath("/myportal/case") && ( <> {renderLinkCrumb( diff --git a/memory-bank/change-log.md b/memory-bank/change-log.md index be7d909b..1fab1697 100644 --- a/memory-bank/change-log.md +++ b/memory-bank/change-log.md @@ -392,6 +392,43 @@ Follow-ups: - Next slice recommendation: introduce a tiny local `renderMappedRoute(path, resolver)` helper to remove repeated inline IIFE map invocations, then optionally merge simple maps under one top-level resolver while preserving explicit ordering and side-effect-free constraints. +### CL-22541-N: breadcrumbs unified mapped-route resolver + widened structural guardrails + +date: 2026-04-09 +author: Cline +scope: `components/breadcrumbs.js`, `tests/phase22/breadcrumbs-route-map-structure.test.cjs` +type: change +rationale: Execute the requested wider next slice by removing duplicated mapped-route invocation patterns, introducing a single top-level mapped resolver with explicit precedence, and migrating an additional safe my-portal route group into map-driven rendering while preserving explicit dynamic/callback branches. +impact: Refactor-only structural consolidation/readability improvement with widened mapped-route coverage and stronger structure guardrail tests; no intended route/auth/session/API/EN-CY/a11y behavior change. +status: completed + +Summary: + +- Added `getSimpleMyPortalRouteRenderer(path)` in `components/breadcrumbs.js` and migrated additional safe map-friendly routes: + - `/myportal/searchresults` + - `/myportal/addresssearch` + - `/myportal/advancedsearch` + - `/myportal/contactus` + - `/myportal/viewall` +- Added `resolveMappedRouteRenderer(path)` to unify map precedence under one resolver. +- Added `renderMappedRoute(path, resolver?)` helper and replaced duplicated inline map IIFE invocations with a single call: + - `{renderMappedRoute(pathname)}` +- Kept dynamic/stateful callback branches explicit and unchanged, especially `/myportal/case/id/[incident]` (`router.back()`) and other callback/state driven branches. +- Expanded `tests/phase22/breadcrumbs-route-map-structure.test.cjs` to assert: + - new my-portal route-map entries are present + - unified resolver/helper signatures are present + - single mapped-route invocation is used in JSX + - dynamic callback branch remains explicit. + +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 wider slice candidate: move a second safe myportal results pair group (`/myportal/advancedsearchresults`, `/myportal/addresssearchresults`) into the unified mapped resolver where callback-free, then consider splitting resolver maps into a dedicated local constant section for improved scanability. + ### CL-00X: 22500 `components/elements/index.js` Phase 1 helper extraction date: 2026-04-07 diff --git a/tests/phase22/breadcrumbs-route-map-structure.test.cjs b/tests/phase22/breadcrumbs-route-map-structure.test.cjs index c3a6f99c..9727ca6c 100644 --- a/tests/phase22/breadcrumbs-route-map-structure.test.cjs +++ b/tests/phase22/breadcrumbs-route-map-structure.test.cjs @@ -30,6 +30,42 @@ test("breadcrumbs/simple-link-text map includes address and advanced search resu true, "Expected /advancedsearchresults to be mapped in getSimpleLinkTextPairRenderer" ); + + assert.strictEqual( + source.includes('"/myportal/searchresults": () => ('), + true, + "Expected /myportal/searchresults to be mapped in getSimpleMyPortalRouteRenderer" + ); + + assert.strictEqual( + source.includes('"/myportal/viewall": () =>'), + true, + "Expected /myportal/viewall to be mapped in getSimpleMyPortalRouteRenderer" + ); +}); + +test("breadcrumbs/merged resolver renders mapped routes through single helper invocation", async () => { + const source = loadBreadcrumbSource(); + + assert.strictEqual( + source.includes("const resolveMappedRouteRenderer = (path) =>"), + true, + "Expected unified mapped route resolver helper to exist" + ); + + assert.strictEqual( + source.includes( + "const renderMappedRoute = (path, resolver = resolveMappedRouteRenderer) =>" + ), + true, + "Expected reusable renderMappedRoute helper to exist" + ); + + assert.strictEqual( + source.includes("{renderMappedRoute(pathname)}"), + true, + "Expected breadcrumb JSX to use single mapped route render invocation" + ); }); test("breadcrumbs/dynamic callback branch remains explicit for myportal case incident route", async () => { From ee3f3eae74a6ee1466ae47af25131dc8baa285bd Mon Sep 17 00:00:00 2001 From: robbond Date: Thu, 9 Apr 2026 10:16:45 +0100 Subject: [PATCH 15/33] 22541 map myportal results pair routes through unified breadcrumb resolver --- components/breadcrumbs.js | 67 +++++++++---------- memory-bank/change-log.md | 30 +++++++++ .../breadcrumbs-route-map-structure.test.cjs | 24 +++++++ 3 files changed, 85 insertions(+), 36 deletions(-) diff --git a/components/breadcrumbs.js b/components/breadcrumbs.js index 672f9a0e..f0e3b552 100644 --- a/components/breadcrumbs.js +++ b/components/breadcrumbs.js @@ -194,7 +194,37 @@ const Breadcrumbs = (props) => { getViewAllLabel( currentViewState.viewKey || router.query.key ) - ) + ), + "/myportal/advancedsearchresults": () => ( + <> + {renderMyPortalCrumb()} + {renderLinkCrumb( + isWelsh + ? router.locale + "/myportal/advancedsearch" + : "/myportal/advancedsearch", + t("common:breadcrumb-advanced-search") + )} + {renderTextCrumb( + t("common:breadcrumb-advanced-search-results") + )} + + ), + "/myportal/addresssearchresults": () => ( + <> + {renderMyPortalCrumb()} + {renderLinkCrumb( + isWelsh + ? "/" + + router.locale + + "/fymhorth/chwiliadcyfeiriadau" + : "/myportal/addresssearch", + t("common:breadcrumb-address-search") + )} + {renderTextCrumb( + t("common:breadcrumb-address-search-results") + )} + + ) }; return simpleMyPortalRouteRenderersByPath[path] || null; @@ -318,41 +348,6 @@ const Breadcrumbs = (props) => { )} {renderMappedRoute(pathname)} - {isPath("/myportal/advancedsearchresults") && ( - <> - {renderMyPortalCrumb()} - {renderLinkCrumb( - isWelsh - ? router.locale + - "/myportal/advancedsearch" - : "/myportal/advancedsearch", - t("common:breadcrumb-advanced-search") - )} - {renderTextCrumb( - t( - "common:breadcrumb-advanced-search-results" - ) - )} - - )} - {isPath("/myportal/addresssearchresults") && ( - <> - {renderMyPortalCrumb()} - {renderLinkCrumb( - isWelsh - ? "/" + - router.locale + - "/fymhorth/chwiliadcyfeiriadau" - : "/myportal/addresssearch", - t("common:breadcrumb-address-search") - )} - {renderTextCrumb( - t( - "common:breadcrumb-address-search-results" - ) - )} - - )} {isPath("/newappeal") && <>} {isPath("/newappeal/[appealtypes]") && ( <> diff --git a/memory-bank/change-log.md b/memory-bank/change-log.md index 1fab1697..a1706c71 100644 --- a/memory-bank/change-log.md +++ b/memory-bank/change-log.md @@ -429,6 +429,36 @@ Follow-ups: - Next wider slice candidate: move a second safe myportal results pair group (`/myportal/advancedsearchresults`, `/myportal/addresssearchresults`) into the unified mapped resolver where callback-free, then consider splitting resolver maps into a dedicated local constant section for improved scanability. +### CL-22541-O: breadcrumbs myportal results-pair migration into unified mapped resolver + +date: 2026-04-09 +author: Cline +scope: `components/breadcrumbs.js`, `tests/phase22/breadcrumbs-route-map-structure.test.cjs` +type: change +rationale: Execute the agreed next slice by migrating the remaining callback-free myportal results-pair branches into the unified mapped resolver so more safe branches are rendered through one consistent mapping flow. +impact: Refactor-only structural consolidation/readability improvement; no intended route/auth/session/API/EN-CY/a11y behavior change. +status: completed + +Summary: + +- Extended `getSimpleMyPortalRouteRenderer(path)` to include: + - `/myportal/advancedsearchresults` + - `/myportal/addresssearchresults` +- Removed now-redundant explicit conditional branches for those two routes from the main JSX chain. +- Kept callback/stateful branches explicit and unchanged (notably `/myportal/case/id/[incident]` with `router.back()`). +- Expanded `tests/phase22/breadcrumbs-route-map-structure.test.cjs` guardrails to assert: + - both myportal results-pair routes are mapped + - legacy explicit `isPath(...)` branches for those routes are no longer present + +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 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-00X: 22500 `components/elements/index.js` Phase 1 helper extraction date: 2026-04-07 diff --git a/tests/phase22/breadcrumbs-route-map-structure.test.cjs b/tests/phase22/breadcrumbs-route-map-structure.test.cjs index 9727ca6c..65613f6b 100644 --- a/tests/phase22/breadcrumbs-route-map-structure.test.cjs +++ b/tests/phase22/breadcrumbs-route-map-structure.test.cjs @@ -42,6 +42,18 @@ test("breadcrumbs/simple-link-text map includes address and advanced search resu true, "Expected /myportal/viewall to be mapped in getSimpleMyPortalRouteRenderer" ); + + assert.strictEqual( + source.includes('"/myportal/advancedsearchresults": () => ('), + true, + "Expected /myportal/advancedsearchresults to be mapped in getSimpleMyPortalRouteRenderer" + ); + + assert.strictEqual( + source.includes('"/myportal/addresssearchresults": () => ('), + true, + "Expected /myportal/addresssearchresults to be mapped in getSimpleMyPortalRouteRenderer" + ); }); test("breadcrumbs/merged resolver renders mapped routes through single helper invocation", async () => { @@ -66,6 +78,18 @@ test("breadcrumbs/merged resolver renders mapped routes through single helper in true, "Expected breadcrumb JSX to use single mapped route render invocation" ); + + assert.strictEqual( + source.includes('isPath("/myportal/advancedsearchresults")'), + false, + "Expected /myportal/advancedsearchresults explicit branch to be removed after mapping" + ); + + assert.strictEqual( + source.includes('isPath("/myportal/addresssearchresults")'), + false, + "Expected /myportal/addresssearchresults explicit branch to be removed after mapping" + ); }); test("breadcrumbs/dynamic callback branch remains explicit for myportal case incident route", async () => { From 78d62c541f4438b18cf0b9cb72fe68c91e0a525b Mon Sep 17 00:00:00 2001 From: robbond Date: Thu, 9 Apr 2026 10:21:09 +0100 Subject: [PATCH 16/33] 22541 consolidate breadcrumb mapped route maps into grouped constants --- components/breadcrumbs.js | 220 ++++++++---------- memory-bank/change-log.md | 33 +++ .../breadcrumbs-route-map-structure.test.cjs | 14 ++ 3 files changed, 148 insertions(+), 119 deletions(-) diff --git a/components/breadcrumbs.js b/components/breadcrumbs.js index f0e3b552..90c2a391 100644 --- a/components/breadcrumbs.js +++ b/components/breadcrumbs.js @@ -113,132 +113,114 @@ const Breadcrumbs = (props) => { return staticTextCrumbByPath[path] || null; }; - const getSimpleRouteRenderer = (path) => { - const simpleRouteRenderersByPath = { - "/myportal": () => renderTextCrumb(t("myportal:page-title")), - "/searchresults": () => - renderTextCrumb(t("common:breadcrumb-search-results")), - "/advancedsearch": () => - renderTextCrumb(t("common:breadcrumb-advanced-search")), - "/addresssearch": () => - renderTextCrumb(t("common:breadcrumb-address-search")), - "/contactus": () => - renderTextCrumb(t("common:footer-contact-us-link-label")), - "/viewall": () => - renderMyPortalSectionCrumbs(t("common:breadcrumb-your-cases")), - "/myportal/dnsapplications": () => - renderMyPortalSectionCrumbs(t("dnsCommon:service-name")) - }; - - return simpleRouteRenderersByPath[path] || null; + const simpleRouteRenderersByPath = { + "/myportal": () => renderTextCrumb(t("myportal:page-title")), + "/searchresults": () => + renderTextCrumb(t("common:breadcrumb-search-results")), + "/advancedsearch": () => + renderTextCrumb(t("common:breadcrumb-advanced-search")), + "/addresssearch": () => + renderTextCrumb(t("common:breadcrumb-address-search")), + "/contactus": () => + renderTextCrumb(t("common:footer-contact-us-link-label")), + "/viewall": () => + renderMyPortalSectionCrumbs(t("common:breadcrumb-your-cases")), + "/myportal/dnsapplications": () => + renderMyPortalSectionCrumbs(t("dnsCommon:service-name")) }; - const getSimpleLinkTextPairRenderer = (path) => { - const simpleLinkTextPairRenderersByPath = { - "/addresssearchresults": () => ( - <> - {renderLinkCrumb( - isWelsh - ? router.locale + "/chwiliadcyfeiriadau" - : "/addresssearch", - t("common:breadcrumb-address-search") - )} - {renderTextCrumb( - t("common:breadcrumb-address-search-results") - )} - - ), - "/advancedsearchresults": () => ( - <> - {renderLinkCrumb( - isWelsh - ? router.locale + "/advancedsearch" - : "/advancedsearch", - t("common:breadcrumb-advanced-search") - )} - {renderTextCrumb( - t("common:breadcrumb-advanced-search-results") - )} - - ) - }; - - return simpleLinkTextPairRenderersByPath[path] || null; - }; - - const getSimpleMyPortalRouteRenderer = (path) => { - const simpleMyPortalRouteRenderersByPath = { - "/myportal/searchresults": () => ( - <> - {renderAnchorCrumb( - myPortalHref, - t("common:breadcrumb-my-portal") - )} - {renderTextCrumb(t("common:breadcrumb-search-results"))} - - ), - "/myportal/addresssearch": () => - renderMyPortalSectionCrumbs( + const simpleLinkTextPairRenderersByPath = { + "/addresssearchresults": () => ( + <> + {renderLinkCrumb( + isWelsh + ? router.locale + "/chwiliadcyfeiriadau" + : "/addresssearch", t("common:breadcrumb-address-search") - ), - "/myportal/advancedsearch": () => - renderMyPortalSectionCrumbs( + )} + {renderTextCrumb(t("common:breadcrumb-address-search-results"))} + + ), + "/advancedsearchresults": () => ( + <> + {renderLinkCrumb( + isWelsh + ? router.locale + "/advancedsearch" + : "/advancedsearch", t("common:breadcrumb-advanced-search") - ), - "/myportal/contactus": () => - renderMyPortalSectionCrumbs( - t("common:footer-contact-us-link-label") - ), - "/myportal/viewall": () => - renderMyPortalSectionCrumbs( - getViewAllLabel( - currentViewState.viewKey || router.query.key - ) - ), - "/myportal/advancedsearchresults": () => ( - <> - {renderMyPortalCrumb()} - {renderLinkCrumb( - isWelsh - ? router.locale + "/myportal/advancedsearch" - : "/myportal/advancedsearch", - t("common:breadcrumb-advanced-search") - )} - {renderTextCrumb( - t("common:breadcrumb-advanced-search-results") - )} - - ), - "/myportal/addresssearchresults": () => ( - <> - {renderMyPortalCrumb()} - {renderLinkCrumb( - isWelsh - ? "/" + - router.locale + - "/fymhorth/chwiliadcyfeiriadau" - : "/myportal/addresssearch", - t("common:breadcrumb-address-search") - )} - {renderTextCrumb( - t("common:breadcrumb-address-search-results") - )} - - ) - }; - - return simpleMyPortalRouteRenderersByPath[path] || null; + )} + {renderTextCrumb( + t("common:breadcrumb-advanced-search-results") + )} + + ) }; + const simpleMyPortalRouteRenderersByPath = { + "/myportal/searchresults": () => ( + <> + {renderAnchorCrumb( + myPortalHref, + t("common:breadcrumb-my-portal") + )} + {renderTextCrumb(t("common:breadcrumb-search-results"))} + + ), + "/myportal/addresssearch": () => + renderMyPortalSectionCrumbs(t("common:breadcrumb-address-search")), + "/myportal/advancedsearch": () => + 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) + ), + "/myportal/advancedsearchresults": () => ( + <> + {renderMyPortalCrumb()} + {renderLinkCrumb( + isWelsh + ? router.locale + "/myportal/advancedsearch" + : "/myportal/advancedsearch", + t("common:breadcrumb-advanced-search") + )} + {renderTextCrumb( + t("common:breadcrumb-advanced-search-results") + )} + + ), + "/myportal/addresssearchresults": () => ( + <> + {renderMyPortalCrumb()} + {renderLinkCrumb( + isWelsh + ? "/" + router.locale + "/fymhorth/chwiliadcyfeiriadau" + : "/myportal/addresssearch", + t("common:breadcrumb-address-search") + )} + {renderTextCrumb(t("common:breadcrumb-address-search-results"))} + + ) + }; + + const mappedRouteRendererMaps = [ + simpleRouteRenderersByPath, + simpleLinkTextPairRenderersByPath, + simpleMyPortalRouteRenderersByPath + ]; + + const getMappedRendererByPath = (path, routeRendererMap) => + routeRendererMap[path] || null; + const resolveMappedRouteRenderer = (path) => { - const mappedResolvers = [ - getSimpleRouteRenderer, - getSimpleLinkTextPairRenderer, - getSimpleMyPortalRouteRenderer - ]; - - for (const resolveRenderer of mappedResolvers) { - const routeRenderer = resolveRenderer(path); + for (const routeRendererMap of mappedRouteRendererMaps) { + const routeRenderer = getMappedRendererByPath( + path, + routeRendererMap + ); if (routeRenderer) { return routeRenderer; } diff --git a/memory-bank/change-log.md b/memory-bank/change-log.md index a1706c71..f2e0d2c0 100644 --- a/memory-bank/change-log.md +++ b/memory-bank/change-log.md @@ -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 diff --git a/tests/phase22/breadcrumbs-route-map-structure.test.cjs b/tests/phase22/breadcrumbs-route-map-structure.test.cjs index 65613f6b..77c0e4a7 100644 --- a/tests/phase22/breadcrumbs-route-map-structure.test.cjs +++ b/tests/phase22/breadcrumbs-route-map-structure.test.cjs @@ -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, From 5f6dde782a30d3ae0ea5f333f4197c1582b170e9 Mon Sep 17 00:00:00 2001 From: robbond Date: Thu, 9 Apr 2026 10:25:47 +0100 Subject: [PATCH 17/33] 22541 extract breadcrumb route-map helpers and add precedence guard tests --- components/breadcrumbs.js | 23 ++----- lib/routing/breadcrumbRouteMaps.js | 29 ++++++++ memory-bank/change-log.md | 40 +++++++++++ .../breadcrumb-route-maps-helper.test.cjs | 69 +++++++++++++++++++ .../breadcrumbs-route-map-structure.test.cjs | 42 +++++++++-- tests/phase22/index.test.cjs | 2 + 6 files changed, 185 insertions(+), 20 deletions(-) create mode 100644 lib/routing/breadcrumbRouteMaps.js create mode 100644 tests/phase22/breadcrumb-route-maps-helper.test.cjs diff --git a/components/breadcrumbs.js b/components/breadcrumbs.js index 90c2a391..591224b2 100644 --- a/components/breadcrumbs.js +++ b/components/breadcrumbs.js @@ -13,6 +13,10 @@ import { setRepresentationSubmit } from "../store/currentView/action"; import { resolveCaseBreadcrumbState } from "../lib/routing/routeState"; +import { + buildBreadcrumbRendererMaps, + resolveMappedRouteRenderer as resolveMappedRouteRendererByMaps +} from "../lib/routing/breadcrumbRouteMaps"; const Breadcrumbs = (props) => { const { currentView, @@ -206,27 +210,14 @@ const Breadcrumbs = (props) => { ) }; - const mappedRouteRendererMaps = [ + const mappedRouteRendererMaps = buildBreadcrumbRendererMaps({ simpleRouteRenderersByPath, simpleLinkTextPairRenderersByPath, simpleMyPortalRouteRenderersByPath - ]; - - const getMappedRendererByPath = (path, routeRendererMap) => - routeRendererMap[path] || null; + }); const resolveMappedRouteRenderer = (path) => { - for (const routeRendererMap of mappedRouteRendererMaps) { - const routeRenderer = getMappedRendererByPath( - path, - routeRendererMap - ); - if (routeRenderer) { - return routeRenderer; - } - } - - return null; + return resolveMappedRouteRendererByMaps(path, mappedRouteRendererMaps); }; const renderMappedRoute = (path, resolver = resolveMappedRouteRenderer) => { diff --git a/lib/routing/breadcrumbRouteMaps.js b/lib/routing/breadcrumbRouteMaps.js new file mode 100644 index 00000000..cf5038bc --- /dev/null +++ b/lib/routing/breadcrumbRouteMaps.js @@ -0,0 +1,29 @@ +const getMappedRendererByPath = (path, routeRendererMap) => + routeRendererMap[path] || null; + +const resolveMappedRouteRenderer = (path, routeRendererMaps = []) => { + for (const routeRendererMap of routeRendererMaps) { + const routeRenderer = getMappedRendererByPath(path, routeRendererMap); + if (routeRenderer) { + return routeRenderer; + } + } + + return null; +}; + +const buildBreadcrumbRendererMaps = ({ + simpleRouteRenderersByPath, + simpleLinkTextPairRenderersByPath, + simpleMyPortalRouteRenderersByPath +}) => [ + simpleRouteRenderersByPath, + simpleLinkTextPairRenderersByPath, + simpleMyPortalRouteRenderersByPath +]; + +module.exports = { + buildBreadcrumbRendererMaps, + getMappedRendererByPath, + resolveMappedRouteRenderer +}; diff --git a/memory-bank/change-log.md b/memory-bank/change-log.md index f2e0d2c0..272f9802 100644 --- a/memory-bank/change-log.md +++ b/memory-bank/change-log.md @@ -492,6 +492,46 @@ 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-22541-Q: breadcrumbs route-map helper module extraction + map-order invariants + +date: 2026-04-09 +author: Cline +scope: `lib/routing/breadcrumbRouteMaps.js`, `components/breadcrumbs.js`, `tests/phase22/{breadcrumb-route-maps-helper,breadcrumbs-route-map-structure,index}.test.cjs` +type: change +rationale: Execute both queued follow-up slices together by extracting map composition/resolution logic into a pure routing helper module and adding stronger structure + pure-helper guardrails for map-order precedence. +impact: Refactor-only structural modularization and test hardening; no intended route/auth/session/API/EN-CY/a11y behavior change. +status: completed + +Summary: + +- Added new pure helper module `lib/routing/breadcrumbRouteMaps.js`: + - `buildBreadcrumbRendererMaps(...)` + - `getMappedRendererByPath(...)` + - `resolveMappedRouteRenderer(...)` +- Updated `components/breadcrumbs.js` to import/use shared helper logic: + - map composition now via `buildBreadcrumbRendererMaps(...)` + - resolver now delegates to `resolveMappedRouteRendererByMaps(...)` + - dynamic/callback-sensitive explicit branches remain unchanged. +- Added focused pure-helper tests in `tests/phase22/breadcrumb-route-maps-helper.test.cjs` for: + - map build order + - map lookup null/renderer behavior + - resolver precedence behavior +- Expanded `tests/phase22/breadcrumbs-route-map-structure.test.cjs` to assert: + - component imports shared breadcrumb route-map helper module + - resolver delegation uses helper module + - map builder call preserves explicit ordering (simple -> link-text -> myportal) +- Updated `tests/phase22/index.test.cjs` to include the new helper suite. + +Validation: + +- `npx eslint lib/routing/breadcrumbRouteMaps.js components/breadcrumbs.js tests/phase22/breadcrumb-route-maps-helper.test.cjs tests/phase22/breadcrumbs-route-map-structure.test.cjs tests/phase22/index.test.cjs` -> pass. +- `node tests/phase22/index.test.cjs` -> pass (combined suite; breadcrumb-route-maps-helper 3/3; breadcrumbs-route-map 3/3). + +Follow-ups: + +- Next slice option A (larger): move per-path map object declarations out of `components/breadcrumbs.js` into module-level pure factories (still injected with `t/router/currentView`) to further shrink component body. +- Next slice option B (smaller): add one focused parity test asserting mapped resolver fallback returns `null` in component rendering path for non-mapped routes (ensures no accidental render noise). + ### CL-00X: 22500 `components/elements/index.js` Phase 1 helper extraction date: 2026-04-07 diff --git a/tests/phase22/breadcrumb-route-maps-helper.test.cjs b/tests/phase22/breadcrumb-route-maps-helper.test.cjs new file mode 100644 index 00000000..211be03a --- /dev/null +++ b/tests/phase22/breadcrumb-route-maps-helper.test.cjs @@ -0,0 +1,69 @@ +const assert = require("assert"); + +const { + buildBreadcrumbRendererMaps, + getMappedRendererByPath, + resolveMappedRouteRenderer +} = require("../../lib/routing/breadcrumbRouteMaps"); + +const tests = []; +const test = (name, fn) => tests.push({ name, fn }); + +test("breadcrumbRouteMaps/buildBreadcrumbRendererMaps preserves explicit map order", async () => { + const mapA = { "/a": () => "A" }; + const mapB = { "/b": () => "B" }; + const mapC = { "/c": () => "C" }; + + const result = buildBreadcrumbRendererMaps({ + simpleRouteRenderersByPath: mapA, + simpleLinkTextPairRenderersByPath: mapB, + simpleMyPortalRouteRenderersByPath: mapC + }); + + assert.strictEqual(result[0], mapA); + assert.strictEqual(result[1], mapB); + assert.strictEqual(result[2], mapC); +}); + +test("breadcrumbRouteMaps/getMappedRendererByPath returns mapped renderer or null", async () => { + const renderer = () => "ok"; + const map = { "/x": renderer }; + + assert.strictEqual(getMappedRendererByPath("/x", map), renderer); + assert.strictEqual(getMappedRendererByPath("/missing", map), null); +}); + +test("breadcrumbRouteMaps/resolveMappedRouteRenderer honors map precedence", async () => { + const firstRenderer = () => "first"; + const secondRenderer = () => "second"; + + const result = resolveMappedRouteRenderer("/same", [ + { "/same": firstRenderer }, + { "/same": secondRenderer } + ]); + + assert.strictEqual(result, firstRenderer); + assert.strictEqual(resolveMappedRouteRenderer("/none", []), null); +}); + +const run = async () => { + let passed = 0; + + for (const currentTest of tests) { + await currentTest.fn(); + passed += 1; + } + + console.log( + `Phase 22 breadcrumb-route-maps-helper tests passed (${passed}/${tests.length}).` + ); +}; + +module.exports = run; + +if (require.main === module) { + run().catch((error) => { + console.error(error); + process.exit(1); + }); +} diff --git a/tests/phase22/breadcrumbs-route-map-structure.test.cjs b/tests/phase22/breadcrumbs-route-map-structure.test.cjs index 77c0e4a7..51b3512d 100644 --- a/tests/phase22/breadcrumbs-route-map-structure.test.cjs +++ b/tests/phase22/breadcrumbs-route-map-structure.test.cjs @@ -60,17 +60,25 @@ test("breadcrumbs/merged resolver renders mapped routes through single helper in const source = loadBreadcrumbSource(); assert.strictEqual( - source.includes("const mappedRouteRendererMaps = ["), + source.includes('from "../lib/routing/breadcrumbRouteMaps"'), true, - "Expected grouped mapped route renderer map composition to exist" + "Expected breadcrumbs to import shared breadcrumb route-map helper module" ); assert.strictEqual( source.includes( - "const getMappedRendererByPath = (path, routeRendererMap) =>" + "const mappedRouteRendererMaps = buildBreadcrumbRendererMaps({" ), true, - "Expected shared mapped renderer lookup helper to exist" + "Expected grouped mapped route renderer map composition to use helper builder" + ); + + assert.strictEqual( + source.includes( + "return resolveMappedRouteRendererByMaps(path, mappedRouteRendererMaps);" + ), + true, + "Expected resolver to delegate to shared route-map resolver helper" ); assert.strictEqual( @@ -104,6 +112,32 @@ test("breadcrumbs/merged resolver renders mapped routes through single helper in false, "Expected /myportal/addresssearchresults explicit branch to be removed after mapping" ); + + const mapBuilderCallIndex = source.indexOf( + "const mappedRouteRendererMaps = buildBreadcrumbRendererMaps({" + ); + const mapBuilderSlice = source.slice( + mapBuilderCallIndex, + mapBuilderCallIndex + 300 + ); + + const simpleRouteOrderIndex = mapBuilderSlice.indexOf( + "simpleRouteRenderersByPath" + ); + const simpleLinkTextPairOrderIndex = mapBuilderSlice.indexOf( + "simpleLinkTextPairRenderersByPath" + ); + const simpleMyPortalOrderIndex = mapBuilderSlice.indexOf( + "simpleMyPortalRouteRenderersByPath" + ); + + assert.strictEqual( + simpleRouteOrderIndex >= 0 && + simpleLinkTextPairOrderIndex > simpleRouteOrderIndex && + simpleMyPortalOrderIndex > simpleLinkTextPairOrderIndex, + true, + "Expected map builder call to preserve explicit route-map ordering (simple -> link-text -> myportal)" + ); }); test("breadcrumbs/dynamic callback branch remains explicit for myportal case incident route", async () => { diff --git a/tests/phase22/index.test.cjs b/tests/phase22/index.test.cjs index b3996055..7bfabdc5 100644 --- a/tests/phase22/index.test.cjs +++ b/tests/phase22/index.test.cjs @@ -7,6 +7,7 @@ const runAuthRedirectSafetyTests = require("./auth-redirect-safety.test.cjs"); const runI18nRouteParityTests = require("./i18n-route-parity.test.cjs"); const runAzurestorageHelperTests = require("./azurestorage-helper-behaviour.test.cjs"); const runRouteStateHelperTests = require("./route-state-helper.test.cjs"); +const runBreadcrumbRouteMapsHelperTests = require("./breadcrumb-route-maps-helper.test.cjs"); const runBreadcrumbsRouteMapStructureTests = require("./breadcrumbs-route-map-structure.test.cjs"); const run = async () => { @@ -19,6 +20,7 @@ const run = async () => { await runI18nRouteParityTests(); await runAzurestorageHelperTests(); await runRouteStateHelperTests(); + await runBreadcrumbRouteMapsHelperTests(); await runBreadcrumbsRouteMapStructureTests(); console.log("Phase 22 combined suite passed."); }; From 062cd2346354a258a3a1cf5861cd4244dc0c1eba Mon Sep 17 00:00:00 2001 From: robbond Date: Thu, 9 Apr 2026 12:08:36 +0100 Subject: [PATCH 18/33] Refactor breadcrumbs to use factory-based route renderers --- components/breadcrumbs.js | 266 ++++----- i18n.js | 2 +- lib/routing/breadcrumbRendererFactories.js | 107 ++++ lib/routing/routeState.js | 8 + .../breadcrumb-route-maps-helper.test.cjs | 169 ++++-- .../breadcrumbs-route-map-structure.test.cjs | 128 ++++- tests/phase22/route-state-helper.test.cjs | 515 ++++++++++++------ 7 files changed, 813 insertions(+), 382 deletions(-) create mode 100644 lib/routing/breadcrumbRendererFactories.js diff --git a/components/breadcrumbs.js b/components/breadcrumbs.js index 591224b2..bf3e3909 100644 --- a/components/breadcrumbs.js +++ b/components/breadcrumbs.js @@ -17,6 +17,12 @@ import { buildBreadcrumbRendererMaps, resolveMappedRouteRenderer as resolveMappedRouteRendererByMaps } from "../lib/routing/breadcrumbRouteMaps"; +import { + createSimpleRouteRenderers, + createSimpleLinkTextPairRenderers, + createSimpleMyPortalRouteRenderers +} from "../lib/routing/breadcrumbRendererFactories"; + const Breadcrumbs = (props) => { const { currentView, @@ -98,133 +104,27 @@ const Breadcrumbs = (props) => { const getStaticTextCrumbLabel = (path) => { const staticTextCrumbByPath = { - "/account/register": t("account:register-new-account-heading"), - "/dns": t("dnsCommon:service-name"), - "/dnsapplications": t("dnsCommon:service-name"), - "/dns/application-process": "Guidance", - "/dns/help": "Help", - "/dns/contact-us": t("common:footer-contact-us-link-label"), - "/dns/applications": t("dnsApplications:page-title"), - "/help/cookies": t("cookies:cookie-breadcrumb"), - "/privacy": t("common:footer-privacy-link-label"), - "/accessibility": t("common:footer-accessibility-link-label"), - "/details-about-cookies": t("cookies:cookie-policy-title-heading"), - "/auth/signin": t("auth:auth-page-title"), - "/auth/verify-request": t("auth:auth-check-email-page-title"), - "/auth/error": t("auth:auth-error-signin-error-title") + "/account/register": () => + t("account:register-new-account-heading"), + "/dns": () => t("dnsCommon:service-name"), + "/dnsapplications": () => t("dnsCommon:service-name"), + "/dns/application-process": () => "Guidance", + "/dns/help": () => "Help", + "/dns/contact-us": () => t("common:footer-contact-us-link-label"), + "/dns/applications": () => t("dnsApplications:page-title"), + "/help/cookies": () => t("cookies:cookie-breadcrumb"), + "/privacy": () => t("common:footer-privacy-link-label"), + "/accessibility": () => t("common:footer-accessibility-link-label"), + "/details-about-cookies": () => + t("cookies:cookie-policy-title-heading"), + "/auth/signin": () => t("auth:auth-page-title"), + "/auth/verify-request": () => t("auth:auth-check-email-page-title"), + "/auth/error": () => t("auth:auth-error-signin-error-title") }; return staticTextCrumbByPath[path] || null; }; - const simpleRouteRenderersByPath = { - "/myportal": () => renderTextCrumb(t("myportal:page-title")), - "/searchresults": () => - renderTextCrumb(t("common:breadcrumb-search-results")), - "/advancedsearch": () => - renderTextCrumb(t("common:breadcrumb-advanced-search")), - "/addresssearch": () => - renderTextCrumb(t("common:breadcrumb-address-search")), - "/contactus": () => - renderTextCrumb(t("common:footer-contact-us-link-label")), - "/viewall": () => - renderMyPortalSectionCrumbs(t("common:breadcrumb-your-cases")), - "/myportal/dnsapplications": () => - renderMyPortalSectionCrumbs(t("dnsCommon:service-name")) - }; - - const simpleLinkTextPairRenderersByPath = { - "/addresssearchresults": () => ( - <> - {renderLinkCrumb( - isWelsh - ? router.locale + "/chwiliadcyfeiriadau" - : "/addresssearch", - t("common:breadcrumb-address-search") - )} - {renderTextCrumb(t("common:breadcrumb-address-search-results"))} - - ), - "/advancedsearchresults": () => ( - <> - {renderLinkCrumb( - isWelsh - ? router.locale + "/advancedsearch" - : "/advancedsearch", - t("common:breadcrumb-advanced-search") - )} - {renderTextCrumb( - t("common:breadcrumb-advanced-search-results") - )} - - ) - }; - - const simpleMyPortalRouteRenderersByPath = { - "/myportal/searchresults": () => ( - <> - {renderAnchorCrumb( - myPortalHref, - t("common:breadcrumb-my-portal") - )} - {renderTextCrumb(t("common:breadcrumb-search-results"))} - - ), - "/myportal/addresssearch": () => - renderMyPortalSectionCrumbs(t("common:breadcrumb-address-search")), - "/myportal/advancedsearch": () => - 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) - ), - "/myportal/advancedsearchresults": () => ( - <> - {renderMyPortalCrumb()} - {renderLinkCrumb( - isWelsh - ? router.locale + "/myportal/advancedsearch" - : "/myportal/advancedsearch", - t("common:breadcrumb-advanced-search") - )} - {renderTextCrumb( - t("common:breadcrumb-advanced-search-results") - )} - - ), - "/myportal/addresssearchresults": () => ( - <> - {renderMyPortalCrumb()} - {renderLinkCrumb( - isWelsh - ? "/" + router.locale + "/fymhorth/chwiliadcyfeiriadau" - : "/myportal/addresssearch", - t("common:breadcrumb-address-search") - )} - {renderTextCrumb(t("common:breadcrumb-address-search-results"))} - - ) - }; - - const mappedRouteRendererMaps = buildBreadcrumbRendererMaps({ - simpleRouteRenderersByPath, - simpleLinkTextPairRenderersByPath, - simpleMyPortalRouteRenderersByPath - }); - - const resolveMappedRouteRenderer = (path) => { - return resolveMappedRouteRendererByMaps(path, mappedRouteRendererMaps); - }; - - const renderMappedRoute = (path, resolver = resolveMappedRouteRenderer) => { - const routeRenderer = resolver(path); - return routeRenderer ? routeRenderer() : null; - }; - const renderMyPortalCrumb = () => (
  • @@ -288,7 +188,7 @@ const Breadcrumbs = (props) => { <> {renderLinkCrumb( isWelsh - ? router.locale + "/dnsapplications" + ? `${router.locale}/dnsapplications` : "/dnsapplications", t("dnsCommon:service-name") )} @@ -296,6 +196,52 @@ const Breadcrumbs = (props) => { ); + const simpleRouteRenderersByPath = createSimpleRouteRenderers({ + t, + renderTextCrumb, + renderMyPortalSectionCrumbs + }); + + const simpleLinkTextPairRenderersByPath = createSimpleLinkTextPairRenderers( + { + t, + router, + isWelsh, + renderLinkCrumb, + renderTextCrumb + } + ); + + const simpleMyPortalRouteRenderersByPath = + createSimpleMyPortalRouteRenderers({ + t, + router, + isWelsh, + myPortalHref, + currentViewState, + getViewAllLabel, + renderAnchorCrumb, + renderLinkCrumb, + renderTextCrumb, + renderMyPortalCrumb, + renderMyPortalSectionCrumbs + }); + + const mappedRouteRendererMaps = buildBreadcrumbRendererMaps({ + simpleRouteRenderersByPath, + simpleLinkTextPairRenderersByPath, + simpleMyPortalRouteRenderersByPath + }); + + const resolveMappedRouteRenderer = (path) => { + return resolveMappedRouteRendererByMaps(path, mappedRouteRendererMaps); + }; + + const renderMappedRoute = (path, resolver = resolveMappedRouteRenderer) => { + const routeRenderer = resolver(path); + return routeRenderer ? routeRenderer() : null; + }; + const { breadcrumbHref, caseResultsHref, breadcrumbLabel } = resolveCaseBreadcrumbState({ query: router.query, @@ -305,6 +251,9 @@ const Breadcrumbs = (props) => { addressLabel: t("common:breadcrumb-address-search-results"), defaultLabel: t("common:breadcrumb-search-results") }); + + const staticTextCrumbLabel = getStaticTextCrumbLabel(pathname); + return ( <>
    • )} + {isPath("/myportal/case") && ( <> {renderLinkCrumb( isWelsh - ? "/" + router.locale + "/fymhorth" + ? `/${router.locale}/fymhorth` : "/myportal", t("common:breadcrumb-my-portal") )} {renderCaseReferenceCrumb(currentReference)} )} + {isPath("/case/[ticketnumber]") && ( <> {renderLinkCrumb( @@ -394,24 +349,19 @@ const Breadcrumbs = (props) => { {renderCaseReferenceCrumb(fallbackSearchTitle)} )} + {isPath("/case/id/[incident]") && ( <> {renderLinkCrumb( isWelsh - ? "/" + - router.locale + - "/chwiliadcyfeiriadau" + ? `/${router.locale}/chwiliadcyfeiriadau` : "/addresssearch", t("common:breadcrumb-address-search") )} {renderLinkCrumb( isWelsh - ? "/" + - router.locale + - "/canlyniadaucyfeiriadau?" + - nestedSearchString - : "/addresssearchresults?" + - nestedSearchString, + ? `/${router.locale}/canlyniadaucyfeiriadau?${nestedSearchString}` + : `/addresssearchresults?${nestedSearchString}`, t( "common:breadcrumb-address-search-results" ) @@ -419,37 +369,31 @@ const Breadcrumbs = (props) => { {renderCaseReferenceCrumb(currentReference)} )} + {isPath("/myportal/case/id/[incident]") && ( <> - {" "} {renderMyPortalCrumb()} {renderLinkCrumb( isWelsh - ? "/" + - router.locale + - "/fymhorth/chwiliadcyfeiriadau" + ? `/${router.locale}/fymhorth/chwiliadcyfeiriadau` : "/myportal/addresssearch", t("common:breadcrumb-address-search") )} {renderLinkCrumb( isWelsh - ? "/" + - router.locale + - "/fymhorth/canlyniadaucyfeiriadau?" + - nestedSearchString - : "/myportal/addresssearchresults?" + - nestedSearchString, + ? `/${router.locale}/fymhorth/canlyniadaucyfeiriadau?${nestedSearchString}` + : `/myportal/addresssearchresults?${nestedSearchString}`, t( "common:breadcrumb-address-search-results" ), () => { - // spinnerState(); router.back(); } )} {renderCaseReferenceCrumb(currentReference)} )} + {isPath("/myportal/case/[ticketnumber]") && ( <> {renderMyPortalCrumb()} @@ -460,6 +404,7 @@ const Breadcrumbs = (props) => { {renderCaseReferenceCrumb(caseReferenceDisplay)} )} + {isPath("/myportal/dnsdetails") && ( <> {renderMyPortalCrumb()} @@ -470,11 +415,12 @@ const Breadcrumbs = (props) => { {renderCaseReferenceCrumb(currentReference)} )} + {isPath("/myportal/dns/[developmentName]") && ( <> {renderLinkCrumb( isWelsh - ? router.locale + "/fymhorth" + ? `${router.locale}/fymhorth` : "/myportal", t("common:breadcrumb-my-portal") )} @@ -485,28 +431,22 @@ const Breadcrumbs = (props) => { {renderCaseReferenceCrumb(caseReferenceDisplay)} )} + {isPath("/case") && ( <> {renderLinkCrumb( isWelsh - ? router.locale + - "/searchresults?q=" + - router.query.q + - "&page=" + - router.query.page - : "/searchresults?q=" + - router.query.q + - "&page=" + - router.query.page, + ? `${router.locale}/searchresults?q=${router.query.q}&page=${router.query.page}` + : `/searchresults?q=${router.query.q}&page=${router.query.page}`, t("common:breadcrumb-search-results"), () => { - // spinnerState(); router.back(); } )} {renderCaseReferenceCrumb(currentReference)} )} + {isPath("/myportal/representation") && ( <> {currentView.representationSubmit === true && @@ -515,6 +455,7 @@ const Breadcrumbs = (props) => { renderBackCrumb(() => { setRepresentationSubmit(qcount); })} + {currentView.representationSubmit !== true && hasRepDetails && repDetails?.representationType !== @@ -522,6 +463,7 @@ const Breadcrumbs = (props) => { renderBackCrumb(() => { setRepresentationSubmit(false); })} + {currentView.representationSubmit !== true && hasRepDetails && repDetails?.representationType === @@ -535,6 +477,7 @@ const Breadcrumbs = (props) => { })} )} + {isPath("/account/personaldetails") && ( <> {renderLinkCrumb( @@ -546,6 +489,7 @@ const Breadcrumbs = (props) => { )} + {isPath("/account/changepassword") && ( <> {renderLinkCrumb( @@ -557,15 +501,18 @@ const Breadcrumbs = (props) => { )} + {isPath("/dnsdetails") && renderDnsCaseReferenceCrumbs(currentReference)} + {isPath("/dns/[developmentName]") && renderDnsCaseReferenceCrumbs(caseReferenceDisplay)} + {isPath("/dns/application-view") && ( <> {renderLinkCrumb( isWelsh - ? router.locale + "/dns/applications" + ? `${router.locale}/dns/applications` : "/dns/applications", t("dnsApplicationView:page-parent-title") )} @@ -574,8 +521,9 @@ const Breadcrumbs = (props) => { )} - {getStaticTextCrumbLabel(pathname) && - renderTextCrumb(getStaticTextCrumbLabel(pathname))} + + {staticTextCrumbLabel && + renderTextCrumb(staticTextCrumbLabel)} @@ -595,13 +543,11 @@ const mapDispatchToProps = (dispatch) => { updateField: (form, field, newValue) => dispatch(change(form, field, newValue)), setRepresentationCapacity: (representationCapacity) => { - //dispatch(reset("representationForm")); dispatch(setRepresentationCapacity(representationCapacity)); }, setRepresentationSubmit: (representationSubmit) => { dispatch(setRepresentationSubmit(representationSubmit)); }, - setCurrentView: (currentView) => { dispatch(setCurrentView(currentView)); }, diff --git a/i18n.js b/i18n.js index 09c9872c..5b5abac8 100644 --- a/i18n.js +++ b/i18n.js @@ -16,7 +16,7 @@ module.exports = { "/myportal/contactus": ["newappeal", "account", "common"], "/error": ["common", "home", "myportal"], "/furtherdetails": ["common", "home", "myportal"], - "/myportal": ["myportal", "common", "home", "case"], + "/myportal": ["myportal", "common", "home", "case", "auth"], "/myportal/viewall": ["search", "myportal", "case"], "/myportal/advancedsearch": ["search", "myportal"], "/myportal/advancedsearchresults": ["search", "myportal", "case"], diff --git a/lib/routing/breadcrumbRendererFactories.js b/lib/routing/breadcrumbRendererFactories.js new file mode 100644 index 00000000..88ceb51e --- /dev/null +++ b/lib/routing/breadcrumbRendererFactories.js @@ -0,0 +1,107 @@ +import React from "react"; + +export const createSimpleRouteRenderers = ({ + t, + renderTextCrumb, + renderMyPortalSectionCrumbs +}) => ({ + "/myportal": () => renderTextCrumb(t("myportal:page-title")), + "/searchresults": () => + renderTextCrumb(t("common:breadcrumb-search-results")), + "/advancedsearch": () => + renderTextCrumb(t("common:breadcrumb-advanced-search")), + "/addresssearch": () => + renderTextCrumb(t("common:breadcrumb-address-search")), + "/contactus": () => + renderTextCrumb(t("common:footer-contact-us-link-label")), + "/viewall": () => + renderMyPortalSectionCrumbs(t("common:breadcrumb-your-cases")), + "/myportal/dnsapplications": () => + renderMyPortalSectionCrumbs(t("dnsCommon:service-name")) +}); + +export const createSimpleLinkTextPairRenderers = ({ + t, + router, + isWelsh, + renderLinkCrumb, + renderTextCrumb +}) => ({ + "/addresssearchresults": () => ( + <> + {renderLinkCrumb( + isWelsh + ? `/${router.locale}/chwiliadcyfeiriadau` + : "/addresssearch", + t("common:breadcrumb-address-search") + )} + {renderTextCrumb(t("common:breadcrumb-address-search-results"))} + + ), + "/advancedsearchresults": () => ( + <> + {renderLinkCrumb( + isWelsh + ? `/${router.locale}/advancedsearch` + : "/advancedsearch", + t("common:breadcrumb-advanced-search") + )} + {renderTextCrumb(t("common:breadcrumb-advanced-search-results"))} + + ) +}); + +export const createSimpleMyPortalRouteRenderers = ({ + t, + router, + isWelsh, + myPortalHref, + currentViewState, + getViewAllLabel, + renderAnchorCrumb, + renderLinkCrumb, + renderTextCrumb, + renderMyPortalCrumb, + renderMyPortalSectionCrumbs +}) => ({ + "/myportal/searchresults": () => ( + <> + {renderAnchorCrumb(myPortalHref, t("common:breadcrumb-my-portal"))} + {renderTextCrumb(t("common:breadcrumb-search-results"))} + + ), + "/myportal/addresssearch": () => + renderMyPortalSectionCrumbs(t("common:breadcrumb-address-search")), + "/myportal/advancedsearch": () => + 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) + ), + "/myportal/advancedsearchresults": () => ( + <> + {renderMyPortalCrumb()} + {renderLinkCrumb( + isWelsh + ? `/${router.locale}/myportal/advancedsearch` + : "/myportal/advancedsearch", + t("common:breadcrumb-advanced-search") + )} + {renderTextCrumb(t("common:breadcrumb-advanced-search-results"))} + + ), + "/myportal/addresssearchresults": () => ( + <> + {renderMyPortalCrumb()} + {renderLinkCrumb( + isWelsh + ? `/${router.locale}/fymhorth/chwiliadcyfeiriadau` + : "/myportal/addresssearch", + t("common:breadcrumb-address-search") + )} + {renderTextCrumb(t("common:breadcrumb-address-search-results"))} + + ) +}); diff --git a/lib/routing/routeState.js b/lib/routing/routeState.js index e56ca3d3..5d334ba0 100644 --- a/lib/routing/routeState.js +++ b/lib/routing/routeState.js @@ -21,8 +21,16 @@ export const resolveSearchResultsHref = ({ const routeState = normalizeRouteStateQuery(query); const { viewAll, advanced, address, key } = routeState; const base = hasSession ? "/myportal" : ""; + const hasSearchQuery = + typeof query?.q === "string" && query.q.trim().length > 0; if (fallbackToMyPortalWhenNoFlags && !viewAll && !advanced && !address) { + if (hasSearchQuery) { + return { + pathname: `${base}/searchresults`, + query + }; + } return { pathname: "/myportal" }; diff --git a/tests/phase22/breadcrumb-route-maps-helper.test.cjs b/tests/phase22/breadcrumb-route-maps-helper.test.cjs index 211be03a..fbf951f4 100644 --- a/tests/phase22/breadcrumb-route-maps-helper.test.cjs +++ b/tests/phase22/breadcrumb-route-maps-helper.test.cjs @@ -1,49 +1,156 @@ const assert = require("assert"); - -const { - buildBreadcrumbRendererMaps, - getMappedRendererByPath, - resolveMappedRouteRenderer -} = require("../../lib/routing/breadcrumbRouteMaps"); +const fs = require("fs"); +const path = require("path"); +const vm = require("vm"); const tests = []; const test = (name, fn) => tests.push({ name, fn }); -test("breadcrumbRouteMaps/buildBreadcrumbRendererMaps preserves explicit map order", async () => { - const mapA = { "/a": () => "A" }; - const mapB = { "/b": () => "B" }; - const mapC = { "/c": () => "C" }; +const helperModulePath = path.join( + __dirname, + "..", + "..", + "lib", + "routing", + "breadcrumbRouteMaps.js" +); - const result = buildBreadcrumbRendererMaps({ - simpleRouteRenderersByPath: mapA, - simpleLinkTextPairRenderersByPath: mapB, - simpleMyPortalRouteRenderersByPath: mapC +const loadHelpers = () => { + const source = fs.readFileSync(helperModulePath, "utf8"); + + const transformedSource = ` +${source + .replace(/export const /g, "const ") + .replace(/export function /g, "function ")} + +module.exports = { + buildBreadcrumbRendererMaps, + resolveMappedRouteRenderer +}; +`; + + const sandbox = { + module: { exports: {} }, + exports: {}, + require, + __dirname: path.dirname(helperModulePath), + __filename: helperModulePath, + console + }; + + vm.runInNewContext(transformedSource, sandbox, { + filename: helperModulePath }); - assert.strictEqual(result[0], mapA); - assert.strictEqual(result[1], mapB); - assert.strictEqual(result[2], mapC); + return sandbox.module.exports; +}; + +test("buildBreadcrumbRendererMaps returns grouped maps in explicit precedence order", () => { + const { buildBreadcrumbRendererMaps } = loadHelpers(); + + const simpleRouteRenderersByPath = { + "/alpha": () => "alpha" + }; + const simpleLinkTextPairRenderersByPath = { + "/beta": () => "beta" + }; + const simpleMyPortalRouteRenderersByPath = { + "/gamma": () => "gamma" + }; + + const result = buildBreadcrumbRendererMaps({ + simpleRouteRenderersByPath, + simpleLinkTextPairRenderersByPath, + simpleMyPortalRouteRenderersByPath + }); + + assert.ok(Array.isArray(result), "Expected grouped maps array"); + assert.strictEqual(result.length, 3, "Expected three grouped route maps"); + assert.strictEqual( + result[0], + simpleRouteRenderersByPath, + "Expected simple route renderers first" + ); + assert.strictEqual( + result[1], + simpleLinkTextPairRenderersByPath, + "Expected simple link-text pair renderers second" + ); + assert.strictEqual( + result[2], + simpleMyPortalRouteRenderersByPath, + "Expected my-portal route renderers third" + ); }); -test("breadcrumbRouteMaps/getMappedRendererByPath returns mapped renderer or null", async () => { - const renderer = () => "ok"; - const map = { "/x": renderer }; +test("resolveMappedRouteRenderer returns renderer from first matching grouped map", () => { + const { buildBreadcrumbRendererMaps, resolveMappedRouteRenderer } = + loadHelpers(); - assert.strictEqual(getMappedRendererByPath("/x", map), renderer); - assert.strictEqual(getMappedRendererByPath("/missing", map), null); -}); - -test("breadcrumbRouteMaps/resolveMappedRouteRenderer honors map precedence", async () => { const firstRenderer = () => "first"; const secondRenderer = () => "second"; - const result = resolveMappedRouteRenderer("/same", [ - { "/same": firstRenderer }, - { "/same": secondRenderer } - ]); + const maps = buildBreadcrumbRendererMaps({ + simpleRouteRenderersByPath: { + "/known": firstRenderer + }, + simpleLinkTextPairRenderersByPath: { + "/known": secondRenderer + }, + simpleMyPortalRouteRenderersByPath: {} + }); - assert.strictEqual(result, firstRenderer); - assert.strictEqual(resolveMappedRouteRenderer("/none", []), null); + const result = resolveMappedRouteRenderer("/known", maps); + + assert.strictEqual( + result, + firstRenderer, + "Expected resolver to use first matching map by precedence order" + ); +}); + +test("resolveMappedRouteRenderer returns renderer from later grouped map when earlier maps do not match", () => { + const { buildBreadcrumbRendererMaps, resolveMappedRouteRenderer } = + loadHelpers(); + + const myPortalRenderer = () => "myportal"; + + const maps = buildBreadcrumbRendererMaps({ + simpleRouteRenderersByPath: {}, + simpleLinkTextPairRenderersByPath: {}, + simpleMyPortalRouteRenderersByPath: { + "/myportal/searchresults": myPortalRenderer + } + }); + + const result = resolveMappedRouteRenderer("/myportal/searchresults", maps); + + assert.strictEqual( + result, + myPortalRenderer, + "Expected resolver to return matching renderer from later grouped map" + ); +}); + +test("resolveMappedRouteRenderer returns null for unmapped path", () => { + const { buildBreadcrumbRendererMaps, resolveMappedRouteRenderer } = + loadHelpers(); + + const maps = buildBreadcrumbRendererMaps({ + simpleRouteRenderersByPath: { + "/known": () => "known" + }, + simpleLinkTextPairRenderersByPath: {}, + simpleMyPortalRouteRenderersByPath: {} + }); + + const result = resolveMappedRouteRenderer("/unknown", maps); + + assert.strictEqual( + result, + null, + "Expected null when no grouped map contains the path" + ); }); const run = async () => { diff --git a/tests/phase22/breadcrumbs-route-map-structure.test.cjs b/tests/phase22/breadcrumbs-route-map-structure.test.cjs index 51b3512d..e740838a 100644 --- a/tests/phase22/breadcrumbs-route-map-structure.test.cjs +++ b/tests/phase22/breadcrumbs-route-map-structure.test.cjs @@ -5,58 +5,75 @@ const path = require("path"); const tests = []; const test = (name, fn) => tests.push({ name, fn }); -const loadBreadcrumbSource = () => { - const filePath = path.join( - __dirname, - "..", - "..", - "components", - "breadcrumbs.js" - ); +const loadSource = (...parts) => { + const filePath = path.join(__dirname, "..", "..", ...parts); return fs.readFileSync(filePath, "utf8"); }; -test("breadcrumbs/simple-link-text map includes address and advanced search result routes", async () => { - const source = loadBreadcrumbSource(); +const loadBreadcrumbSource = () => loadSource("components", "breadcrumbs.js"); + +const loadFactorySource = () => + loadSource("lib", "routing", "breadcrumbRendererFactories.js"); + +test("breadcrumbs/factory module includes expected mapped route definitions", async () => { + const source = loadFactorySource(); + + assert.strictEqual( + source.includes("export const createSimpleRouteRenderers ="), + true, + "Expected simple route renderer factory export" + ); + + assert.strictEqual( + source.includes("export const createSimpleLinkTextPairRenderers ="), + true, + "Expected link-text pair renderer factory export" + ); + + assert.strictEqual( + source.includes("export const createSimpleMyPortalRouteRenderers ="), + true, + "Expected my-portal route renderer factory export" + ); assert.strictEqual( source.includes('"/addresssearchresults": () => ('), true, - "Expected /addresssearchresults to be mapped in getSimpleLinkTextPairRenderer" + "Expected /addresssearchresults to be mapped in createSimpleLinkTextPairRenderers" ); assert.strictEqual( source.includes('"/advancedsearchresults": () => ('), true, - "Expected /advancedsearchresults to be mapped in getSimpleLinkTextPairRenderer" + "Expected /advancedsearchresults to be mapped in createSimpleLinkTextPairRenderers" ); assert.strictEqual( source.includes('"/myportal/searchresults": () => ('), true, - "Expected /myportal/searchresults to be mapped in getSimpleMyPortalRouteRenderer" + "Expected /myportal/searchresults to be mapped in createSimpleMyPortalRouteRenderers" ); assert.strictEqual( source.includes('"/myportal/viewall": () =>'), true, - "Expected /myportal/viewall to be mapped in getSimpleMyPortalRouteRenderer" + "Expected /myportal/viewall to be mapped in createSimpleMyPortalRouteRenderers" ); assert.strictEqual( source.includes('"/myportal/advancedsearchresults": () => ('), true, - "Expected /myportal/advancedsearchresults to be mapped in getSimpleMyPortalRouteRenderer" + "Expected /myportal/advancedsearchresults to be mapped in createSimpleMyPortalRouteRenderers" ); assert.strictEqual( source.includes('"/myportal/addresssearchresults": () => ('), true, - "Expected /myportal/addresssearchresults to be mapped in getSimpleMyPortalRouteRenderer" + "Expected /myportal/addresssearchresults to be mapped in createSimpleMyPortalRouteRenderers" ); }); -test("breadcrumbs/merged resolver renders mapped routes through single helper invocation", async () => { +test("breadcrumbs/component composes mapped routes via imported factories and shared resolver", async () => { const source = loadBreadcrumbSource(); assert.strictEqual( @@ -66,30 +83,80 @@ test("breadcrumbs/merged resolver renders mapped routes through single helper in ); assert.strictEqual( - source.includes( - "const mappedRouteRendererMaps = buildBreadcrumbRendererMaps({" + source.includes('from "../lib/routing/breadcrumbRendererFactories"'), + true, + "Expected breadcrumbs to import breadcrumb renderer factories" + ); + + assert.strictEqual( + /createSimpleRouteRenderers/.test(source), + true, + "Expected breadcrumbs to reference createSimpleRouteRenderers" + ); + + assert.strictEqual( + /createSimpleLinkTextPairRenderers/.test(source), + true, + "Expected breadcrumbs to reference createSimpleLinkTextPairRenderers" + ); + + assert.strictEqual( + /createSimpleMyPortalRouteRenderers/.test(source), + true, + "Expected breadcrumbs to reference createSimpleMyPortalRouteRenderers" + ); + + assert.strictEqual( + /const\s+simpleRouteRenderersByPath\s*=\s*createSimpleRouteRenderers\s*\(/.test( + source + ), + true, + "Expected breadcrumbs to build simple route renderers from factory" + ); + + assert.strictEqual( + /const\s+simpleLinkTextPairRenderersByPath\s*=\s*createSimpleLinkTextPairRenderers\s*\(/.test( + source + ), + true, + "Expected breadcrumbs to build link-text pair renderers from factory" + ); + + assert.strictEqual( + /const\s+simpleMyPortalRouteRenderersByPath\s*=\s*createSimpleMyPortalRouteRenderers\s*\(/.test( + source + ), + true, + "Expected breadcrumbs to build my-portal route renderers from factory" + ); + + assert.strictEqual( + /const\s+mappedRouteRendererMaps\s*=\s*buildBreadcrumbRendererMaps\s*\(/.test( + source ), true, "Expected grouped mapped route renderer map composition to use helper builder" ); assert.strictEqual( - source.includes( - "return resolveMappedRouteRendererByMaps(path, mappedRouteRendererMaps);" + /return\s+resolveMappedRouteRendererByMaps\s*\(\s*path\s*,\s*mappedRouteRendererMaps\s*\)/.test( + source ), true, "Expected resolver to delegate to shared route-map resolver helper" ); assert.strictEqual( - source.includes("const resolveMappedRouteRenderer = (path) =>"), + /const\s+resolveMappedRouteRenderer\s*=\s*\(\s*path\s*\)\s*=>/.test( + source + ), true, "Expected unified mapped route resolver helper to exist" ); assert.strictEqual( - source.includes( - "const renderMappedRoute = (path, resolver = resolveMappedRouteRenderer) =>" + /const\s+renderMappedRoute\s*=\s*\(\s*path\s*,\s*resolver\s*=\s*resolveMappedRouteRenderer\s*\)\s*=>/.test( + source ), true, "Expected reusable renderMappedRoute helper to exist" @@ -112,13 +179,24 @@ test("breadcrumbs/merged resolver renders mapped routes through single helper in false, "Expected /myportal/addresssearchresults explicit branch to be removed after mapping" ); +}); + +test("breadcrumbs/map builder preserves route map ordering", async () => { + const source = loadBreadcrumbSource(); const mapBuilderCallIndex = source.indexOf( "const mappedRouteRendererMaps = buildBreadcrumbRendererMaps({" ); + + assert.notStrictEqual( + mapBuilderCallIndex, + -1, + "Expected grouped map builder call to exist" + ); + const mapBuilderSlice = source.slice( mapBuilderCallIndex, - mapBuilderCallIndex + 300 + mapBuilderCallIndex + 500 ); const simpleRouteOrderIndex = mapBuilderSlice.indexOf( diff --git a/tests/phase22/route-state-helper.test.cjs b/tests/phase22/route-state-helper.test.cjs index 71ef6719..83272777 100644 --- a/tests/phase22/route-state-helper.test.cjs +++ b/tests/phase22/route-state-helper.test.cjs @@ -1,187 +1,372 @@ +const assert = require("assert"); const fs = require("fs"); const path = require("path"); const vm = require("vm"); -const assert = require("assert"); - -const rootDir = path.resolve(__dirname, "..", ".."); - -const loadRouteStateModule = () => { - const filePath = path.join(rootDir, "lib", "routing", "routeState.js"); - let source = fs.readFileSync(filePath, "utf8"); - - source = source.replace(/export const\s+/g, "const "); - source += - "\nmodule.exports = { normalizeRouteStateQuery, resolveSearchResultsHref, resolveSearchBreadcrumbLabel, isDnsRoutePath, resolveCaseBreadcrumbState };\n"; - - const context = { - module: { exports: {} }, - exports: {}, - require - }; - - vm.runInNewContext(source, context, { filename: filePath }); - return context.module.exports; -}; const tests = []; const test = (name, fn) => tests.push({ name, fn }); -test("routing/routeState normalizes va/adv/ads flags and key", async () => { - const mod = loadRouteStateModule(); +const helperModulePath = path.join( + __dirname, + "..", + "..", + "lib", + "routing", + "routeState.js" +); - const normalized = mod.normalizeRouteStateQuery({ - va: "true", - adv: "false", - ads: "true", - key: "myCases" +const toPlain = (value) => JSON.parse(JSON.stringify(value)); + +const loadHelpers = () => { + const source = fs.readFileSync(helperModulePath, "utf8"); + + const transformedSource = ` +${source + .replace(/export const /g, "const ") + .replace(/export function /g, "function ")} + +module.exports = { + normalizeRouteStateQuery, + resolveSearchResultsHref, + resolveSearchBreadcrumbLabel, + isDnsRoutePath, + resolveCaseBreadcrumbState +}; +`; + + const sandbox = { + module: { exports: {} }, + exports: {}, + require, + __dirname: path.dirname(helperModulePath), + __filename: helperModulePath, + console + }; + + vm.runInNewContext(transformedSource, sandbox, { + filename: helperModulePath }); - assert.deepStrictEqual(JSON.parse(JSON.stringify(normalized)), { - viewAll: true, - advanced: false, - address: true, - key: "myCases" - }); + return sandbox.module.exports; +}; + +test("normalizeRouteStateQuery maps known boolean query flags", () => { + const { normalizeRouteStateQuery } = loadHelpers(); + + assert.deepStrictEqual( + toPlain( + normalizeRouteStateQuery({ + va: "true", + adv: "false", + ads: "true", + key: "myCases" + }) + ), + { + viewAll: true, + advanced: false, + address: true, + key: "myCases" + } + ); }); -test("routing/routeState resolves view-all href when va=true", async () => { - const mod = loadRouteStateModule(); +test("resolveSearchResultsHref falls back to myportal when no flags and no search query exist for signed-in user", () => { + const { resolveSearchResultsHref } = loadHelpers(); - const href = mod.resolveSearchResultsHref({ - query: { va: "true", key: "myCases", adv: "true" }, - hasSession: true - }); - - assert.deepStrictEqual(JSON.parse(JSON.stringify(href)), { - pathname: "/myportal/viewall", - query: { key: "myCases" } - }); + assert.deepStrictEqual( + toPlain( + resolveSearchResultsHref({ + query: {}, + hasSession: true, + fallbackToMyPortalWhenNoFlags: true + }) + ), + { + pathname: "/myportal" + } + ); }); -test("routing/routeState resolves advanced/address/default result hrefs", async () => { - const mod = loadRouteStateModule(); +test("resolveSearchResultsHref preserves public searchresults route when search query exists and no flags are set", () => { + const { resolveSearchResultsHref } = loadHelpers(); - const advancedHref = mod.resolveSearchResultsHref({ - query: { adv: "true", q: "abc" }, - hasSession: false - }); - const addressHref = mod.resolveSearchResultsHref({ - query: { ads: "true", q: "abc" }, - hasSession: true - }); - const defaultHref = mod.resolveSearchResultsHref({ - query: { q: "abc" }, - hasSession: true - }); - - assert.deepStrictEqual(JSON.parse(JSON.stringify(advancedHref)), { - pathname: "/advancedsearchresults", - query: { adv: "true", q: "abc" } - }); - assert.deepStrictEqual(JSON.parse(JSON.stringify(addressHref)), { - pathname: "/myportal/addresssearchresults", - query: { ads: "true", q: "abc" } - }); - assert.deepStrictEqual(JSON.parse(JSON.stringify(defaultHref)), { - pathname: "/myportal/searchresults", - query: { q: "abc" } - }); + assert.deepStrictEqual( + toPlain( + resolveSearchResultsHref({ + query: { q: "abc" }, + hasSession: false, + fallbackToMyPortalWhenNoFlags: true + }) + ), + { + pathname: "/searchresults", + query: { q: "abc" } + } + ); }); -test("routing/routeState supports fallback to /myportal when no route flags", async () => { - const mod = loadRouteStateModule(); +test("resolveSearchResultsHref preserves myportal searchresults route when search query exists and no flags are set for signed-in user", () => { + const { resolveSearchResultsHref } = loadHelpers(); - const href = mod.resolveSearchResultsHref({ - query: { q: "abc" }, - hasSession: false, - fallbackToMyPortalWhenNoFlags: true - }); - - assert.deepStrictEqual(JSON.parse(JSON.stringify(href)), { - pathname: "/myportal" - }); -}); - -test("routing/routeState supports DNS route override", async () => { - const mod = loadRouteStateModule(); - - const href = mod.resolveSearchResultsHref({ - query: { adv: "true", q: "abc" }, - hasSession: true, - isDnsRoute: true - }); - - assert.deepStrictEqual(JSON.parse(JSON.stringify(href)), { - pathname: "/myportal/dnsapplications" - }); -}); - -test("routing/routeState resolves breadcrumb label using key and route flags", async () => { - const mod = loadRouteStateModule(); - const getViewAllLabel = (key) => - ({ myCases: "My Cases", watchedCases: "Watched Cases" })[key] || null; - - const fromViewAll = mod.resolveSearchBreadcrumbLabel({ - query: { va: "true", key: "myCases" }, - getViewAllLabel, - advancedLabel: "Advanced", - addressLabel: "Address", - defaultLabel: "Search" - }); - const fromAdvanced = mod.resolveSearchBreadcrumbLabel({ - query: { adv: "true" }, - getViewAllLabel, - advancedLabel: "Advanced", - addressLabel: "Address", - defaultLabel: "Search" - }); - const fromDefault = mod.resolveSearchBreadcrumbLabel({ - query: {}, - getViewAllLabel, - advancedLabel: "Advanced", - addressLabel: "Address", - defaultLabel: "Search" - }); - - assert.strictEqual(fromViewAll, "My Cases"); - assert.strictEqual(fromAdvanced, "Advanced"); - assert.strictEqual(fromDefault, "Search"); -}); - -test("routing/routeState identifies dns and myportal dns route prefixes", async () => { - const mod = loadRouteStateModule(); - - assert.strictEqual(mod.isDnsRoutePath("/dns"), true); - assert.strictEqual(mod.isDnsRoutePath("/dns/development"), true); - assert.strictEqual(mod.isDnsRoutePath("/myportal/dns"), true); - assert.strictEqual(mod.isDnsRoutePath("/myportal/dns/applications"), true); - assert.strictEqual(mod.isDnsRoutePath("/case/123"), false); -}); - -test("routing/routeState resolves bundled case breadcrumb state", async () => { - const mod = loadRouteStateModule(); - const getViewAllLabel = (key) => ({ myCases: "My Cases" })[key] || null; - - const state = mod.resolveCaseBreadcrumbState({ - query: { va: "true", key: "myCases" }, - hasSession: true, - getViewAllLabel, - advancedLabel: "Advanced", - addressLabel: "Address", - defaultLabel: "Search" - }); - - assert.deepStrictEqual(JSON.parse(JSON.stringify(state)), { - breadcrumbHref: { - pathname: "/myportal/viewall", - query: { key: "myCases" } - }, - caseResultsHref: { + assert.deepStrictEqual( + toPlain( + resolveSearchResultsHref({ + query: { q: "abc" }, + hasSession: true, + fallbackToMyPortalWhenNoFlags: true + }) + ), + { pathname: "/myportal/searchresults", - query: { va: "true", key: "myCases" } - }, - breadcrumbLabel: "My Cases" - }); + query: { q: "abc" } + } + ); +}); + +test("resolveSearchResultsHref routes view-all requests to myportal viewall with key only", () => { + const { resolveSearchResultsHref } = loadHelpers(); + + assert.deepStrictEqual( + toPlain( + resolveSearchResultsHref({ + query: { + va: "true", + key: "mySubmittedReps", + q: "ignored" + }, + hasSession: true, + includeViewAll: true + }) + ), + { + pathname: "/myportal/viewall", + query: { key: "mySubmittedReps" } + } + ); +}); + +test("resolveSearchResultsHref routes advanced requests to advancedsearchresults and preserves query", () => { + const { resolveSearchResultsHref } = loadHelpers(); + + assert.deepStrictEqual( + toPlain( + resolveSearchResultsHref({ + query: { q: "abc", adv: "true", page: "2" }, + hasSession: false + }) + ), + { + pathname: "/advancedsearchresults", + query: { q: "abc", adv: "true", page: "2" } + } + ); +}); + +test("resolveSearchResultsHref routes address requests to addresssearchresults and preserves query", () => { + const { resolveSearchResultsHref } = loadHelpers(); + + assert.deepStrictEqual( + toPlain( + resolveSearchResultsHref({ + query: { postcode: "CF10", ads: "true" }, + hasSession: true + }) + ), + { + pathname: "/myportal/addresssearchresults", + query: { postcode: "CF10", ads: "true" } + } + ); +}); + +test("resolveSearchResultsHref routes dns requests to dnsapplications", () => { + const { resolveSearchResultsHref } = loadHelpers(); + + assert.deepStrictEqual( + toPlain( + resolveSearchResultsHref({ + query: { anything: "x" }, + hasSession: true, + isDnsRoute: true + }) + ), + { + pathname: "/myportal/dnsapplications" + } + ); + + assert.deepStrictEqual( + toPlain( + resolveSearchResultsHref({ + query: { anything: "x" }, + hasSession: false, + isDnsRoute: true + }) + ), + { + pathname: "/dnsapplications" + } + ); +}); + +test("resolveSearchResultsHref defaults to searchresults and preserves query when no special route applies", () => { + const { resolveSearchResultsHref } = loadHelpers(); + + assert.deepStrictEqual( + toPlain( + resolveSearchResultsHref({ + query: { q: "abc", page: "3" }, + hasSession: false + }) + ), + { + pathname: "/searchresults", + query: { q: "abc", page: "3" } + } + ); +}); + +test("resolveSearchBreadcrumbLabel prioritizes view-all label, then keyed label, then advanced/address/default", () => { + const { resolveSearchBreadcrumbLabel } = loadHelpers(); + + const getViewAllLabel = (key) => { + const labels = { + myCases: "My cases", + watchedCases: "Watched cases" + }; + return labels[key] || null; + }; + + assert.strictEqual( + resolveSearchBreadcrumbLabel({ + query: { va: "true", key: "myCases" }, + getViewAllLabel, + advancedLabel: "Advanced search results", + addressLabel: "Address search results", + defaultLabel: "Search results" + }), + "My cases" + ); + + assert.strictEqual( + resolveSearchBreadcrumbLabel({ + query: { key: "watchedCases" }, + getViewAllLabel, + advancedLabel: "Advanced search results", + addressLabel: "Address search results", + defaultLabel: "Search results" + }), + "Watched cases" + ); + + assert.strictEqual( + resolveSearchBreadcrumbLabel({ + query: { adv: "true" }, + getViewAllLabel, + advancedLabel: "Advanced search results", + addressLabel: "Address search results", + defaultLabel: "Search results" + }), + "Advanced search results" + ); + + assert.strictEqual( + resolveSearchBreadcrumbLabel({ + query: { ads: "true" }, + getViewAllLabel, + advancedLabel: "Advanced search results", + addressLabel: "Address search results", + defaultLabel: "Search results" + }), + "Address search results" + ); + + assert.strictEqual( + resolveSearchBreadcrumbLabel({ + query: {}, + getViewAllLabel, + advancedLabel: "Advanced search results", + addressLabel: "Address search results", + defaultLabel: "Search results" + }), + "Search results" + ); +}); + +test("isDnsRoutePath correctly identifies dns route families", () => { + const { isDnsRoutePath } = loadHelpers(); + + assert.strictEqual(isDnsRoutePath("/dns"), true); + assert.strictEqual(isDnsRoutePath("/dns/applications"), true); + assert.strictEqual(isDnsRoutePath("/myportal/dns"), true); + assert.strictEqual(isDnsRoutePath("/myportal/dns/example"), true); + + assert.strictEqual(isDnsRoutePath("/searchresults"), false); + assert.strictEqual(isDnsRoutePath("/myportal"), false); + assert.strictEqual(isDnsRoutePath("/myportal/case/[ticketnumber]"), false); +}); + +test("resolveCaseBreadcrumbState returns breadcrumb and case-results hrefs plus breadcrumb label", () => { + const { resolveCaseBreadcrumbState } = loadHelpers(); + + const getViewAllLabel = (key) => + key === "mySubmittedReps" ? "Submitted representations" : null; + + assert.deepStrictEqual( + toPlain( + resolveCaseBreadcrumbState({ + query: { q: "cas-", adv: "false" }, + hasSession: true, + getViewAllLabel, + advancedLabel: "Advanced search results", + addressLabel: "Address search results", + defaultLabel: "Search results" + }) + ), + { + breadcrumbHref: { + pathname: "/myportal/searchresults", + query: { q: "cas-", adv: "false" } + }, + caseResultsHref: { + pathname: "/myportal/searchresults", + query: { q: "cas-", adv: "false" } + }, + breadcrumbLabel: "Search results" + } + ); +}); + +test("resolveCaseBreadcrumbState distinguishes view-all breadcrumb from case-results href", () => { + const { resolveCaseBreadcrumbState } = loadHelpers(); + + const getViewAllLabel = (key) => + key === "mySubmittedReps" ? "Submitted representations" : null; + + assert.deepStrictEqual( + toPlain( + resolveCaseBreadcrumbState({ + query: { va: "true", key: "mySubmittedReps" }, + hasSession: true, + getViewAllLabel, + advancedLabel: "Advanced search results", + addressLabel: "Address search results", + defaultLabel: "Search results" + }) + ), + { + breadcrumbHref: { + pathname: "/myportal/viewall", + query: { key: "mySubmittedReps" } + }, + caseResultsHref: { + pathname: "/myportal/searchresults", + query: { va: "true", key: "mySubmittedReps" } + }, + breadcrumbLabel: "Submitted representations" + } + ); }); const run = async () => { @@ -193,7 +378,7 @@ const run = async () => { } console.log( - `Phase 22 route-state helper tests passed (${passed}/${tests.length}).` + `Phase 22 route-state-helper tests passed (${passed}/${tests.length}).` ); }; From c264830934cbc6e8dd24edba73847fb9576b63dc Mon Sep 17 00:00:00 2001 From: robbond Date: Thu, 9 Apr 2026 13:16:56 +0100 Subject: [PATCH 19/33] Extract case detail breadcrumb routes into shared renderer factory --- components/breadcrumbs.js | 69 +++++------ lib/routing/breadcrumbRendererFactories.js | 133 ++++++++++++++++++++- lib/routing/breadcrumbRouteMaps.js | 6 +- 3 files changed, 167 insertions(+), 41 deletions(-) diff --git a/components/breadcrumbs.js b/components/breadcrumbs.js index bf3e3909..ff3e52fa 100644 --- a/components/breadcrumbs.js +++ b/components/breadcrumbs.js @@ -20,7 +20,8 @@ import { import { createSimpleRouteRenderers, createSimpleLinkTextPairRenderers, - createSimpleMyPortalRouteRenderers + createSimpleMyPortalRouteRenderers, + createCaseDetailRouteRenderers } from "../lib/routing/breadcrumbRendererFactories"; const Breadcrumbs = (props) => { @@ -90,12 +91,11 @@ const Breadcrumbs = (props) => { const getViewAllLabel = (viewKey) => { const labelsByKey = { - awaitingSubmissionDetails: t( - "myportal:awatitingsubmission-card-title" - ), - watchedCases: t("myportal:watchedcases-card-title"), - myCases: t("myportal:mycases-card-title"), - myRepresentations: t("myportal:myrepresentations-card-title"), + awaitingSubmissionDetails: () => + t("myportal:awatitingsubmission-card-title"), + watchedCases: () => t("myportal:watchedcases-card-title"), + myCases: () => t("myportal:mycases-card-title"), + myRepresentations: () => t("myportal:myrepresentations-card-title"), mySubmittedReps: "Submitted representations" }; @@ -107,7 +107,6 @@ const Breadcrumbs = (props) => { "/account/register": () => t("account:register-new-account-heading"), "/dns": () => t("dnsCommon:service-name"), - "/dnsapplications": () => t("dnsCommon:service-name"), "/dns/application-process": () => "Guidance", "/dns/help": () => "Help", "/dns/contact-us": () => t("common:footer-contact-us-link-label"), @@ -227,12 +226,6 @@ const Breadcrumbs = (props) => { renderMyPortalSectionCrumbs }); - const mappedRouteRendererMaps = buildBreadcrumbRendererMaps({ - simpleRouteRenderersByPath, - simpleLinkTextPairRenderersByPath, - simpleMyPortalRouteRenderersByPath - }); - const resolveMappedRouteRenderer = (path) => { return resolveMappedRouteRendererByMaps(path, mappedRouteRendererMaps); }; @@ -247,11 +240,32 @@ const Breadcrumbs = (props) => { query: router.query, hasSession: Boolean(session), getViewAllLabel, - advancedLabel: t("common:breadcrumb-advanced-search-results"), - addressLabel: t("common:breadcrumb-address-search-results"), - defaultLabel: t("common:breadcrumb-search-results") + advancedLabel: () => t("common:breadcrumb-advanced-search-results"), + addressLabel: () => t("common:breadcrumb-address-search-results"), + defaultLabel: () => t("common:breadcrumb-search-results") }); + const caseDetailRouteRenderersByPath = createCaseDetailRouteRenderers({ + t, + router, + isWelsh, + caseResultsHref, + breadcrumbLabel, + fallbackSearchTitle, + caseReferenceDisplay, + getViewAllLabel, + renderLinkCrumb, + renderCaseReferenceCrumb, + renderMyPortalCrumb + }); + + const mappedRouteRendererMaps = buildBreadcrumbRendererMaps({ + simpleRouteRenderersByPath, + simpleLinkTextPairRenderersByPath, + simpleMyPortalRouteRenderersByPath, + caseDetailRouteRenderersByPath + }); + const staticTextCrumbLabel = getStaticTextCrumbLabel(pathname); return ( @@ -340,16 +354,6 @@ const Breadcrumbs = (props) => { )} - {isPath("/case/[ticketnumber]") && ( - <> - {renderLinkCrumb( - caseResultsHref, - breadcrumbLabel - )} - {renderCaseReferenceCrumb(fallbackSearchTitle)} - - )} - {isPath("/case/id/[incident]") && ( <> {renderLinkCrumb( @@ -394,17 +398,6 @@ const Breadcrumbs = (props) => { )} - {isPath("/myportal/case/[ticketnumber]") && ( - <> - {renderMyPortalCrumb()} - {renderLinkCrumb( - breadcrumbHref, - breadcrumbLabel - )} - {renderCaseReferenceCrumb(caseReferenceDisplay)} - - )} - {isPath("/myportal/dnsdetails") && ( <> {renderMyPortalCrumb()} diff --git a/lib/routing/breadcrumbRendererFactories.js b/lib/routing/breadcrumbRendererFactories.js index 88ceb51e..756a8054 100644 --- a/lib/routing/breadcrumbRendererFactories.js +++ b/lib/routing/breadcrumbRendererFactories.js @@ -17,7 +17,8 @@ export const createSimpleRouteRenderers = ({ "/viewall": () => renderMyPortalSectionCrumbs(t("common:breadcrumb-your-cases")), "/myportal/dnsapplications": () => - renderMyPortalSectionCrumbs(t("dnsCommon:service-name")) + renderMyPortalSectionCrumbs(t("dnsCommon:service-name")), + "/dnsapplications": () => renderTextCrumb(t("dnsCommon:service-name")) }); export const createSimpleLinkTextPairRenderers = ({ @@ -105,3 +106,133 @@ export const createSimpleMyPortalRouteRenderers = ({ ) }); + +export const createCaseDetailRouteRenderers = ({ + t, + router, + isWelsh, + caseResultsHref, + breadcrumbLabel, + fallbackSearchTitle, + caseReferenceDisplay, + getViewAllLabel, + renderLinkCrumb, + renderCaseReferenceCrumb, + renderMyPortalCrumb +}) => ({ + "/case/[ticketnumber]": () => { + const { ads, adv, va, key } = router.query; + + if (ads === "true") { + return ( + <> + {renderLinkCrumb( + isWelsh + ? `/${router.locale}/chwiliadcyfeiriadau` + : "/addresssearch", + t("common:breadcrumb-address-search") + )} + {renderLinkCrumb( + caseResultsHref, + t("common:breadcrumb-address-search-results") + )} + {renderCaseReferenceCrumb(fallbackSearchTitle)} + + ); + } + + if (adv === "true") { + return ( + <> + {renderLinkCrumb( + isWelsh + ? `/${router.locale}/advancedsearch` + : "/advancedsearch", + t("common:breadcrumb-advanced-search") + )} + {renderLinkCrumb( + caseResultsHref, + t("common:breadcrumb-advanced-search-results") + )} + {renderCaseReferenceCrumb(fallbackSearchTitle)} + + ); + } + + if (va === "true") { + return ( + <> + {renderLinkCrumb("/myportal/viewall", getViewAllLabel(key))} + {renderCaseReferenceCrumb(fallbackSearchTitle)} + + ); + } + + return ( + <> + {renderLinkCrumb(caseResultsHref, breadcrumbLabel)} + {renderCaseReferenceCrumb(fallbackSearchTitle)} + + ); + }, + + "/myportal/case/[ticketnumber]": () => { + const { ads, adv, va, key } = router.query; + + if (ads === "true") { + return ( + <> + {renderMyPortalCrumb()} + {renderLinkCrumb( + isWelsh + ? `/${router.locale}/fymhorth/chwiliadcyfeiriadau` + : "/myportal/addresssearch", + t("common:breadcrumb-address-search") + )} + {renderLinkCrumb( + caseResultsHref, + t("common:breadcrumb-address-search-results") + )} + {renderCaseReferenceCrumb(caseReferenceDisplay)} + + ); + } + + if (adv === "true") { + return ( + <> + {renderMyPortalCrumb()} + {renderLinkCrumb( + isWelsh + ? `/${router.locale}/myportal/advancedsearch` + : "/myportal/advancedsearch", + t("common:breadcrumb-advanced-search") + )} + {renderLinkCrumb( + caseResultsHref, + t("common:breadcrumb-advanced-search-results") + )} + {renderCaseReferenceCrumb(caseReferenceDisplay)} + + ); + } + + if (va === "true") { + return ( + <> + {renderMyPortalCrumb()} + {renderLinkCrumb("/myportal/viewall", getViewAllLabel(key))} + {renderCaseReferenceCrumb(caseReferenceDisplay)} + + ); + } + + return ( + <> + {renderMyPortalCrumb()} + {renderLinkCrumb(caseResultsHref, breadcrumbLabel)} + {renderCaseReferenceCrumb(caseReferenceDisplay)} + + ); + } +}); diff --git a/lib/routing/breadcrumbRouteMaps.js b/lib/routing/breadcrumbRouteMaps.js index cf5038bc..14375002 100644 --- a/lib/routing/breadcrumbRouteMaps.js +++ b/lib/routing/breadcrumbRouteMaps.js @@ -15,11 +15,13 @@ const resolveMappedRouteRenderer = (path, routeRendererMaps = []) => { const buildBreadcrumbRendererMaps = ({ simpleRouteRenderersByPath, simpleLinkTextPairRenderersByPath, - simpleMyPortalRouteRenderersByPath + simpleMyPortalRouteRenderersByPath, + caseDetailRouteRenderersByPath }) => [ simpleRouteRenderersByPath, simpleLinkTextPairRenderersByPath, - simpleMyPortalRouteRenderersByPath + simpleMyPortalRouteRenderersByPath, + caseDetailRouteRenderersByPath ]; module.exports = { From 96946ed205f153b8b171a81210e2344e883ee502 Mon Sep 17 00:00:00 2001 From: robbond Date: Thu, 9 Apr 2026 13:56:17 +0100 Subject: [PATCH 20/33] Extract additional routes in to shared renderer factory --- .env.local | 3 +- .gitignore | 1 + components/breadcrumbs.js | 91 ++-------- lib/routing/breadcrumbRendererFactories.js | 76 ++++++++ lib/routing/breadcrumbRouteMaps.js | 6 +- .../breadcrumb-route-maps-helper.test.cjs | 42 ++++- .../breadcrumbs-route-map-structure.test.cjs | 162 +++++++++++++++++- 7 files changed, 293 insertions(+), 88 deletions(-) diff --git a/.env.local b/.env.local index b8d02b17..7fcf638a 100644 --- a/.env.local +++ b/.env.local @@ -32,7 +32,7 @@ RELAYPATH = "ar-hc-lz-pedw-test-uks-01" CRMURL = "ts-pedw.crm11.dynamics.com" CRMURL_VERSION = "v9.2" -# # //New PreProd +# //New PreProd # CLIENT_ID = ab6c4678-b31a-4eb3-b429-e039120e488a # CLIENT_SECRET = VWY8Q~9EtRzGXpd8Xs~5OS1fej2IyVJ8JgTMncw3 # RELAY_ROOT = https://ar-ns-lz-pedw-ppe-uks-01.servicebus.windows.net/ar-hc-lz-pedw-ppe-uks-01/ @@ -271,3 +271,4 @@ HIDEERRORLOGS = false SHOWSIPS = true ALLOWED_IPS=::1,203.0.113.42,198.51.100.17 +UPLOAD_BATCH_COUNT = 5 \ No newline at end of file diff --git a/.gitignore b/.gitignore index 28014204..4c5f74a4 100644 --- a/.gitignore +++ b/.gitignore @@ -59,3 +59,4 @@ GUARDRAILS.md ai-prompts/ workflows/ AI_CONTEXT.md +pages/baracuda.min.html diff --git a/components/breadcrumbs.js b/components/breadcrumbs.js index ff3e52fa..f27c33ff 100644 --- a/components/breadcrumbs.js +++ b/components/breadcrumbs.js @@ -21,7 +21,8 @@ import { createSimpleRouteRenderers, createSimpleLinkTextPairRenderers, createSimpleMyPortalRouteRenderers, - createCaseDetailRouteRenderers + createCaseDetailRouteRenderers, + createDetailAndAccountRouteRenderers } from "../lib/routing/breadcrumbRendererFactories"; const Breadcrumbs = (props) => { @@ -259,11 +260,26 @@ const Breadcrumbs = (props) => { renderMyPortalCrumb }); + const detailAndAccountRouteRenderersByPath = + createDetailAndAccountRouteRenderers({ + t, + router, + isWelsh, + cyMyPortalHref, + currentReference, + caseReferenceDisplay, + renderMyPortalCrumb, + renderLinkCrumb, + renderCaseReferenceCrumb, + renderDnsCaseReferenceCrumbs + }); + const mappedRouteRendererMaps = buildBreadcrumbRendererMaps({ simpleRouteRenderersByPath, simpleLinkTextPairRenderersByPath, simpleMyPortalRouteRenderersByPath, - caseDetailRouteRenderersByPath + caseDetailRouteRenderersByPath, + detailAndAccountRouteRenderersByPath }); const staticTextCrumbLabel = getStaticTextCrumbLabel(pathname); @@ -398,33 +414,6 @@ const Breadcrumbs = (props) => { )} - {isPath("/myportal/dnsdetails") && ( - <> - {renderMyPortalCrumb()} - {renderLinkCrumb( - "/myportal/dnsapplications", - t("dnsCommon:service-name") - )} - {renderCaseReferenceCrumb(currentReference)} - - )} - - {isPath("/myportal/dns/[developmentName]") && ( - <> - {renderLinkCrumb( - isWelsh - ? `${router.locale}/fymhorth` - : "/myportal", - t("common:breadcrumb-my-portal") - )} - {renderLinkCrumb( - "/myportal/dnsapplications", - t("dnsCommon:service-name") - )} - {renderCaseReferenceCrumb(caseReferenceDisplay)} - - )} - {isPath("/case") && ( <> {renderLinkCrumb( @@ -471,50 +460,6 @@ const Breadcrumbs = (props) => { )} - {isPath("/account/personaldetails") && ( - <> - {renderLinkCrumb( - cyMyPortalHref, - t("common:breadcrumb-my-portal") - )} -
  • - {t("account:account-title")} -
    • - - )} - - {isPath("/account/changepassword") && ( - <> - {renderLinkCrumb( - cyMyPortalHref, - t("common:breadcrumb-my-portal") - )} -
  • - Update your password -
    • - - )} - - {isPath("/dnsdetails") && - renderDnsCaseReferenceCrumbs(currentReference)} - - {isPath("/dns/[developmentName]") && - renderDnsCaseReferenceCrumbs(caseReferenceDisplay)} - - {isPath("/dns/application-view") && ( - <> - {renderLinkCrumb( - isWelsh - ? `${router.locale}/dns/applications` - : "/dns/applications", - t("dnsApplicationView:page-parent-title") - )} -
  • - TWA - Morlais Demonstration Zone -
    • - - )} - {staticTextCrumbLabel && renderTextCrumb(staticTextCrumbLabel)} diff --git a/lib/routing/breadcrumbRendererFactories.js b/lib/routing/breadcrumbRendererFactories.js index 756a8054..138497cc 100644 --- a/lib/routing/breadcrumbRendererFactories.js +++ b/lib/routing/breadcrumbRendererFactories.js @@ -236,3 +236,79 @@ export const createCaseDetailRouteRenderers = ({ ); } }); + +export const createDetailAndAccountRouteRenderers = ({ + t, + router, + isWelsh, + cyMyPortalHref, + currentReference, + caseReferenceDisplay, + renderMyPortalCrumb, + renderLinkCrumb, + renderCaseReferenceCrumb, + renderDnsCaseReferenceCrumbs +}) => ({ + "/myportal/dnsdetails": () => ( + <> + {renderMyPortalCrumb()} + {renderLinkCrumb( + "/myportal/dnsapplications", + t("dnsCommon:service-name") + )} + {renderCaseReferenceCrumb(currentReference)} + + ), + + "/myportal/dns/[developmentName]": () => ( + <> + {renderMyPortalCrumb()} + {renderLinkCrumb( + "/myportal/dnsapplications", + t("dnsCommon:service-name") + )} + {renderCaseReferenceCrumb(caseReferenceDisplay)} + + ), + + "/dnsdetails": () => renderDnsCaseReferenceCrumbs(currentReference), + + "/dns/[developmentName]": () => + renderDnsCaseReferenceCrumbs(caseReferenceDisplay), + + "/dns/application-view": () => ( + <> + {renderLinkCrumb( + isWelsh + ? `/${router.locale}/dns/applications` + : "/dns/applications", + t("dnsApplicationView:page-parent-title") + )} + {renderLinkCrumb( + isWelsh + ? `/${router.locale}/dnsapplications` + : "/dnsapplications", + t("dnsCommon:service-name") + )} + {renderCaseReferenceCrumb("TWA - Morlais Demonstration Zone")} + + ), + + "/account/personaldetails": () => ( + <> + {renderLinkCrumb(cyMyPortalHref, t("common:breadcrumb-my-portal"))} +
  • + {t("account:account-title")} +
    • + + ), + + "/account/changepassword": () => ( + <> + {renderLinkCrumb(cyMyPortalHref, t("common:breadcrumb-my-portal"))} +
  • + Update your password +
    • + + ) +}); diff --git a/lib/routing/breadcrumbRouteMaps.js b/lib/routing/breadcrumbRouteMaps.js index 14375002..3d505eb1 100644 --- a/lib/routing/breadcrumbRouteMaps.js +++ b/lib/routing/breadcrumbRouteMaps.js @@ -16,12 +16,14 @@ const buildBreadcrumbRendererMaps = ({ simpleRouteRenderersByPath, simpleLinkTextPairRenderersByPath, simpleMyPortalRouteRenderersByPath, - caseDetailRouteRenderersByPath + caseDetailRouteRenderersByPath, + detailAndAccountRouteRenderersByPath }) => [ simpleRouteRenderersByPath, simpleLinkTextPairRenderersByPath, simpleMyPortalRouteRenderersByPath, - caseDetailRouteRenderersByPath + caseDetailRouteRenderersByPath, + detailAndAccountRouteRenderersByPath ]; module.exports = { diff --git a/tests/phase22/breadcrumb-route-maps-helper.test.cjs b/tests/phase22/breadcrumb-route-maps-helper.test.cjs index fbf951f4..60ab8661 100644 --- a/tests/phase22/breadcrumb-route-maps-helper.test.cjs +++ b/tests/phase22/breadcrumb-route-maps-helper.test.cjs @@ -57,15 +57,23 @@ test("buildBreadcrumbRendererMaps returns grouped maps in explicit precedence or const simpleMyPortalRouteRenderersByPath = { "/gamma": () => "gamma" }; + const caseDetailRouteRenderersByPath = { + "/delta": () => "delta" + }; + const detailAndAccountRouteRenderersByPath = { + "/epsilon": () => "epsilon" + }; const result = buildBreadcrumbRendererMaps({ simpleRouteRenderersByPath, simpleLinkTextPairRenderersByPath, - simpleMyPortalRouteRenderersByPath + simpleMyPortalRouteRenderersByPath, + caseDetailRouteRenderersByPath, + detailAndAccountRouteRenderersByPath }); assert.ok(Array.isArray(result), "Expected grouped maps array"); - assert.strictEqual(result.length, 3, "Expected three grouped route maps"); + assert.strictEqual(result.length, 5, "Expected five grouped route maps"); assert.strictEqual( result[0], simpleRouteRenderersByPath, @@ -81,6 +89,16 @@ test("buildBreadcrumbRendererMaps returns grouped maps in explicit precedence or simpleMyPortalRouteRenderersByPath, "Expected my-portal route renderers third" ); + assert.strictEqual( + result[3], + caseDetailRouteRenderersByPath, + "Expected case detail route renderers fourth" + ); + assert.strictEqual( + result[4], + detailAndAccountRouteRenderersByPath, + "Expected detail and account route renderers fifth" + ); }); test("resolveMappedRouteRenderer returns renderer from first matching grouped map", () => { @@ -97,7 +115,9 @@ test("resolveMappedRouteRenderer returns renderer from first matching grouped ma simpleLinkTextPairRenderersByPath: { "/known": secondRenderer }, - simpleMyPortalRouteRenderersByPath: {} + simpleMyPortalRouteRenderersByPath: {}, + caseDetailRouteRenderersByPath: {}, + detailAndAccountRouteRenderersByPath: {} }); const result = resolveMappedRouteRenderer("/known", maps); @@ -113,21 +133,23 @@ test("resolveMappedRouteRenderer returns renderer from later grouped map when ea const { buildBreadcrumbRendererMaps, resolveMappedRouteRenderer } = loadHelpers(); - const myPortalRenderer = () => "myportal"; + const detailRenderer = () => "detail"; const maps = buildBreadcrumbRendererMaps({ simpleRouteRenderersByPath: {}, simpleLinkTextPairRenderersByPath: {}, - simpleMyPortalRouteRenderersByPath: { - "/myportal/searchresults": myPortalRenderer + simpleMyPortalRouteRenderersByPath: {}, + caseDetailRouteRenderersByPath: {}, + detailAndAccountRouteRenderersByPath: { + "/account/personaldetails": detailRenderer } }); - const result = resolveMappedRouteRenderer("/myportal/searchresults", maps); + const result = resolveMappedRouteRenderer("/account/personaldetails", maps); assert.strictEqual( result, - myPortalRenderer, + detailRenderer, "Expected resolver to return matching renderer from later grouped map" ); }); @@ -141,7 +163,9 @@ test("resolveMappedRouteRenderer returns null for unmapped path", () => { "/known": () => "known" }, simpleLinkTextPairRenderersByPath: {}, - simpleMyPortalRouteRenderersByPath: {} + simpleMyPortalRouteRenderersByPath: {}, + caseDetailRouteRenderersByPath: {}, + detailAndAccountRouteRenderersByPath: {} }); const result = resolveMappedRouteRenderer("/unknown", maps); diff --git a/tests/phase22/breadcrumbs-route-map-structure.test.cjs b/tests/phase22/breadcrumbs-route-map-structure.test.cjs index e740838a..59f890b0 100644 --- a/tests/phase22/breadcrumbs-route-map-structure.test.cjs +++ b/tests/phase22/breadcrumbs-route-map-structure.test.cjs @@ -36,6 +36,18 @@ test("breadcrumbs/factory module includes expected mapped route definitions", as "Expected my-portal route renderer factory export" ); + assert.strictEqual( + source.includes("export const createCaseDetailRouteRenderers ="), + true, + "Expected case detail route renderer factory export" + ); + + assert.strictEqual( + source.includes("export const createDetailAndAccountRouteRenderers ="), + true, + "Expected detail and account route renderer factory export" + ); + assert.strictEqual( source.includes('"/addresssearchresults": () => ('), true, @@ -71,6 +83,60 @@ test("breadcrumbs/factory module includes expected mapped route definitions", as true, "Expected /myportal/addresssearchresults to be mapped in createSimpleMyPortalRouteRenderers" ); + + assert.strictEqual( + source.includes('"/case/[ticketnumber]": () =>'), + true, + "Expected /case/[ticketnumber] to be mapped in createCaseDetailRouteRenderers" + ); + + assert.strictEqual( + source.includes('"/myportal/case/[ticketnumber]": () =>'), + true, + "Expected /myportal/case/[ticketnumber] to be mapped in createCaseDetailRouteRenderers" + ); + + assert.strictEqual( + source.includes('"/myportal/dnsdetails": () =>'), + true, + "Expected /myportal/dnsdetails to be mapped in createDetailAndAccountRouteRenderers" + ); + + assert.strictEqual( + source.includes('"/myportal/dns/[developmentName]": () =>'), + true, + "Expected /myportal/dns/[developmentName] to be mapped in createDetailAndAccountRouteRenderers" + ); + + assert.strictEqual( + source.includes('"/dnsdetails": () =>'), + true, + "Expected /dnsdetails to be mapped in createDetailAndAccountRouteRenderers" + ); + + assert.strictEqual( + source.includes('"/dns/[developmentName]": () =>'), + true, + "Expected /dns/[developmentName] to be mapped in createDetailAndAccountRouteRenderers" + ); + + assert.strictEqual( + source.includes('"/dns/application-view": () =>'), + true, + "Expected /dns/application-view to be mapped in createDetailAndAccountRouteRenderers" + ); + + assert.strictEqual( + source.includes('"/account/personaldetails": () =>'), + true, + "Expected /account/personaldetails to be mapped in createDetailAndAccountRouteRenderers" + ); + + assert.strictEqual( + source.includes('"/account/changepassword": () =>'), + true, + "Expected /account/changepassword to be mapped in createDetailAndAccountRouteRenderers" + ); }); test("breadcrumbs/component composes mapped routes via imported factories and shared resolver", async () => { @@ -106,6 +172,18 @@ test("breadcrumbs/component composes mapped routes via imported factories and sh "Expected breadcrumbs to reference createSimpleMyPortalRouteRenderers" ); + assert.strictEqual( + /createCaseDetailRouteRenderers/.test(source), + true, + "Expected breadcrumbs to reference createCaseDetailRouteRenderers" + ); + + assert.strictEqual( + /createDetailAndAccountRouteRenderers/.test(source), + true, + "Expected breadcrumbs to reference createDetailAndAccountRouteRenderers" + ); + assert.strictEqual( /const\s+simpleRouteRenderersByPath\s*=\s*createSimpleRouteRenderers\s*\(/.test( source @@ -130,6 +208,22 @@ test("breadcrumbs/component composes mapped routes via imported factories and sh "Expected breadcrumbs to build my-portal route renderers from factory" ); + assert.strictEqual( + /const\s+caseDetailRouteRenderersByPath\s*=\s*createCaseDetailRouteRenderers\s*\(/.test( + source + ), + true, + "Expected breadcrumbs to build case detail route renderers from factory" + ); + + assert.strictEqual( + /const\s+detailAndAccountRouteRenderersByPath\s*=\s*createDetailAndAccountRouteRenderers\s*\(/.test( + source + ), + true, + "Expected breadcrumbs to build detail and account route renderers from factory" + ); + assert.strictEqual( /const\s+mappedRouteRendererMaps\s*=\s*buildBreadcrumbRendererMaps\s*\(/.test( source @@ -179,6 +273,60 @@ test("breadcrumbs/component composes mapped routes via imported factories and sh false, "Expected /myportal/addresssearchresults explicit branch to be removed after mapping" ); + + assert.strictEqual( + source.includes('isPath("/case/[ticketnumber]")'), + false, + "Expected /case/[ticketnumber] explicit branch to be removed after mapping" + ); + + assert.strictEqual( + source.includes('isPath("/myportal/case/[ticketnumber]")'), + false, + "Expected /myportal/case/[ticketnumber] explicit branch to be removed after mapping" + ); + + assert.strictEqual( + source.includes('isPath("/myportal/dnsdetails")'), + false, + "Expected /myportal/dnsdetails explicit branch to be removed after mapping" + ); + + assert.strictEqual( + source.includes('isPath("/myportal/dns/[developmentName]")'), + false, + "Expected /myportal/dns/[developmentName] explicit branch to be removed after mapping" + ); + + assert.strictEqual( + source.includes('isPath("/dnsdetails")'), + false, + "Expected /dnsdetails explicit branch to be removed after mapping" + ); + + assert.strictEqual( + source.includes('isPath("/dns/[developmentName]")'), + false, + "Expected /dns/[developmentName] explicit branch to be removed after mapping" + ); + + assert.strictEqual( + source.includes('isPath("/dns/application-view")'), + false, + "Expected /dns/application-view explicit branch to be removed after mapping" + ); + + assert.strictEqual( + source.includes('isPath("/account/personaldetails")'), + false, + "Expected /account/personaldetails explicit branch to be removed after mapping" + ); + + assert.strictEqual( + source.includes('isPath("/account/changepassword")'), + false, + "Expected /account/changepassword explicit branch to be removed after mapping" + ); }); test("breadcrumbs/map builder preserves route map ordering", async () => { @@ -196,7 +344,7 @@ test("breadcrumbs/map builder preserves route map ordering", async () => { const mapBuilderSlice = source.slice( mapBuilderCallIndex, - mapBuilderCallIndex + 500 + mapBuilderCallIndex + 700 ); const simpleRouteOrderIndex = mapBuilderSlice.indexOf( @@ -208,13 +356,21 @@ test("breadcrumbs/map builder preserves route map ordering", async () => { const simpleMyPortalOrderIndex = mapBuilderSlice.indexOf( "simpleMyPortalRouteRenderersByPath" ); + const caseDetailOrderIndex = mapBuilderSlice.indexOf( + "caseDetailRouteRenderersByPath" + ); + const detailAndAccountOrderIndex = mapBuilderSlice.indexOf( + "detailAndAccountRouteRenderersByPath" + ); assert.strictEqual( simpleRouteOrderIndex >= 0 && simpleLinkTextPairOrderIndex > simpleRouteOrderIndex && - simpleMyPortalOrderIndex > simpleLinkTextPairOrderIndex, + simpleMyPortalOrderIndex > simpleLinkTextPairOrderIndex && + caseDetailOrderIndex > simpleMyPortalOrderIndex && + detailAndAccountOrderIndex > caseDetailOrderIndex, true, - "Expected map builder call to preserve explicit route-map ordering (simple -> link-text -> myportal)" + "Expected map builder call to preserve explicit route-map ordering (simple -> link-text -> myportal -> case detail -> detail/account)" ); }); From 8edd23d621ab6b55f254720374e40f3b3ba602f7 Mon Sep 17 00:00:00 2001 From: robbond Date: Thu, 9 Apr 2026 14:30:03 +0100 Subject: [PATCH 21/33] 22541 compose mapped breadcrumb groups in factory and add null fallback guard --- components/breadcrumbs.js | 79 +++++----------- lib/routing/breadcrumbRendererFactories.js | 89 +++++++++++++++++++ memory-bank/change-log.md | 33 +++++++ .../breadcrumbs-route-map-structure.test.cjs | 70 +++------------ 4 files changed, 153 insertions(+), 118 deletions(-) diff --git a/components/breadcrumbs.js b/components/breadcrumbs.js index f27c33ff..ab0bb689 100644 --- a/components/breadcrumbs.js +++ b/components/breadcrumbs.js @@ -17,13 +17,7 @@ import { buildBreadcrumbRendererMaps, resolveMappedRouteRenderer as resolveMappedRouteRendererByMaps } from "../lib/routing/breadcrumbRouteMaps"; -import { - createSimpleRouteRenderers, - createSimpleLinkTextPairRenderers, - createSimpleMyPortalRouteRenderers, - createCaseDetailRouteRenderers, - createDetailAndAccountRouteRenderers -} from "../lib/routing/breadcrumbRendererFactories"; +import { createMappedRouteRendererGroups } from "../lib/routing/breadcrumbRendererFactories"; const Breadcrumbs = (props) => { const { @@ -196,37 +190,6 @@ const Breadcrumbs = (props) => { ); - const simpleRouteRenderersByPath = createSimpleRouteRenderers({ - t, - renderTextCrumb, - renderMyPortalSectionCrumbs - }); - - const simpleLinkTextPairRenderersByPath = createSimpleLinkTextPairRenderers( - { - t, - router, - isWelsh, - renderLinkCrumb, - renderTextCrumb - } - ); - - const simpleMyPortalRouteRenderersByPath = - createSimpleMyPortalRouteRenderers({ - t, - router, - isWelsh, - myPortalHref, - currentViewState, - getViewAllLabel, - renderAnchorCrumb, - renderLinkCrumb, - renderTextCrumb, - renderMyPortalCrumb, - renderMyPortalSectionCrumbs - }); - const resolveMappedRouteRenderer = (path) => { return resolveMappedRouteRendererByMaps(path, mappedRouteRendererMaps); }; @@ -241,39 +204,39 @@ const Breadcrumbs = (props) => { query: router.query, hasSession: Boolean(session), getViewAllLabel, - advancedLabel: () => t("common:breadcrumb-advanced-search-results"), - addressLabel: () => t("common:breadcrumb-address-search-results"), - defaultLabel: () => t("common:breadcrumb-search-results") + advancedLabel: t("common:breadcrumb-advanced-search-results"), + addressLabel: t("common:breadcrumb-address-search-results"), + defaultLabel: t("common:breadcrumb-search-results") }); - const caseDetailRouteRenderersByPath = createCaseDetailRouteRenderers({ + const { + simpleRouteRenderersByPath, + simpleLinkTextPairRenderersByPath, + simpleMyPortalRouteRenderersByPath, + caseDetailRouteRenderersByPath, + detailAndAccountRouteRenderersByPath + } = createMappedRouteRendererGroups({ t, router, isWelsh, + myPortalHref, + cyMyPortalHref, + currentViewState, + getViewAllLabel, caseResultsHref, breadcrumbLabel, fallbackSearchTitle, + currentReference, caseReferenceDisplay, - getViewAllLabel, + renderAnchorCrumb, renderLinkCrumb, + renderTextCrumb, renderCaseReferenceCrumb, - renderMyPortalCrumb + renderMyPortalCrumb, + renderMyPortalSectionCrumbs, + renderDnsCaseReferenceCrumbs }); - const detailAndAccountRouteRenderersByPath = - createDetailAndAccountRouteRenderers({ - t, - router, - isWelsh, - cyMyPortalHref, - currentReference, - caseReferenceDisplay, - renderMyPortalCrumb, - renderLinkCrumb, - renderCaseReferenceCrumb, - renderDnsCaseReferenceCrumbs - }); - const mappedRouteRendererMaps = buildBreadcrumbRendererMaps({ simpleRouteRenderersByPath, simpleLinkTextPairRenderersByPath, diff --git a/lib/routing/breadcrumbRendererFactories.js b/lib/routing/breadcrumbRendererFactories.js index 138497cc..7cf29243 100644 --- a/lib/routing/breadcrumbRendererFactories.js +++ b/lib/routing/breadcrumbRendererFactories.js @@ -312,3 +312,92 @@ export const createDetailAndAccountRouteRenderers = ({ ) }); + +export const createMappedRouteRendererGroups = ({ + t, + router, + isWelsh, + myPortalHref, + cyMyPortalHref, + currentViewState, + getViewAllLabel, + caseResultsHref, + breadcrumbLabel, + fallbackSearchTitle, + currentReference, + caseReferenceDisplay, + renderAnchorCrumb, + renderLinkCrumb, + renderTextCrumb, + renderCaseReferenceCrumb, + renderMyPortalCrumb, + renderMyPortalSectionCrumbs, + renderDnsCaseReferenceCrumbs +}) => { + const simpleRouteRenderersByPath = createSimpleRouteRenderers({ + t, + renderTextCrumb, + renderMyPortalSectionCrumbs + }); + + const simpleLinkTextPairRenderersByPath = createSimpleLinkTextPairRenderers( + { + t, + router, + isWelsh, + renderLinkCrumb, + renderTextCrumb + } + ); + + const simpleMyPortalRouteRenderersByPath = + createSimpleMyPortalRouteRenderers({ + t, + router, + isWelsh, + myPortalHref, + currentViewState, + getViewAllLabel, + renderAnchorCrumb, + renderLinkCrumb, + renderTextCrumb, + renderMyPortalCrumb, + renderMyPortalSectionCrumbs + }); + + const caseDetailRouteRenderersByPath = createCaseDetailRouteRenderers({ + t, + router, + isWelsh, + caseResultsHref, + breadcrumbLabel, + fallbackSearchTitle, + caseReferenceDisplay, + getViewAllLabel, + renderLinkCrumb, + renderCaseReferenceCrumb, + renderMyPortalCrumb + }); + + const detailAndAccountRouteRenderersByPath = + createDetailAndAccountRouteRenderers({ + t, + router, + isWelsh, + cyMyPortalHref, + currentReference, + caseReferenceDisplay, + renderMyPortalCrumb, + renderLinkCrumb, + renderCaseReferenceCrumb, + renderDnsCaseReferenceCrumbs + }); + + return { + simpleRouteRenderersByPath, + simpleLinkTextPairRenderersByPath, + simpleMyPortalRouteRenderersByPath, + caseDetailRouteRenderersByPath, + detailAndAccountRouteRenderersByPath + }; +}; diff --git a/memory-bank/change-log.md b/memory-bank/change-log.md index 272f9802..a798936c 100644 --- a/memory-bank/change-log.md +++ b/memory-bank/change-log.md @@ -532,6 +532,39 @@ Follow-ups: - Next slice option A (larger): move per-path map object declarations out of `components/breadcrumbs.js` into module-level pure factories (still injected with `t/router/currentView`) to further shrink component body. - Next slice option B (smaller): add one focused parity test asserting mapped resolver fallback returns `null` in component rendering path for non-mapped routes (ensures no accidental render noise). +### CL-22541-R: breadcrumbs mapped-group factory composition + unmapped-route null parity guard + +date: 2026-04-09 +author: Cline +scope: `lib/routing/breadcrumbRendererFactories.js`, `components/breadcrumbs.js`, `tests/phase22/breadcrumbs-route-map-structure.test.cjs` +type: change +rationale: Execute both approved next slices in one commit by centralizing deterministic mapped route-group composition into a factory-level helper and adding explicit structure guard coverage for null fallback behavior on unmapped routes. +impact: Refactor-only structural consolidation and test hardening; no intended route/auth/session/API/EN-CY/a11y behavior change. +status: completed + +Summary: + +- Added `createMappedRouteRendererGroups(...)` in `lib/routing/breadcrumbRendererFactories.js` to compose and return all deterministic mapped renderer groups in one place: + - `simpleRouteRenderersByPath` + - `simpleLinkTextPairRenderersByPath` + - `simpleMyPortalRouteRenderersByPath` + - `caseDetailRouteRenderersByPath` + - `detailAndAccountRouteRenderersByPath` +- Updated `components/breadcrumbs.js` to consume `createMappedRouteRendererGroups(...)` and remove local per-group factory composition boilerplate while preserving existing map precedence and resolver flow. +- Expanded `tests/phase22/breadcrumbs-route-map-structure.test.cjs` to assert: + - grouped renderer maps are composed via `createMappedRouteRendererGroups(...)` + - mapped rendering path explicitly preserves null fallback (`routeRenderer ? routeRenderer() : null`) + +Validation: + +- `npx eslint lib/routing/breadcrumbRendererFactories.js components/breadcrumbs.js tests/phase22/breadcrumbs-route-map-structure.test.cjs tests/phase22/breadcrumb-route-maps-helper.test.cjs tests/phase22/index.test.cjs` -> pass. +- `node tests/phase22/index.test.cjs` -> pass (combined suite; breadcrumbs-route-map 4/4). + +Follow-ups: + +- Next slice option A (larger): extract remaining deterministic inline branches (`/myportal/case`, `/case/id/[incident]` if kept deterministic after constraints review) only if they remain callback/state free. +- Next slice option B (smaller): add one focused assertion in helper-level tests that empty grouped map entries are tolerated without affecting precedence resolution. + ### CL-00X: 22500 `components/elements/index.js` Phase 1 helper extraction date: 2026-04-07 diff --git a/tests/phase22/breadcrumbs-route-map-structure.test.cjs b/tests/phase22/breadcrumbs-route-map-structure.test.cjs index 59f890b0..e37eb836 100644 --- a/tests/phase22/breadcrumbs-route-map-structure.test.cjs +++ b/tests/phase22/breadcrumbs-route-map-structure.test.cjs @@ -155,73 +155,17 @@ test("breadcrumbs/component composes mapped routes via imported factories and sh ); assert.strictEqual( - /createSimpleRouteRenderers/.test(source), + /createMappedRouteRendererGroups/.test(source), true, - "Expected breadcrumbs to reference createSimpleRouteRenderers" + "Expected breadcrumbs to reference createMappedRouteRendererGroups" ); assert.strictEqual( - /createSimpleLinkTextPairRenderers/.test(source), - true, - "Expected breadcrumbs to reference createSimpleLinkTextPairRenderers" - ); - - assert.strictEqual( - /createSimpleMyPortalRouteRenderers/.test(source), - true, - "Expected breadcrumbs to reference createSimpleMyPortalRouteRenderers" - ); - - assert.strictEqual( - /createCaseDetailRouteRenderers/.test(source), - true, - "Expected breadcrumbs to reference createCaseDetailRouteRenderers" - ); - - assert.strictEqual( - /createDetailAndAccountRouteRenderers/.test(source), - true, - "Expected breadcrumbs to reference createDetailAndAccountRouteRenderers" - ); - - assert.strictEqual( - /const\s+simpleRouteRenderersByPath\s*=\s*createSimpleRouteRenderers\s*\(/.test( + /const\s+\{[\s\S]*simpleRouteRenderersByPath[\s\S]*detailAndAccountRouteRenderersByPath[\s\S]*\}\s*=\s*createMappedRouteRendererGroups\s*\(/.test( source ), true, - "Expected breadcrumbs to build simple route renderers from factory" - ); - - assert.strictEqual( - /const\s+simpleLinkTextPairRenderersByPath\s*=\s*createSimpleLinkTextPairRenderers\s*\(/.test( - source - ), - true, - "Expected breadcrumbs to build link-text pair renderers from factory" - ); - - assert.strictEqual( - /const\s+simpleMyPortalRouteRenderersByPath\s*=\s*createSimpleMyPortalRouteRenderers\s*\(/.test( - source - ), - true, - "Expected breadcrumbs to build my-portal route renderers from factory" - ); - - assert.strictEqual( - /const\s+caseDetailRouteRenderersByPath\s*=\s*createCaseDetailRouteRenderers\s*\(/.test( - source - ), - true, - "Expected breadcrumbs to build case detail route renderers from factory" - ); - - assert.strictEqual( - /const\s+detailAndAccountRouteRenderersByPath\s*=\s*createDetailAndAccountRouteRenderers\s*\(/.test( - source - ), - true, - "Expected breadcrumbs to build detail and account route renderers from factory" + "Expected breadcrumbs to compose grouped renderer maps via createMappedRouteRendererGroups" ); assert.strictEqual( @@ -256,6 +200,12 @@ test("breadcrumbs/component composes mapped routes via imported factories and sh "Expected reusable renderMappedRoute helper to exist" ); + assert.strictEqual( + source.includes("return routeRenderer ? routeRenderer() : null;"), + true, + "Expected mapped renderer flow to return null for unmapped routes" + ); + assert.strictEqual( source.includes("{renderMappedRoute(pathname)}"), true, From 17795f20c76f184ed916807a3d5a0ae0548e7aa0 Mon Sep 17 00:00:00 2001 From: robbond Date: Thu, 9 Apr 2026 14:33:54 +0100 Subject: [PATCH 22/33] 22541 extract deterministic case breadcrumb branches into factory maps --- components/breadcrumbs.js | 33 +---------------- lib/routing/breadcrumbRendererFactories.js | 33 +++++++++++++++++ memory-bank/change-log.md | 37 +++++++++++++++++++ .../breadcrumbs-route-map-structure.test.cjs | 24 ++++++++++++ 4 files changed, 95 insertions(+), 32 deletions(-) diff --git a/components/breadcrumbs.js b/components/breadcrumbs.js index ab0bb689..23e17a77 100644 --- a/components/breadcrumbs.js +++ b/components/breadcrumbs.js @@ -227,6 +227,7 @@ const Breadcrumbs = (props) => { breadcrumbLabel, fallbackSearchTitle, currentReference, + nestedSearchString, caseReferenceDisplay, renderAnchorCrumb, renderLinkCrumb, @@ -321,38 +322,6 @@ const Breadcrumbs = (props) => { )} - {isPath("/myportal/case") && ( - <> - {renderLinkCrumb( - isWelsh - ? `/${router.locale}/fymhorth` - : "/myportal", - t("common:breadcrumb-my-portal") - )} - {renderCaseReferenceCrumb(currentReference)} - - )} - - {isPath("/case/id/[incident]") && ( - <> - {renderLinkCrumb( - isWelsh - ? `/${router.locale}/chwiliadcyfeiriadau` - : "/addresssearch", - t("common:breadcrumb-address-search") - )} - {renderLinkCrumb( - isWelsh - ? `/${router.locale}/canlyniadaucyfeiriadau?${nestedSearchString}` - : `/addresssearchresults?${nestedSearchString}`, - t( - "common:breadcrumb-address-search-results" - ) - )} - {renderCaseReferenceCrumb(currentReference)} - - )} - {isPath("/myportal/case/id/[incident]") && ( <> {renderMyPortalCrumb()} diff --git a/lib/routing/breadcrumbRendererFactories.js b/lib/routing/breadcrumbRendererFactories.js index 7cf29243..21c3024b 100644 --- a/lib/routing/breadcrumbRendererFactories.js +++ b/lib/routing/breadcrumbRendererFactories.js @@ -111,6 +111,8 @@ export const createCaseDetailRouteRenderers = ({ t, router, isWelsh, + currentReference, + nestedSearchString, caseResultsHref, breadcrumbLabel, fallbackSearchTitle, @@ -120,6 +122,34 @@ export const createCaseDetailRouteRenderers = ({ renderCaseReferenceCrumb, renderMyPortalCrumb }) => ({ + "/myportal/case": () => ( + <> + {renderLinkCrumb( + isWelsh ? `/${router.locale}/fymhorth` : "/myportal", + t("common:breadcrumb-my-portal") + )} + {renderCaseReferenceCrumb(currentReference)} + + ), + + "/case/id/[incident]": () => ( + <> + {renderLinkCrumb( + isWelsh + ? `/${router.locale}/chwiliadcyfeiriadau` + : "/addresssearch", + t("common:breadcrumb-address-search") + )} + {renderLinkCrumb( + isWelsh + ? `/${router.locale}/canlyniadaucyfeiriadau?${nestedSearchString}` + : `/addresssearchresults?${nestedSearchString}`, + t("common:breadcrumb-address-search-results") + )} + {renderCaseReferenceCrumb(currentReference)} + + ), + "/case/[ticketnumber]": () => { const { ads, adv, va, key } = router.query; @@ -325,6 +355,7 @@ export const createMappedRouteRendererGroups = ({ breadcrumbLabel, fallbackSearchTitle, currentReference, + nestedSearchString, caseReferenceDisplay, renderAnchorCrumb, renderLinkCrumb, @@ -369,6 +400,8 @@ export const createMappedRouteRendererGroups = ({ t, router, isWelsh, + currentReference, + nestedSearchString, caseResultsHref, breadcrumbLabel, fallbackSearchTitle, diff --git a/memory-bank/change-log.md b/memory-bank/change-log.md index a798936c..bf772e1f 100644 --- a/memory-bank/change-log.md +++ b/memory-bank/change-log.md @@ -565,6 +565,43 @@ Follow-ups: - Next slice option A (larger): extract remaining deterministic inline branches (`/myportal/case`, `/case/id/[incident]` if kept deterministic after constraints review) only if they remain callback/state free. - Next slice option B (smaller): add one focused assertion in helper-level tests that empty grouped map entries are tolerated without affecting precedence resolution. +### CL-22541-S: breadcrumbs deterministic case-branch extraction (`/myportal/case`, `/case/id/[incident]`) + +date: 2026-04-09 +author: Cline +scope: `lib/routing/breadcrumbRendererFactories.js`, `components/breadcrumbs.js`, `tests/phase22/breadcrumbs-route-map-structure.test.cjs` +type: change +rationale: Execute the next deterministic extraction slice by migrating remaining callback-free case breadcrumb branches into the case-detail factory group while preserving map precedence and leaving stateful/callback routes inline. +impact: Refactor-only structural extraction and test guardrail expansion; no intended route/auth/session/API/EN-CY/a11y behavior change. +status: completed + +Summary: + +- Extended `createCaseDetailRouteRenderers(...)` in `lib/routing/breadcrumbRendererFactories.js` to map: + - `/myportal/case` + - `/case/id/[incident]` +- Injected additional deterministic inputs required by these routes: + - `currentReference` + - `nestedSearchString` +- Updated `createMappedRouteRendererGroups(...)` wiring to pass the new inputs to case-detail factory composition. +- Updated `components/breadcrumbs.js` to pass `nestedSearchString` into grouped factory composition. +- Removed now-redundant inline `isPath(...)` branches for: + - `/myportal/case` + - `/case/id/[incident]` +- Expanded `tests/phase22/breadcrumbs-route-map-structure.test.cjs` to assert: + - both new routes are mapped in `createCaseDetailRouteRenderers` + - both inline branches are absent from `components/breadcrumbs.js` + +Validation: + +- `npx eslint lib/routing/breadcrumbRendererFactories.js 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 4/4). + +Follow-ups: + +- Next slice option A (larger): evaluate whether any remaining deterministic inline branches can be extracted without violating callback/state constraints. +- Next slice option B (smaller): add a focused helper-level precedence test where earlier map contains falsy/non-function values and later maps contain valid renderers. + ### CL-00X: 22500 `components/elements/index.js` Phase 1 helper extraction date: 2026-04-07 diff --git a/tests/phase22/breadcrumbs-route-map-structure.test.cjs b/tests/phase22/breadcrumbs-route-map-structure.test.cjs index e37eb836..60cb5a27 100644 --- a/tests/phase22/breadcrumbs-route-map-structure.test.cjs +++ b/tests/phase22/breadcrumbs-route-map-structure.test.cjs @@ -90,6 +90,18 @@ test("breadcrumbs/factory module includes expected mapped route definitions", as "Expected /case/[ticketnumber] to be mapped in createCaseDetailRouteRenderers" ); + assert.strictEqual( + source.includes('"/myportal/case": () =>'), + true, + "Expected /myportal/case to be mapped in createCaseDetailRouteRenderers" + ); + + assert.strictEqual( + source.includes('"/case/id/[incident]": () =>'), + true, + "Expected /case/id/[incident] to be mapped in createCaseDetailRouteRenderers" + ); + assert.strictEqual( source.includes('"/myportal/case/[ticketnumber]": () =>'), true, @@ -230,6 +242,18 @@ test("breadcrumbs/component composes mapped routes via imported factories and sh "Expected /case/[ticketnumber] explicit branch to be removed after mapping" ); + assert.strictEqual( + source.includes('isPath("/myportal/case")'), + false, + "Expected /myportal/case explicit branch to be removed after mapping" + ); + + assert.strictEqual( + source.includes('isPath("/case/id/[incident]")'), + false, + "Expected /case/id/[incident] explicit branch to be removed after mapping" + ); + assert.strictEqual( source.includes('isPath("/myportal/case/[ticketnumber]")'), false, From 2a84056a769f2300032f98330de25779b49503d2 Mon Sep 17 00:00:00 2001 From: robbond Date: Thu, 9 Apr 2026 14:39:30 +0100 Subject: [PATCH 23/33] 22541 extract new appeal breadcrumb branch into mapped renderer group --- components/breadcrumbs.js | 18 ++-------- lib/routing/breadcrumbRendererFactories.js | 23 ++++++++++++ lib/routing/breadcrumbRouteMaps.js | 2 ++ memory-bank/change-log.md | 36 +++++++++++++++++++ .../breadcrumb-route-maps-helper.test.cjs | 22 +++++++++--- .../breadcrumbs-route-map-structure.test.cjs | 28 +++++++++++++-- 6 files changed, 106 insertions(+), 23 deletions(-) diff --git a/components/breadcrumbs.js b/components/breadcrumbs.js index 23e17a77..17985d09 100644 --- a/components/breadcrumbs.js +++ b/components/breadcrumbs.js @@ -213,6 +213,7 @@ const Breadcrumbs = (props) => { simpleRouteRenderersByPath, simpleLinkTextPairRenderersByPath, simpleMyPortalRouteRenderersByPath, + newAppealRouteRenderersByPath, caseDetailRouteRenderersByPath, detailAndAccountRouteRenderersByPath } = createMappedRouteRendererGroups({ @@ -242,6 +243,7 @@ const Breadcrumbs = (props) => { simpleRouteRenderersByPath, simpleLinkTextPairRenderersByPath, simpleMyPortalRouteRenderersByPath, + newAppealRouteRenderersByPath, caseDetailRouteRenderersByPath, detailAndAccountRouteRenderersByPath }); @@ -306,22 +308,6 @@ const Breadcrumbs = (props) => { )} - {isPath("/newappeal/selectappeal") && ( - <> - {renderLinkCrumb( - myPortalHref, - t("newappeal:parent-page-title") - )} - {renderLinkCrumb( - myPortalHref, - t("newappeal:page-title") - )} -
  • - Select Appeal -
    • - - )} - {isPath("/myportal/case/id/[incident]") && ( <> {renderMyPortalCrumb()} diff --git a/lib/routing/breadcrumbRendererFactories.js b/lib/routing/breadcrumbRendererFactories.js index 21c3024b..ad9efc92 100644 --- a/lib/routing/breadcrumbRendererFactories.js +++ b/lib/routing/breadcrumbRendererFactories.js @@ -107,6 +107,21 @@ export const createSimpleMyPortalRouteRenderers = ({ ) }); +export const createNewAppealRouteRenderers = ({ + t, + myPortalHref, + renderLinkCrumb, + renderTextCrumb +}) => ({ + "/newappeal/selectappeal": () => ( + <> + {renderLinkCrumb(myPortalHref, t("newappeal:parent-page-title"))} + {renderLinkCrumb(myPortalHref, t("newappeal:page-title"))} + {renderTextCrumb("Select Appeal")} + + ) +}); + export const createCaseDetailRouteRenderers = ({ t, router, @@ -396,6 +411,13 @@ export const createMappedRouteRendererGroups = ({ renderMyPortalSectionCrumbs }); + const newAppealRouteRenderersByPath = createNewAppealRouteRenderers({ + t, + myPortalHref, + renderLinkCrumb, + renderTextCrumb + }); + const caseDetailRouteRenderersByPath = createCaseDetailRouteRenderers({ t, router, @@ -430,6 +452,7 @@ export const createMappedRouteRendererGroups = ({ simpleRouteRenderersByPath, simpleLinkTextPairRenderersByPath, simpleMyPortalRouteRenderersByPath, + newAppealRouteRenderersByPath, caseDetailRouteRenderersByPath, detailAndAccountRouteRenderersByPath }; diff --git a/lib/routing/breadcrumbRouteMaps.js b/lib/routing/breadcrumbRouteMaps.js index 3d505eb1..c3cbde18 100644 --- a/lib/routing/breadcrumbRouteMaps.js +++ b/lib/routing/breadcrumbRouteMaps.js @@ -16,12 +16,14 @@ const buildBreadcrumbRendererMaps = ({ simpleRouteRenderersByPath, simpleLinkTextPairRenderersByPath, simpleMyPortalRouteRenderersByPath, + newAppealRouteRenderersByPath, caseDetailRouteRenderersByPath, detailAndAccountRouteRenderersByPath }) => [ simpleRouteRenderersByPath, simpleLinkTextPairRenderersByPath, simpleMyPortalRouteRenderersByPath, + newAppealRouteRenderersByPath, caseDetailRouteRenderersByPath, detailAndAccountRouteRenderersByPath ]; diff --git a/memory-bank/change-log.md b/memory-bank/change-log.md index bf772e1f..1a07eb6c 100644 --- a/memory-bank/change-log.md +++ b/memory-bank/change-log.md @@ -602,6 +602,42 @@ Follow-ups: - Next slice option A (larger): evaluate whether any remaining deterministic inline branches can be extracted without violating callback/state constraints. - Next slice option B (smaller): add a focused helper-level precedence test where earlier map contains falsy/non-function values and later maps contain valid renderers. +### CL-22541-T: breadcrumbs larger slice — new-appeal mapped group extraction (`/newappeal/selectappeal`) + +date: 2026-04-09 +author: Cline +scope: `lib/routing/{breadcrumbRendererFactories,breadcrumbRouteMaps}.js`, `components/breadcrumbs.js`, `tests/phase22/{breadcrumb-route-maps-helper,breadcrumbs-route-map-structure}.test.cjs` +type: change +rationale: Execute the next larger deterministic refactor slice by extracting callback-free new-appeal breadcrumb branching into a dedicated mapped renderer group and extending map-order guardrails. +impact: Refactor-only structural extraction plus precedence-test hardening; no intended route/auth/session/API/EN-CY/a11y behavior change. +status: completed + +Summary: + +- Added `createNewAppealRouteRenderers(...)` in `lib/routing/breadcrumbRendererFactories.js`. +- Mapped `/newappeal/selectappeal` into the new grouped renderer factory. +- Extended grouped composition return from `createMappedRouteRendererGroups(...)` with `newAppealRouteRenderersByPath`. +- Updated `lib/routing/breadcrumbRouteMaps.js` to include `newAppealRouteRenderersByPath` in explicit map precedence ordering. +- Updated `components/breadcrumbs.js` to consume/pass `newAppealRouteRenderersByPath` into map builder. +- Removed now-redundant inline `isPath("/newappeal/selectappeal")` branch from component JSX. +- Expanded tests: + - `tests/phase22/breadcrumbs-route-map-structure.test.cjs` + - assert new factory export and mapped route presence + - assert inline branch removal + - assert updated map-order invariant (simple -> link-text -> myportal -> new-appeal -> case detail -> detail/account) + - `tests/phase22/breadcrumb-route-maps-helper.test.cjs` + - assert six-map ordering contract and updated grouped precedence wiring. + +Validation: + +- `npx eslint lib/routing/breadcrumbRendererFactories.js lib/routing/breadcrumbRouteMaps.js components/breadcrumbs.js tests/phase22/breadcrumb-route-maps-helper.test.cjs tests/phase22/breadcrumbs-route-map-structure.test.cjs tests/phase22/index.test.cjs` -> pass. +- `node tests/phase22/index.test.cjs` -> pass (combined suite). + +Follow-ups: + +- Next larger slice candidate: evaluate extraction viability for `/case` branch only if callback/`router.back()` behavior can remain explicit and parity-safe. +- Next smaller slice candidate: add helper-level test coverage for unexpected non-function map values and explicit skip behavior (defensive precedence guard). + ### CL-00X: 22500 `components/elements/index.js` Phase 1 helper extraction date: 2026-04-07 diff --git a/tests/phase22/breadcrumb-route-maps-helper.test.cjs b/tests/phase22/breadcrumb-route-maps-helper.test.cjs index 60ab8661..23c40e38 100644 --- a/tests/phase22/breadcrumb-route-maps-helper.test.cjs +++ b/tests/phase22/breadcrumb-route-maps-helper.test.cjs @@ -57,6 +57,9 @@ test("buildBreadcrumbRendererMaps returns grouped maps in explicit precedence or const simpleMyPortalRouteRenderersByPath = { "/gamma": () => "gamma" }; + const newAppealRouteRenderersByPath = { + "/eta": () => "eta" + }; const caseDetailRouteRenderersByPath = { "/delta": () => "delta" }; @@ -68,12 +71,13 @@ test("buildBreadcrumbRendererMaps returns grouped maps in explicit precedence or simpleRouteRenderersByPath, simpleLinkTextPairRenderersByPath, simpleMyPortalRouteRenderersByPath, + newAppealRouteRenderersByPath, caseDetailRouteRenderersByPath, detailAndAccountRouteRenderersByPath }); assert.ok(Array.isArray(result), "Expected grouped maps array"); - assert.strictEqual(result.length, 5, "Expected five grouped route maps"); + assert.strictEqual(result.length, 6, "Expected six grouped route maps"); assert.strictEqual( result[0], simpleRouteRenderersByPath, @@ -91,13 +95,18 @@ test("buildBreadcrumbRendererMaps returns grouped maps in explicit precedence or ); assert.strictEqual( result[3], - caseDetailRouteRenderersByPath, - "Expected case detail route renderers fourth" + newAppealRouteRenderersByPath, + "Expected new-appeal route renderers fourth" ); assert.strictEqual( result[4], + caseDetailRouteRenderersByPath, + "Expected case detail route renderers fifth" + ); + assert.strictEqual( + result[5], detailAndAccountRouteRenderersByPath, - "Expected detail and account route renderers fifth" + "Expected detail and account route renderers sixth" ); }); @@ -116,6 +125,7 @@ test("resolveMappedRouteRenderer returns renderer from first matching grouped ma "/known": secondRenderer }, simpleMyPortalRouteRenderersByPath: {}, + newAppealRouteRenderersByPath: {}, caseDetailRouteRenderersByPath: {}, detailAndAccountRouteRenderersByPath: {} }); @@ -138,6 +148,9 @@ test("resolveMappedRouteRenderer returns renderer from later grouped map when ea const maps = buildBreadcrumbRendererMaps({ simpleRouteRenderersByPath: {}, simpleLinkTextPairRenderersByPath: {}, + newAppealRouteRenderersByPath: { + "/newappeal/selectappeal": () => "newappeal" + }, simpleMyPortalRouteRenderersByPath: {}, caseDetailRouteRenderersByPath: {}, detailAndAccountRouteRenderersByPath: { @@ -164,6 +177,7 @@ test("resolveMappedRouteRenderer returns null for unmapped path", () => { }, simpleLinkTextPairRenderersByPath: {}, simpleMyPortalRouteRenderersByPath: {}, + newAppealRouteRenderersByPath: {}, caseDetailRouteRenderersByPath: {}, detailAndAccountRouteRenderersByPath: {} }); diff --git a/tests/phase22/breadcrumbs-route-map-structure.test.cjs b/tests/phase22/breadcrumbs-route-map-structure.test.cjs index 60cb5a27..5cf9d452 100644 --- a/tests/phase22/breadcrumbs-route-map-structure.test.cjs +++ b/tests/phase22/breadcrumbs-route-map-structure.test.cjs @@ -36,6 +36,12 @@ test("breadcrumbs/factory module includes expected mapped route definitions", as "Expected my-portal route renderer factory export" ); + assert.strictEqual( + source.includes("export const createNewAppealRouteRenderers ="), + true, + "Expected new-appeal route renderer factory export" + ); + assert.strictEqual( source.includes("export const createCaseDetailRouteRenderers ="), true, @@ -84,6 +90,12 @@ test("breadcrumbs/factory module includes expected mapped route definitions", as "Expected /myportal/addresssearchresults to be mapped in createSimpleMyPortalRouteRenderers" ); + assert.strictEqual( + source.includes('"/newappeal/selectappeal": () => ('), + true, + "Expected /newappeal/selectappeal to be mapped in createNewAppealRouteRenderers" + ); + assert.strictEqual( source.includes('"/case/[ticketnumber]": () =>'), true, @@ -173,7 +185,7 @@ test("breadcrumbs/component composes mapped routes via imported factories and sh ); assert.strictEqual( - /const\s+\{[\s\S]*simpleRouteRenderersByPath[\s\S]*detailAndAccountRouteRenderersByPath[\s\S]*\}\s*=\s*createMappedRouteRendererGroups\s*\(/.test( + /const\s+\{[\s\S]*simpleRouteRenderersByPath[\s\S]*newAppealRouteRenderersByPath[\s\S]*detailAndAccountRouteRenderersByPath[\s\S]*\}\s*=\s*createMappedRouteRendererGroups\s*\(/.test( source ), true, @@ -254,6 +266,12 @@ test("breadcrumbs/component composes mapped routes via imported factories and sh "Expected /case/id/[incident] explicit branch to be removed after mapping" ); + assert.strictEqual( + source.includes('isPath("/newappeal/selectappeal")'), + false, + "Expected /newappeal/selectappeal explicit branch to be removed after mapping" + ); + assert.strictEqual( source.includes('isPath("/myportal/case/[ticketnumber]")'), false, @@ -330,6 +348,9 @@ test("breadcrumbs/map builder preserves route map ordering", async () => { const simpleMyPortalOrderIndex = mapBuilderSlice.indexOf( "simpleMyPortalRouteRenderersByPath" ); + const newAppealOrderIndex = mapBuilderSlice.indexOf( + "newAppealRouteRenderersByPath" + ); const caseDetailOrderIndex = mapBuilderSlice.indexOf( "caseDetailRouteRenderersByPath" ); @@ -341,10 +362,11 @@ test("breadcrumbs/map builder preserves route map ordering", async () => { simpleRouteOrderIndex >= 0 && simpleLinkTextPairOrderIndex > simpleRouteOrderIndex && simpleMyPortalOrderIndex > simpleLinkTextPairOrderIndex && - caseDetailOrderIndex > simpleMyPortalOrderIndex && + newAppealOrderIndex > simpleMyPortalOrderIndex && + caseDetailOrderIndex > newAppealOrderIndex && detailAndAccountOrderIndex > caseDetailOrderIndex, true, - "Expected map builder call to preserve explicit route-map ordering (simple -> link-text -> myportal -> case detail -> detail/account)" + "Expected map builder call to preserve explicit route-map ordering (simple -> link-text -> myportal -> new-appeal -> case detail -> detail/account)" ); }); From 0cd78e6f4639d16ee704574d26101208eb06654e Mon Sep 17 00:00:00 2001 From: robbond Date: Thu, 9 Apr 2026 14:45:12 +0100 Subject: [PATCH 24/33] 22541 harden breadcrumb mapped route resolver against invalid entries --- lib/routing/breadcrumbRouteMaps.js | 10 +++++-- memory-bank/change-log.md | 30 +++++++++++++++++++ .../breadcrumb-route-maps-helper.test.cjs | 28 +++++++++++++++++ 3 files changed, 66 insertions(+), 2 deletions(-) diff --git a/lib/routing/breadcrumbRouteMaps.js b/lib/routing/breadcrumbRouteMaps.js index c3cbde18..ef46b5f5 100644 --- a/lib/routing/breadcrumbRouteMaps.js +++ b/lib/routing/breadcrumbRouteMaps.js @@ -1,5 +1,11 @@ -const getMappedRendererByPath = (path, routeRendererMap) => - routeRendererMap[path] || null; +const getMappedRendererByPath = (path, routeRendererMap) => { + if (!routeRendererMap || typeof routeRendererMap !== "object") { + return null; + } + + const routeRenderer = routeRendererMap[path]; + return typeof routeRenderer === "function" ? routeRenderer : null; +}; const resolveMappedRouteRenderer = (path, routeRendererMaps = []) => { for (const routeRendererMap of routeRendererMaps) { diff --git a/memory-bank/change-log.md b/memory-bank/change-log.md index 1a07eb6c..89b9bfc6 100644 --- a/memory-bank/change-log.md +++ b/memory-bank/change-log.md @@ -638,6 +638,36 @@ Follow-ups: - Next larger slice candidate: evaluate extraction viability for `/case` branch only if callback/`router.back()` behavior can remain explicit and parity-safe. - Next smaller slice candidate: add helper-level test coverage for unexpected non-function map values and explicit skip behavior (defensive precedence guard). +### CL-22541-U: breadcrumbs smaller slice — defensive mapped-route resolver hardening + +date: 2026-04-09 +author: Cline +scope: `lib/routing/breadcrumbRouteMaps.js`, `tests/phase22/breadcrumb-route-maps-helper.test.cjs` +type: change +rationale: Execute the queued smaller slice by hardening mapped-route lookup against malformed map entries and non-function values while keeping precedence behavior unchanged. +impact: Refactor-hardening only; no intended breadcrumb route behavior change for valid mapped renderers. +status: completed + +Summary: + +- Updated `getMappedRendererByPath(...)` to safely handle invalid route-map entries: + - returns `null` when map is missing/non-object + - returns `null` when mapped value is not a function +- Preserved existing resolver precedence semantics for valid function renderers. +- Added focused helper test asserting resolver skips: + - invalid map entries (`null`/`undefined`) + - non-function mapped values + and still resolves the first later valid renderer. + +Validation: + +- `npx eslint lib/routing/breadcrumbRouteMaps.js tests/phase22/breadcrumb-route-maps-helper.test.cjs tests/phase22/index.test.cjs` -> pass. +- `node tests/phase22/index.test.cjs` -> pass (combined suite; breadcrumb-route-maps-helper 5/5). + +Follow-ups: + +- Next larger slice: extract remaining callback-bearing deterministic branches into mapped route groups with callback injection, then update structure guards accordingly. + ### CL-00X: 22500 `components/elements/index.js` Phase 1 helper extraction date: 2026-04-07 diff --git a/tests/phase22/breadcrumb-route-maps-helper.test.cjs b/tests/phase22/breadcrumb-route-maps-helper.test.cjs index 23c40e38..8f04ee21 100644 --- a/tests/phase22/breadcrumb-route-maps-helper.test.cjs +++ b/tests/phase22/breadcrumb-route-maps-helper.test.cjs @@ -191,6 +191,34 @@ test("resolveMappedRouteRenderer returns null for unmapped path", () => { ); }); +test("resolveMappedRouteRenderer skips invalid map entries and non-function renderer values", () => { + const { buildBreadcrumbRendererMaps, resolveMappedRouteRenderer } = + loadHelpers(); + + const validRenderer = () => "valid"; + + const maps = buildBreadcrumbRendererMaps({ + simpleRouteRenderersByPath: { + "/known": "not-a-function" + }, + simpleLinkTextPairRenderersByPath: null, + simpleMyPortalRouteRenderersByPath: { + "/known": validRenderer + }, + newAppealRouteRenderersByPath: undefined, + caseDetailRouteRenderersByPath: {}, + detailAndAccountRouteRenderersByPath: {} + }); + + const result = resolveMappedRouteRenderer("/known", maps); + + assert.strictEqual( + result, + validRenderer, + "Expected resolver to skip invalid/non-function entries and return first valid renderer" + ); +}); + const run = async () => { let passed = 0; From 0b905f9374862730ac4c49ef76151660de981961 Mon Sep 17 00:00:00 2001 From: robbond Date: Thu, 9 Apr 2026 14:57:47 +0100 Subject: [PATCH 25/33] refactor(breadcrumbs): extract callback route renderers into mapped groups --- components/breadcrumbs.js | 44 ++------------ lib/routing/breadcrumbRendererFactories.js | 59 +++++++++++++++++++ lib/routing/breadcrumbRouteMaps.js | 2 + memory-bank/change-log.md | 41 +++++++++++++ .../breadcrumb-route-maps-helper.test.cjs | 21 +++++-- .../breadcrumbs-route-map-structure.test.cjs | 42 ++++++++++--- 6 files changed, 159 insertions(+), 50 deletions(-) diff --git a/components/breadcrumbs.js b/components/breadcrumbs.js index 17985d09..379109a7 100644 --- a/components/breadcrumbs.js +++ b/components/breadcrumbs.js @@ -214,6 +214,7 @@ const Breadcrumbs = (props) => { simpleLinkTextPairRenderersByPath, simpleMyPortalRouteRenderersByPath, newAppealRouteRenderersByPath, + callbackRouteRenderersByPath, caseDetailRouteRenderersByPath, detailAndAccountRouteRenderersByPath } = createMappedRouteRendererGroups({ @@ -230,6 +231,9 @@ const Breadcrumbs = (props) => { currentReference, nestedSearchString, caseReferenceDisplay, + onBack: () => { + router.back(); + }, renderAnchorCrumb, renderLinkCrumb, renderTextCrumb, @@ -244,6 +248,7 @@ const Breadcrumbs = (props) => { simpleLinkTextPairRenderersByPath, simpleMyPortalRouteRenderersByPath, newAppealRouteRenderersByPath, + callbackRouteRenderersByPath, caseDetailRouteRenderersByPath, detailAndAccountRouteRenderersByPath }); @@ -308,45 +313,6 @@ const Breadcrumbs = (props) => { )} - {isPath("/myportal/case/id/[incident]") && ( - <> - {renderMyPortalCrumb()} - {renderLinkCrumb( - isWelsh - ? `/${router.locale}/fymhorth/chwiliadcyfeiriadau` - : "/myportal/addresssearch", - t("common:breadcrumb-address-search") - )} - {renderLinkCrumb( - isWelsh - ? `/${router.locale}/fymhorth/canlyniadaucyfeiriadau?${nestedSearchString}` - : `/myportal/addresssearchresults?${nestedSearchString}`, - t( - "common:breadcrumb-address-search-results" - ), - () => { - router.back(); - } - )} - {renderCaseReferenceCrumb(currentReference)} - - )} - - {isPath("/case") && ( - <> - {renderLinkCrumb( - isWelsh - ? `${router.locale}/searchresults?q=${router.query.q}&page=${router.query.page}` - : `/searchresults?q=${router.query.q}&page=${router.query.page}`, - t("common:breadcrumb-search-results"), - () => { - router.back(); - } - )} - {renderCaseReferenceCrumb(currentReference)} - - )} - {isPath("/myportal/representation") && ( <> {currentView.representationSubmit === true && diff --git a/lib/routing/breadcrumbRendererFactories.js b/lib/routing/breadcrumbRendererFactories.js index ad9efc92..40048dfc 100644 --- a/lib/routing/breadcrumbRendererFactories.js +++ b/lib/routing/breadcrumbRendererFactories.js @@ -122,6 +122,51 @@ export const createNewAppealRouteRenderers = ({ ) }); +export const createCallbackRouteRenderers = ({ + t, + router, + isWelsh, + nestedSearchString, + currentReference, + renderMyPortalCrumb, + renderLinkCrumb, + renderCaseReferenceCrumb, + onBack +}) => ({ + "/myportal/case/id/[incident]": () => ( + <> + {renderMyPortalCrumb()} + {renderLinkCrumb( + isWelsh + ? `/${router.locale}/fymhorth/chwiliadcyfeiriadau` + : "/myportal/addresssearch", + t("common:breadcrumb-address-search") + )} + {renderLinkCrumb( + isWelsh + ? `/${router.locale}/fymhorth/canlyniadaucyfeiriadau?${nestedSearchString}` + : `/myportal/addresssearchresults?${nestedSearchString}`, + t("common:breadcrumb-address-search-results"), + onBack + )} + {renderCaseReferenceCrumb(currentReference)} + + ), + + "/case": () => ( + <> + {renderLinkCrumb( + isWelsh + ? `${router.locale}/searchresults?q=${router.query.q}&page=${router.query.page}` + : `/searchresults?q=${router.query.q}&page=${router.query.page}`, + t("common:breadcrumb-search-results"), + onBack + )} + {renderCaseReferenceCrumb(currentReference)} + + ) +}); + export const createCaseDetailRouteRenderers = ({ t, router, @@ -372,6 +417,7 @@ export const createMappedRouteRendererGroups = ({ currentReference, nestedSearchString, caseReferenceDisplay, + onBack, renderAnchorCrumb, renderLinkCrumb, renderTextCrumb, @@ -418,6 +464,18 @@ export const createMappedRouteRendererGroups = ({ renderTextCrumb }); + const callbackRouteRenderersByPath = createCallbackRouteRenderers({ + t, + router, + isWelsh, + nestedSearchString, + currentReference, + renderMyPortalCrumb, + renderLinkCrumb, + renderCaseReferenceCrumb, + onBack + }); + const caseDetailRouteRenderersByPath = createCaseDetailRouteRenderers({ t, router, @@ -453,6 +511,7 @@ export const createMappedRouteRendererGroups = ({ simpleLinkTextPairRenderersByPath, simpleMyPortalRouteRenderersByPath, newAppealRouteRenderersByPath, + callbackRouteRenderersByPath, caseDetailRouteRenderersByPath, detailAndAccountRouteRenderersByPath }; diff --git a/lib/routing/breadcrumbRouteMaps.js b/lib/routing/breadcrumbRouteMaps.js index ef46b5f5..977da52e 100644 --- a/lib/routing/breadcrumbRouteMaps.js +++ b/lib/routing/breadcrumbRouteMaps.js @@ -23,6 +23,7 @@ const buildBreadcrumbRendererMaps = ({ simpleLinkTextPairRenderersByPath, simpleMyPortalRouteRenderersByPath, newAppealRouteRenderersByPath, + callbackRouteRenderersByPath, caseDetailRouteRenderersByPath, detailAndAccountRouteRenderersByPath }) => [ @@ -30,6 +31,7 @@ const buildBreadcrumbRendererMaps = ({ simpleLinkTextPairRenderersByPath, simpleMyPortalRouteRenderersByPath, newAppealRouteRenderersByPath, + callbackRouteRenderersByPath, caseDetailRouteRenderersByPath, detailAndAccountRouteRenderersByPath ]; diff --git a/memory-bank/change-log.md b/memory-bank/change-log.md index 89b9bfc6..dfd38bcc 100644 --- a/memory-bank/change-log.md +++ b/memory-bank/change-log.md @@ -668,6 +668,47 @@ Follow-ups: - Next larger slice: extract remaining callback-bearing deterministic branches into mapped route groups with callback injection, then update structure guards accordingly. +### CL-22541-V: breadcrumbs larger slice — callback route-group extraction (`/myportal/case/id/[incident]`, `/case`) + +date: 2026-04-09 +author: Cline +scope: `lib/routing/{breadcrumbRendererFactories,breadcrumbRouteMaps}.js`, `components/breadcrumbs.js`, `tests/phase22/{breadcrumb-route-maps-helper,breadcrumbs-route-map-structure}.test.cjs` +type: change +rationale: Execute the next larger extraction slice by moving callback-bearing breadcrumb branches into a dedicated callback renderer map while preserving `router.back()` behavior through explicit callback injection. +impact: Structural refactor with preserved callback semantics; no intended route/auth/session/API/EN-CY/a11y behavior change. +status: completed + +Summary: + +- Added `createCallbackRouteRenderers(...)` in `lib/routing/breadcrumbRendererFactories.js` to map: + - `/myportal/case/id/[incident]` + - `/case` +- Introduced explicit callback injection (`onBack`) into grouped factory composition and route renderers, preserving `router.back()` behavior via injected callback. +- Extended `createMappedRouteRendererGroups(...)` return with `callbackRouteRenderersByPath`. +- Updated map builder in `lib/routing/breadcrumbRouteMaps.js` to include callback map in explicit precedence order: + - simple -> link-text -> myportal -> new-appeal -> callback -> case detail -> detail/account. +- Updated `components/breadcrumbs.js`: + - pass `onBack: () => { router.back(); }` into grouped factory composition + - include callback route map in `buildBreadcrumbRendererMaps(...)` + - remove now-redundant inline `isPath("/myportal/case/id/[incident]")` and `isPath("/case")` branches. +- Expanded tests: + - `tests/phase22/breadcrumb-route-maps-helper.test.cjs` + - update grouped map order assertions to seven maps including callback group. + - `tests/phase22/breadcrumbs-route-map-structure.test.cjs` + - assert callback factory export and mapped callback route presence + - assert callback map inclusion in component grouped destructuring and map-order invariant + - assert inline callback branches are removed while `router.back();` remains preserved. + +Validation: + +- `npx eslint lib/routing/breadcrumbRendererFactories.js lib/routing/breadcrumbRouteMaps.js components/breadcrumbs.js tests/phase22/breadcrumb-route-maps-helper.test.cjs tests/phase22/breadcrumbs-route-map-structure.test.cjs tests/phase22/index.test.cjs` -> pass. +- `node tests/phase22/index.test.cjs` -> pass (combined suite). + +Follow-ups: + +- Next smaller slice candidate: add a focused helper test for empty-string/whitespace path lookups to assert strict null behavior for non-exact keys. +- Next larger slice candidate: evaluate whether `/newappeal/[appealtypes]` and `/myportal/[appealtypes]` back-link branches can be extracted with explicit callback/setter injection while preserving state-step semantics. + ### CL-00X: 22500 `components/elements/index.js` Phase 1 helper extraction date: 2026-04-07 diff --git a/tests/phase22/breadcrumb-route-maps-helper.test.cjs b/tests/phase22/breadcrumb-route-maps-helper.test.cjs index 8f04ee21..57d7187c 100644 --- a/tests/phase22/breadcrumb-route-maps-helper.test.cjs +++ b/tests/phase22/breadcrumb-route-maps-helper.test.cjs @@ -60,6 +60,9 @@ test("buildBreadcrumbRendererMaps returns grouped maps in explicit precedence or const newAppealRouteRenderersByPath = { "/eta": () => "eta" }; + const callbackRouteRenderersByPath = { + "/theta": () => "theta" + }; const caseDetailRouteRenderersByPath = { "/delta": () => "delta" }; @@ -72,12 +75,13 @@ test("buildBreadcrumbRendererMaps returns grouped maps in explicit precedence or simpleLinkTextPairRenderersByPath, simpleMyPortalRouteRenderersByPath, newAppealRouteRenderersByPath, + callbackRouteRenderersByPath, caseDetailRouteRenderersByPath, detailAndAccountRouteRenderersByPath }); assert.ok(Array.isArray(result), "Expected grouped maps array"); - assert.strictEqual(result.length, 6, "Expected six grouped route maps"); + assert.strictEqual(result.length, 7, "Expected seven grouped route maps"); assert.strictEqual( result[0], simpleRouteRenderersByPath, @@ -100,13 +104,18 @@ test("buildBreadcrumbRendererMaps returns grouped maps in explicit precedence or ); assert.strictEqual( result[4], - caseDetailRouteRenderersByPath, - "Expected case detail route renderers fifth" + callbackRouteRenderersByPath, + "Expected callback route renderers fifth" ); assert.strictEqual( result[5], + caseDetailRouteRenderersByPath, + "Expected case detail route renderers sixth" + ); + assert.strictEqual( + result[6], detailAndAccountRouteRenderersByPath, - "Expected detail and account route renderers sixth" + "Expected detail and account route renderers seventh" ); }); @@ -126,6 +135,7 @@ test("resolveMappedRouteRenderer returns renderer from first matching grouped ma }, simpleMyPortalRouteRenderersByPath: {}, newAppealRouteRenderersByPath: {}, + callbackRouteRenderersByPath: {}, caseDetailRouteRenderersByPath: {}, detailAndAccountRouteRenderersByPath: {} }); @@ -153,6 +163,7 @@ test("resolveMappedRouteRenderer returns renderer from later grouped map when ea }, simpleMyPortalRouteRenderersByPath: {}, caseDetailRouteRenderersByPath: {}, + callbackRouteRenderersByPath: {}, detailAndAccountRouteRenderersByPath: { "/account/personaldetails": detailRenderer } @@ -178,6 +189,7 @@ test("resolveMappedRouteRenderer returns null for unmapped path", () => { simpleLinkTextPairRenderersByPath: {}, simpleMyPortalRouteRenderersByPath: {}, newAppealRouteRenderersByPath: {}, + callbackRouteRenderersByPath: {}, caseDetailRouteRenderersByPath: {}, detailAndAccountRouteRenderersByPath: {} }); @@ -206,6 +218,7 @@ test("resolveMappedRouteRenderer skips invalid map entries and non-function rend "/known": validRenderer }, newAppealRouteRenderersByPath: undefined, + callbackRouteRenderersByPath: {}, caseDetailRouteRenderersByPath: {}, detailAndAccountRouteRenderersByPath: {} }); diff --git a/tests/phase22/breadcrumbs-route-map-structure.test.cjs b/tests/phase22/breadcrumbs-route-map-structure.test.cjs index 5cf9d452..8834073e 100644 --- a/tests/phase22/breadcrumbs-route-map-structure.test.cjs +++ b/tests/phase22/breadcrumbs-route-map-structure.test.cjs @@ -42,6 +42,12 @@ test("breadcrumbs/factory module includes expected mapped route definitions", as "Expected new-appeal route renderer factory export" ); + assert.strictEqual( + source.includes("export const createCallbackRouteRenderers ="), + true, + "Expected callback route renderer factory export" + ); + assert.strictEqual( source.includes("export const createCaseDetailRouteRenderers ="), true, @@ -96,6 +102,18 @@ test("breadcrumbs/factory module includes expected mapped route definitions", as "Expected /newappeal/selectappeal to be mapped in createNewAppealRouteRenderers" ); + assert.strictEqual( + source.includes('"/myportal/case/id/[incident]": () => ('), + true, + "Expected /myportal/case/id/[incident] to be mapped in createCallbackRouteRenderers" + ); + + assert.strictEqual( + source.includes('"/case": () => ('), + true, + "Expected /case to be mapped in createCallbackRouteRenderers" + ); + assert.strictEqual( source.includes('"/case/[ticketnumber]": () =>'), true, @@ -185,7 +203,7 @@ test("breadcrumbs/component composes mapped routes via imported factories and sh ); assert.strictEqual( - /const\s+\{[\s\S]*simpleRouteRenderersByPath[\s\S]*newAppealRouteRenderersByPath[\s\S]*detailAndAccountRouteRenderersByPath[\s\S]*\}\s*=\s*createMappedRouteRendererGroups\s*\(/.test( + /const\s+\{[\s\S]*simpleRouteRenderersByPath[\s\S]*newAppealRouteRenderersByPath[\s\S]*callbackRouteRenderersByPath[\s\S]*detailAndAccountRouteRenderersByPath[\s\S]*\}\s*=\s*createMappedRouteRendererGroups\s*\(/.test( source ), true, @@ -351,6 +369,9 @@ test("breadcrumbs/map builder preserves route map ordering", async () => { const newAppealOrderIndex = mapBuilderSlice.indexOf( "newAppealRouteRenderersByPath" ); + const callbackOrderIndex = mapBuilderSlice.indexOf( + "callbackRouteRenderersByPath" + ); const caseDetailOrderIndex = mapBuilderSlice.indexOf( "caseDetailRouteRenderersByPath" ); @@ -363,26 +384,33 @@ test("breadcrumbs/map builder preserves route map ordering", async () => { simpleLinkTextPairOrderIndex > simpleRouteOrderIndex && simpleMyPortalOrderIndex > simpleLinkTextPairOrderIndex && newAppealOrderIndex > simpleMyPortalOrderIndex && - caseDetailOrderIndex > newAppealOrderIndex && + callbackOrderIndex > newAppealOrderIndex && + caseDetailOrderIndex > callbackOrderIndex && detailAndAccountOrderIndex > caseDetailOrderIndex, true, - "Expected map builder call to preserve explicit route-map ordering (simple -> link-text -> myportal -> new-appeal -> case detail -> detail/account)" + "Expected map builder call to preserve explicit route-map ordering (simple -> link-text -> myportal -> new-appeal -> callback -> case detail -> detail/account)" ); }); -test("breadcrumbs/dynamic callback branch remains explicit for myportal case incident route", async () => { +test("breadcrumbs/callback-mapped branches preserve router.back behavior", async () => { const source = loadBreadcrumbSource(); assert.strictEqual( source.includes('isPath("/myportal/case/id/[incident]")'), - true, - "Expected dynamic /myportal/case/id/[incident] breadcrumb branch to remain explicit" + false, + "Expected /myportal/case/id/[incident] explicit branch to be removed after callback mapping" + ); + + assert.strictEqual( + source.includes('isPath("/case")'), + false, + "Expected /case explicit branch to be removed after callback mapping" ); assert.strictEqual( source.includes("router.back();"), true, - "Expected callback-driven router.back() behavior to remain explicit" + "Expected callback-driven router.back() behavior to remain preserved" ); }); From cebd47bf1ce006b5c912cb80379e5f319f8d2e72 Mon Sep 17 00:00:00 2001 From: robbond Date: Thu, 9 Apr 2026 15:03:19 +0100 Subject: [PATCH 26/33] refactor(breadcrumbs): map step-back route branches into renderer group --- components/breadcrumbs.js | 51 ++++-------------- lib/routing/breadcrumbRendererFactories.js | 52 ++++++++++++++++++- lib/routing/breadcrumbRouteMaps.js | 2 + memory-bank/change-log.md | 45 ++++++++++++++++ .../breadcrumb-route-maps-helper.test.cjs | 21 ++++++-- .../breadcrumbs-route-map-structure.test.cjs | 40 ++++++++++++-- 6 files changed, 163 insertions(+), 48 deletions(-) diff --git a/components/breadcrumbs.js b/components/breadcrumbs.js index 379109a7..01c045be 100644 --- a/components/breadcrumbs.js +++ b/components/breadcrumbs.js @@ -215,6 +215,7 @@ const Breadcrumbs = (props) => { simpleMyPortalRouteRenderersByPath, newAppealRouteRenderersByPath, callbackRouteRenderersByPath, + stepBackRouteRenderersByPath, caseDetailRouteRenderersByPath, detailAndAccountRouteRenderersByPath } = createMappedRouteRendererGroups({ @@ -234,13 +235,21 @@ const Breadcrumbs = (props) => { onBack: () => { router.back(); }, + currentSection: appealType.currentSection, + onStepBack: () => { + setCurrentSection(appealType.currentSection - 1); + }, + onStepBackWithInlineClass: () => { + setCurrentSection(appealType.currentSection - 1); + }, renderAnchorCrumb, renderLinkCrumb, renderTextCrumb, renderCaseReferenceCrumb, renderMyPortalCrumb, renderMyPortalSectionCrumbs, - renderDnsCaseReferenceCrumbs + renderDnsCaseReferenceCrumbs, + renderBackCrumb }); const mappedRouteRendererMaps = buildBreadcrumbRendererMaps({ @@ -249,6 +258,7 @@ const Breadcrumbs = (props) => { simpleMyPortalRouteRenderersByPath, newAppealRouteRenderersByPath, callbackRouteRenderersByPath, + stepBackRouteRenderersByPath, caseDetailRouteRenderersByPath, detailAndAccountRouteRenderersByPath }); @@ -274,45 +284,6 @@ const Breadcrumbs = (props) => { {isPath("/newappeal") && <>} - {isPath("/newappeal/[appealtypes]") && ( - <> - {appealType.currentSection > 1 && - (appealType.currentSection === 9999 - ? renderLinkCrumb( - "/", - t( - "common:service-name-breadcrumb" - ) - ) - : renderBackCrumb( - () => - setCurrentSection( - appealType.currentSection - - 1 - ), - "govuk-breadcrumbs__link-item" - ))} - - )} - - {isPath("/myportal/[appealtypes]") && ( - <> - {appealType.currentSection > 1 && - (appealType.currentSection === 9999 - ? renderLinkCrumb( - "/", - t( - "common:service-name-breadcrumb" - ) - ) - : renderBackCrumb(() => - setCurrentSection( - appealType.currentSection - 1 - ) - ))} - - )} - {isPath("/myportal/representation") && ( <> {currentView.representationSubmit === true && diff --git a/lib/routing/breadcrumbRendererFactories.js b/lib/routing/breadcrumbRendererFactories.js index 40048dfc..ae8d6c40 100644 --- a/lib/routing/breadcrumbRendererFactories.js +++ b/lib/routing/breadcrumbRendererFactories.js @@ -167,6 +167,42 @@ export const createCallbackRouteRenderers = ({ ) }); +export const createStepBackRouteRenderers = ({ + t, + currentSection, + onStepBack, + onStepBackWithInlineClass, + renderLinkCrumb, + renderBackCrumb +}) => ({ + "/newappeal/[appealtypes]": () => { + if (currentSection <= 1) { + return null; + } + + if (currentSection === 9999) { + return renderLinkCrumb("/", t("common:service-name-breadcrumb")); + } + + return renderBackCrumb( + onStepBackWithInlineClass, + "govuk-breadcrumbs__link-item" + ); + }, + + "/myportal/[appealtypes]": () => { + if (currentSection <= 1) { + return null; + } + + if (currentSection === 9999) { + return renderLinkCrumb("/", t("common:service-name-breadcrumb")); + } + + return renderBackCrumb(onStepBack); + } +}); + export const createCaseDetailRouteRenderers = ({ t, router, @@ -418,13 +454,17 @@ export const createMappedRouteRendererGroups = ({ nestedSearchString, caseReferenceDisplay, onBack, + currentSection, + onStepBack, + onStepBackWithInlineClass, renderAnchorCrumb, renderLinkCrumb, renderTextCrumb, renderCaseReferenceCrumb, renderMyPortalCrumb, renderMyPortalSectionCrumbs, - renderDnsCaseReferenceCrumbs + renderDnsCaseReferenceCrumbs, + renderBackCrumb }) => { const simpleRouteRenderersByPath = createSimpleRouteRenderers({ t, @@ -476,6 +516,15 @@ export const createMappedRouteRendererGroups = ({ onBack }); + const stepBackRouteRenderersByPath = createStepBackRouteRenderers({ + t, + currentSection, + onStepBack, + onStepBackWithInlineClass, + renderLinkCrumb, + renderBackCrumb + }); + const caseDetailRouteRenderersByPath = createCaseDetailRouteRenderers({ t, router, @@ -512,6 +561,7 @@ export const createMappedRouteRendererGroups = ({ simpleMyPortalRouteRenderersByPath, newAppealRouteRenderersByPath, callbackRouteRenderersByPath, + stepBackRouteRenderersByPath, caseDetailRouteRenderersByPath, detailAndAccountRouteRenderersByPath }; diff --git a/lib/routing/breadcrumbRouteMaps.js b/lib/routing/breadcrumbRouteMaps.js index 977da52e..5666de00 100644 --- a/lib/routing/breadcrumbRouteMaps.js +++ b/lib/routing/breadcrumbRouteMaps.js @@ -24,6 +24,7 @@ const buildBreadcrumbRendererMaps = ({ simpleMyPortalRouteRenderersByPath, newAppealRouteRenderersByPath, callbackRouteRenderersByPath, + stepBackRouteRenderersByPath, caseDetailRouteRenderersByPath, detailAndAccountRouteRenderersByPath }) => [ @@ -32,6 +33,7 @@ const buildBreadcrumbRendererMaps = ({ simpleMyPortalRouteRenderersByPath, newAppealRouteRenderersByPath, callbackRouteRenderersByPath, + stepBackRouteRenderersByPath, caseDetailRouteRenderersByPath, detailAndAccountRouteRenderersByPath ]; diff --git a/memory-bank/change-log.md b/memory-bank/change-log.md index dfd38bcc..124e7eec 100644 --- a/memory-bank/change-log.md +++ b/memory-bank/change-log.md @@ -709,6 +709,51 @@ Follow-ups: - Next smaller slice candidate: add a focused helper test for empty-string/whitespace path lookups to assert strict null behavior for non-exact keys. - Next larger slice candidate: evaluate whether `/newappeal/[appealtypes]` and `/myportal/[appealtypes]` back-link branches can be extracted with explicit callback/setter injection while preserving state-step semantics. +### CL-22541-W: breadcrumbs larger slice — step-back route-group extraction (`/newappeal/[appealtypes]`, `/myportal/[appealtypes]`) + +date: 2026-04-09 +author: Cline +scope: `lib/routing/{breadcrumbRendererFactories,breadcrumbRouteMaps}.js`, `components/breadcrumbs.js`, `tests/phase22/{breadcrumb-route-maps-helper,breadcrumbs-route-map-structure}.test.cjs` +type: change +rationale: Execute the next larger extraction slice by moving step-based back-link branches into a dedicated mapped route group with explicit setter callback injection, preserving section-navigation semantics. +impact: Structural refactor with preserved back-link and step-state behavior; no intended route/auth/session/API/EN-CY/a11y behavior change. +status: completed + +Summary: + +- Added `createStepBackRouteRenderers(...)` in `lib/routing/breadcrumbRendererFactories.js` to map: + - `/newappeal/[appealtypes]` + - `/myportal/[appealtypes]` +- Preserved existing step semantics in mapped handlers: + - no crumb when `currentSection <= 1` + - service-name crumb when `currentSection === 9999` + - back-link crumb with existing class parity (`govuk-breadcrumbs__link-item` for new-appeal flow) +- Introduced explicit injected handlers (`onStepBack`, `onStepBackWithInlineClass`) and injected crumb renderer dependency (`renderBackCrumb`) into grouped factory composition. +- Extended map builder in `lib/routing/breadcrumbRouteMaps.js` with `stepBackRouteRenderersByPath` and updated precedence order: + - simple -> link-text -> myportal -> new-appeal -> callback -> step-back -> case detail -> detail/account. +- Updated `components/breadcrumbs.js`: + - pass `currentSection` and step-back callbacks into `createMappedRouteRendererGroups(...)` + - include step-back map in `buildBreadcrumbRendererMaps(...)` + - remove inline `isPath("/newappeal/[appealtypes]")` and `isPath("/myportal/[appealtypes]")` branches. +- Expanded tests: + - `tests/phase22/breadcrumb-route-maps-helper.test.cjs` + - updated grouped map count/order to include step-back map (8 total) + - `tests/phase22/breadcrumbs-route-map-structure.test.cjs` + - assert step-back factory export + mapped route presence + - assert grouped destructuring includes step-back map + - assert inline step-back branches are removed + - assert updated map-order invariant includes step-back group. + +Validation: + +- `npx eslint lib/routing/breadcrumbRendererFactories.js lib/routing/breadcrumbRouteMaps.js components/breadcrumbs.js tests/phase22/breadcrumb-route-maps-helper.test.cjs tests/phase22/breadcrumbs-route-map-structure.test.cjs tests/phase22/index.test.cjs` -> pass. +- `node tests/phase22/index.test.cjs` -> pass (combined suite). + +Follow-ups: + +- Next smaller slice candidate: add focused helper test for strict null behavior on empty-string/whitespace/non-exact path keys. +- Next larger slice candidate: evaluate extractability of `/myportal/representation` back-link states via explicit callback injection, only if questionnaire/submit side-effects remain parity-safe and readable. + ### CL-00X: 22500 `components/elements/index.js` Phase 1 helper extraction date: 2026-04-07 diff --git a/tests/phase22/breadcrumb-route-maps-helper.test.cjs b/tests/phase22/breadcrumb-route-maps-helper.test.cjs index 57d7187c..3dec5147 100644 --- a/tests/phase22/breadcrumb-route-maps-helper.test.cjs +++ b/tests/phase22/breadcrumb-route-maps-helper.test.cjs @@ -63,6 +63,9 @@ test("buildBreadcrumbRendererMaps returns grouped maps in explicit precedence or const callbackRouteRenderersByPath = { "/theta": () => "theta" }; + const stepBackRouteRenderersByPath = { + "/iota": () => "iota" + }; const caseDetailRouteRenderersByPath = { "/delta": () => "delta" }; @@ -76,12 +79,13 @@ test("buildBreadcrumbRendererMaps returns grouped maps in explicit precedence or simpleMyPortalRouteRenderersByPath, newAppealRouteRenderersByPath, callbackRouteRenderersByPath, + stepBackRouteRenderersByPath, caseDetailRouteRenderersByPath, detailAndAccountRouteRenderersByPath }); assert.ok(Array.isArray(result), "Expected grouped maps array"); - assert.strictEqual(result.length, 7, "Expected seven grouped route maps"); + assert.strictEqual(result.length, 8, "Expected eight grouped route maps"); assert.strictEqual( result[0], simpleRouteRenderersByPath, @@ -109,13 +113,18 @@ test("buildBreadcrumbRendererMaps returns grouped maps in explicit precedence or ); assert.strictEqual( result[5], - caseDetailRouteRenderersByPath, - "Expected case detail route renderers sixth" + stepBackRouteRenderersByPath, + "Expected step-back route renderers sixth" ); assert.strictEqual( result[6], + caseDetailRouteRenderersByPath, + "Expected case detail route renderers seventh" + ); + assert.strictEqual( + result[7], detailAndAccountRouteRenderersByPath, - "Expected detail and account route renderers seventh" + "Expected detail and account route renderers eighth" ); }); @@ -136,6 +145,7 @@ test("resolveMappedRouteRenderer returns renderer from first matching grouped ma simpleMyPortalRouteRenderersByPath: {}, newAppealRouteRenderersByPath: {}, callbackRouteRenderersByPath: {}, + stepBackRouteRenderersByPath: {}, caseDetailRouteRenderersByPath: {}, detailAndAccountRouteRenderersByPath: {} }); @@ -164,6 +174,7 @@ test("resolveMappedRouteRenderer returns renderer from later grouped map when ea simpleMyPortalRouteRenderersByPath: {}, caseDetailRouteRenderersByPath: {}, callbackRouteRenderersByPath: {}, + stepBackRouteRenderersByPath: {}, detailAndAccountRouteRenderersByPath: { "/account/personaldetails": detailRenderer } @@ -190,6 +201,7 @@ test("resolveMappedRouteRenderer returns null for unmapped path", () => { simpleMyPortalRouteRenderersByPath: {}, newAppealRouteRenderersByPath: {}, callbackRouteRenderersByPath: {}, + stepBackRouteRenderersByPath: {}, caseDetailRouteRenderersByPath: {}, detailAndAccountRouteRenderersByPath: {} }); @@ -219,6 +231,7 @@ test("resolveMappedRouteRenderer skips invalid map entries and non-function rend }, newAppealRouteRenderersByPath: undefined, callbackRouteRenderersByPath: {}, + stepBackRouteRenderersByPath: {}, caseDetailRouteRenderersByPath: {}, detailAndAccountRouteRenderersByPath: {} }); diff --git a/tests/phase22/breadcrumbs-route-map-structure.test.cjs b/tests/phase22/breadcrumbs-route-map-structure.test.cjs index 8834073e..429a01e4 100644 --- a/tests/phase22/breadcrumbs-route-map-structure.test.cjs +++ b/tests/phase22/breadcrumbs-route-map-structure.test.cjs @@ -48,6 +48,12 @@ test("breadcrumbs/factory module includes expected mapped route definitions", as "Expected callback route renderer factory export" ); + assert.strictEqual( + source.includes("export const createStepBackRouteRenderers ="), + true, + "Expected step-back route renderer factory export" + ); + assert.strictEqual( source.includes("export const createCaseDetailRouteRenderers ="), true, @@ -114,6 +120,18 @@ test("breadcrumbs/factory module includes expected mapped route definitions", as "Expected /case to be mapped in createCallbackRouteRenderers" ); + assert.strictEqual( + source.includes('"/newappeal/[appealtypes]": () => {'), + true, + "Expected /newappeal/[appealtypes] to be mapped in createStepBackRouteRenderers" + ); + + assert.strictEqual( + source.includes('"/myportal/[appealtypes]": () => {'), + true, + "Expected /myportal/[appealtypes] to be mapped in createStepBackRouteRenderers" + ); + assert.strictEqual( source.includes('"/case/[ticketnumber]": () =>'), true, @@ -203,7 +221,7 @@ test("breadcrumbs/component composes mapped routes via imported factories and sh ); assert.strictEqual( - /const\s+\{[\s\S]*simpleRouteRenderersByPath[\s\S]*newAppealRouteRenderersByPath[\s\S]*callbackRouteRenderersByPath[\s\S]*detailAndAccountRouteRenderersByPath[\s\S]*\}\s*=\s*createMappedRouteRendererGroups\s*\(/.test( + /const\s+\{[\s\S]*simpleRouteRenderersByPath[\s\S]*newAppealRouteRenderersByPath[\s\S]*callbackRouteRenderersByPath[\s\S]*stepBackRouteRenderersByPath[\s\S]*detailAndAccountRouteRenderersByPath[\s\S]*\}\s*=\s*createMappedRouteRendererGroups\s*\(/.test( source ), true, @@ -290,6 +308,18 @@ test("breadcrumbs/component composes mapped routes via imported factories and sh "Expected /newappeal/selectappeal explicit branch to be removed after mapping" ); + assert.strictEqual( + source.includes('isPath("/newappeal/[appealtypes]")'), + false, + "Expected /newappeal/[appealtypes] explicit branch to be removed after step-back mapping" + ); + + assert.strictEqual( + source.includes('isPath("/myportal/[appealtypes]")'), + false, + "Expected /myportal/[appealtypes] explicit branch to be removed after step-back mapping" + ); + assert.strictEqual( source.includes('isPath("/myportal/case/[ticketnumber]")'), false, @@ -372,6 +402,9 @@ test("breadcrumbs/map builder preserves route map ordering", async () => { const callbackOrderIndex = mapBuilderSlice.indexOf( "callbackRouteRenderersByPath" ); + const stepBackOrderIndex = mapBuilderSlice.indexOf( + "stepBackRouteRenderersByPath" + ); const caseDetailOrderIndex = mapBuilderSlice.indexOf( "caseDetailRouteRenderersByPath" ); @@ -385,10 +418,11 @@ test("breadcrumbs/map builder preserves route map ordering", async () => { simpleMyPortalOrderIndex > simpleLinkTextPairOrderIndex && newAppealOrderIndex > simpleMyPortalOrderIndex && callbackOrderIndex > newAppealOrderIndex && - caseDetailOrderIndex > callbackOrderIndex && + stepBackOrderIndex > callbackOrderIndex && + caseDetailOrderIndex > stepBackOrderIndex && detailAndAccountOrderIndex > caseDetailOrderIndex, true, - "Expected map builder call to preserve explicit route-map ordering (simple -> link-text -> myportal -> new-appeal -> callback -> case detail -> detail/account)" + "Expected map builder call to preserve explicit route-map ordering (simple -> link-text -> myportal -> new-appeal -> callback -> step-back -> case detail -> detail/account)" ); }); From 7a60e64a8429e0f0b87c15d234758dfa0a38e1f2 Mon Sep 17 00:00:00 2001 From: robbond Date: Thu, 9 Apr 2026 15:06:41 +0100 Subject: [PATCH 27/33] test(breadcrumbs): assert strict null on non-exact route map lookups --- memory-bank/change-log.md | 30 +++++++++++ .../breadcrumb-route-maps-helper.test.cjs | 50 +++++++++++++++++++ 2 files changed, 80 insertions(+) diff --git a/memory-bank/change-log.md b/memory-bank/change-log.md index 124e7eec..f303f84e 100644 --- a/memory-bank/change-log.md +++ b/memory-bank/change-log.md @@ -754,6 +754,36 @@ Follow-ups: - Next smaller slice candidate: add focused helper test for strict null behavior on empty-string/whitespace/non-exact path keys. - Next larger slice candidate: evaluate extractability of `/myportal/representation` back-link states via explicit callback injection, only if questionnaire/submit side-effects remain parity-safe and readable. +### CL-22541-X: breadcrumbs smaller slice — strict null lookup guard coverage (empty/whitespace/non-exact paths) + +date: 2026-04-09 +author: Cline +scope: `tests/phase22/breadcrumb-route-maps-helper.test.cjs` +type: change +rationale: Execute the queued smaller follow-up slice by hardening helper regression coverage for strict exact-match route lookup semantics. +impact: Test-only hardening; no runtime route/auth/session/API/EN-CY/a11y behavior change. +status: completed + +Summary: + +- Added focused helper-level test case in `tests/phase22/breadcrumb-route-maps-helper.test.cjs`: + - `resolveMappedRouteRenderer returns null for empty, whitespace, and non-exact path variants` +- New assertions verify resolver returns `null` for: + - empty path (`""`) + - whitespace-only path (`" "`) + - trailing/leading whitespace variants (`"/known "`, `" /known"`) + - case-variant non-exact key (`"/KNOWN"`) +- Confirms route-map resolver remains strict/exact and does not auto-trim or case-normalize lookup keys. + +Validation: + +- `npx eslint tests/phase22/breadcrumb-route-maps-helper.test.cjs tests/phase22/index.test.cjs` -> pass. +- `node tests/phase22/index.test.cjs` -> pass (combined suite; breadcrumb-route-maps-helper 6/6). + +Follow-ups: + +- Next larger slice candidate remains `/myportal/representation` callback/state branch extraction only if side-effects can be injected/parity-preserved cleanly. + ### CL-00X: 22500 `components/elements/index.js` Phase 1 helper extraction date: 2026-04-07 diff --git a/tests/phase22/breadcrumb-route-maps-helper.test.cjs b/tests/phase22/breadcrumb-route-maps-helper.test.cjs index 3dec5147..30c627bf 100644 --- a/tests/phase22/breadcrumb-route-maps-helper.test.cjs +++ b/tests/phase22/breadcrumb-route-maps-helper.test.cjs @@ -215,6 +215,56 @@ test("resolveMappedRouteRenderer returns null for unmapped path", () => { ); }); +test("resolveMappedRouteRenderer returns null for empty, whitespace, and non-exact path variants", () => { + const { buildBreadcrumbRendererMaps, resolveMappedRouteRenderer } = + loadHelpers(); + + const knownRenderer = () => "known"; + + const maps = buildBreadcrumbRendererMaps({ + simpleRouteRenderersByPath: { + "/known": knownRenderer + }, + simpleLinkTextPairRenderersByPath: {}, + simpleMyPortalRouteRenderersByPath: {}, + newAppealRouteRenderersByPath: {}, + callbackRouteRenderersByPath: {}, + stepBackRouteRenderersByPath: {}, + caseDetailRouteRenderersByPath: {}, + detailAndAccountRouteRenderersByPath: {} + }); + + assert.strictEqual( + resolveMappedRouteRenderer("", maps), + null, + "Expected null for empty path lookup when no empty key is mapped" + ); + + assert.strictEqual( + resolveMappedRouteRenderer(" ", maps), + null, + "Expected null for whitespace-only path lookup" + ); + + assert.strictEqual( + resolveMappedRouteRenderer("/known ", maps), + null, + "Expected null for non-exact path variant with trailing whitespace" + ); + + assert.strictEqual( + resolveMappedRouteRenderer(" /known", maps), + null, + "Expected null for non-exact path variant with leading whitespace" + ); + + assert.strictEqual( + resolveMappedRouteRenderer("/KNOWN", maps), + null, + "Expected null for non-exact case-variant path lookup" + ); +}); + test("resolveMappedRouteRenderer skips invalid map entries and non-function renderer values", () => { const { buildBreadcrumbRendererMaps, resolveMappedRouteRenderer } = loadHelpers(); From d3f4dda8af2f067bca112539b8af1e922c466495 Mon Sep 17 00:00:00 2001 From: robbond Date: Thu, 9 Apr 2026 15:16:01 +0100 Subject: [PATCH 28/33] refactor(breadcrumbs): extract representation route-state renderer group --- components/breadcrumbs.js | 47 ++++++----------- lib/routing/breadcrumbRendererFactories.js | 50 +++++++++++++++++++ lib/routing/breadcrumbRouteMaps.js | 2 + memory-bank/change-log.md | 49 ++++++++++++++++++ .../breadcrumb-route-maps-helper.test.cjs | 22 ++++++-- .../breadcrumbs-route-map-structure.test.cjs | 28 +++++++++-- 6 files changed, 160 insertions(+), 38 deletions(-) diff --git a/components/breadcrumbs.js b/components/breadcrumbs.js index 01c045be..90f078c5 100644 --- a/components/breadcrumbs.js +++ b/components/breadcrumbs.js @@ -216,6 +216,7 @@ const Breadcrumbs = (props) => { newAppealRouteRenderersByPath, callbackRouteRenderersByPath, stepBackRouteRenderersByPath, + representationRouteRenderersByPath, caseDetailRouteRenderersByPath, detailAndAccountRouteRenderersByPath } = createMappedRouteRendererGroups({ @@ -242,6 +243,20 @@ const Breadcrumbs = (props) => { onStepBackWithInlineClass: () => { setCurrentSection(appealType.currentSection - 1); }, + currentView, + hasRepDetails, + repDetails, + showQuestionnaireSection, + onRepresentationSubmitBackFromConfirmation: () => { + setRepresentationSubmit(qcount); + }, + onRepresentationSubmitBackToDetails: () => { + setRepresentationSubmit(false); + }, + onRepresentationQuestionnaireBack: () => { + setShowQuestionnaireSection(showQuestionnaireSection - 1); + setRepresentationSubmit(false); + }, renderAnchorCrumb, renderLinkCrumb, renderTextCrumb, @@ -259,6 +274,7 @@ const Breadcrumbs = (props) => { newAppealRouteRenderersByPath, callbackRouteRenderersByPath, stepBackRouteRenderersByPath, + representationRouteRenderersByPath, caseDetailRouteRenderersByPath, detailAndAccountRouteRenderersByPath }); @@ -284,37 +300,6 @@ const Breadcrumbs = (props) => { {isPath("/newappeal") && <>} - {isPath("/myportal/representation") && ( - <> - {currentView.representationSubmit === true && - currentView.representationSubmitConfirmation !== - true && - renderBackCrumb(() => { - setRepresentationSubmit(qcount); - })} - - {currentView.representationSubmit !== true && - hasRepDetails && - repDetails?.representationType !== - "Questionnaire" && - renderBackCrumb(() => { - setRepresentationSubmit(false); - })} - - {currentView.representationSubmit !== true && - hasRepDetails && - repDetails?.representationType === - "Questionnaire" && - showQuestionnaireSection > 1 && - renderBackCrumb(() => { - setShowQuestionnaireSection( - showQuestionnaireSection - 1 - ); - setRepresentationSubmit(false); - })} - - )} - {staticTextCrumbLabel && renderTextCrumb(staticTextCrumbLabel)} diff --git a/lib/routing/breadcrumbRendererFactories.js b/lib/routing/breadcrumbRendererFactories.js index ae8d6c40..122de2ac 100644 --- a/lib/routing/breadcrumbRendererFactories.js +++ b/lib/routing/breadcrumbRendererFactories.js @@ -203,6 +203,36 @@ export const createStepBackRouteRenderers = ({ } }); +export const createRepresentationRouteRenderers = ({ + currentView, + hasRepDetails, + repDetails, + showQuestionnaireSection, + onRepresentationSubmitBackFromConfirmation, + onRepresentationSubmitBackToDetails, + onRepresentationQuestionnaireBack, + renderBackCrumb +}) => ({ + "/myportal/representation": () => ( + <> + {currentView.representationSubmit === true && + currentView.representationSubmitConfirmation !== true && + renderBackCrumb(onRepresentationSubmitBackFromConfirmation)} + + {currentView.representationSubmit !== true && + hasRepDetails && + repDetails?.representationType !== "Questionnaire" && + renderBackCrumb(onRepresentationSubmitBackToDetails)} + + {currentView.representationSubmit !== true && + hasRepDetails && + repDetails?.representationType === "Questionnaire" && + showQuestionnaireSection > 1 && + renderBackCrumb(onRepresentationQuestionnaireBack)} + + ) +}); + export const createCaseDetailRouteRenderers = ({ t, router, @@ -457,6 +487,13 @@ export const createMappedRouteRendererGroups = ({ currentSection, onStepBack, onStepBackWithInlineClass, + currentView, + hasRepDetails, + repDetails, + showQuestionnaireSection, + onRepresentationSubmitBackFromConfirmation, + onRepresentationSubmitBackToDetails, + onRepresentationQuestionnaireBack, renderAnchorCrumb, renderLinkCrumb, renderTextCrumb, @@ -525,6 +562,18 @@ export const createMappedRouteRendererGroups = ({ renderBackCrumb }); + const representationRouteRenderersByPath = + createRepresentationRouteRenderers({ + currentView, + hasRepDetails, + repDetails, + showQuestionnaireSection, + onRepresentationSubmitBackFromConfirmation, + onRepresentationSubmitBackToDetails, + onRepresentationQuestionnaireBack, + renderBackCrumb + }); + const caseDetailRouteRenderersByPath = createCaseDetailRouteRenderers({ t, router, @@ -562,6 +611,7 @@ export const createMappedRouteRendererGroups = ({ newAppealRouteRenderersByPath, callbackRouteRenderersByPath, stepBackRouteRenderersByPath, + representationRouteRenderersByPath, caseDetailRouteRenderersByPath, detailAndAccountRouteRenderersByPath }; diff --git a/lib/routing/breadcrumbRouteMaps.js b/lib/routing/breadcrumbRouteMaps.js index 5666de00..81c11364 100644 --- a/lib/routing/breadcrumbRouteMaps.js +++ b/lib/routing/breadcrumbRouteMaps.js @@ -25,6 +25,7 @@ const buildBreadcrumbRendererMaps = ({ newAppealRouteRenderersByPath, callbackRouteRenderersByPath, stepBackRouteRenderersByPath, + representationRouteRenderersByPath, caseDetailRouteRenderersByPath, detailAndAccountRouteRenderersByPath }) => [ @@ -34,6 +35,7 @@ const buildBreadcrumbRendererMaps = ({ newAppealRouteRenderersByPath, callbackRouteRenderersByPath, stepBackRouteRenderersByPath, + representationRouteRenderersByPath, caseDetailRouteRenderersByPath, detailAndAccountRouteRenderersByPath ]; diff --git a/memory-bank/change-log.md b/memory-bank/change-log.md index f303f84e..8d7a2f8a 100644 --- a/memory-bank/change-log.md +++ b/memory-bank/change-log.md @@ -784,6 +784,55 @@ Follow-ups: - Next larger slice candidate remains `/myportal/representation` callback/state branch extraction only if side-effects can be injected/parity-preserved cleanly. +### CL-22541-Y: breadcrumbs larger slice — representation route-group extraction (`/myportal/representation`) + +date: 2026-04-09 +author: Cline +scope: `lib/routing/{breadcrumbRendererFactories,breadcrumbRouteMaps}.js`, `components/breadcrumbs.js`, `tests/phase22/{breadcrumb-route-maps-helper,breadcrumbs-route-map-structure}.test.cjs` +type: change +rationale: Execute the queued larger follow-up slice by extracting `/myportal/representation` callback/state breadcrumb branches into a dedicated mapped route group with explicit callback injection while preserving questionnaire/submit side-effects. +impact: Structural refactor with preserved representation back-link state behavior; no intended route/auth/session/API/EN-CY/a11y behavior change. +status: completed + +Summary: + +- Added `createRepresentationRouteRenderers(...)` in `lib/routing/breadcrumbRendererFactories.js` mapping: + - `/myportal/representation` +- Preserved existing representation-state semantics in mapped handler: + - submit/back from confirmation (`setRepresentationSubmit(qcount)`) + - non-questionnaire back path (`setRepresentationSubmit(false)`) + - questionnaire step-back path (`setShowQuestionnaireSection(showQuestionnaireSection - 1)` + `setRepresentationSubmit(false)`) +- Introduced explicit injected state/callback dependencies into grouped composition: + - `currentView`, `hasRepDetails`, `repDetails`, `showQuestionnaireSection` + - `onRepresentationSubmitBackFromConfirmation` + - `onRepresentationSubmitBackToDetails` + - `onRepresentationQuestionnaireBack` +- Extended `buildBreadcrumbRendererMaps(...)` in `lib/routing/breadcrumbRouteMaps.js` with `representationRouteRenderersByPath` and updated precedence order: + - simple -> link-text -> myportal -> new-appeal -> callback -> step-back -> representation -> case detail -> detail/account. +- Updated `components/breadcrumbs.js`: + - pass representation state/callback injections into `createMappedRouteRendererGroups(...)` + - include `representationRouteRenderersByPath` in map builder call + - remove inline `isPath("/myportal/representation")` branch block. +- Expanded tests: + - `tests/phase22/breadcrumb-route-maps-helper.test.cjs` + - updated map-count/order assertions to include representation group (9 total) + - updated map build fixtures to include `representationRouteRenderersByPath` + - `tests/phase22/breadcrumbs-route-map-structure.test.cjs` + - assert representation factory export + mapped route presence + - assert grouped destructuring includes representation map + - assert inline representation branch removal + - assert updated map-order invariant includes representation group. + +Validation: + +- `npx eslint lib/routing/breadcrumbRendererFactories.js lib/routing/breadcrumbRouteMaps.js components/breadcrumbs.js tests/phase22/breadcrumb-route-maps-helper.test.cjs tests/phase22/breadcrumbs-route-map-structure.test.cjs tests/phase22/index.test.cjs` -> pass. +- `node tests/phase22/index.test.cjs` -> pass (combined suite). + +Follow-ups: + +- Next smaller slice candidate: helper-level assertion for missing/undefined representation dependency values yielding no renderer output regressions. +- Next larger slice candidate: evaluate whether remaining `/newappeal` edge branch can be absorbed into mapped grouping without reducing readability or explicitness. + ### CL-00X: 22500 `components/elements/index.js` Phase 1 helper extraction date: 2026-04-07 diff --git a/tests/phase22/breadcrumb-route-maps-helper.test.cjs b/tests/phase22/breadcrumb-route-maps-helper.test.cjs index 30c627bf..864840b7 100644 --- a/tests/phase22/breadcrumb-route-maps-helper.test.cjs +++ b/tests/phase22/breadcrumb-route-maps-helper.test.cjs @@ -66,6 +66,9 @@ test("buildBreadcrumbRendererMaps returns grouped maps in explicit precedence or const stepBackRouteRenderersByPath = { "/iota": () => "iota" }; + const representationRouteRenderersByPath = { + "/kappa": () => "kappa" + }; const caseDetailRouteRenderersByPath = { "/delta": () => "delta" }; @@ -80,12 +83,13 @@ test("buildBreadcrumbRendererMaps returns grouped maps in explicit precedence or newAppealRouteRenderersByPath, callbackRouteRenderersByPath, stepBackRouteRenderersByPath, + representationRouteRenderersByPath, caseDetailRouteRenderersByPath, detailAndAccountRouteRenderersByPath }); assert.ok(Array.isArray(result), "Expected grouped maps array"); - assert.strictEqual(result.length, 8, "Expected eight grouped route maps"); + assert.strictEqual(result.length, 9, "Expected nine grouped route maps"); assert.strictEqual( result[0], simpleRouteRenderersByPath, @@ -118,13 +122,18 @@ test("buildBreadcrumbRendererMaps returns grouped maps in explicit precedence or ); assert.strictEqual( result[6], - caseDetailRouteRenderersByPath, - "Expected case detail route renderers seventh" + representationRouteRenderersByPath, + "Expected representation route renderers seventh" ); assert.strictEqual( result[7], + caseDetailRouteRenderersByPath, + "Expected case detail route renderers eighth" + ); + assert.strictEqual( + result[8], detailAndAccountRouteRenderersByPath, - "Expected detail and account route renderers eighth" + "Expected detail and account route renderers ninth" ); }); @@ -146,6 +155,7 @@ test("resolveMappedRouteRenderer returns renderer from first matching grouped ma newAppealRouteRenderersByPath: {}, callbackRouteRenderersByPath: {}, stepBackRouteRenderersByPath: {}, + representationRouteRenderersByPath: {}, caseDetailRouteRenderersByPath: {}, detailAndAccountRouteRenderersByPath: {} }); @@ -175,6 +185,7 @@ test("resolveMappedRouteRenderer returns renderer from later grouped map when ea caseDetailRouteRenderersByPath: {}, callbackRouteRenderersByPath: {}, stepBackRouteRenderersByPath: {}, + representationRouteRenderersByPath: {}, detailAndAccountRouteRenderersByPath: { "/account/personaldetails": detailRenderer } @@ -202,6 +213,7 @@ test("resolveMappedRouteRenderer returns null for unmapped path", () => { newAppealRouteRenderersByPath: {}, callbackRouteRenderersByPath: {}, stepBackRouteRenderersByPath: {}, + representationRouteRenderersByPath: {}, caseDetailRouteRenderersByPath: {}, detailAndAccountRouteRenderersByPath: {} }); @@ -230,6 +242,7 @@ test("resolveMappedRouteRenderer returns null for empty, whitespace, and non-exa newAppealRouteRenderersByPath: {}, callbackRouteRenderersByPath: {}, stepBackRouteRenderersByPath: {}, + representationRouteRenderersByPath: {}, caseDetailRouteRenderersByPath: {}, detailAndAccountRouteRenderersByPath: {} }); @@ -282,6 +295,7 @@ test("resolveMappedRouteRenderer skips invalid map entries and non-function rend newAppealRouteRenderersByPath: undefined, callbackRouteRenderersByPath: {}, stepBackRouteRenderersByPath: {}, + representationRouteRenderersByPath: {}, caseDetailRouteRenderersByPath: {}, detailAndAccountRouteRenderersByPath: {} }); diff --git a/tests/phase22/breadcrumbs-route-map-structure.test.cjs b/tests/phase22/breadcrumbs-route-map-structure.test.cjs index 429a01e4..6066c10c 100644 --- a/tests/phase22/breadcrumbs-route-map-structure.test.cjs +++ b/tests/phase22/breadcrumbs-route-map-structure.test.cjs @@ -54,6 +54,12 @@ test("breadcrumbs/factory module includes expected mapped route definitions", as "Expected step-back route renderer factory export" ); + assert.strictEqual( + source.includes("export const createRepresentationRouteRenderers ="), + true, + "Expected representation route renderer factory export" + ); + assert.strictEqual( source.includes("export const createCaseDetailRouteRenderers ="), true, @@ -132,6 +138,12 @@ test("breadcrumbs/factory module includes expected mapped route definitions", as "Expected /myportal/[appealtypes] to be mapped in createStepBackRouteRenderers" ); + assert.strictEqual( + source.includes('"/myportal/representation": () => ('), + true, + "Expected /myportal/representation to be mapped in createRepresentationRouteRenderers" + ); + assert.strictEqual( source.includes('"/case/[ticketnumber]": () =>'), true, @@ -221,7 +233,7 @@ test("breadcrumbs/component composes mapped routes via imported factories and sh ); assert.strictEqual( - /const\s+\{[\s\S]*simpleRouteRenderersByPath[\s\S]*newAppealRouteRenderersByPath[\s\S]*callbackRouteRenderersByPath[\s\S]*stepBackRouteRenderersByPath[\s\S]*detailAndAccountRouteRenderersByPath[\s\S]*\}\s*=\s*createMappedRouteRendererGroups\s*\(/.test( + /const\s+\{[\s\S]*simpleRouteRenderersByPath[\s\S]*newAppealRouteRenderersByPath[\s\S]*callbackRouteRenderersByPath[\s\S]*stepBackRouteRenderersByPath[\s\S]*representationRouteRenderersByPath[\s\S]*detailAndAccountRouteRenderersByPath[\s\S]*\}\s*=\s*createMappedRouteRendererGroups\s*\(/.test( source ), true, @@ -320,6 +332,12 @@ test("breadcrumbs/component composes mapped routes via imported factories and sh "Expected /myportal/[appealtypes] explicit branch to be removed after step-back mapping" ); + assert.strictEqual( + source.includes('isPath("/myportal/representation")'), + false, + "Expected /myportal/representation explicit branch to be removed after representation mapping" + ); + assert.strictEqual( source.includes('isPath("/myportal/case/[ticketnumber]")'), false, @@ -405,6 +423,9 @@ test("breadcrumbs/map builder preserves route map ordering", async () => { const stepBackOrderIndex = mapBuilderSlice.indexOf( "stepBackRouteRenderersByPath" ); + const representationOrderIndex = mapBuilderSlice.indexOf( + "representationRouteRenderersByPath" + ); const caseDetailOrderIndex = mapBuilderSlice.indexOf( "caseDetailRouteRenderersByPath" ); @@ -419,10 +440,11 @@ test("breadcrumbs/map builder preserves route map ordering", async () => { newAppealOrderIndex > simpleMyPortalOrderIndex && callbackOrderIndex > newAppealOrderIndex && stepBackOrderIndex > callbackOrderIndex && - caseDetailOrderIndex > stepBackOrderIndex && + representationOrderIndex > stepBackOrderIndex && + caseDetailOrderIndex > representationOrderIndex && detailAndAccountOrderIndex > caseDetailOrderIndex, true, - "Expected map builder call to preserve explicit route-map ordering (simple -> link-text -> myportal -> new-appeal -> callback -> step-back -> case detail -> detail/account)" + "Expected map builder call to preserve explicit route-map ordering (simple -> link-text -> myportal -> new-appeal -> callback -> step-back -> representation -> case detail -> detail/account)" ); }); From 97cde880c09c8ce1a75e5c16badbba389f9fab6f Mon Sep 17 00:00:00 2001 From: robbond Date: Thu, 9 Apr 2026 15:17:44 +0100 Subject: [PATCH 29/33] docs(breadcrumbs): record map precedence and callback invariants --- memory-bank/change-log.md | 27 +++++++++++++++++++++++++++ memory-bank/decisions.md | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+) diff --git a/memory-bank/change-log.md b/memory-bank/change-log.md index 8d7a2f8a..8b05ce3b 100644 --- a/memory-bank/change-log.md +++ b/memory-bank/change-log.md @@ -833,6 +833,33 @@ Follow-ups: - Next smaller slice candidate: helper-level assertion for missing/undefined representation dependency values yielding no renderer output regressions. - Next larger slice candidate: evaluate whether remaining `/newappeal` edge branch can be absorbed into mapped grouping without reducing readability or explicitness. +### CL-22541-Z: breadcrumbs closure slice 1 — mapped-route precedence/callback invariants decision + +date: 2026-04-09 +author: Cline +scope: `memory-bank/decisions.md` +type: change +rationale: Execute closure slice 1 by documenting explicit architectural invariants for breadcrumb mapped-route precedence and callback injection contracts so future refactors remain safe and auditable. +impact: Documentation/governance hardening only; no runtime route/auth/session/API/EN-CY/a11y behavior change. +status: completed + +Summary: + +- Added `D-006` to `memory-bank/decisions.md`. +- Captured accepted invariant contracts for: + - explicit breadcrumb map precedence ordering (9 groups) + - callback/state behavior dependency injection requirement (no ad-hoc inline reintroduction) + - structure test guardrails as contract checks for intentional future changes. + +Validation: + +- Documentation consistency review against current breadcrumb map structure and phase22 structure test expectations. + +Follow-ups: + +- Closure slice 2: add focused negative-path representation map/dependency tolerance test coverage. +- Closure slice 3: resolve and guard remaining `/newappeal` inline edge branch treatment. + ### CL-00X: 22500 `components/elements/index.js` Phase 1 helper extraction date: 2026-04-07 diff --git a/memory-bank/decisions.md b/memory-bank/decisions.md index 34f90d18..5f3c4068 100644 --- a/memory-bank/decisions.md +++ b/memory-bank/decisions.md @@ -170,3 +170,40 @@ Related: - `context/test-coverage-map.md` - `context/current-state-scorecard.md` - `memory-bank/open-questions.md` (Q-002) + +--- + +### D-006: Breadcrumb mapped-route precedence and callback injection invariants + +date: 2026-04-09 +author: Cline +scope: `components/breadcrumbs.js`, `lib/routing/{breadcrumbRendererFactories,breadcrumbRouteMaps}.js`, `tests/phase22/breadcrumbs-route-map-structure.test.cjs` +type: decision +rationale: Priority 3 route-state extraction moved most breadcrumb behavior into grouped mapped renderers; explicit invariants are required so future refactors do not silently reorder precedence or regress callback/state behavior. +impact: Improves regression safety for search/case/myportal navigation by making map-order and callback injection constraints explicit. +status: accepted + +Decision: + +- Preserve explicit mapped renderer precedence in this order unless a tested migration plan is approved: + 1. `simpleRouteRenderersByPath` + 2. `simpleLinkTextPairRenderersByPath` + 3. `simpleMyPortalRouteRenderersByPath` + 4. `newAppealRouteRenderersByPath` + 5. `callbackRouteRenderersByPath` + 6. `stepBackRouteRenderersByPath` + 7. `representationRouteRenderersByPath` + 8. `caseDetailRouteRenderersByPath` + 9. `detailAndAccountRouteRenderersByPath` +- Callback/stateful breadcrumb behavior must be dependency-injected into factory groups (e.g. `onBack`, step-back callbacks, representation submit/questionnaire callbacks) rather than recreated as ad-hoc inline path branches. +- Structural guardrails in `tests/phase22/breadcrumbs-route-map-structure.test.cjs` are considered contract tests for these invariants and must be updated in the same commit as intentional precedence/callback changes. + +Consequences: + +- Future breadcrumb extraction work remains predictable and test-auditable. +- Accidental map-order drift or callback behavior inlining should be caught early by structure/helper tests. + +Related: + +- `memory-bank/change-log.md` (CL-22541-V, CL-22541-W, CL-22541-Y) +- `tests/phase22/breadcrumbs-route-map-structure.test.cjs` From 61254e3942d23e828a3b4100a9c3d222442fd5cc Mon Sep 17 00:00:00 2001 From: robbond Date: Thu, 9 Apr 2026 15:19:40 +0100 Subject: [PATCH 30/33] test(breadcrumbs): cover missing representation route map fallback --- memory-bank/change-log.md | 27 +++++++++++++++ .../breadcrumb-route-maps-helper.test.cjs | 33 +++++++++++++++++++ 2 files changed, 60 insertions(+) diff --git a/memory-bank/change-log.md b/memory-bank/change-log.md index 8b05ce3b..3c929c46 100644 --- a/memory-bank/change-log.md +++ b/memory-bank/change-log.md @@ -860,6 +860,33 @@ Follow-ups: - Closure slice 2: add focused negative-path representation map/dependency tolerance test coverage. - Closure slice 3: resolve and guard remaining `/newappeal` inline edge branch treatment. +### CL-22541-Z2: breadcrumbs closure slice 2 — missing representation map negative-path guard + +date: 2026-04-09 +author: Cline +scope: `tests/phase22/breadcrumb-route-maps-helper.test.cjs` +type: change +rationale: Execute closure slice 2 by adding focused negative-path coverage ensuring resolver behavior remains stable when representation route-map dependency is missing from grouped map input. +impact: Test hardening only; no runtime route/auth/session/API/EN-CY/a11y behavior change. +status: completed + +Summary: + +- Added focused helper-level test: + - `resolveMappedRouteRenderer tolerates missing representation map entry in grouped map input` +- New assertions verify: + - missing `representationRouteRenderersByPath` resolves `/myportal/representation` to `null` + - later maps still resolve correctly (case detail fallback remains intact). + +Validation: + +- `node tests/phase22/breadcrumb-route-maps-helper.test.cjs` -> pass (7/7). +- `node tests/phase22/index.test.cjs` -> pass (combined suite). + +Follow-ups: + +- Closure slice 3: resolve and guard remaining `/newappeal` inline edge branch treatment. + ### CL-00X: 22500 `components/elements/index.js` Phase 1 helper extraction date: 2026-04-07 diff --git a/tests/phase22/breadcrumb-route-maps-helper.test.cjs b/tests/phase22/breadcrumb-route-maps-helper.test.cjs index 864840b7..7c6439bc 100644 --- a/tests/phase22/breadcrumb-route-maps-helper.test.cjs +++ b/tests/phase22/breadcrumb-route-maps-helper.test.cjs @@ -309,6 +309,39 @@ test("resolveMappedRouteRenderer skips invalid map entries and non-function rend ); }); +test("resolveMappedRouteRenderer tolerates missing representation map entry in grouped map input", () => { + const { buildBreadcrumbRendererMaps, resolveMappedRouteRenderer } = + loadHelpers(); + + const caseDetailRenderer = () => "case-detail"; + + const maps = buildBreadcrumbRendererMaps({ + simpleRouteRenderersByPath: {}, + simpleLinkTextPairRenderersByPath: {}, + simpleMyPortalRouteRenderersByPath: {}, + newAppealRouteRenderersByPath: {}, + callbackRouteRenderersByPath: {}, + stepBackRouteRenderersByPath: {}, + representationRouteRenderersByPath: undefined, + caseDetailRouteRenderersByPath: { + "/case/[ticketnumber]": caseDetailRenderer + }, + detailAndAccountRouteRenderersByPath: {} + }); + + assert.strictEqual( + resolveMappedRouteRenderer("/myportal/representation", maps), + null, + "Expected null when representation renderer map is missing" + ); + + assert.strictEqual( + resolveMappedRouteRenderer("/case/[ticketnumber]", maps), + caseDetailRenderer, + "Expected later grouped map resolution to remain intact when representation map is missing" + ); +}); + const run = async () => { let passed = 0; From 7d195ad906b918830be42a0c61639952a685e212 Mon Sep 17 00:00:00 2001 From: robbond Date: Thu, 9 Apr 2026 15:22:36 +0100 Subject: [PATCH 31/33] refactor(breadcrumbs): remove stale /newappeal inline no-op branch --- components/breadcrumbs.js | 2 -- memory-bank/change-log.md | 25 +++++++++++++++++++ .../breadcrumbs-route-map-structure.test.cjs | 6 +++++ 3 files changed, 31 insertions(+), 2 deletions(-) diff --git a/components/breadcrumbs.js b/components/breadcrumbs.js index 90f078c5..f7e0d251 100644 --- a/components/breadcrumbs.js +++ b/components/breadcrumbs.js @@ -298,8 +298,6 @@ const Breadcrumbs = (props) => { {renderMappedRoute(pathname)} - {isPath("/newappeal") && <>} - {staticTextCrumbLabel && renderTextCrumb(staticTextCrumbLabel)} diff --git a/memory-bank/change-log.md b/memory-bank/change-log.md index 3c929c46..a2de7b0a 100644 --- a/memory-bank/change-log.md +++ b/memory-bank/change-log.md @@ -887,6 +887,31 @@ Follow-ups: - Closure slice 3: resolve and guard remaining `/newappeal` inline edge branch treatment. +### CL-22541-Z3: breadcrumbs closure slice 3 — remove lingering `/newappeal` no-op inline branch + +date: 2026-04-09 +author: Cline +scope: `components/breadcrumbs.js`, `tests/phase22/breadcrumbs-route-map-structure.test.cjs` +type: change +rationale: Execute closure slice 3 by resolving the remaining inline `/newappeal` edge branch (a no-op render guard) and locking its removal with explicit structure coverage. +impact: Refactor/test hardening only; no runtime route/auth/session/API/EN-CY/a11y behavior change. +status: completed + +Summary: + +- Removed lingering no-op branch from breadcrumbs JSX: + - deleted `{isPath("/newappeal") && <>}` +- Added structure guard assertion that `/newappeal` inline branch is absent. + +Validation: + +- `node tests/phase22/breadcrumbs-route-map-structure.test.cjs` -> pass (4/4). +- `node tests/phase22/index.test.cjs` -> pass (combined suite). + +Follow-ups: + +- Breadcrumb route-state extraction closure slices (1/2/3) complete. + ### CL-00X: 22500 `components/elements/index.js` Phase 1 helper extraction date: 2026-04-07 diff --git a/tests/phase22/breadcrumbs-route-map-structure.test.cjs b/tests/phase22/breadcrumbs-route-map-structure.test.cjs index 6066c10c..b6632cf1 100644 --- a/tests/phase22/breadcrumbs-route-map-structure.test.cjs +++ b/tests/phase22/breadcrumbs-route-map-structure.test.cjs @@ -320,6 +320,12 @@ test("breadcrumbs/component composes mapped routes via imported factories and sh "Expected /newappeal/selectappeal explicit branch to be removed after mapping" ); + assert.strictEqual( + source.includes('isPath("/newappeal")'), + false, + "Expected /newappeal no-op explicit branch to be removed" + ); + assert.strictEqual( source.includes('isPath("/newappeal/[appealtypes]")'), false, From ac74782030184d086c5352754636192a0c5480d3 Mon Sep 17 00:00:00 2001 From: robbond Date: Thu, 9 Apr 2026 16:26:44 +0100 Subject: [PATCH 32/33] fix(breadcrumbs): restore static and viewall label crumb resolution --- components/breadcrumbs.js | 10 +++++-- .../breadcrumbs-route-map-structure.test.cjs | 28 +++++++++++++++++++ 2 files changed, 35 insertions(+), 3 deletions(-) diff --git a/components/breadcrumbs.js b/components/breadcrumbs.js index f7e0d251..250e40f3 100644 --- a/components/breadcrumbs.js +++ b/components/breadcrumbs.js @@ -94,7 +94,10 @@ const Breadcrumbs = (props) => { mySubmittedReps: "Submitted representations" }; - return labelsByKey[viewKey] || null; + const viewAllLabelResolver = labelsByKey[viewKey]; + return typeof viewAllLabelResolver === "function" + ? viewAllLabelResolver() + : viewAllLabelResolver || null; }; const getStaticTextCrumbLabel = (path) => { @@ -116,7 +119,8 @@ const Breadcrumbs = (props) => { "/auth/error": () => t("auth:auth-error-signin-error-title") }; - return staticTextCrumbByPath[path] || null; + const staticTextCrumbResolver = staticTextCrumbByPath[path]; + return staticTextCrumbResolver ? staticTextCrumbResolver() : null; }; const renderMyPortalCrumb = () => ( @@ -175,7 +179,7 @@ const Breadcrumbs = (props) => { const renderBackCrumb = ( onClick, - listItemClass = "govuk-breadcrumbs__link-item backChevron" + listItemClass = "govuk-breadcrumbs__list-item backChevron" ) => renderAnchorCrumb("#", t("common:back-link"), onClick, listItemClass); const renderDnsCaseReferenceCrumbs = (referenceValue) => ( diff --git a/tests/phase22/breadcrumbs-route-map-structure.test.cjs b/tests/phase22/breadcrumbs-route-map-structure.test.cjs index b6632cf1..4dfd31a3 100644 --- a/tests/phase22/breadcrumbs-route-map-structure.test.cjs +++ b/tests/phase22/breadcrumbs-route-map-structure.test.cjs @@ -284,6 +284,34 @@ test("breadcrumbs/component composes mapped routes via imported factories and sh "Expected breadcrumb JSX to use single mapped route render invocation" ); + assert.strictEqual( + source.includes("const viewAllLabelResolver = labelsByKey[viewKey];"), + true, + "Expected view-all label lookup to resolve callable/non-callable map entries" + ); + + assert.strictEqual( + source.includes('return typeof viewAllLabelResolver === "function"'), + true, + "Expected view-all label resolver to invoke function-backed labels" + ); + + assert.strictEqual( + source.includes( + "const staticTextCrumbResolver = staticTextCrumbByPath[path];" + ), + true, + "Expected static text breadcrumb path lookup to resolve a callable label renderer" + ); + + assert.strictEqual( + source.includes( + "return staticTextCrumbResolver ? staticTextCrumbResolver() : null;" + ), + true, + "Expected static text breadcrumb resolver to invoke mapped label function" + ); + assert.strictEqual( source.includes('isPath("/myportal/advancedsearchresults")'), false, From ee2751a642ce7207db67d1caf5d8da8a43fe147f Mon Sep 17 00:00:00 2001 From: robbond Date: Thu, 9 Apr 2026 16:34:41 +0100 Subject: [PATCH 33/33] catch fix in view all --- components/myportal/viewall.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/components/myportal/viewall.js b/components/myportal/viewall.js index 6532be5a..0affa007 100644 --- a/components/myportal/viewall.js +++ b/components/myportal/viewall.js @@ -523,9 +523,12 @@ const ViewAllResults = (props) => { ? jsonpath({ path: '$..[?(@ && @.value=="' + - searchDetailsObj[key].value[0][ - "_pinswg_localplanningauthority_value@OData.Community.Display.V1.FormattedValuee" - ] + + (searchDetailsObj[key][ + "_pinswg_localplanningauthority_value@OData.Community.Display.V1.FormattedValue" + ] || + searchDetailsObj[key]?.value[0][ + "_pinswg_localplanningauthority_value@OData.Community.Display.V1.FormattedValue" + ]) + '")].value_cy', json: transLookup, eval: true @@ -544,7 +547,7 @@ const ViewAllResults = (props) => { path: '$..[?(@ && @.value=="' + resultItem[ - "_pinswg_localplanningauthority_value@OData.Community.Display.V1.FormattedValuee" + "_pinswg_localplanningauthority_value@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup,