fix: use authenticated CSRF-aware request for inspection planning
This commit is contained in:
@@ -4,6 +4,7 @@ import { Link, useNavigate } from 'react-router';
|
||||
import { Alert, LoadingBlock } from '../components/Feedback';
|
||||
import { Icon } from '../components/Icon';
|
||||
import { SearchableSelect } from '../components/SearchableSelect';
|
||||
import { apiRequest } from '../lib/api';
|
||||
|
||||
interface Option {
|
||||
id: string;
|
||||
@@ -23,28 +24,6 @@ interface CreatedInspection {
|
||||
code: string;
|
||||
}
|
||||
|
||||
async function requestJson<T>(url: string, init?: RequestInit): Promise<T> {
|
||||
const response = await fetch(`/api/v3${url}`, {
|
||||
credentials: 'same-origin',
|
||||
...init,
|
||||
headers: {
|
||||
Accept: 'application/json',
|
||||
...(init?.body ? { 'Content-Type': 'application/json' } : {}),
|
||||
...(init?.headers ?? {}),
|
||||
},
|
||||
});
|
||||
const payload = await response.json().catch(() => ({}));
|
||||
if (!response.ok) {
|
||||
const message = typeof payload?.message === 'string'
|
||||
? payload.message
|
||||
: typeof payload?.error?.message === 'string'
|
||||
? payload.error.message
|
||||
: `No se pudo completar la operación (${response.status}).`;
|
||||
throw new Error(message);
|
||||
}
|
||||
return payload as T;
|
||||
}
|
||||
|
||||
function inspectorName(person: Inspector): string {
|
||||
return `${person.firstName} ${person.lastName}`.trim() || person.username;
|
||||
}
|
||||
@@ -76,8 +55,8 @@ export function InspectionVisitCreateF61Page() {
|
||||
useEffect(() => {
|
||||
setLoading(true);
|
||||
Promise.all([
|
||||
requestJson<{ data: Option[] }>('/inspection-visits/planning-context/departments'),
|
||||
requestJson<{ data: Inspector[] }>('/inspection-visits/assignees'),
|
||||
apiRequest<{ data: Option[] }>('/inspection-visits/planning-context/departments'),
|
||||
apiRequest<{ data: Inspector[] }>('/inspection-visits/assignees'),
|
||||
]).then(([departmentResponse, inspectorResponse]) => {
|
||||
setDepartments(departmentResponse.data);
|
||||
setInspectors(inspectorResponse.data);
|
||||
@@ -94,7 +73,7 @@ export function InspectionVisitCreateF61Page() {
|
||||
setYacimientos([]);
|
||||
setOperators([]);
|
||||
if (!departmentId) return;
|
||||
requestJson<{ data: Option[] }>(`/inspection-visits/planning-context/departments/${departmentId}/areas`)
|
||||
apiRequest<{ data: Option[] }>(`/inspection-visits/planning-context/departments/${departmentId}/areas`)
|
||||
.then((response) => setAreas(response.data))
|
||||
.catch((cause) => setError(cause instanceof Error ? cause.message : String(cause)));
|
||||
}, [departmentId]);
|
||||
@@ -105,7 +84,7 @@ export function InspectionVisitCreateF61Page() {
|
||||
setYacimientos([]);
|
||||
setOperators([]);
|
||||
if (!areaId) return;
|
||||
requestJson<{ data: Option[] }>(`/inspection-visits/planning-context/areas/${areaId}/yacimientos`)
|
||||
apiRequest<{ data: Option[] }>(`/inspection-visits/planning-context/areas/${areaId}/yacimientos`)
|
||||
.then((response) => setYacimientos(response.data))
|
||||
.catch((cause) => setError(cause instanceof Error ? cause.message : String(cause)));
|
||||
}, [areaId]);
|
||||
@@ -118,7 +97,7 @@ export function InspectionVisitCreateF61Page() {
|
||||
if (Number.isNaN(parsedStart.getTime())) return;
|
||||
const at = encodeURIComponent(parsedStart.toISOString());
|
||||
setLoadingOperators(true);
|
||||
requestJson<{ data: Option[] }>(`/inspection-visits/planning-context/areas/${areaId}/operators?at=${at}`)
|
||||
apiRequest<{ data: Option[] }>(`/inspection-visits/planning-context/areas/${areaId}/operators?at=${at}`)
|
||||
.then((response) => {
|
||||
setOperators(response.data);
|
||||
if (response.data.length === 1 && response.data[0]) setOperatorId(response.data[0].id);
|
||||
@@ -142,7 +121,7 @@ export function InspectionVisitCreateF61Page() {
|
||||
|
||||
setBusy(true);
|
||||
try {
|
||||
const created = await requestJson<CreatedInspection>('/inspection-visits', {
|
||||
const created = await apiRequest<CreatedInspection>('/inspection-visits', {
|
||||
method: 'POST',
|
||||
body: JSON.stringify({
|
||||
operationalAreaId: areaId,
|
||||
|
||||
Reference in New Issue
Block a user