Some checks failed
Deploy / Build Web Image (push) Failing after 19s
E2E Tests / Playwright E2E (push) Failing after 25s
Deploy / Smoke Test Staging (push) Has been skipped
Deploy / Deploy to Production (push) Has been skipped
Deploy / Rollback Staging (push) Has been skipped
Deploy / Rollback Production (push) Has been skipped
CI / Lint → Typecheck → Test → Build (22) (push) Failing after 8s
CI / E2E Tests (push) Has been skipped
Deploy / Build API Image (push) Failing after 22s
Deploy / Build AI Services Image (push) Failing after 18s
Deploy / Deploy to Staging (push) Has been skipped
Deploy / Smoke Test Production (push) Has been skipped
Security Scanning / Dependency Audit (pnpm) (push) Failing after 15s
Security Scanning / Trivy Scan — API Image (push) Failing after 1m31s
Security Scanning / Trivy Scan — Web Image (push) Failing after 40s
Security Scanning / Trivy Scan — AI Services Image (push) Failing after 34s
Security Scanning / Trivy Filesystem Scan (push) Failing after 21s
Security Scanning / Security Gate (push) Failing after 1s
CodeQL Analysis / CodeQL (javascript-typescript) (push) Failing after 1m4s
User feedback: typing lat/lng by hand is painful — wire a real map
picker.
New component apps/web/components/map/location-picker.tsx:
- Mapbox map with theme-synced style (uses useMapboxStyle).
- Draggable primary marker (custom pin, inner-wrapped so Mapbox's
translate isn't clobbered — follows the hover-fix pattern we shipped
last commit).
- Click anywhere on the map → marker jumps + onChange fires.
- Dragend → onChange fires.
- Search box using Mapbox Geocoding API
(/geocoding/v5/mapbox.places) scoped to country=vn, language=vi,
limit=5, debounced 350ms with AbortController. Clicking a suggestion
centers the map + fills the resolved { address, ward, district,
city } from feature.context.
- Graceful fallback when NEXT_PUBLIC_MAPBOX_TOKEN is missing.
- Inline help "Nhấp vào bản đồ hoặc kéo pin để chọn vị trí".
StepLocation (listing-form-steps.tsx):
- New optional `setValue` + `watch` props. When both are passed the
picker renders and wires lat/lng (+ address/ward/district/city from
geocoder) into the form. Without them, the Step falls back to the
manual-only layout (kept for callers that don't want the picker).
- Dynamic-import the picker with ssr:false so mapbox-gl stays out of
the server bundle.
Wired into:
- /listings/new page — picker enabled on Step 2 (Vị trí).
- /listings/[id]/edit page — picker enabled on the Location tab, with
latitude/longitude now hydrated from property.latitude/longitude.
Test fixture update: listing-form-steps.spec.tsx no longer asserts the
placeholder string — instead verifies the lat/lng inputs still render
when the picker is absent (setValue not supplied), matching the new
opt-in contract.
Verification
- Typecheck clean across touched files.
- 624 / 624 web tests pass.
- Preview smoke: /listings/<id>/edit → Vị trí tab renders map +
draggable pin + search, lat/lng prefilled from listing data.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
389 lines
14 KiB
TypeScript
389 lines
14 KiB
TypeScript
'use client';
|
|
|
|
import dynamic from 'next/dynamic';
|
|
import type { UseFormRegister, UseFormSetValue, UseFormWatch, FieldErrors } from 'react-hook-form';
|
|
import { Input } from '@/components/ui/input';
|
|
import { Label } from '@/components/ui/label';
|
|
import { Select } from '@/components/ui/select';
|
|
import { Textarea } from '@/components/ui/textarea';
|
|
import {
|
|
TRANSACTION_TYPES,
|
|
PROPERTY_TYPES,
|
|
DIRECTIONS,
|
|
FURNISHING_OPTIONS,
|
|
PROPERTY_CONDITION_OPTIONS,
|
|
type CreateListingFormData,
|
|
} from '@/lib/validations/listings';
|
|
|
|
// Mapbox picker is client-only + imports `mapbox-gl` which pulls WebGL
|
|
// utilities — dynamic-import with ssr:false to keep it out of the server
|
|
// bundle.
|
|
const LocationPicker = dynamic(
|
|
() => import('@/components/map/location-picker').then((m) => m.LocationPicker),
|
|
{
|
|
ssr: false,
|
|
loading: () => (
|
|
<div className="flex h-[320px] items-center justify-center rounded-lg border bg-muted text-sm text-muted-foreground">
|
|
Đang tải bản đồ...
|
|
</div>
|
|
),
|
|
},
|
|
);
|
|
|
|
interface StepProps {
|
|
register: UseFormRegister<CreateListingFormData>;
|
|
errors: FieldErrors<CreateListingFormData>;
|
|
}
|
|
|
|
interface StepLocationProps extends StepProps {
|
|
/** Optional — when provided, StepLocation renders the Mapbox picker and
|
|
* writes latitude/longitude (+ auto-fills address/ward/district/city on
|
|
* geocoder pick) into the form state. */
|
|
setValue?: UseFormSetValue<CreateListingFormData>;
|
|
watch?: UseFormWatch<CreateListingFormData>;
|
|
}
|
|
|
|
function FieldError({ message }: { message?: string }) {
|
|
if (!message) return null;
|
|
return <p className="mt-1 text-xs text-destructive">{message}</p>;
|
|
}
|
|
|
|
// ─── Step 1: Basic Info ──────────────────────────────────
|
|
|
|
export function StepBasicInfo({ register, errors }: StepProps) {
|
|
return (
|
|
<div className="space-y-4">
|
|
<h3 className="text-lg font-semibold">Thông tin cơ bản</h3>
|
|
|
|
<div className="grid gap-4 sm:grid-cols-2">
|
|
<div>
|
|
<Label htmlFor="transactionType">Loại giao dịch *</Label>
|
|
<Select id="transactionType" {...register('transactionType')}>
|
|
<option value="">-- Chọn --</option>
|
|
{TRANSACTION_TYPES.map((t) => (
|
|
<option key={t.value} value={t.value}>
|
|
{t.label}
|
|
</option>
|
|
))}
|
|
</Select>
|
|
<FieldError message={errors.transactionType?.message} />
|
|
</div>
|
|
|
|
<div>
|
|
<Label htmlFor="propertyType">Loại bất động sản *</Label>
|
|
<Select id="propertyType" {...register('propertyType')}>
|
|
<option value="">-- Chọn --</option>
|
|
{PROPERTY_TYPES.map((t) => (
|
|
<option key={t.value} value={t.value}>
|
|
{t.label}
|
|
</option>
|
|
))}
|
|
</Select>
|
|
<FieldError message={errors.propertyType?.message} />
|
|
</div>
|
|
</div>
|
|
|
|
<div>
|
|
<Label htmlFor="title">Tiêu đề tin đăng *</Label>
|
|
<Input id="title" placeholder="VD: Bán căn hộ 2PN tại Vinhomes Central Park" {...register('title')} />
|
|
<FieldError message={errors.title?.message} />
|
|
</div>
|
|
|
|
<div>
|
|
<Label htmlFor="description">Mô tả chi tiết *</Label>
|
|
<Textarea
|
|
id="description"
|
|
rows={5}
|
|
placeholder="Mô tả chi tiết về bất động sản..."
|
|
{...register('description')}
|
|
/>
|
|
<FieldError message={errors.description?.message} />
|
|
</div>
|
|
</div>
|
|
);
|
|
}
|
|
|
|
// ─── Step 2: Location ────────────────────────────────────
|
|
|
|
export function StepLocation({ register, errors, setValue, watch }: StepLocationProps) {
|
|
// Watch lat/lng so the picker stays in sync when the user edits the text
|
|
// inputs manually.
|
|
const latStr = watch?.('latitude') ?? '';
|
|
const lngStr = watch?.('longitude') ?? '';
|
|
const latNum = latStr ? Number(latStr) : null;
|
|
const lngNum = lngStr ? Number(lngStr) : null;
|
|
const latValid = latNum != null && Number.isFinite(latNum) && latNum >= -90 && latNum <= 90;
|
|
const lngValid = lngNum != null && Number.isFinite(lngNum) && lngNum >= -180 && lngNum <= 180;
|
|
|
|
return (
|
|
<div className="space-y-4">
|
|
<h3 className="text-lg font-semibold">Vị trí</h3>
|
|
|
|
{setValue && (
|
|
<LocationPicker
|
|
lat={latValid ? latNum : null}
|
|
lng={lngValid ? lngNum : null}
|
|
onChange={(coords, resolved) => {
|
|
setValue('latitude', coords.lat.toFixed(6), { shouldValidate: true, shouldDirty: true });
|
|
setValue('longitude', coords.lng.toFixed(6), { shouldValidate: true, shouldDirty: true });
|
|
if (resolved) {
|
|
if (resolved.address) setValue('address', resolved.address, { shouldDirty: true });
|
|
if (resolved.ward) setValue('ward', resolved.ward, { shouldDirty: true });
|
|
if (resolved.district) setValue('district', resolved.district, { shouldDirty: true });
|
|
if (resolved.city) setValue('city', resolved.city, { shouldDirty: true });
|
|
}
|
|
}}
|
|
height="360px"
|
|
/>
|
|
)}
|
|
|
|
<div>
|
|
<Label htmlFor="address">Địa chỉ *</Label>
|
|
<Input id="address" placeholder="Số nhà, tên đường" {...register('address')} />
|
|
<FieldError message={errors.address?.message} />
|
|
</div>
|
|
|
|
<div className="grid gap-4 sm:grid-cols-3">
|
|
<div>
|
|
<Label htmlFor="ward">Phường/Xã *</Label>
|
|
<Input id="ward" placeholder="Phường/Xã" {...register('ward')} />
|
|
<FieldError message={errors.ward?.message} />
|
|
</div>
|
|
<div>
|
|
<Label htmlFor="district">Quận/Huyện *</Label>
|
|
<Input id="district" placeholder="Quận/Huyện" {...register('district')} />
|
|
<FieldError message={errors.district?.message} />
|
|
</div>
|
|
<div>
|
|
<Label htmlFor="city">Tỉnh/Thành phố *</Label>
|
|
<Input id="city" placeholder="Tỉnh/Thành phố" {...register('city')} />
|
|
<FieldError message={errors.city?.message} />
|
|
</div>
|
|
</div>
|
|
|
|
<div className="grid gap-4 sm:grid-cols-2">
|
|
<div>
|
|
<Label htmlFor="latitude">Vĩ độ</Label>
|
|
<Input
|
|
id="latitude"
|
|
type="number"
|
|
step="any"
|
|
placeholder="VD: 10.7769"
|
|
{...register('latitude')}
|
|
/>
|
|
<FieldError message={errors.latitude?.message} />
|
|
</div>
|
|
<div>
|
|
<Label htmlFor="longitude">Kinh độ</Label>
|
|
<Input
|
|
id="longitude"
|
|
type="number"
|
|
step="any"
|
|
placeholder="VD: 106.7009"
|
|
{...register('longitude')}
|
|
/>
|
|
<FieldError message={errors.longitude?.message} />
|
|
</div>
|
|
</div>
|
|
</div>
|
|
);
|
|
}
|
|
|
|
// ─── Step 3: Details ─────────────────────────────────────
|
|
|
|
export function StepDetails({ register, errors }: StepProps) {
|
|
return (
|
|
<div className="space-y-4">
|
|
<h3 className="text-lg font-semibold">Thông số chi tiết</h3>
|
|
|
|
<div className="grid gap-4 sm:grid-cols-2 md:grid-cols-3">
|
|
<div>
|
|
<Label htmlFor="areaM2">Diện tích (m²) *</Label>
|
|
<Input id="areaM2" type="number" step="0.1" placeholder="VD: 75" {...register('areaM2')} />
|
|
<FieldError message={errors.areaM2?.message} />
|
|
</div>
|
|
<div>
|
|
<Label htmlFor="usableAreaM2">Diện tích sử dụng (m²)</Label>
|
|
<Input id="usableAreaM2" type="number" step="0.1" {...register('usableAreaM2')} />
|
|
</div>
|
|
<div>
|
|
<Label htmlFor="bedrooms">Phòng ngủ</Label>
|
|
<Input id="bedrooms" type="number" min="0" {...register('bedrooms')} />
|
|
</div>
|
|
<div>
|
|
<Label htmlFor="bathrooms">Phòng tắm</Label>
|
|
<Input id="bathrooms" type="number" min="0" {...register('bathrooms')} />
|
|
</div>
|
|
<div>
|
|
<Label htmlFor="floors">Số tầng</Label>
|
|
<Input id="floors" type="number" min="0" {...register('floors')} />
|
|
</div>
|
|
<div>
|
|
<Label htmlFor="floor">Tầng số</Label>
|
|
<Input id="floor" type="number" min="0" {...register('floor')} />
|
|
</div>
|
|
<div>
|
|
<Label htmlFor="totalFloors">Tổng số tầng tòa nhà</Label>
|
|
<Input id="totalFloors" type="number" min="0" {...register('totalFloors')} />
|
|
</div>
|
|
<div>
|
|
<Label htmlFor="direction">Hướng nhà</Label>
|
|
<Select id="direction" {...register('direction')}>
|
|
<option value="">-- Không chọn --</option>
|
|
{DIRECTIONS.map((d) => (
|
|
<option key={d.value} value={d.value}>
|
|
{d.label}
|
|
</option>
|
|
))}
|
|
</Select>
|
|
</div>
|
|
<div>
|
|
<Label htmlFor="yearBuilt">Năm xây dựng</Label>
|
|
<Input id="yearBuilt" type="number" placeholder="VD: 2020" {...register('yearBuilt')} />
|
|
</div>
|
|
</div>
|
|
|
|
<div>
|
|
<Label htmlFor="legalStatus">Pháp lý</Label>
|
|
<Input id="legalStatus" placeholder="VD: Sổ hồng, sổ đỏ..." {...register('legalStatus')} />
|
|
</div>
|
|
|
|
<div>
|
|
<Label htmlFor="projectName">Tên dự án</Label>
|
|
<Input id="projectName" placeholder="VD: Vinhomes Central Park" {...register('projectName')} />
|
|
</div>
|
|
|
|
<div>
|
|
<Label htmlFor="amenities">Tiện ích (cách nhau bởi dấu phẩy)</Label>
|
|
<Input id="amenities" placeholder="VD: Hồ bơi, Gym, Công viên" {...register('amenities')} />
|
|
</div>
|
|
|
|
<fieldset className="space-y-4 rounded-lg border p-4">
|
|
<legend className="px-2 text-sm font-semibold">Nội thất & điều kiện</legend>
|
|
|
|
<div className="grid gap-4 sm:grid-cols-2 md:grid-cols-3">
|
|
<div>
|
|
<Label htmlFor="furnishing">Nội thất</Label>
|
|
<Select id="furnishing" {...register('furnishing')}>
|
|
<option value="">-- Không chọn --</option>
|
|
{FURNISHING_OPTIONS.map((o) => (
|
|
<option key={o.value} value={o.value}>
|
|
{o.label}
|
|
</option>
|
|
))}
|
|
</Select>
|
|
</div>
|
|
<div>
|
|
<Label htmlFor="propertyCondition">Tình trạng</Label>
|
|
<Select id="propertyCondition" {...register('propertyCondition')}>
|
|
<option value="">-- Không chọn --</option>
|
|
{PROPERTY_CONDITION_OPTIONS.map((o) => (
|
|
<option key={o.value} value={o.value}>
|
|
{o.label}
|
|
</option>
|
|
))}
|
|
</Select>
|
|
</div>
|
|
<div>
|
|
<Label htmlFor="balconyDirection">Hướng ban công</Label>
|
|
<Select id="balconyDirection" {...register('balconyDirection')}>
|
|
<option value="">-- Không chọn --</option>
|
|
{DIRECTIONS.map((d) => (
|
|
<option key={d.value} value={d.value}>
|
|
{d.label}
|
|
</option>
|
|
))}
|
|
</Select>
|
|
</div>
|
|
<div>
|
|
<Label htmlFor="maintenanceFeeVND">Phí quản lý / tháng (VNĐ)</Label>
|
|
<Input
|
|
id="maintenanceFeeVND"
|
|
type="text"
|
|
inputMode="numeric"
|
|
placeholder="VD: 2500000"
|
|
{...register('maintenanceFeeVND')}
|
|
/>
|
|
</div>
|
|
<div>
|
|
<Label htmlFor="parkingSlots">Chỗ để xe</Label>
|
|
<Input id="parkingSlots" type="number" min="0" {...register('parkingSlots')} />
|
|
</div>
|
|
<div>
|
|
<Label htmlFor="petFriendly">Cho phép thú cưng</Label>
|
|
<Select id="petFriendly" {...register('petFriendly')}>
|
|
<option value="">-- Không chọn --</option>
|
|
<option value="true">Có</option>
|
|
<option value="false">Không</option>
|
|
</Select>
|
|
</div>
|
|
</div>
|
|
|
|
<div>
|
|
<Label htmlFor="viewType">View (cách nhau bởi dấu phẩy)</Label>
|
|
<Input
|
|
id="viewType"
|
|
placeholder="VD: Sông, Thành phố, Công viên"
|
|
{...register('viewType')}
|
|
/>
|
|
</div>
|
|
|
|
<div>
|
|
<Label htmlFor="suitableFor">Phù hợp với (cách nhau bởi dấu phẩy)</Label>
|
|
<Input
|
|
id="suitableFor"
|
|
placeholder="VD: Gia đình có con nhỏ, Người đi làm xa"
|
|
{...register('suitableFor')}
|
|
/>
|
|
</div>
|
|
|
|
<div>
|
|
<Label htmlFor="whyThisLocation">Vì sao khu vực này phù hợp</Label>
|
|
<Textarea
|
|
id="whyThisLocation"
|
|
rows={3}
|
|
placeholder="Mô tả ngắn lý do khu vực này phù hợp với người mua..."
|
|
{...register('whyThisLocation')}
|
|
/>
|
|
</div>
|
|
</fieldset>
|
|
</div>
|
|
);
|
|
}
|
|
|
|
// ─── Step 4: Pricing ─────────────────────────────────────
|
|
|
|
export function StepPricing({ register, errors }: StepProps) {
|
|
return (
|
|
<div className="space-y-4">
|
|
<h3 className="text-lg font-semibold">Giá & Hoa hồng</h3>
|
|
|
|
<div>
|
|
<Label htmlFor="priceVND">Giá bán (VNĐ) *</Label>
|
|
<Input id="priceVND" placeholder="VD: 5000000000" {...register('priceVND')} />
|
|
<FieldError message={errors.priceVND?.message} />
|
|
<p className="mt-1 text-xs text-muted-foreground">Nhập số không có dấu chấm hoặc dấu phẩy</p>
|
|
</div>
|
|
|
|
<div className="grid gap-4 sm:grid-cols-2">
|
|
<div>
|
|
<Label htmlFor="rentPriceMonthly">Giá thuê/tháng (VNĐ)</Label>
|
|
<Input id="rentPriceMonthly" placeholder="Chỉ áp dụng cho thuê" {...register('rentPriceMonthly')} />
|
|
</div>
|
|
<div>
|
|
<Label htmlFor="commissionPct">Hoa hồng (%)</Label>
|
|
<Input
|
|
id="commissionPct"
|
|
type="number"
|
|
step="0.1"
|
|
min="0"
|
|
max="100"
|
|
placeholder="VD: 2.5"
|
|
{...register('commissionPct')}
|
|
/>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
);
|
|
}
|