chore: update eslint and prettier configuration
This commit is contained in:
@@ -2,10 +2,19 @@
|
||||
|
||||
import { useMemo } from 'react';
|
||||
import type { ColumnDef } from '@tanstack/react-table';
|
||||
import { ArrowDownCircle, ArrowUpCircle, MapPin, Milestone } from 'lucide-react';
|
||||
import {
|
||||
ArrowDownCircle,
|
||||
ArrowUpCircle,
|
||||
MapPin,
|
||||
Milestone,
|
||||
} from 'lucide-react';
|
||||
|
||||
import { Badge } from '@/components/ui/badge';
|
||||
import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover';
|
||||
import {
|
||||
Popover,
|
||||
PopoverContent,
|
||||
PopoverTrigger,
|
||||
} from '@/components/ui/popover';
|
||||
import type { Chainage, Package, Project } from '@/types';
|
||||
|
||||
function EmptyValue() {
|
||||
@@ -43,9 +52,7 @@ function StateBadges({ value }: { value: string | null }) {
|
||||
</PopoverTrigger>
|
||||
<PopoverContent className="w-auto p-2" align="start">
|
||||
<div className="flex flex-col gap-1.5">
|
||||
<p className="mb-0.5 px-1 text-muted-foreground">
|
||||
Other States
|
||||
</p>
|
||||
<p className="mb-0.5 px-1 text-muted-foreground">Other States</p>
|
||||
{remainingStates.map((state) => (
|
||||
<Badge key={state} variant="secondary">
|
||||
{state}
|
||||
@@ -78,7 +85,9 @@ export function useSegmentColumns(projects: Project[], packages: Package[]) {
|
||||
id: 'project',
|
||||
header: 'Project',
|
||||
cell: ({ row }) => {
|
||||
const pkg = packages.find((item) => item.id === row.original.package_id);
|
||||
const pkg = packages.find(
|
||||
(item) => item.id === row.original.package_id,
|
||||
);
|
||||
const project = projects.find((item) => item.id === pkg?.project_id);
|
||||
return project?.name || <EmptyValue />;
|
||||
},
|
||||
@@ -87,7 +96,9 @@ export function useSegmentColumns(projects: Project[], packages: Package[]) {
|
||||
id: 'project_state',
|
||||
header: 'Project State',
|
||||
cell: ({ row }) => {
|
||||
const pkg = packages.find((item) => item.id === row.original.package_id);
|
||||
const pkg = packages.find(
|
||||
(item) => item.id === row.original.package_id,
|
||||
);
|
||||
const project = projects.find((item) => item.id === pkg?.project_id);
|
||||
return <StateBadges value={project?.state ?? null} />;
|
||||
},
|
||||
@@ -127,7 +138,8 @@ export function useSegmentColumns(projects: Project[], packages: Package[]) {
|
||||
className="flex items-center gap-1.5 border-blue-500/50 text-blue-500"
|
||||
>
|
||||
<MapPin className="size-3" />
|
||||
{row.original.start_lat.toFixed(4)}, {row.original.start_lng.toFixed(4)}
|
||||
{row.original.start_lat.toFixed(4)},{' '}
|
||||
{row.original.start_lng.toFixed(4)}
|
||||
</Badge>
|
||||
),
|
||||
},
|
||||
|
||||
@@ -95,7 +95,11 @@ export function SegmentDialog({
|
||||
<form onSubmit={onSubmit} className="space-y-6">
|
||||
{!segmentId ? (
|
||||
<div className="grid gap-5 md:grid-cols-2">
|
||||
<FormField label="Project" required error={getError('project_id')}>
|
||||
<FormField
|
||||
label="Project"
|
||||
required
|
||||
error={getError('project_id')}
|
||||
>
|
||||
<Select value={projectId} onValueChange={onProjectChange}>
|
||||
<SelectTrigger aria-invalid={!!getError('project_id')}>
|
||||
{isProjectsLoading ? (
|
||||
@@ -115,10 +119,19 @@ export function SegmentDialog({
|
||||
))}
|
||||
</SelectContent>
|
||||
</Select>
|
||||
<input type="hidden" {...register('project_id')} value={projectId} readOnly />
|
||||
<input
|
||||
type="hidden"
|
||||
{...register('project_id')}
|
||||
value={projectId}
|
||||
readOnly
|
||||
/>
|
||||
</FormField>
|
||||
|
||||
<FormField label="Package" required error={getError('package_id')}>
|
||||
<FormField
|
||||
label="Package"
|
||||
required
|
||||
error={getError('package_id')}
|
||||
>
|
||||
<Select
|
||||
value={packageId}
|
||||
onValueChange={onPackageChange}
|
||||
@@ -132,7 +145,11 @@ export function SegmentDialog({
|
||||
</span>
|
||||
) : (
|
||||
<SelectValue
|
||||
placeholder={projectId ? 'Choose a package' : 'Select project first'}
|
||||
placeholder={
|
||||
projectId
|
||||
? 'Choose a package'
|
||||
: 'Select project first'
|
||||
}
|
||||
/>
|
||||
)}
|
||||
</SelectTrigger>
|
||||
@@ -144,7 +161,12 @@ export function SegmentDialog({
|
||||
))}
|
||||
</SelectContent>
|
||||
</Select>
|
||||
<input type="hidden" {...register('package_id')} value={packageId} readOnly />
|
||||
<input
|
||||
type="hidden"
|
||||
{...register('package_id')}
|
||||
value={packageId}
|
||||
readOnly
|
||||
/>
|
||||
</FormField>
|
||||
</div>
|
||||
) : null}
|
||||
@@ -218,7 +240,12 @@ export function SegmentDialog({
|
||||
START COORDINATES
|
||||
</p>
|
||||
<div className="grid grid-cols-2 gap-4">
|
||||
<FormField id="start-lat" label="Latitude" required error={getError('start_lat')}>
|
||||
<FormField
|
||||
id="start-lat"
|
||||
label="Latitude"
|
||||
required
|
||||
error={getError('start_lat')}
|
||||
>
|
||||
<Input
|
||||
id="start-lat"
|
||||
type="number"
|
||||
@@ -230,7 +257,12 @@ export function SegmentDialog({
|
||||
{...register('start_lat')}
|
||||
/>
|
||||
</FormField>
|
||||
<FormField id="start-lng" label="Longitude" required error={getError('start_lng')}>
|
||||
<FormField
|
||||
id="start-lng"
|
||||
label="Longitude"
|
||||
required
|
||||
error={getError('start_lng')}
|
||||
>
|
||||
<Input
|
||||
id="start-lng"
|
||||
type="number"
|
||||
@@ -251,7 +283,12 @@ export function SegmentDialog({
|
||||
END COORDINATES
|
||||
</p>
|
||||
<div className="grid grid-cols-2 gap-4">
|
||||
<FormField id="end-lat" label="Latitude" required error={getError('end_lat')}>
|
||||
<FormField
|
||||
id="end-lat"
|
||||
label="Latitude"
|
||||
required
|
||||
error={getError('end_lat')}
|
||||
>
|
||||
<Input
|
||||
id="end-lat"
|
||||
type="number"
|
||||
@@ -263,7 +300,12 @@ export function SegmentDialog({
|
||||
{...register('end_lat')}
|
||||
/>
|
||||
</FormField>
|
||||
<FormField id="end-lng" label="Longitude" required error={getError('end_lng')}>
|
||||
<FormField
|
||||
id="end-lng"
|
||||
label="Longitude"
|
||||
required
|
||||
error={getError('end_lng')}
|
||||
>
|
||||
<Input
|
||||
id="end-lng"
|
||||
type="number"
|
||||
|
||||
@@ -17,7 +17,9 @@ const requiredNumber = (message: string) =>
|
||||
.string()
|
||||
.trim()
|
||||
.min(1, message)
|
||||
.refine((value) => Number.isFinite(Number(value)), { message: 'Enter a valid number' });
|
||||
.refine((value) => Number.isFinite(Number(value)), {
|
||||
message: 'Enter a valid number',
|
||||
});
|
||||
|
||||
const latitude = requiredNumber('Latitude is required').refine(
|
||||
(value) => {
|
||||
@@ -64,7 +66,9 @@ const defaultValues: SegmentFormValues = {
|
||||
direction: 'UP',
|
||||
};
|
||||
|
||||
function toSegmentPayload(values: SegmentFormValues): ChainageCreate | ChainageUpdate {
|
||||
function toSegmentPayload(
|
||||
values: SegmentFormValues,
|
||||
): ChainageCreate | ChainageUpdate {
|
||||
return {
|
||||
package_id: values.package_id,
|
||||
segment_name: values.segment_name.trim(),
|
||||
@@ -99,7 +103,8 @@ export function useSegmentForm({ onSaved }: { onSaved: () => void }) {
|
||||
const packageId = useWatch({ control, name: 'package_id' }) || '';
|
||||
const direction = useWatch({ control, name: 'direction' }) || 'UP';
|
||||
const segmentName = useWatch({ control, name: 'segment_name' }) || '';
|
||||
const chainageStartKm = useWatch({ control, name: 'chainage_start_km' }) || '';
|
||||
const chainageStartKm =
|
||||
useWatch({ control, name: 'chainage_start_km' }) || '';
|
||||
const chainageEndKm = useWatch({ control, name: 'chainage_end_km' }) || '';
|
||||
const startLat = useWatch({ control, name: 'start_lat' }) || '';
|
||||
const startLng = useWatch({ control, name: 'start_lng' }) || '';
|
||||
@@ -130,14 +135,18 @@ export function useSegmentForm({ onSaved }: { onSaved: () => void }) {
|
||||
queryClient.invalidateQueries({ queryKey: segmentKeys.all });
|
||||
},
|
||||
onError: (_error, values) => {
|
||||
toast.error(values.id ? 'Failed to update segment' : 'Failed to create segment');
|
||||
toast.error(
|
||||
values.id ? 'Failed to update segment' : 'Failed to create segment',
|
||||
);
|
||||
},
|
||||
});
|
||||
|
||||
const onSubmit = handleSubmit(
|
||||
(values) => saveMutation.mutate(values),
|
||||
(formErrors) => {
|
||||
const firstMessage = Object.values(formErrors).find((error) => error?.message)?.message;
|
||||
const firstMessage = Object.values(formErrors).find(
|
||||
(error) => error?.message,
|
||||
)?.message;
|
||||
if (firstMessage) {
|
||||
toast.error(String(firstMessage));
|
||||
}
|
||||
@@ -169,14 +178,21 @@ export function useSegmentForm({ onSaved }: { onSaved: () => void }) {
|
||||
|
||||
const setProjectId = useCallback(
|
||||
(value: string) => {
|
||||
setValue('project_id', value, { shouldDirty: true, shouldValidate: true });
|
||||
setValue('project_id', value, {
|
||||
shouldDirty: true,
|
||||
shouldValidate: true,
|
||||
});
|
||||
setValue('package_id', '', { shouldDirty: true, shouldValidate: true });
|
||||
},
|
||||
[setValue],
|
||||
);
|
||||
|
||||
const setPackageId = useCallback(
|
||||
(value: string) => setValue('package_id', value, { shouldDirty: true, shouldValidate: true }),
|
||||
(value: string) =>
|
||||
setValue('package_id', value, {
|
||||
shouldDirty: true,
|
||||
shouldValidate: true,
|
||||
}),
|
||||
[setValue],
|
||||
);
|
||||
|
||||
|
||||
@@ -4,7 +4,11 @@ import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
|
||||
import { useMemo } from 'react';
|
||||
import { toast } from 'sonner';
|
||||
|
||||
import { chainageService, packageService, projectService } from '@/services/api';
|
||||
import {
|
||||
chainageService,
|
||||
packageService,
|
||||
projectService,
|
||||
} from '@/services/api';
|
||||
import type { Chainage, PaginationParams } from '@/types';
|
||||
|
||||
import { segmentKeys } from '../queries/segmentKeys';
|
||||
@@ -15,7 +19,10 @@ interface UseSegmentsQueryParams {
|
||||
}
|
||||
|
||||
export function useSegmentsQuery({ skip, limit }: UseSegmentsQueryParams) {
|
||||
const listParams = useMemo<PaginationParams>(() => ({ skip, limit }), [limit, skip]);
|
||||
const listParams = useMemo<PaginationParams>(
|
||||
() => ({ skip, limit }),
|
||||
[limit, skip],
|
||||
);
|
||||
|
||||
return useQuery({
|
||||
queryKey: segmentKeys.list(listParams),
|
||||
@@ -40,7 +47,8 @@ export function useAllPackageOptionsQuery() {
|
||||
export function usePackagesByProjectQuery(projectId: string, enabled: boolean) {
|
||||
return useQuery({
|
||||
queryKey: ['packages', 'by-project', projectId],
|
||||
queryFn: () => packageService.getPackagesByProject(projectId, { skip: 0, limit: 1000 }),
|
||||
queryFn: () =>
|
||||
packageService.getPackagesByProject(projectId, { skip: 0, limit: 1000 }),
|
||||
enabled: enabled && Boolean(projectId),
|
||||
});
|
||||
}
|
||||
@@ -49,7 +57,8 @@ export function useDeleteSegmentMutation() {
|
||||
const queryClient = useQueryClient();
|
||||
|
||||
return useMutation({
|
||||
mutationFn: (segment: Chainage) => chainageService.deleteChainage(segment.id),
|
||||
mutationFn: (segment: Chainage) =>
|
||||
chainageService.deleteChainage(segment.id),
|
||||
onSuccess: (_data, segment) => {
|
||||
toast.success('Segment deleted', {
|
||||
description: `${segment.segment_name} has been removed from the system.`,
|
||||
|
||||
@@ -48,7 +48,10 @@ export default function SegmentPage() {
|
||||
canSubmit,
|
||||
isSaving,
|
||||
} = segmentForm;
|
||||
const projectPackagesQuery = usePackagesByProjectQuery(projectId, isDialogOpen);
|
||||
const projectPackagesQuery = usePackagesByProjectQuery(
|
||||
projectId,
|
||||
isDialogOpen,
|
||||
);
|
||||
|
||||
const openCreate = useCallback(() => {
|
||||
prepareCreateSegment();
|
||||
@@ -57,7 +60,9 @@ export default function SegmentPage() {
|
||||
|
||||
const openEdit = useCallback(
|
||||
(segment: Chainage) => {
|
||||
const pkg = allPackagesQuery.data?.items.find((item) => item.id === segment.package_id);
|
||||
const pkg = allPackagesQuery.data?.items.find(
|
||||
(item) => item.id === segment.package_id,
|
||||
);
|
||||
prepareEditSegment(segment, pkg?.project_id || '');
|
||||
setIsDialogOpen(true);
|
||||
},
|
||||
@@ -76,7 +81,11 @@ export default function SegmentPage() {
|
||||
|
||||
const deleteSegment = useCallback(
|
||||
(segment: Chainage) => {
|
||||
if (!confirm(`Are you sure you want to delete segment "${segment.segment_name}"?`)) {
|
||||
if (
|
||||
!confirm(
|
||||
`Are you sure you want to delete segment "${segment.segment_name}"?`,
|
||||
)
|
||||
) {
|
||||
return;
|
||||
}
|
||||
deleteSegmentMutation.mutate(segment);
|
||||
|
||||
Reference in New Issue
Block a user