feat: add location autocomplete
This commit is contained in:
7
bun.lock
7
bun.lock
@@ -12,6 +12,7 @@
|
|||||||
"@radix-ui/react-label": "^2.1.7",
|
"@radix-ui/react-label": "^2.1.7",
|
||||||
"@radix-ui/react-select": "^2.2.6",
|
"@radix-ui/react-select": "^2.2.6",
|
||||||
"@radix-ui/react-slot": "^1.2.3",
|
"@radix-ui/react-slot": "^1.2.3",
|
||||||
|
"@vis.gl/react-google-maps": "^1.8.3",
|
||||||
"better-auth": "^1.6.0",
|
"better-auth": "^1.6.0",
|
||||||
"class-variance-authority": "^0.7.1",
|
"class-variance-authority": "^0.7.1",
|
||||||
"clsx": "^2.1.1",
|
"clsx": "^2.1.1",
|
||||||
@@ -172,6 +173,8 @@
|
|||||||
|
|
||||||
"@floating-ui/utils": ["@floating-ui/utils@0.2.10", "", {}, "sha512-aGTxbpbg8/b5JfU1HXSrbH3wXZuLPJcNEcZQFMxLs3oSzgtVu6nFPkbbGGUvBcUjKV2YyB9Wxxabo+HEH9tcRQ=="],
|
"@floating-ui/utils": ["@floating-ui/utils@0.2.10", "", {}, "sha512-aGTxbpbg8/b5JfU1HXSrbH3wXZuLPJcNEcZQFMxLs3oSzgtVu6nFPkbbGGUvBcUjKV2YyB9Wxxabo+HEH9tcRQ=="],
|
||||||
|
|
||||||
|
"@googlemaps/js-api-loader": ["@googlemaps/js-api-loader@2.0.2", "", { "dependencies": { "@types/google.maps": "^3.53.1" } }, "sha512-bKVuTqatS8Jven5aFqVB7rCHF1VFEzpzyi0ruzO0GUR+A7m9oMqMgtnmpANj7kMYEvvhty8Fk7TnJ1MKjWHu+Q=="],
|
||||||
|
|
||||||
"@humanfs/core": ["@humanfs/core@0.19.1", "", {}, "sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA=="],
|
"@humanfs/core": ["@humanfs/core@0.19.1", "", {}, "sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA=="],
|
||||||
|
|
||||||
"@humanfs/node": ["@humanfs/node@0.16.7", "", { "dependencies": { "@humanfs/core": "^0.19.1", "@humanwhocodes/retry": "^0.4.0" } }, "sha512-/zUx+yOsIrG4Y43Eh2peDeKCxlRt/gET6aHfaKpuq267qXdYDFViVHfMaLyygZOnl0kGWxFIgsBy8QFuTLUXEQ=="],
|
"@humanfs/node": ["@humanfs/node@0.16.7", "", { "dependencies": { "@humanfs/core": "^0.19.1", "@humanwhocodes/retry": "^0.4.0" } }, "sha512-/zUx+yOsIrG4Y43Eh2peDeKCxlRt/gET6aHfaKpuq267qXdYDFViVHfMaLyygZOnl0kGWxFIgsBy8QFuTLUXEQ=="],
|
||||||
@@ -442,6 +445,8 @@
|
|||||||
|
|
||||||
"@types/estree": ["@types/estree@1.0.8", "", {}, "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w=="],
|
"@types/estree": ["@types/estree@1.0.8", "", {}, "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w=="],
|
||||||
|
|
||||||
|
"@types/google.maps": ["@types/google.maps@3.58.1", "", {}, "sha512-X9QTSvGJ0nCfMzYOnaVs/k6/4L+7F5uCS+4iUmkLEls6J9S/Phv+m/i3mDeyc49ZBgwab3EFO1HEoBY7k98EGQ=="],
|
||||||
|
|
||||||
"@types/json-schema": ["@types/json-schema@7.0.15", "", {}, "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA=="],
|
"@types/json-schema": ["@types/json-schema@7.0.15", "", {}, "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA=="],
|
||||||
|
|
||||||
"@types/json5": ["@types/json5@0.0.29", "", {}, "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ=="],
|
"@types/json5": ["@types/json5@0.0.29", "", {}, "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ=="],
|
||||||
@@ -528,6 +533,8 @@
|
|||||||
|
|
||||||
"@unrs/resolver-binding-win32-x64-msvc": ["@unrs/resolver-binding-win32-x64-msvc@1.11.1", "", { "os": "win32", "cpu": "x64" }, "sha512-lrW200hZdbfRtztbygyaq/6jP6AKE8qQN2KvPcJ+x7wiD038YtnYtZ82IMNJ69GJibV7bwL3y9FgK+5w/pYt6g=="],
|
"@unrs/resolver-binding-win32-x64-msvc": ["@unrs/resolver-binding-win32-x64-msvc@1.11.1", "", { "os": "win32", "cpu": "x64" }, "sha512-lrW200hZdbfRtztbygyaq/6jP6AKE8qQN2KvPcJ+x7wiD038YtnYtZ82IMNJ69GJibV7bwL3y9FgK+5w/pYt6g=="],
|
||||||
|
|
||||||
|
"@vis.gl/react-google-maps": ["@vis.gl/react-google-maps@1.8.3", "", { "dependencies": { "@googlemaps/js-api-loader": "^2.0.2", "@types/google.maps": "^3.54.10", "fast-deep-equal": "^3.1.3" }, "peerDependencies": { "react": ">=16.8.0 || ^19.0 || ^19.0.0-rc", "react-dom": ">=16.8.0 || ^19.0 || ^19.0.0-rc" } }, "sha512-DW7nEuvOJ299DmdBnvGiUARrgS/+sTEO1iJgG9J8YaErZqLoq7S4TJ22f3EjJvR4dti4L4gft43JEK77nnKXDw=="],
|
||||||
|
|
||||||
"acorn": ["acorn@8.15.0", "", { "bin": { "acorn": "bin/acorn" } }, "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg=="],
|
"acorn": ["acorn@8.15.0", "", { "bin": { "acorn": "bin/acorn" } }, "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg=="],
|
||||||
|
|
||||||
"acorn-jsx": ["acorn-jsx@5.3.2", "", { "peerDependencies": { "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" } }, "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ=="],
|
"acorn-jsx": ["acorn-jsx@5.3.2", "", { "peerDependencies": { "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" } }, "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ=="],
|
||||||
|
|||||||
61
src/app/api/location-autocomplete/route.ts
Normal file
61
src/app/api/location-autocomplete/route.ts
Normal file
@@ -0,0 +1,61 @@
|
|||||||
|
import { NextResponse } from "next/server";
|
||||||
|
import {
|
||||||
|
getGoogleMapsLocationCapability,
|
||||||
|
getGoogleMapsServerApiKey,
|
||||||
|
mapGooglePlacesSuggestions,
|
||||||
|
} from "@/lib/google-maps";
|
||||||
|
|
||||||
|
const AUTOCOMPLETE_FIELD_MASK = [
|
||||||
|
"suggestions.placePrediction.place",
|
||||||
|
"suggestions.placePrediction.placeId",
|
||||||
|
"suggestions.placePrediction.text.text",
|
||||||
|
"suggestions.placePrediction.structuredFormat.mainText.text",
|
||||||
|
"suggestions.placePrediction.structuredFormat.secondaryText.text",
|
||||||
|
].join(",");
|
||||||
|
|
||||||
|
export async function GET(request: Request) {
|
||||||
|
const capability = getGoogleMapsLocationCapability();
|
||||||
|
if (!capability.enabled) {
|
||||||
|
return NextResponse.json({ suggestions: [] }, { status: 503 });
|
||||||
|
}
|
||||||
|
|
||||||
|
const apiKey = getGoogleMapsServerApiKey();
|
||||||
|
if (!apiKey) {
|
||||||
|
return NextResponse.json({ suggestions: [] }, { status: 503 });
|
||||||
|
}
|
||||||
|
|
||||||
|
const { searchParams } = new URL(request.url);
|
||||||
|
const input = searchParams.get("input")?.trim();
|
||||||
|
const sessionToken = searchParams.get("sessionToken")?.trim();
|
||||||
|
|
||||||
|
if (!input) {
|
||||||
|
return NextResponse.json({ suggestions: [] });
|
||||||
|
}
|
||||||
|
|
||||||
|
const response = await fetch(
|
||||||
|
"https://places.googleapis.com/v1/places:autocomplete",
|
||||||
|
{
|
||||||
|
method: "POST",
|
||||||
|
headers: {
|
||||||
|
"Content-Type": "application/json",
|
||||||
|
"X-Goog-Api-Key": apiKey,
|
||||||
|
"X-Goog-FieldMask": AUTOCOMPLETE_FIELD_MASK,
|
||||||
|
},
|
||||||
|
body: JSON.stringify({
|
||||||
|
input,
|
||||||
|
sessionToken: sessionToken || undefined,
|
||||||
|
}),
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
if (!response.ok) {
|
||||||
|
return NextResponse.json({ suggestions: [] }, { status: 502 });
|
||||||
|
}
|
||||||
|
|
||||||
|
const payload = (await response.json()) as Parameters<
|
||||||
|
typeof mapGooglePlacesSuggestions
|
||||||
|
>[0];
|
||||||
|
return NextResponse.json({
|
||||||
|
suggestions: mapGooglePlacesSuggestions(payload),
|
||||||
|
});
|
||||||
|
}
|
||||||
@@ -3,8 +3,8 @@
|
|||||||
import { addHours, addMinutes, isValid, parseISO } from "date-fns";
|
import { addHours, addMinutes, isValid, parseISO } from "date-fns";
|
||||||
import { useEffect } from "react";
|
import { useEffect } from "react";
|
||||||
import { Controller, useForm } from "react-hook-form";
|
import { Controller, useForm } from "react-hook-form";
|
||||||
import { LucideMapPin } from "lucide-react";
|
|
||||||
import { DateTimePicker } from "@/components/date-time-picker";
|
import { DateTimePicker } from "@/components/date-time-picker";
|
||||||
|
import { LocationAutocomplete } from "@/components/location-autocomplete";
|
||||||
import { RecurrencePicker } from "@/components/recurrence-picker";
|
import { RecurrencePicker } from "@/components/recurrence-picker";
|
||||||
import { Button } from "@/components/ui/button";
|
import { Button } from "@/components/ui/button";
|
||||||
import { Checkbox } from "@/components/ui/checkbox";
|
import { Checkbox } from "@/components/ui/checkbox";
|
||||||
@@ -19,12 +19,12 @@ import {
|
|||||||
import { Input } from "@/components/ui/input";
|
import { Input } from "@/components/ui/input";
|
||||||
import { Label } from "@/components/ui/label";
|
import { Label } from "@/components/ui/label";
|
||||||
import { Textarea } from "@/components/ui/textarea";
|
import { Textarea } from "@/components/ui/textarea";
|
||||||
import { validateRecurrence, parseRecurrenceRule } from "@/lib/recurrence";
|
|
||||||
import {
|
import {
|
||||||
|
type EventFormValues,
|
||||||
getDefaultEventFormValues,
|
getDefaultEventFormValues,
|
||||||
validateEventFormValues,
|
validateEventFormValues,
|
||||||
type EventFormValues,
|
|
||||||
} from "@/lib/event-form";
|
} from "@/lib/event-form";
|
||||||
|
import { parseRecurrenceRule, validateRecurrence } from "@/lib/recurrence";
|
||||||
|
|
||||||
interface EventDialogProps {
|
interface EventDialogProps {
|
||||||
open: boolean;
|
open: boolean;
|
||||||
@@ -46,7 +46,11 @@ export const EventDialog = ({
|
|||||||
onReset,
|
onReset,
|
||||||
}: EventDialogProps) => {
|
}: EventDialogProps) => {
|
||||||
const isAiDraft = dialogSource === "ai" && !editingId;
|
const isAiDraft = dialogSource === "ai" && !editingId;
|
||||||
const titleText = editingId ? "Edit Event" : isAiDraft ? "Review AI Draft" : "New Event";
|
const titleText = editingId
|
||||||
|
? "Edit Event"
|
||||||
|
: isAiDraft
|
||||||
|
? "Review AI Draft"
|
||||||
|
: "New Event";
|
||||||
const descriptionText = editingId
|
const descriptionText = editingId
|
||||||
? "Update the event details below. Title and start date are required."
|
? "Update the event details below. Title and start date are required."
|
||||||
: isAiDraft
|
: isAiDraft
|
||||||
@@ -89,11 +93,16 @@ export const EventDialog = ({
|
|||||||
{ label: "+3 hours", minutes: 180 },
|
{ label: "+3 hours", minutes: 180 },
|
||||||
];
|
];
|
||||||
|
|
||||||
const handleApplyDuration = (minutes: number, currentAllDay: boolean, currentStart: string) => {
|
const handleApplyDuration = (
|
||||||
|
minutes: number,
|
||||||
|
currentAllDay: boolean,
|
||||||
|
currentStart: string,
|
||||||
|
) => {
|
||||||
if (!currentStart) return;
|
if (!currentStart) return;
|
||||||
const base = parseISO(currentStart);
|
const base = parseISO(currentStart);
|
||||||
if (!isValid(base)) return;
|
if (!isValid(base)) return;
|
||||||
const next = minutes < 60 ? addMinutes(base, minutes) : addHours(base, minutes / 60);
|
const next =
|
||||||
|
minutes < 60 ? addMinutes(base, minutes) : addHours(base, minutes / 60);
|
||||||
const pad = (value: number) => String(value).padStart(2, "0");
|
const pad = (value: number) => String(value).padStart(2, "0");
|
||||||
const result = currentAllDay
|
const result = currentAllDay
|
||||||
? `${next.getFullYear()}-${pad(next.getMonth() + 1)}-${pad(next.getDate())}`
|
? `${next.getFullYear()}-${pad(next.getMonth() + 1)}-${pad(next.getDate())}`
|
||||||
@@ -108,14 +117,18 @@ export const EventDialog = ({
|
|||||||
for (const [fieldName, messages] of Object.entries(fieldErrors)) {
|
for (const [fieldName, messages] of Object.entries(fieldErrors)) {
|
||||||
const firstMessage = messages?.[0];
|
const firstMessage = messages?.[0];
|
||||||
if (firstMessage) {
|
if (firstMessage) {
|
||||||
setError(fieldName as keyof EventFormValues, { message: firstMessage });
|
setError(fieldName as keyof EventFormValues, {
|
||||||
|
message: firstMessage,
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (values.recurrenceRule) {
|
if (values.recurrenceRule) {
|
||||||
const recurrenceValidation = validateRecurrence(parseRecurrenceRule(values.recurrenceRule));
|
const recurrenceValidation = validateRecurrence(
|
||||||
|
parseRecurrenceRule(values.recurrenceRule),
|
||||||
|
);
|
||||||
if (!recurrenceValidation.isValid) {
|
if (!recurrenceValidation.isValid) {
|
||||||
setError("recurrenceRule", {
|
setError("recurrenceRule", {
|
||||||
message:
|
message:
|
||||||
@@ -143,14 +156,22 @@ export const EventDialog = ({
|
|||||||
<form className="space-y-3" onSubmit={onSubmit}>
|
<form className="space-y-3" onSubmit={onSubmit}>
|
||||||
{isAiDraft && (
|
{isAiDraft && (
|
||||||
<div className="rounded-md border border-primary/20 bg-primary/5 px-3 py-2 text-xs leading-relaxed text-primary">
|
<div className="rounded-md border border-primary/20 bg-primary/5 px-3 py-2 text-xs leading-relaxed text-primary">
|
||||||
This draft was generated from natural language. Double-check dates, times, location, recurrence, and links before saving.
|
This draft was generated from natural language. Double-check
|
||||||
|
dates, times, location, recurrence, and links before saving.
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
<div className="space-y-1.5">
|
<div className="space-y-1.5">
|
||||||
<Label htmlFor="event-title">Title</Label>
|
<Label htmlFor="event-title">Title</Label>
|
||||||
<Input id="event-title" placeholder="Event title" className="font-medium" {...register("title")} />
|
<Input
|
||||||
{errors.title && <p className="text-xs text-destructive">{errors.title.message}</p>}
|
id="event-title"
|
||||||
|
placeholder="Event title"
|
||||||
|
className="font-medium"
|
||||||
|
{...register("title")}
|
||||||
|
/>
|
||||||
|
{errors.title && (
|
||||||
|
<p className="text-xs text-destructive">{errors.title.message}</p>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="space-y-1.5">
|
<div className="space-y-1.5">
|
||||||
@@ -163,18 +184,27 @@ export const EventDialog = ({
|
|||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="grid grid-cols-2 gap-3">
|
<div className="grid grid-cols-1 gap-3 sm:grid-cols-2">
|
||||||
<div className="space-y-1.5">
|
<div className="space-y-1.5">
|
||||||
<Label htmlFor="event-location">Location</Label>
|
<Label htmlFor="event-location">Location</Label>
|
||||||
<div className="relative">
|
<Controller
|
||||||
<LucideMapPin className="absolute left-3 top-1/2 h-3.5 w-3.5 -translate-y-1/2 text-muted-foreground/50" />
|
name="location"
|
||||||
<Input id="event-location" placeholder="Location" className="pl-8" {...register("location")} />
|
control={control}
|
||||||
</div>
|
render={({ field }) => (
|
||||||
|
<LocationAutocomplete
|
||||||
|
id="event-location"
|
||||||
|
onChange={field.onChange}
|
||||||
|
value={field.value}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
/>
|
||||||
</div>
|
</div>
|
||||||
<div className="space-y-1.5">
|
<div className="space-y-1.5">
|
||||||
<Label htmlFor="event-url">URL</Label>
|
<Label htmlFor="event-url">URL</Label>
|
||||||
<Input id="event-url" placeholder="URL" {...register("url")} />
|
<Input id="event-url" placeholder="URL" {...register("url")} />
|
||||||
{errors.url && <p className="text-xs text-destructive">{errors.url.message}</p>}
|
{errors.url && (
|
||||||
|
<p className="text-xs text-destructive">{errors.url.message}</p>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -182,11 +212,17 @@ export const EventDialog = ({
|
|||||||
name="recurrenceRule"
|
name="recurrenceRule"
|
||||||
control={control}
|
control={control}
|
||||||
render={({ field }) => (
|
render={({ field }) => (
|
||||||
<RecurrencePicker value={field.value} onChange={field.onChange} start={start} />
|
<RecurrencePicker
|
||||||
|
value={field.value}
|
||||||
|
onChange={field.onChange}
|
||||||
|
start={start}
|
||||||
|
/>
|
||||||
)}
|
)}
|
||||||
/>
|
/>
|
||||||
{errors.recurrenceRule && (
|
{errors.recurrenceRule && (
|
||||||
<p className="text-xs text-destructive">{errors.recurrenceRule.message}</p>
|
<p className="text-xs text-destructive">
|
||||||
|
{errors.recurrenceRule.message}
|
||||||
|
</p>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
<div className="flex items-center gap-2 py-1">
|
<div className="flex items-center gap-2 py-1">
|
||||||
@@ -197,11 +233,16 @@ export const EventDialog = ({
|
|||||||
<Checkbox
|
<Checkbox
|
||||||
id="event-all-day"
|
id="event-all-day"
|
||||||
checked={field.value}
|
checked={field.value}
|
||||||
onCheckedChange={(checked) => field.onChange(checked === true)}
|
onCheckedChange={(checked) =>
|
||||||
|
field.onChange(checked === true)
|
||||||
|
}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
/>
|
/>
|
||||||
<Label htmlFor="event-all-day" className="cursor-pointer text-sm font-normal">
|
<Label
|
||||||
|
htmlFor="event-all-day"
|
||||||
|
className="cursor-pointer text-sm font-normal"
|
||||||
|
>
|
||||||
All day
|
All day
|
||||||
</Label>
|
</Label>
|
||||||
</div>
|
</div>
|
||||||
@@ -211,7 +252,12 @@ export const EventDialog = ({
|
|||||||
name="start"
|
name="start"
|
||||||
control={control}
|
control={control}
|
||||||
render={({ field }) => (
|
render={({ field }) => (
|
||||||
<DateTimePicker value={field.value} onChange={field.onChange} allDay={allDay} placeholder="Start date" />
|
<DateTimePicker
|
||||||
|
value={field.value}
|
||||||
|
onChange={field.onChange}
|
||||||
|
allDay={allDay}
|
||||||
|
placeholder="Start date"
|
||||||
|
/>
|
||||||
)}
|
)}
|
||||||
/>
|
/>
|
||||||
{!allDay && (
|
{!allDay && (
|
||||||
@@ -227,7 +273,9 @@ export const EventDialog = ({
|
|||||||
variant="ghost"
|
variant="ghost"
|
||||||
size="sm"
|
size="sm"
|
||||||
disabled={!start}
|
disabled={!start}
|
||||||
onClick={() => handleApplyDuration(minutes, allDay, start)}
|
onClick={() =>
|
||||||
|
handleApplyDuration(minutes, allDay, start)
|
||||||
|
}
|
||||||
className="px-2 py-1 text-xs text-muted-foreground"
|
className="px-2 py-1 text-xs text-muted-foreground"
|
||||||
>
|
>
|
||||||
{label}
|
{label}
|
||||||
@@ -241,15 +289,28 @@ export const EventDialog = ({
|
|||||||
name="end"
|
name="end"
|
||||||
control={control}
|
control={control}
|
||||||
render={({ field }) => (
|
render={({ field }) => (
|
||||||
<DateTimePicker value={field.value} onChange={field.onChange} allDay={allDay} placeholder="End date" />
|
<DateTimePicker
|
||||||
|
value={field.value}
|
||||||
|
onChange={field.onChange}
|
||||||
|
allDay={allDay}
|
||||||
|
placeholder="End date"
|
||||||
|
/>
|
||||||
)}
|
)}
|
||||||
/>
|
/>
|
||||||
{errors.start && <p className="text-xs text-destructive">{errors.start.message}</p>}
|
{errors.start && (
|
||||||
{errors.end && <p className="text-xs text-destructive">{errors.end.message}</p>}
|
<p className="text-xs text-destructive">{errors.start.message}</p>
|
||||||
|
)}
|
||||||
|
{errors.end && (
|
||||||
|
<p className="text-xs text-destructive">{errors.end.message}</p>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<DialogFooter className="gap-2 sm:gap-0">
|
<DialogFooter className="gap-2 sm:gap-0">
|
||||||
<Button type="button" variant="ghost" onClick={() => handleOpenChange(false)}>
|
<Button
|
||||||
|
type="button"
|
||||||
|
variant="ghost"
|
||||||
|
onClick={() => handleOpenChange(false)}
|
||||||
|
>
|
||||||
Cancel
|
Cancel
|
||||||
</Button>
|
</Button>
|
||||||
<Button type="submit">{saveLabel}</Button>
|
<Button type="submit">{saveLabel}</Button>
|
||||||
|
|||||||
222
src/components/location-autocomplete.tsx
Normal file
222
src/components/location-autocomplete.tsx
Normal file
@@ -0,0 +1,222 @@
|
|||||||
|
"use client";
|
||||||
|
|
||||||
|
import { LucideMapPin } from "lucide-react";
|
||||||
|
import { useEffect, useMemo, useRef, useState } from "react";
|
||||||
|
import { Input } from "@/components/ui/input";
|
||||||
|
import {
|
||||||
|
type GoogleMapsLocationCapability,
|
||||||
|
type GoogleMapsSuggestion,
|
||||||
|
getGoogleMapsLocationCapability,
|
||||||
|
getGoogleMapsPlaceLabel,
|
||||||
|
getLocationAutocompletePlaceholder,
|
||||||
|
} from "@/lib/google-maps";
|
||||||
|
import { cn } from "@/lib/utils";
|
||||||
|
|
||||||
|
interface LocationAutocompleteProps {
|
||||||
|
capability?: GoogleMapsLocationCapability;
|
||||||
|
className?: string;
|
||||||
|
id: string;
|
||||||
|
onChange: (value: string) => void;
|
||||||
|
value: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
const SEARCH_HELP_TEXT = "Search Google Maps or keep typing a custom location.";
|
||||||
|
const SEARCH_UNAVAILABLE_TEXT =
|
||||||
|
"Google Maps search is unavailable right now. You can still type a location.";
|
||||||
|
|
||||||
|
export const LocationAutocomplete = ({
|
||||||
|
capability,
|
||||||
|
className,
|
||||||
|
id,
|
||||||
|
onChange,
|
||||||
|
value,
|
||||||
|
}: LocationAutocompleteProps) => {
|
||||||
|
const resolvedCapability = capability ?? getGoogleMapsLocationCapability();
|
||||||
|
|
||||||
|
if (!resolvedCapability.enabled) {
|
||||||
|
return (
|
||||||
|
<ManualLocationInput
|
||||||
|
className={className}
|
||||||
|
id={id}
|
||||||
|
onChange={onChange}
|
||||||
|
placeholder={getLocationAutocompletePlaceholder(resolvedCapability)}
|
||||||
|
value={value}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<ServerLocationInput
|
||||||
|
capability={resolvedCapability}
|
||||||
|
className={className}
|
||||||
|
id={id}
|
||||||
|
onChange={onChange}
|
||||||
|
value={value}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
const ManualLocationInput = ({
|
||||||
|
className,
|
||||||
|
id,
|
||||||
|
onChange,
|
||||||
|
placeholder,
|
||||||
|
value,
|
||||||
|
}: Omit<LocationAutocompleteProps, "capability"> & { placeholder: string }) => {
|
||||||
|
return (
|
||||||
|
<div className="space-y-1.5" data-location-mode="manual">
|
||||||
|
<div className="relative">
|
||||||
|
<LucideMapPin className="absolute left-3 top-1/2 h-3.5 w-3.5 -translate-y-1/2 text-muted-foreground/50" />
|
||||||
|
<Input
|
||||||
|
className={cn("pl-8", className)}
|
||||||
|
id={id}
|
||||||
|
onChange={(event) => onChange(event.target.value)}
|
||||||
|
placeholder={placeholder}
|
||||||
|
value={value}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
const ServerLocationInput = ({
|
||||||
|
capability,
|
||||||
|
className,
|
||||||
|
id,
|
||||||
|
onChange,
|
||||||
|
value,
|
||||||
|
}: Omit<LocationAutocompleteProps, "capability"> & {
|
||||||
|
capability: GoogleMapsLocationCapability;
|
||||||
|
}) => {
|
||||||
|
const [hasSearchError, setHasSearchError] = useState(false);
|
||||||
|
const [isLoadingSuggestions, setIsLoadingSuggestions] = useState(false);
|
||||||
|
const [suggestions, setSuggestions] = useState<GoogleMapsSuggestion[]>([]);
|
||||||
|
const sessionTokenRef = useRef<string | null>(null);
|
||||||
|
const skipNextLookupRef = useRef(false);
|
||||||
|
|
||||||
|
const helperText = useMemo(() => {
|
||||||
|
return hasSearchError ? SEARCH_UNAVAILABLE_TEXT : SEARCH_HELP_TEXT;
|
||||||
|
}, [hasSearchError]);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (skipNextLookupRef.current) {
|
||||||
|
skipNextLookupRef.current = false;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const query = value.trim();
|
||||||
|
if (!query || hasSearchError) {
|
||||||
|
setSuggestions([]);
|
||||||
|
setIsLoadingSuggestions(false);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!sessionTokenRef.current) {
|
||||||
|
sessionTokenRef.current = crypto.randomUUID();
|
||||||
|
}
|
||||||
|
|
||||||
|
const controller = new AbortController();
|
||||||
|
setIsLoadingSuggestions(true);
|
||||||
|
|
||||||
|
void fetch(
|
||||||
|
`/api/location-autocomplete?input=${encodeURIComponent(query)}&sessionToken=${encodeURIComponent(sessionTokenRef.current)}`,
|
||||||
|
{ signal: controller.signal },
|
||||||
|
)
|
||||||
|
.then(async (response) => {
|
||||||
|
if (!response.ok) {
|
||||||
|
throw new Error("Autocomplete request failed");
|
||||||
|
}
|
||||||
|
|
||||||
|
return (await response.json()) as {
|
||||||
|
suggestions?: GoogleMapsSuggestion[];
|
||||||
|
};
|
||||||
|
})
|
||||||
|
.then((payload) => {
|
||||||
|
setSuggestions(payload.suggestions ?? []);
|
||||||
|
})
|
||||||
|
.catch((error) => {
|
||||||
|
if (controller.signal.aborted) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
console.error("Location autocomplete failed", error);
|
||||||
|
setHasSearchError(true);
|
||||||
|
setSuggestions([]);
|
||||||
|
})
|
||||||
|
.finally(() => {
|
||||||
|
if (!controller.signal.aborted) {
|
||||||
|
setIsLoadingSuggestions(false);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
return () => controller.abort();
|
||||||
|
}, [hasSearchError, value]);
|
||||||
|
|
||||||
|
const handleSuggestionSelect = (suggestion: GoogleMapsSuggestion) => {
|
||||||
|
const nextValue = getGoogleMapsPlaceLabel({
|
||||||
|
formattedAddress: suggestion.formattedAddress,
|
||||||
|
name: suggestion.text,
|
||||||
|
predictionText: suggestion.text,
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!nextValue) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
skipNextLookupRef.current = true;
|
||||||
|
sessionTokenRef.current = null;
|
||||||
|
setSuggestions([]);
|
||||||
|
onChange(nextValue);
|
||||||
|
};
|
||||||
|
|
||||||
|
const showSuggestions = suggestions.length > 0 && !hasSearchError;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="space-y-1.5" data-location-mode="google-maps-server">
|
||||||
|
<div className="relative">
|
||||||
|
<LucideMapPin className="absolute left-3 top-1/2 h-3.5 w-3.5 -translate-y-1/2 text-muted-foreground/50" />
|
||||||
|
<Input
|
||||||
|
aria-autocomplete="list"
|
||||||
|
aria-expanded={showSuggestions}
|
||||||
|
className={cn("pl-8", className)}
|
||||||
|
id={id}
|
||||||
|
onChange={(event) => {
|
||||||
|
setHasSearchError(false);
|
||||||
|
onChange(event.target.value);
|
||||||
|
}}
|
||||||
|
placeholder={getLocationAutocompletePlaceholder(capability)}
|
||||||
|
role="combobox"
|
||||||
|
value={value}
|
||||||
|
/>
|
||||||
|
{showSuggestions ? (
|
||||||
|
<div className="absolute left-0 right-0 top-[calc(100%+0.375rem)] z-20 rounded-md border border-border/60 bg-background/95 p-1 shadow-lg backdrop-blur-sm">
|
||||||
|
<div className="space-y-1" role="listbox">
|
||||||
|
{suggestions.map((suggestion) => {
|
||||||
|
const suggestionKey =
|
||||||
|
suggestion.placeId || suggestion.text || "suggestion";
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div key={suggestionKey}>
|
||||||
|
<button
|
||||||
|
className="w-full rounded-sm px-3 py-2 text-left text-sm text-foreground transition hover:bg-accent hover:text-accent-foreground"
|
||||||
|
onClick={() => handleSuggestionSelect(suggestion)}
|
||||||
|
type="button"
|
||||||
|
>
|
||||||
|
{suggestion.text || "Use this place"}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
})}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
) : null}
|
||||||
|
</div>
|
||||||
|
<p className="text-xs text-muted-foreground">{helperText}</p>
|
||||||
|
{isLoadingSuggestions ? (
|
||||||
|
<p className="text-xs text-muted-foreground">
|
||||||
|
Loading place suggestions…
|
||||||
|
</p>
|
||||||
|
) : null}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
};
|
||||||
170
src/lib/google-maps.ts
Normal file
170
src/lib/google-maps.ts
Normal file
@@ -0,0 +1,170 @@
|
|||||||
|
export interface GoogleMapsLocationConfig {
|
||||||
|
enabled?: boolean | null;
|
||||||
|
region?: string | null;
|
||||||
|
publicEnabled?: boolean | null;
|
||||||
|
serverApiKey?: string | null;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface GoogleMapsLocationCapability {
|
||||||
|
enabled: boolean;
|
||||||
|
reason: "configured" | "missing_server_api_key" | "disabled";
|
||||||
|
region: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface GoogleMapsPlaceLabelSource {
|
||||||
|
displayName?: string | { text?: string | null } | null;
|
||||||
|
formattedAddress?: string | null;
|
||||||
|
name?: string | null;
|
||||||
|
predictionText?: string | null;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface GoogleMapsSuggestion {
|
||||||
|
formattedAddress?: string;
|
||||||
|
placeId?: string;
|
||||||
|
text: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
const DEFAULT_GOOGLE_MAPS_REGION = "us";
|
||||||
|
|
||||||
|
const normalizeConfigValue = (value?: string | null) => {
|
||||||
|
const trimmedValue = value?.trim();
|
||||||
|
return trimmedValue ? trimmedValue : null;
|
||||||
|
};
|
||||||
|
|
||||||
|
const getDisplayNameText = (
|
||||||
|
displayName?: string | { text?: string | null } | null,
|
||||||
|
) => {
|
||||||
|
if (typeof displayName === "string") {
|
||||||
|
return normalizeConfigValue(displayName);
|
||||||
|
}
|
||||||
|
|
||||||
|
return normalizeConfigValue(displayName?.text);
|
||||||
|
};
|
||||||
|
|
||||||
|
const parseEnabledValue = (value?: string | null) => {
|
||||||
|
const normalizedValue = normalizeConfigValue(value)?.toLowerCase();
|
||||||
|
|
||||||
|
if (!normalizedValue) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return !["0", "false", "no", "off"].includes(normalizedValue);
|
||||||
|
};
|
||||||
|
|
||||||
|
export const getGoogleMapsLocationCapability = (
|
||||||
|
config: GoogleMapsLocationConfig = {},
|
||||||
|
): GoogleMapsLocationCapability => {
|
||||||
|
const enabled =
|
||||||
|
typeof config.enabled === "boolean"
|
||||||
|
? config.enabled
|
||||||
|
: typeof config.publicEnabled === "boolean"
|
||||||
|
? config.publicEnabled
|
||||||
|
: parseEnabledValue(
|
||||||
|
process.env.NEXT_PUBLIC_GOOGLE_MAPS_AUTOCOMPLETE_ENABLED,
|
||||||
|
);
|
||||||
|
const serverApiKey = normalizeConfigValue(
|
||||||
|
config.serverApiKey ?? process.env.GOOGLE_MAPS_API_KEY,
|
||||||
|
);
|
||||||
|
const region =
|
||||||
|
normalizeConfigValue(config.region ?? process.env.GOOGLE_MAPS_REGION) ??
|
||||||
|
DEFAULT_GOOGLE_MAPS_REGION;
|
||||||
|
|
||||||
|
if (!enabled) {
|
||||||
|
return {
|
||||||
|
enabled: false,
|
||||||
|
reason: "disabled",
|
||||||
|
region,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
if (typeof window !== "undefined") {
|
||||||
|
return {
|
||||||
|
enabled: true,
|
||||||
|
reason: "configured",
|
||||||
|
region,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!serverApiKey) {
|
||||||
|
return {
|
||||||
|
enabled: false,
|
||||||
|
reason: "missing_server_api_key",
|
||||||
|
region,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
enabled: true,
|
||||||
|
reason: "configured",
|
||||||
|
region,
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
export const getGoogleMapsServerApiKey = () =>
|
||||||
|
normalizeConfigValue(process.env.GOOGLE_MAPS_API_KEY);
|
||||||
|
|
||||||
|
export const getGoogleMapsPlaceLabel = (source: GoogleMapsPlaceLabelSource) => {
|
||||||
|
return (
|
||||||
|
normalizeConfigValue(source.predictionText) ??
|
||||||
|
getDisplayNameText(source.displayName) ??
|
||||||
|
normalizeConfigValue(source.formattedAddress) ??
|
||||||
|
normalizeConfigValue(source.name) ??
|
||||||
|
""
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export const getLocationAutocompletePlaceholder = (
|
||||||
|
capability: GoogleMapsLocationCapability,
|
||||||
|
) => {
|
||||||
|
return capability.enabled
|
||||||
|
? "Search Google Maps or type a location"
|
||||||
|
: "Location";
|
||||||
|
};
|
||||||
|
|
||||||
|
interface GooglePlacesAutocompleteResponse {
|
||||||
|
suggestions?: Array<{
|
||||||
|
placePrediction?: {
|
||||||
|
place?: string;
|
||||||
|
placeId?: string;
|
||||||
|
text?: { text?: string | null };
|
||||||
|
structuredFormat?: {
|
||||||
|
mainText?: { text?: string | null };
|
||||||
|
secondaryText?: { text?: string | null };
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}>;
|
||||||
|
}
|
||||||
|
|
||||||
|
export const mapGooglePlacesSuggestions = (
|
||||||
|
payload: GooglePlacesAutocompleteResponse,
|
||||||
|
): GoogleMapsSuggestion[] => {
|
||||||
|
const suggestions: GoogleMapsSuggestion[] = [];
|
||||||
|
|
||||||
|
for (const suggestion of payload.suggestions ?? []) {
|
||||||
|
const placePrediction = suggestion.placePrediction;
|
||||||
|
const text =
|
||||||
|
normalizeConfigValue(placePrediction?.text?.text) ??
|
||||||
|
normalizeConfigValue(placePrediction?.structuredFormat?.mainText?.text) ??
|
||||||
|
"";
|
||||||
|
|
||||||
|
if (!text) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
suggestions.push({
|
||||||
|
formattedAddress:
|
||||||
|
normalizeConfigValue(
|
||||||
|
placePrediction?.structuredFormat?.secondaryText?.text,
|
||||||
|
) ?? undefined,
|
||||||
|
placeId:
|
||||||
|
normalizeConfigValue(placePrediction?.placeId) ??
|
||||||
|
normalizeConfigValue(
|
||||||
|
placePrediction?.place?.replace(/^places\//, ""),
|
||||||
|
) ??
|
||||||
|
undefined,
|
||||||
|
text,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
return suggestions;
|
||||||
|
};
|
||||||
111
tests/location-autocomplete.test.ts
Normal file
111
tests/location-autocomplete.test.ts
Normal file
@@ -0,0 +1,111 @@
|
|||||||
|
import { describe, expect, test } from "bun:test";
|
||||||
|
import { createElement } from "react";
|
||||||
|
import { renderToStaticMarkup } from "react-dom/server";
|
||||||
|
import {
|
||||||
|
getGoogleMapsLocationCapability,
|
||||||
|
getGoogleMapsPlaceLabel,
|
||||||
|
mapGooglePlacesSuggestions,
|
||||||
|
} from "@/lib/google-maps";
|
||||||
|
|
||||||
|
const renderLocationAutocomplete = async (capability: {
|
||||||
|
enabled: boolean;
|
||||||
|
region: string;
|
||||||
|
reason: "configured" | "missing_server_api_key" | "disabled";
|
||||||
|
}) => {
|
||||||
|
const { LocationAutocomplete } = await import("@/components/location-autocomplete");
|
||||||
|
|
||||||
|
return renderToStaticMarkup(
|
||||||
|
createElement(LocationAutocomplete, {
|
||||||
|
capability,
|
||||||
|
id: "event-location",
|
||||||
|
onChange: () => {},
|
||||||
|
value: "",
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
describe("Google Maps location capability boundary", () => {
|
||||||
|
test("disables Google Maps search when the server API key is missing", () => {
|
||||||
|
expect(getGoogleMapsLocationCapability({ serverApiKey: "" })).toEqual({
|
||||||
|
enabled: false,
|
||||||
|
reason: "missing_server_api_key",
|
||||||
|
region: "us",
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
test("enables Google Maps search when the server API key is present", () => {
|
||||||
|
expect(
|
||||||
|
getGoogleMapsLocationCapability({ serverApiKey: "maps-server-key", region: "gb" }),
|
||||||
|
).toEqual({
|
||||||
|
enabled: true,
|
||||||
|
reason: "configured",
|
||||||
|
region: "gb",
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("LocationAutocomplete fallback mode", () => {
|
||||||
|
test("renders a plain text location field when Google Maps configuration is unavailable", async () => {
|
||||||
|
const markup = await renderLocationAutocomplete({
|
||||||
|
enabled: false,
|
||||||
|
reason: "missing_server_api_key",
|
||||||
|
region: "us",
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(markup).toContain('data-location-mode="manual"');
|
||||||
|
expect(markup).toContain('placeholder="Location"');
|
||||||
|
expect(markup).not.toContain("Search Google Maps");
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("LocationAutocomplete configured mode", () => {
|
||||||
|
test("renders a server-backed Google Maps-assisted input path while keeping manual typing available", async () => {
|
||||||
|
const markup = await renderLocationAutocomplete({
|
||||||
|
enabled: true,
|
||||||
|
reason: "configured",
|
||||||
|
region: "us",
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(markup).toContain('data-location-mode="google-maps-server"');
|
||||||
|
expect(markup).toContain('placeholder="Search Google Maps or type a location"');
|
||||||
|
expect(markup).toContain("Search Google Maps or keep typing a custom location.");
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("Google Maps place label selection", () => {
|
||||||
|
test("prefers the chosen prediction label for the visible location value", () => {
|
||||||
|
expect(
|
||||||
|
getGoogleMapsPlaceLabel({
|
||||||
|
displayName: "Google HQ",
|
||||||
|
formattedAddress: "1600 Amphitheatre Parkway, Mountain View, CA",
|
||||||
|
predictionText: "Googleplex",
|
||||||
|
}),
|
||||||
|
).toBe("Googleplex");
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("Google Places server response mapping", () => {
|
||||||
|
test("maps server autocomplete predictions into lightweight suggestion records", () => {
|
||||||
|
expect(
|
||||||
|
mapGooglePlacesSuggestions({
|
||||||
|
suggestions: [
|
||||||
|
{
|
||||||
|
placePrediction: {
|
||||||
|
place: "places/abc123",
|
||||||
|
structuredFormat: {
|
||||||
|
secondaryText: { text: "Mountain View, CA" },
|
||||||
|
},
|
||||||
|
text: { text: "Googleplex" },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
],
|
||||||
|
}),
|
||||||
|
).toEqual([
|
||||||
|
{
|
||||||
|
formattedAddress: "Mountain View, CA",
|
||||||
|
placeId: "abc123",
|
||||||
|
text: "Googleplex",
|
||||||
|
},
|
||||||
|
]);
|
||||||
|
});
|
||||||
|
});
|
||||||
Reference in New Issue
Block a user