ui: show backend error msgs, compact transfer display

motis-project · Jan 19, 2025 · eaa2053 · eaa2053
1 parent 636154f
commit eaa2053
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 8 deletions.
diff --git a/ui/package.json b/ui/package.json
@@ -3,7 +3,7 @@
 	"version": "0.0.1",
 	"private": true,
 	"scripts": {
-		"dev": "vite dev --host 0.0.0.0 --port 3000",
+		"dev": "vite dev",
 		"build": "vite build",
 		"preview": "vite preview",
 		"test": "npm run test:integration && npm run test:unit",

diff --git a/ui/src/lib/ConnectionDetail.svelte b/ui/src/lib/ConnectionDetail.svelte
@@ -89,8 +89,8 @@
 			<div class="w-full flex justify-between items-center space-x-1">
 				<Route {onClickTrip} {l} />
 				{#if pred && (pred.from.track || pred.duration !== 0)}
-					<div class="border-t w-full h-0"></div>
-					<div class="text-sm text-muted-foreground text-nowrap px-2">
+					<div class="border-t h-0 grow shrink"></div>
+					<div class="text-sm text-muted-foreground leading-none px-2">
 						{#if pred.from.track}
 							{t.arrivalOnTrack} {pred.from.track}{pred.duration ? ',' : ''}
 						{/if}
@@ -102,7 +102,7 @@
 						{/if}
 					</div>
 				{/if}
-				<div class="border-t w-full h-0"></div>
+				<div class="border-t h-0 grow shrink"></div>
 				{#if l.from.track}
 					<div class="text-nowrap border rounded-xl px-2">
 						{t.track}

diff --git a/ui/src/lib/ErrorMessage.svelte b/ui/src/lib/ErrorMessage.svelte
@@ -6,4 +6,4 @@
 	} = $props();
 </script>
 
-<div class="m-4 text-red-600">{e}</div>
+<div class="m-4 text-red-600"><div class="min-w-0">{e}</div></div>
diff --git a/ui/src/lib/ItineraryList.svelte b/ui/src/lib/ItineraryList.svelte
@@ -32,7 +32,11 @@
 
 	const throwOnError = (promise: RequestResult<PlanResponse, PlanError, false>) =>
 		promise.then((response) => {
-			if (response.error) throw new Error(String(response.error));
+			console.log(response.error);
+			if (response.error)
+				throw new Error(
+					String((response.error as Record<string, unknown>).error ?? response.error)
+				);
 			return response.data!;
 		});
 </script>

diff --git a/ui/src/lib/i18n/pl.ts b/ui/src/lib/i18n/pl.ts
@@ -34,7 +34,8 @@ const translations: Translations = {
 		}
 	},
 	sharingProvider: 'Dostawca',
-	roundtripStationReturnConstraint: 'Pojazd musi zostać zwrócony do stacji początkowej.'
+	roundtripStationReturnConstraint: 'Pojazd musi zostać zwrócony do stacji początkowej.',
+	noItinerariesFound: 'No itineraries found.'
 };
 
 export default translations;
diff --git a/ui/src/routes/+page.svelte b/ui/src/routes/+page.svelte
@@ -224,7 +224,8 @@
 	const onClickTrip = async (tripId: string, replace: boolean = false) => {
 		const { data: itinerary, error } = await trip({ query: { tripId } });
 		if (error) {
-			alert(error);
+			console.log(error);
+			alert(String((error as Record<string, unknown>).error ?? error));
 			return;
 		}
 		pushStateWithQueryString({ tripId }, { selectedItinerary: itinerary, tripId: tripId }, replace);