got it working

Author: jonathanwelch1-nhs

packages/cpt-ui/src/components/prescriptionList/PrescriptionsListTable.tsx

@@ -8,7 +8,6 @@ import {PRESCRIPTION_LIST_TABLE_TEXT} from "@/constants/ui-strings/PrescriptionL
 import {Link} from "react-router-dom"
 import {FRONTEND_PATHS} from "@/constants/environment"
 import {useSearchContext} from "@/context/SearchProvider"
-import {useNavigationContext} from "@/context/NavigationProvider"
 
 export interface PrescriptionsListTableProps {
   textContent: PrescriptionsListStrings;
@@ -26,7 +25,6 @@ const PrescriptionsListTable = ({
   const initialSortConfig: SortConfig = {key: "issueDate", direction: null}
   const currentTabId: TabId = textContent.testid as TabId
   const searchContext = useSearchContext()
-  const navigationContext = useNavigationContext()
 
   // all tabs have own key in state object so each tab can be sorted individually
   const [allSortConfigs, setAllSortConfigs] = React.useState<
@@ -144,32 +142,12 @@ const PrescriptionsListTable = ({
     prescriptionId: string,
     issueNumber: string | undefined
   ) => {
-    const originalSearchParams =
-      navigationContext.getOriginalSearchParameters()
-
-    let relevantParams = {}
-    if (originalSearchParams) {
-      if (originalSearchParams.prescriptionId) {
-        relevantParams =
-          navigationContext.getRelevantSearchParameters("prescriptionId")
-      } else if (originalSearchParams.nhsNumber) {
-        relevantParams =
-          navigationContext.getRelevantSearchParameters("nhsNumber")
-      } else if (
-        originalSearchParams.firstName ||
-        originalSearchParams.lastName
-      ) {
-        relevantParams =
-          navigationContext.getRelevantSearchParameters("basicDetails")
-      }
+    // Only set the prescription-specific parameters needed for the details page
+    // Don't modify or mix with the original search parameters to avoid cross-contamination
+    searchContext.setPrescriptionId(prescriptionId)
+    if (issueNumber) {
+      searchContext.setIssueNumber(issueNumber)
     }
-
-    // only preserve relevant search parameters and add prescription-specific ones
-    searchContext.setAllSearchParameters({
-      ...relevantParams,
-      prescriptionId,
-      issueNumber
-    })
   }
 
   const getSortedItems = () => {

packages/cpt-ui/src/components/prescriptionSearch/BasicDetailsSearch.tsx

@@ -53,14 +53,14 @@ export default function BasicDetailsSearch() {
 
   // restore original search parameters when available
   useEffect(() => {
-    const originalParams = navigationContext.getOriginalSearchParameters()
-    if (originalParams) {
-      setFirstName(originalParams.firstName || "")
-      setLastName(originalParams.lastName || "")
-      setDobDay(originalParams.dobDay || "")
-      setDobMonth(originalParams.dobMonth || "")
-      setDobYear(originalParams.dobYear || "")
-      setPostcode(originalParams.postcode || "")
+    const relevantParams = navigationContext.getRelevantSearchParameters("basicDetails")
+    if (relevantParams) {
+      setFirstName(relevantParams.firstName || "")
+      setLastName(relevantParams.lastName || "")
+      setDobDay(relevantParams.dobDay || "")
+      setDobMonth(relevantParams.dobMonth || "")
+      setDobYear(relevantParams.dobYear || "")
+      setPostcode(relevantParams.postcode || "")
     }
   }, [navigationContext])
 

packages/cpt-ui/src/components/prescriptionSearch/NhsNumSearch.tsx

@@ -48,9 +48,9 @@ export default function NhsNumSearch() {
   }, [searchContext.nhsNumber, searchContext.searchType])
 
   useEffect(() => {
-    const originalParams = navigationContext.getOriginalSearchParameters()
-    if (originalParams && originalParams.nhsNumber) {
-      setNhsNumber(originalParams.nhsNumber || "")
+    const relevantParams = navigationContext.getRelevantSearchParameters("nhsNumber")
+    if (relevantParams && relevantParams.nhsNumber) {
+      setNhsNumber(relevantParams.nhsNumber || "")
     }
   }, [navigationContext])
 

packages/cpt-ui/src/components/prescriptionSearch/PrescriptionIdSearch.tsx

@@ -43,9 +43,9 @@ export default function PrescriptionIdSearch() {
   const errorMessages = PRESCRIPTION_ID_SEARCH_STRINGS.errors
 
   useEffect(() => {
-    const originalParams = navigationContext.getOriginalSearchParameters()
-    if (originalParams && originalParams.prescriptionId) {
-      setPrescriptionId(originalParams.prescriptionId || "")
+    const relevantParams = navigationContext.getRelevantSearchParameters("prescriptionId")
+    if (relevantParams && relevantParams.prescriptionId) {
+      setPrescriptionId(relevantParams.prescriptionId || "")
     }
   }, [navigationContext])
 

packages/cpt-ui/src/pages/SearchPrescriptionPage.tsx

@@ -1,4 +1,4 @@
-import React, {Fragment} from "react"
+import React, {Fragment, useEffect} from "react"
 import {
   Col,
   Container,
@@ -14,10 +14,28 @@ import BasicDetailsSearch from "@/components/prescriptionSearch/BasicDetailsSear
 
 import {HERO_TEXT} from "@/constants/ui-strings/SearchForAPrescriptionStrings"
 import {PRESCRIPTION_SEARCH_TABS} from "@/constants/ui-strings/SearchTabStrings"
+import {useSearchContext} from "@/context/SearchProvider"
 
 export default function SearchPrescriptionPage() {
   const location = useLocation()
   const pathname = location.pathname
+  const searchContext = useSearchContext()
+
+  // Clear search context contamination when navigating to search pages
+  useEffect(() => {
+    const allParams = searchContext.getAllSearchParameters()
+
+    // Check if we have contamination from multiple search types
+    const hasPrescriptionId = !!allParams.prescriptionId
+    const hasNhsNumber = !!allParams.nhsNumber
+    const hasBasicDetails = !!(allParams.firstName || allParams.lastName || allParams.dobDay)
+
+    const contaminationCount = [hasPrescriptionId, hasNhsNumber, hasBasicDetails].filter(Boolean).length
+
+    if (contaminationCount > 1) {
+      searchContext.clearSearchParameters()
+    }
+  }, [pathname, searchContext])
 
   // Map paths directly to content components
   const pathContent: Record<string, React.ReactNode> = {