fix: my units calendar now shows the reservation name with prefix

fix: make translation function required in getReserveeName wip
City-of-Helsinki · May 7, 2024 · a4fadf1 · a4fadf1
1 parent 43738b2
commit a4fadf1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/apps/admin-ui/src/component/my-units/ReservationUnitCalendar.tsx b/apps/admin-ui/src/component/my-units/ReservationUnitCalendar.tsx
@@ -28,6 +28,7 @@ import {
 } from "common/src/helpers";
 import { RELATED_RESERVATION_STATES } from "common/src/const";
 import { ReservationUnitWithAffectingArgs } from "common/src/queries/fragments";
+import { t } from "i18next";
 
 type Props = {
   begin: string;
@@ -57,7 +58,7 @@ const getEventTitle = ({
   const reservationUnit = reservation.reservationUnit?.[0];
   const isOtherReservationUnit = reservationUnitPk !== reservationUnit?.pk;
 
-  const reserveeName = getReserveeName(reservation);
+  const reserveeName = getReserveeName(reservation, t);
   if (isOtherReservationUnit) {
     const reservationUnitName = reservationUnit?.nameFi ?? "";
 

diff --git a/apps/admin-ui/src/component/my-units/UnitCalendar.tsx b/apps/admin-ui/src/component/my-units/UnitCalendar.tsx
@@ -317,7 +317,7 @@ function getEventTitle({
   }
 
   return event && event?.pk !== event?.reservationUnit?.[0]?.pk
-    ? getReserveeName(event)
+    ? getReserveeName(event, t)
     : title;
 }
 

diff --git a/apps/admin-ui/src/component/reservations/requested/util.ts b/apps/admin-ui/src/component/reservations/requested/util.ts
@@ -198,7 +198,7 @@ export const getTranslationKeyForCustomerTypeChoice = (
 
 export const getReserveeName = (
   reservation: ReservationNode,
-  t?: TFunction,
+  t: TFunction,
   length = 50
 ): string => {
   let prefix = "";