Merge pull request #278 from City-of-Helsinki/TILA-1478

TILA-1478, TILA-1479

Author: siren

admin-ui/src/common/auth/axiosClient.ts

@@ -9,7 +9,7 @@ import {
 } from "./util";
 
 const axiosOptions = {
-  timeout: 20000,
+  timeout: 30000,
   headers: {
     "Content-Type": "application/json",
   },

admin-ui/src/component/applications/Application.tsx

@@ -378,6 +378,10 @@ function Application(): JSX.Element | null {
     return <Loader />;
   }
 
+  if (!application) {
+    return null;
+  }
+
   const notificationContent: { heading: string; body: string } | undefined =
     statusNotification
       ? {

admin-ui/src/component/applications/ApplicationDetails.tsx

@@ -214,6 +214,10 @@ function ApplicationDetails(): JSX.Element | null {
     return <Loader />;
   }
 
+  if (!application) {
+    return null;
+  }
+
   const isOrganisation = Boolean(application?.organisation);
 
   const hasBillingAddress =

admin-ui/src/component/applications/ReservationByApplicationEvent.tsx

@@ -151,6 +151,10 @@ function ReservationByApplicationEvent(): JSX.Element | null {
     return <Loader />;
   }
 
+  if (!application) {
+    return null;
+  }
+
   const customerName = applicantName(application);
 
   const applicationEvent: ApplicationEvent | undefined =

admin-ui/src/component/applications/util.ts

@@ -9,12 +9,13 @@ import {
 } from "../../common/types";
 import { formatDuration } from "../../common/util";
 
-export const applicantName = (
-  application: Application | null
-): string | null | undefined =>
-  application?.applicantType === "individual"
-    ? application?.applicantName
-    : application?.organisation?.name;
+export const applicantName = (app: Application): string => {
+  return app.applicantType === "individual"
+    ? `${app.contactPerson?.firstName || "-"} ${
+        app.contactPerson?.lastName || "-"
+      }`
+    : app.organisation?.name || "-";
+};
 
 export const getApplicationStatusColor = (
   status: ApplicationStatus,

admin-ui/src/component/recurring-reservations/Review.tsx

@@ -410,7 +410,7 @@ function Review({ applicationRound }: IProps): JSX.Element | null {
                           <StyledLink
                             to={`${applicationDetailsUrl(id)}#${eventId}`}
                           >
-                            {applicant}
+                            {truncate(applicant, 20)}
                           </StyledLink>
                         ),
                       },

admin-ui/src/component/recurring-reservations/util.tsx

@@ -11,6 +11,7 @@ import {
   Unit,
 } from "../../common/types";
 import {
+  applicantName,
   applicationHours,
   applicationTurns,
   getNormalizedApplicationStatus,
@@ -71,18 +72,14 @@ export const appMapper = (
     app.status,
     applicationStatusView
   );
+
+  const applicant = applicantName(app);
   return {
     key: `${app.id}-${eventId || "-"} `,
     id: app.id,
     eventId,
-    applicant:
-      app.applicantType === "individual"
-        ? app.applicantName || ""
-        : app.organisation?.name || "",
-    applicantSort: (app.applicantType === "individual"
-      ? app.applicantName || ""
-      : app.organisation?.name || ""
-    ).toLowerCase(),
+    applicant,
+    applicantSort: applicant.toLowerCase(),
     type: app.applicantType
       ? t(`Application.applicantTypes.${app.applicantType}`)
       : "",

admin-ui/src/context/NotificationContext.tsx

@@ -36,26 +36,30 @@ export const NotificationContextProvider: React.FC = ({ children }) => {
     setTimeout(() => setNotification(null), 1000 * 5);
   };
 
+  function notifyError(title: string, message?: string) {
+    showDisappearingNotification({
+      type: "error",
+      title,
+      message: message || null,
+    });
+  }
+
+  function notifySuccess(title: string, message?: string) {
+    showDisappearingNotification({
+      type: "success",
+      title,
+      message: message || null,
+    });
+  }
+
   return (
     <NotificationContext.Provider
       value={{
         notification,
         setNotification: showDisappearingNotification,
         clearNotification,
-        notifyError: (title, message?) => {
-          showDisappearingNotification({
-            type: "error",
-            title,
-            message: message || null,
-          });
-        },
-        notifySuccess: (title, message?) => {
-          showDisappearingNotification({
-            type: "success",
-            title,
-            message: message || null,
-          });
-        },
+        notifyError,
+        notifySuccess,
       }}
     >
       {children}