Updates the event title for reservationUnits week calendar if the reservation is other than set reservationUnit

Author: huru-ukko

admin-ui/src/component/my-units/ReservationUnitCalendar.tsx

@@ -19,6 +19,8 @@ import Legend from "../reservations/requested/Legend";
 import { RESERVATIONS_BY_RESERVATIONUNITS } from "./queries";
 import eventStyleGetter, { legend } from "./eventStyleGetter";
 import { publicUrl } from "../../common/const";
+import { getReserveeName } from "../reservations/requested/util";
+import Loader from "../Loader";
 
 type Props = {
   begin: string;
@@ -49,6 +51,26 @@ const updateQuery = (
   return combineResults(previousResult, fetchMoreResult, "reservations");
 };
 
+const getEventTitle = ({
+  reservationUnitPk,
+  reservation,
+}: {
+  reservationUnitPk: number;
+  reservation: ReservationType;
+}) => {
+  const reservationUnit = reservation.reservationUnits?.[0];
+  const isOtherReservationUnit = reservationUnitPk !== reservationUnit?.pk;
+
+  if (isOtherReservationUnit) {
+    const reserveeName = getReserveeName(reservation);
+    const reservationUnitName = reservationUnit?.nameFi ?? "";
+
+    return [reserveeName, reservationUnitName];
+  }
+
+  return null;
+};
+
 const ReservationUnitCalendar = ({
   begin,
   reservationUnitPk,
@@ -59,7 +81,7 @@ const ReservationUnitCalendar = ({
 
   const { t } = useTranslation();
 
-  const { fetchMore } = useQuery<
+  const { fetchMore, loading } = useQuery<
     Query,
     QueryReservationUnitByPkArgs & ReservationUnitByPkTypeReservationsArgs
   >(RESERVATIONS_BY_RESERVATIONUNITS, {
@@ -77,17 +99,24 @@ const ReservationUnitCalendar = ({
 
       if (reservations) {
         setEvents(
-          reservations.map((reservation) => ({
-            title: `${
-              reservation.reserveeOrganisationName ||
-              `${reservation.reserveeFirstName || ""} ${
-                reservation.reserveeLastName || ""
-              }`
-            }`,
-            event: reservation as ReservationType,
-            start: new Date(get(reservation, "begin")),
-            end: new Date(get(reservation, "end")),
-          }))
+          reservations.map((reservation) => {
+            const titleParts = getEventTitle({
+              reservationUnitPk,
+              reservation,
+            });
+            const title = titleParts
+              ? `${titleParts[0]} / ${t("common.reservationUnit")} ${
+                  titleParts[1]
+                }`
+              : "";
+
+            return {
+              title,
+              event: reservation as ReservationType,
+              start: new Date(get(reservation, "begin")),
+              end: new Date(get(reservation, "end")),
+            };
+          })
         );
       }
     },
@@ -108,6 +137,8 @@ const ReservationUnitCalendar = ({
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [hasMore, setHasMore]);
 
+  if (loading) return <Loader />;
+
   return (
     <Container>
       <CommonCalendar

admin-ui/src/component/my-units/queries.ts

@@ -30,9 +30,12 @@ export const UNIT_QUERY = gql`
 export const RESERVATIONS_BY_RESERVATIONUNITS = gql`
   query ReservationUnit($pk: Int, $from: Date, $to: Date) {
     reservationUnitByPk(pk: $pk) {
+      pk
       reservations(from: $from, to: $to, includeWithSameComponents: true) {
         id
         user {
+          firstName
+          lastName
           email
         }
         name
@@ -41,6 +44,7 @@ export const RESERVATIONS_BY_RESERVATIONUNITS = gql`
         reserveeOrganisationName
         reservationUnits {
           pk
+          nameFi
         }
         pk
         begin

admin-ui/src/i18n/messages.ts

@@ -173,6 +173,7 @@ const translations: ITranslations = {
     increaseByOneAriaLabel: ["Lisää yhdellä"],
     decreaseByOneAriaLabel: ["Vähennä yhdellä"],
     openToNewTab: ["Avaa uuteen välilehteen"],
+    reservationUnit: ["Varausyksikkö"],
   },
   errors: {
     applicationRoundNotFound: ["Haettua hakukierrosta ei löydy"],