more generic breadcrumbs generator with unit tests

gip-inclusion · Sep 25, 2024 · 8bee1bc · 8bee1bc
1 parent 32d0662
commit 8bee1bc
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 9 deletions.
diff --git a/front/src/app/routes/routes.ts b/front/src/app/routes/routes.ts
@@ -1,4 +1,4 @@
-import { AuthenticatedUserQueryParams, frontRoutes } from "shared";
+import { AuthenticatedUserQueryParams, ValueOf, frontRoutes } from "shared";
 import { icUserAgencyDashboardTabSerializer } from "src/app/routes/routeParams/agencyDashboardTabs";
 import { icUserEstablishmentDashboardTabSerializer } from "src/app/routes/routeParams/establishmentDashboardTabs";
 import { ValueSerializer, createRouter, defineRoute, param } from "type-route";
@@ -69,6 +69,9 @@ export const searchParams = {
   ...acquisitionParams,
 };
 
+export type FrontRouteUnion = ValueOf<typeof routes>;
+export type FrontRouteKeys = keyof typeof routes;
+
 export const { RouteProvider, useRoute, routes } = createRouter({
   addAgency: defineRoute(`/${frontRoutes.addAgency}`),
   adminRoot: defineRoute(`/${frontRoutes.admin}`),

diff --git a/front/src/app/utils/IsAllowedConventionTransition.ts b/front/src/app/utils/IsAllowedConventionTransition.ts
@@ -17,6 +17,6 @@ export const isAllowedConventionTransition = (
     actingRoles.some((actingRole) =>
       transitionConfig.validRoles.includes(actingRole),
     ) &&
-    (!transitionConfig.refine?.(convention).isError ?? true)
+    !transitionConfig.refine?.(convention).isError
   );
 };
diff --git a/front/src/app/utils/breadcrumbs.ts b/front/src/app/utils/breadcrumbs.ts
@@ -5,15 +5,23 @@ import {
   BreadcrumbsItem,
 } from "src/app/contents/breadcrumbs/breadcrumbs";
 
+type RoutesKeysFromBreadcrumbs<T extends Record<keyof T, BreadcrumbsItem>> = {
+  [K in keyof T]:
+    | K
+    | (T[K]["children"] extends Record<keyof T[K]["children"], BreadcrumbsItem>
+        ? RoutesKeysFromBreadcrumbs<T[K]["children"]>
+        : never);
+}[keyof T];
+
 export const makeBreadcrumbsSegments =
-  <K>(
-    breadcrumbsSet: Breadcrumbs<K extends string ? K : never>,
+  <T extends Record<keyof T, BreadcrumbsItem>>(
+    breadcrumbsSet: Breadcrumbs<keyof T extends string ? keyof T : never>,
     rootAncestor: BreadcrumbProps["segments"][0],
   ) =>
   ({
     currentRouteKey,
   }: {
-    currentRouteKey: K;
+    currentRouteKey: RoutesKeysFromBreadcrumbs<T>;
   }): BreadcrumbProps["segments"] => {
     const currentRouteAncestor = keys(breadcrumbsSet).find((key) => {
       const currentRouteInBreadcrumbs = breadcrumbsSet[key];

diff --git a/front/src/app/utils/breadcrumbs.type.test.ts b/front/src/app/utils/breadcrumbs.type.test.ts
@@ -0,0 +1,16 @@
+import { getTestBreadcrumbs } from "src/app/utils/breadcrumbs.unit.test";
+
+getTestBreadcrumbs({
+  // @ts-expect-error
+  currentRouteKey: "not-known-route-name",
+});
+
+getTestBreadcrumbs({
+  // root at level 1
+  currentRouteKey: "homeCandidates",
+});
+
+getTestBreadcrumbs({
+  // deep level
+  currentRouteKey: "searchDiagoriente",
+});
diff --git a/front/src/app/utils/breadcrumbs.unit.test.ts b/front/src/app/utils/breadcrumbs.unit.test.ts
@@ -135,7 +135,6 @@ const testRootAncestor: BreadcrumbProps["segments"][0] = {
   },
 };
 
-const getTestBreadcrumbs = makeBreadcrumbsSegments(
-  testBreadcrumbsSet,
-  testRootAncestor,
-);
+export const getTestBreadcrumbs = makeBreadcrumbsSegments<
+  typeof testBreadcrumbsSet
+>(testBreadcrumbsSet, testRootAncestor);