Update group booking and package

apps/edr-passenger-web/backoffice/src/lib/api-client.ts

@@ -2,6 +2,30 @@ import axios, { AxiosInstance, AxiosRequestConfig } from 'axios';
 
 const API_URL = process.env.NEXT_PUBLIC_API_URL || 'http://localhost:4000';
 
+const GENERIC_ERROR_MESSAGE = 'Something went wrong. Please try again.';
+const NETWORK_ERROR_MESSAGE = 'Could not reach the server. Please check your connection and try again.';
+
+/**
+ * Extracts a user-facing message from a failed request. Prefers a real backend-provided message
+ * (joining a NestJS validation array into one line); otherwise falls back to a friendly generic
+ * message — never raw client/network text like "Request failed with status code 500" or
+ * "Network Error", which is what axios puts in `error.message` when there's nothing better.
+ * Every page in this app should use this (or rely on the response interceptor below, which
+ * normalizes the same error in place) instead of reading `err.message` directly.
+ */
+export function getErrorMessage(error: unknown, fallback: string = GENERIC_ERROR_MESSAGE): string {
+  const err = error as any;
+  const raw = err?.response?.data?.message;
+  if (Array.isArray(raw) && raw.length > 0) {
+    const joined = raw.filter((m: unknown) => typeof m === 'string' && m.trim()).join('; ');
+    if (joined) return joined;
+  } else if (typeof raw === 'string' && raw.trim()) {
+    return raw;
+  }
+  if (err?.isAxiosError && !err.response) return NETWORK_ERROR_MESSAGE;
+  return fallback;
+}
+
 class ApiClient {
   private client: AxiosInstance;
 
@@ -30,6 +54,20 @@ class ApiClient {
             window.location.href = '/login';
           }
         }
+
+        // Normalize in place so every existing `err?.response?.data?.message || err?.message ||
+        // '<fallback>'` call site across the app picks up a friendly message automatically,
+        // instead of raw axios/network text or an unjoined NestJS validation array.
+        try {
+          const friendly = getErrorMessage(error);
+          if (error.response?.data && typeof error.response.data === 'object') {
+            error.response.data.message = friendly;
+          }
+          error.message = friendly;
+        } catch {
+          // Best-effort — never let normalization itself break the original rejection.
+        }
+
         return Promise.reject(error);
       },
     );