Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2,515 changes: 1,001 additions & 1,514 deletions src/ui-spa/package-lock.json

Large diffs are not rendered by default.

27 changes: 15 additions & 12 deletions src/ui-spa/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@
"date-fns": "^4.1.0",
"date-fns-tz": "^3.2.0",
"govuk-react-jsx": "^7.1.0",
"react": "^19.1.1",
"react-dom": "^19.1.1",
"react": "^19.2.8",
"react-dom": "^19.2.8",
"react-error-boundary": "^6.0.0",
"react-router": "^7.9.1",
"react-router": "^8.1.0",
"sass": "^1.92.1",
"uuid": "^13.0.0",
"uuid": "^14.0.1",
"zod": "^4.3.6"
},
"devDependencies": {
Expand All @@ -51,12 +51,12 @@
"@testing-library/react": "^16.3.0",
"@testing-library/user-event": "^14.6.1",
"@types/node": "^24.9.1",
"@types/react": "^19.1.10",
"@types/react-dom": "^19.1.7",
"@types/react": "^19.2.17",
"@types/react-dom": "^19.2.3",
"@typescript-eslint/eslint-plugin": "^8.44.0",
"@typescript-eslint/parser": "^8.44.0",
"@vitejs/plugin-react": "^5.0.0",
"@vitest/coverage-v8": "^3.2.4",
"@vitejs/plugin-react": "^6.0.0",
"@vitest/coverage-v8": "^4.1.10",
"cross-env": "^10.0.0",
"dotenv": "^17.0.0",
"eslint": "^9.33.0",
Expand All @@ -74,14 +74,17 @@
"rimraf": "^6.0.1",
"typescript": "~5.8.3",
"typescript-eslint": "^8.39.1",
"vite": "^7.1.12",
"vite-plugin-istanbul": "^7.2.0",
"vite-plugin-svgr": "^4.5.0",
"vitest": "^3.2.4"
"vite": "^8.1.4",
"vite-plugin-istanbul": "^9.0.1",
"vite-plugin-svgr": "^5.2.0",
"vitest": "^4.1.10"
},
"msw": {
"workerDirectory": [
"public"
]
},
"overrides": {
"react-router": "^8.1.0"
}
}
2 changes: 1 addition & 1 deletion src/ui-spa/src/common/hooks/useRouteDocumentTitle.test.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { render, screen, cleanup, act } from "@testing-library/react";
import { MemoryRouter } from "react-router-dom";
import { MemoryRouter } from "react-router";
import useRouteDocumentTitle from "./useRouteDocumentTitle";

