Merge pull request #2370 from openmsupply/2322-tracing-redirection

Add routing for contact-trace

Author: mark-prins

client/packages/common/src/hooks/useBreadcrumbs/useBreadcrumbs.tsx

@@ -4,6 +4,7 @@ import { LocaleKey } from '@common/intl';
 import { create } from 'zustand';
 
 export interface UrlPart {
+  disabled?: boolean;
   path: string;
   key: LocaleKey;
   value: string;

client/packages/common/src/ui/components/navigation/Breadcrumbs/Breadcrumbs.tsx

@@ -52,6 +52,10 @@ export const Breadcrumbs = ({
       }
     }
 
+    if (part.disabled) {
+      return <span key={part.key}>{parseTitle(part)}</span>;
+    }
+
     return (
       <Breadcrumb to={part.path} key={part.key}>
         {t(part.key)}

client/packages/host/src/routers/DispensaryRouter.tsx

@@ -47,6 +47,10 @@ const fullContactTracesPath = RouteBuilder.create(AppRoute.Dispensary)
   .addWildCard()
   .build();
 
+const contactTracesListPath = RouteBuilder.create(AppRoute.Dispensary)
+  .addPart(AppRoute.ContactTrace)
+  .build();
+
 const fullReportsPath = RouteBuilder.create(AppRoute.Dispensary)
   .addPart(AppRoute.Reports)
   .build();
@@ -57,6 +61,7 @@ export const DispensaryRouter: FC = () => {
   const gotoEncounters = useMatch(fullEncountersPath);
   const gotoContactTraces = useMatch(fullContactTracesPath);
   const gotoReports = useMatch(fullReportsPath);
+  const gotoContactTracesList = useMatch(contactTracesListPath);
 
   if (gotoDistribution) {
     return <InvoiceService />;
@@ -69,6 +74,12 @@ export const DispensaryRouter: FC = () => {
   if (gotoEncounters) {
     return <EncounterService />;
   }
+  if (gotoContactTracesList) {
+    const patientListRoute = RouteBuilder.create(AppRoute.Dispensary)
+      .addPart(AppRoute.Patients)
+      .build();
+    return <Navigate to={patientListRoute} />;
+  }
 
   if (gotoContactTraces) {
     return <ContactTraceService />;

client/packages/system/src/ContactTrace/DetailView/DetailView.tsx

@@ -38,7 +38,7 @@ export const DetailView: FC<DetailViewProps> = ({
 }) => {
   const t = useTranslation('dispensary');
   const navigate = useNavigate();
-  const { setSuffix } = useBreadcrumbs([AppRoute.ContactTrace]);
+  const { setSuffix, urlParts } = useBreadcrumbs([AppRoute.ContactTrace]);
   const dateFormat = useFormatDateTime();
   const { getLocalisedFullName } = useIntlUtils();
   const id = useContactTraces.utils.idFromUrl();
@@ -110,6 +110,9 @@ export const DetailView: FC<DetailViewProps> = ({
     }
   }, [isDirty, contactTraceId, id, navigate]);
 
+  const urlStart = urlParts[0];
+  if (urlStart) urlStart.disabled = true;
+
   const updateContactTrace = useDebounceCallback(
     (patch: Partial<ContactTrace>) =>
       setData({