afterEach(() => {
Expand Down
2 changes: 1 addition & 1 deletion src/ui-spa/src/common/hooks/useRouteDocumentTitle.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useEffect, useState } from "react";
import { useLocation } from "react-router-dom";
import { useLocation } from "react-router";

const routeTitles: Record<string, string> = {
"/case-registration": "Home",
Expand Down
2 changes: 1 addition & 1 deletion src/ui-spa/src/components/ProtectedRoutes.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Outlet, Navigate } from "react-router-dom";
import { Outlet, Navigate } from "react-router";
import { useContext } from "react";
import { CaseRegistrationFormContext } from "../common/providers/CaseRegistrationProvider";
const ProtectedRoutes = () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { type GeneralRadioValue } from "../../../common/reducers/caseRegistratio
import { formatNameUtil } from "../../../common/utils/formatNameUtil";
import { isChargedWithAdultWarningActive } from "../../../common/utils/isChargedWithAdultWarningActive";
import { isValidOnOrBeforeDate } from "../../../common/utils/isValidOnOrBeforeDate";
import { useNavigate, useParams } from "react-router-dom";
import { useNavigate, useParams } from "react-router";
import SaveAndCancel from "../../common/SaveAndCancel";
import PageContentWrapper from "../../common/PageContentWrapper";
import styles from "../index.module.scss";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
import { Radios, ErrorSummary, BackLink } from "../../govuk";
import SaveAndCancel from "../../common/SaveAndCancel";
import { CaseRegistrationFormContext } from "../../../common/providers/CaseRegistrationProvider";
import { useNavigate } from "react-router-dom";
import { useNavigate } from "react-router";
import useChargesCount from "../../../common/hooks/useChargesCount";
import { formatNameUtil } from "../../../common/utils/formatNameUtil";
import PageContentWrapper from "../../common/PageContentWrapper";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { type VictimAdditionalDetailsValue } from "../../../common/reducers/case
import { formatNameUtil } from "../../../common/utils/formatNameUtil";
import { sanitizeNameText } from "../../../common/utils/sanitizeNameText";
import { DEFAULT_VICTIM_ADDITIONAL_DETAIL_VALUE } from "../../../common/constants/general";
import { useNavigate, useParams } from "react-router-dom";
import { useNavigate, useParams } from "react-router";
import { v4 as uuidv4 } from "uuid";
import PageContentWrapper from "../../common/PageContentWrapper";
import styles from "../index.module.scss";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import {
} from "../../../common/reducers/caseRegistrationReducer";
import { getNextSuspectJourneyRoute } from "../../../common/utils/getSuspectJourneyRoutes";
import { sanitizeNameText } from "../../../common/utils/sanitizeNameText";
import { useNavigate, useParams } from "react-router-dom";
import { useNavigate, useParams } from "react-router";
import PageContentWrapper from "../../common/PageContentWrapper";
import styles from "../index.module.scss";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { useRef, useEffect, useState, useCallback, useMemo } from "react";
import { Radios, Button, ErrorSummary } from "../../govuk";
import { type GeneralRadioValue } from "../../../common/reducers/caseRegistrationReducer";
import { HOME_PAGE_URL } from "../../../config";
import { useNavigate, useLocation } from "react-router-dom";
import { useNavigate, useLocation } from "react-router";
import PageContentWrapper from "../../common/PageContentWrapper";
import styles from "../index.module.scss";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { CaseRegistrationFormContext } from "../../../common/providers/CaseRegis
import { getAreasOrDivisions } from "../../../common/utils/getAreasOrDivisions";
import { getSelectedUnit } from "../../../common/utils/getSelectedUnit";
import useErrorSummaryList from "../../../common/hooks/useErrorSummaryList";
import { useNavigate } from "react-router-dom";
import { useNavigate } from "react-router";
import PageContentWrapper from "../../common/PageContentWrapper";
import styles from "../index.module.scss";
import pageStyles from "./index.module.scss";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import {
} from "../../../apis/gateway-api";
import { useQuery } from "@tanstack/react-query";
import useErrorSummaryList from "../../../common/hooks/useErrorSummaryList";
import { useNavigate } from "react-router-dom";
import { useNavigate } from "react-router";
import PageContentWrapper from "../../common/PageContentWrapper";
import pageStyles from "./index.module.scss";
import styles from "../index.module.scss";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { CaseRegistrationFormContext } from "../../../common/providers/CaseRegis
import { getCaseComplexities } from "../../../apis/gateway-api";
import { useQuery } from "@tanstack/react-query";
import useErrorSummaryList from "../../../common/hooks/useErrorSummaryList";
import { useNavigate } from "react-router-dom";
import { useNavigate } from "react-router";
import PageContentWrapper from "../../common/PageContentWrapper";
import styles from "../index.module.scss";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { getSelectedUnit } from "../../../common/utils/getSelectedUnit";
import { useQuery } from "@tanstack/react-query";
import { validateUrn } from "../../../apis/gateway-api";
import useErrorSummaryList from "../../../common/hooks/useErrorSummaryList";
import { useNavigate } from "react-router-dom";
import { useNavigate } from "react-router";
import PageContentWrapper from "../../common/PageContentWrapper";
import styles from "../index.module.scss";
import pageStyles from "./index.module.scss";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import SaveAndCancel from "../../common/SaveAndCancel";
import { CaseRegistrationFormContext } from "../../../common/providers/CaseRegistrationProvider";
import { getCaseMonitoringCodes } from "../../../apis/gateway-api";
import { useQuery } from "@tanstack/react-query";
import { useNavigate } from "react-router-dom";
import { useNavigate } from "react-router";
import { type CaseMonitoringCodes } from "../../../schemas";
import { isMonitoringCodeOptional } from "../../../common/utils/isMonitoringCodeOptional";
import useChargesCount from "../../../common/hooks/useChargesCount";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import { useMutation, useQuery } from "@tanstack/react-query";
import { submitCaseRegistration, validateUrn } from "../../../apis/gateway-api";
import { getPoliceUnit } from "../../../common/utils/getPoliceUnit";
import SuspectSummary from "../suspect-summary/SuspectSummary";
import { useNavigate } from "react-router-dom";
import { useNavigate } from "react-router";
import PageContentWrapper from "../../common/PageContentWrapper";
import { useIsAreaSensitive } from "../../../common/hooks/useIsAreaSensitive";
import styles from "./index.module.scss";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {
type CaseRegistrationActions,
} from "../../../../common/reducers/caseRegistrationReducer";
import { Tag } from "../../../../components/govuk";
import { type NavigateFunction } from "react-router-dom";
import { type NavigateFunction } from "react-router";
import type { CaseMonitoringCodes, PoliceUnit } from "../../../../schemas";

export const getCaseDetailsSummaryListRows = (
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { useContext } from "react";
import { Button, BackLink } from "../../govuk";
import { useNavigate, useLocation, Link } from "react-router-dom";
import { useNavigate, useLocation, Link } from "react-router";
import { CaseRegistrationFormContext } from "../../../common/providers/CaseRegistrationProvider";
import PageContentWrapper from "../../common/PageContentWrapper";
import pageStyles from "./index.module.scss";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { useContext } from "react";
import { Button, BackLink } from "../../govuk";
import { useNavigate, useLocation, Link } from "react-router-dom";
import { useNavigate, useLocation, Link } from "react-router";
import { CaseRegistrationFormContext } from "../../../common/providers/CaseRegistrationProvider";
import PageContentWrapper from "../../common/PageContentWrapper";
import pageStyles from "./index.module.scss";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { useContext } from "react";
import { Button, BackLink } from "../../govuk";
import { useNavigate, useLocation, Link } from "react-router-dom";
import { useNavigate, useLocation, Link } from "react-router";
import { CaseRegistrationFormContext } from "../../../common/providers/CaseRegistrationProvider";
import PageContentWrapper from "../../common/PageContentWrapper";
import pageStyles from "./index.module.scss";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {
import { CaseRegistrationFormContext } from "../../../common/providers/CaseRegistrationProvider";
import { getOffences } from "../../../apis/gateway-api";
import { useQuery } from "@tanstack/react-query";
import { Link, useParams, useNavigate } from "react-router-dom";
import { Link, useParams, useNavigate } from "react-router";
import { formatNameUtil } from "../../../common/utils/formatNameUtil";
import useChargesCount from "../../../common/hooks/useChargesCount";
import useErrorSummaryList from "../../../common/hooks/useErrorSummaryList";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { useState, useContext, useCallback, useMemo } from "react";
import { Radios, ErrorSummary, BackLink } from "../../govuk";
import SaveAndCancel from "../../common/SaveAndCancel";
import { CaseRegistrationFormContext } from "../../../common/providers/CaseRegistrationProvider";
import { useNavigate } from "react-router-dom";
import { useNavigate } from "react-router";
import useChargesCount from "../../../common/hooks/useChargesCount";
import ChargesSummary from "./ChargesSummary";
import useErrorSummaryList from "../../../common/hooks/useErrorSummaryList";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { useContext } from "react";
import { Button, BackLink } from "../../govuk";
import { useNavigate, useLocation, Link } from "react-router-dom";
import { useNavigate, useLocation, Link } from "react-router";
import { CaseRegistrationFormContext } from "../../../common/providers/CaseRegistrationProvider";
import { type VictimAdditionalDetailsValue } from "../../../common/reducers/caseRegistrationReducer";
import { formatNameUtil } from "../../../common/utils/formatNameUtil";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { CaseRegistrationFormContext } from "../../../common/providers/CaseRegis
import { getSelectedUnit } from "../../../common/utils/getSelectedUnit";
import { getCourtsByUnitId } from "../../../apis/gateway-api";
import { useQuery } from "@tanstack/react-query";
import { useNavigate } from "react-router-dom";
import { useNavigate } from "react-router";
import { isOnOrAfterChargeDates } from "../../../common/utils/chargeDatesUtil";
import { isMonitoringCodeOptional } from "../../../common/utils/isMonitoringCodeOptional";
import { PRE_CHARGE_DECISION_CODE } from "../../../common/constants/general";
Expand Down
2 changes: 1 addition & 1 deletion src/ui-spa/src/components/case-registration/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { useIsAreaSensitive } from "../../common/hooks/useIsAreaSensitive";
import { sanitizeOperationNameText } from "../../common/utils/sanitizeOperationNameText";
import { DEFAULT_COMPLEXITY_DESCRIPTION } from "../../common/constants/general";
import useErrorSummaryList from "../../common/hooks/useErrorSummaryList";
import { useNavigate } from "react-router-dom";
import { useNavigate } from "react-router";
import PageContentWrapper from "../common/PageContentWrapper";
import styles from "./index.module.scss";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { useContext } from "react";
import { Button, BackLink } from "../../govuk";
import { useNavigate, useLocation, Link } from "react-router-dom";
import { useNavigate, useLocation, Link } from "react-router";
import { CaseRegistrationFormContext } from "../../../common/providers/CaseRegistrationProvider";
import { type GeneralRadioValue } from "../../../common/reducers/caseRegistrationReducer";
import PageContentWrapper from "../../common/PageContentWrapper";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { formatNameUtil } from "../../../common/utils/formatNameUtil";
import useErrorSummaryList from "../../../common/hooks/useErrorSummaryList";
import useGetSuspectRoute from "../../../common/hooks/useGetSuspectRoute";
import ErrorSummaryWrapper from "../../common/ErrorSummaryWrapper";
import { useNavigate, useParams } from "react-router-dom";
import { useNavigate, useParams } from "react-router";
import PageContentWrapper from "../../common/PageContentWrapper";
import styles from "../index.module.scss";
import pageStyles from "./index.module.scss";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { getPreviousSuspectJourneyRoute } from "../../../common/utils/getSuspect
import { formatNameUtil } from "../../../common/utils/formatNameUtil";
import { sanitizeNameText } from "../../../common/utils/sanitizeNameText";
import useErrorSummaryList from "../../../common/hooks/useErrorSummaryList";
import { useNavigate, useParams } from "react-router-dom";
import { useNavigate, useParams } from "react-router";
import ErrorSummaryWrapper from "../../common/ErrorSummaryWrapper";
import PageContentWrapper from "../../common/PageContentWrapper";
import styles from "../index.module.scss";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { useState, useContext, useCallback, useMemo } from "react";
import { Input, BackLink } from "../../govuk";
import SaveAndCancel from "../../common/SaveAndCancel";
import { CaseRegistrationFormContext } from "../../../common/providers/CaseRegistrationProvider";
import { useNavigate, useParams } from "react-router-dom";
import { useNavigate, useParams } from "react-router";
import { sanitizeASNText } from "../../../common/utils/sanitizeASNText";
import useErrorSummaryList from "../../../common/hooks/useErrorSummaryList";
import useGetSuspectRoute from "../../../common/hooks/useGetSuspectRoute";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import SaveAndCancel from "../../common/SaveAndCancel";
import { CaseRegistrationFormContext } from "../../../common/providers/CaseRegistrationProvider";
import { type GeneralRadioValue } from "../../../common/reducers/caseRegistrationReducer";
import { formatNameUtil } from "../../../common/utils/formatNameUtil";
import { useNavigate, useParams } from "react-router-dom";
import { useNavigate, useParams } from "react-router";
import useErrorSummaryList from "../../../common/hooks/useErrorSummaryList";
import useGetSuspectRoute from "../../../common/hooks/useGetSuspectRoute";
import ErrorSummaryWrapper from "../../common/ErrorSummaryWrapper";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { dobValidationConstants } from "../../../common/constants/dobValidationC
import useErrorSummaryList from "../../../common/hooks/useErrorSummaryList";
import useGetSuspectRoute from "../../../common/hooks/useGetSuspectRoute";
import ErrorSummaryWrapper from "../../common/ErrorSummaryWrapper";
import { useNavigate, useParams } from "react-router-dom";
import { useNavigate, useParams } from "react-router";
import PageContentWrapper from "../../common/PageContentWrapper";
import styles from "../index.module.scss";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import SaveAndCancel from "../../common/SaveAndCancel";
import { CaseRegistrationFormContext } from "../../../common/providers/CaseRegistrationProvider";
import { getEthnicities } from "../../../apis/gateway-api";
import { useQuery } from "@tanstack/react-query";
import { useNavigate, useParams } from "react-router-dom";
import { useNavigate, useParams } from "react-router";
import { formatNameUtil } from "../../../common/utils/formatNameUtil";
import useErrorSummaryList from "../../../common/hooks/useErrorSummaryList";
import useGetSuspectRoute from "../../../common/hooks/useGetSuspectRoute";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { CaseRegistrationFormContext } from "../../../common/providers/CaseRegis
import { getGenders } from "../../../apis/gateway-api";
import { useQuery } from "@tanstack/react-query";
import { formatNameUtil } from "../../../common/utils/formatNameUtil";
import { useNavigate, useParams } from "react-router-dom";
import { useNavigate, useParams } from "react-router";
import useErrorSummaryList from "../../../common/hooks/useErrorSummaryList";
import useGetSuspectRoute from "../../../common/hooks/useGetSuspectRoute";
import ErrorSummaryWrapper from "../../common/ErrorSummaryWrapper";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import DateInputNative from "../../common/DateInputNative";
import { CaseRegistrationFormContext } from "../../../common/providers/CaseRegistrationProvider";
import { getOffenderTypes } from "../../../apis/gateway-api";
import { useQuery } from "@tanstack/react-query";
import { useNavigate, useParams } from "react-router-dom";
import { useNavigate, useParams } from "react-router";
import { formatNameUtil } from "../../../common/utils/formatNameUtil";
import { isValidOnOrBeforeDate } from "../../../common/utils/isValidOnOrBeforeDate";
import { isChargedWithAdultWarningActive } from "../../../common/utils/isChargedWithAdultWarningActive";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import SaveAndCancel from "../../common/SaveAndCancel";
import { CaseRegistrationFormContext } from "../../../common/providers/CaseRegistrationProvider";
import { getReligions } from "../../../apis/gateway-api";
import { useQuery } from "@tanstack/react-query";
import { useNavigate, useParams } from "react-router-dom";
import { useNavigate, useParams } from "react-router";
import { formatNameUtil } from "../../../common/utils/formatNameUtil";
import useErrorSummaryList from "../../../common/hooks/useErrorSummaryList";
import useGetSuspectRoute from "../../../common/hooks/useGetSuspectRoute";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { useMemo, useContext } from "react";
import { Button, BackLink } from "../../govuk";
import { useNavigate, useLocation, Link } from "react-router-dom";
import { useNavigate, useLocation, Link } from "react-router";
import { CaseRegistrationFormContext } from "../../../common/providers/CaseRegistrationProvider";
import { formatNameUtil } from "../../../common/utils/formatNameUtil";
import PageContentWrapper from "../../common/PageContentWrapper";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { getSuspectDetailsSummaryListRows } from "./utils/getSuspectDetailsSumma
import { getChargesSummaryListRows } from "../charges-summary/utils/getChargesSummaryListRows";
import { isYouthSuspect } from "../../../common/utils/isYouthSuspect";
import { formatNameUtil } from "../../../common/utils/formatNameUtil";
import { useNavigate } from "react-router-dom";
import { useNavigate } from "react-router";
import styles from "./SuspectSummary.module.scss";

type SuspectSummaryProps = {
Expand Down
Loading
Loading